Fix typing and add blueprint for converting errors

cg/services/order_validation_service/utils.py

@@ -1,6 +1,12 @@
 from typing import Callable
 
-from cg.services.order_validation_service.models.errors import CaseSampleError, OrderError
+from pydantic import ValidationError
+
+from cg.services.order_validation_service.models.errors import (
+    CaseSampleError,
+    OrderError,
+    ValidationErrors,
+)
 from cg.services.order_validation_service.models.order import Order
 from cg.store.store import Store
 
@@ -21,3 +27,7 @@ def apply_case_sample_validation(
         rule_errors: list[CaseSampleError] = rule(case=case, store=store)
         errors.extend(rule_errors)
     return errors
+
+
+def convert_errors(pydantic_errors: list[ValidationError]) -> ValidationErrors:
+    pass

cg/services/order_validation_service/workflows/tomte/validation/field_validator.py

@@ -1,13 +1,17 @@
 from typing import Tuple
-from cg.services.order_validation_service.models.errors import OrderError
+
+from pydantic import ValidationError
+
+from cg.services.order_validation_service.models.errors import ValidationErrors
+from cg.services.order_validation_service.utils import convert_errors
 from cg.services.order_validation_service.workflows.tomte.models.order import TomteOrder
 
 
 class TomteFieldValidator:
 
-    def validate(self, order_json: str) -> Tuple[TomteOrder, list[OrderError]]:
+    def validate(self, order_json: str) -> Tuple[TomteOrder, ValidationErrors]:
         try:
-            return TomteOrder.model_validate_json(order_json)
-        except ValueError:
-            # TODO: map all Pydantic errors to ValidationError
-            pass
+            return TomteOrder.model_validate_json(order_json), ValidationErrors()
+        except ValidationError as error:
+            order_errors: ValidationErrors = convert_errors(error.errors())
+            return order_errors

cg/services/order_validation_service/workflows/tomte/validation/inter_field_validators.py

@@ -1,8 +1,10 @@
 from cg.models.orders.sample_base import ContainerEnum
-from cg.services.order_validation_service.models.errors import OccupiedWellError, OrderError
-from cg.services.order_validation_service.workflows.tomte.models.order import TomteOrder
-from cg.services.order_validation_service.workflows.tomte.models.sample import TomteSample
+from cg.services.order_validation_service.models.errors import OccupiedWellError
 from cg.services.order_validation_service.workflows.tomte.models.case import TomteCase
+from cg.services.order_validation_service.workflows.tomte.models.order import TomteOrder
+from cg.services.order_validation_service.workflows.tomte.models.sample import (
+    TomteSample,
+)
 
 
 def validate_wells_contain_at_most_one_sample(order: TomteOrder) -> list[OccupiedWellError]:
@@ -44,8 +46,8 @@ def _get_excess_samples(
     return colliding_samples
 
 
-def _get_sample_well_map(plate_samples_with_cases: list[tuple[TomteSample, str]]):
-    sample_well_map: dict[str, tuple[TomteSample, TomteCase]] = {}
+def _get_sample_well_map(plate_samples_with_cases: list[tuple[TomteSample, TomteCase]]):
+    sample_well_map: dict[str, list[tuple[TomteSample, TomteCase]]] = {}
     for sample, case in plate_samples_with_cases:
         if sample.well_position not in sample_well_map:
             sample_well_map[sample.well_position] = []

tests/services/order_validation_service/conftest.py

@@ -1,10 +1,15 @@
 import pytest
+
 from cg.constants.constants import GenomeVersion, Workflow
 from cg.models.orders.sample_base import ContainerEnum, SexEnum, StatusEnum
-from cg.services.order_validation_service.workflows.tomte.constants import TomteDeliveryType
+from cg.services.order_validation_service.workflows.tomte.constants import (
+    TomteDeliveryType,
+)
 from cg.services.order_validation_service.workflows.tomte.models.case import TomteCase
 from cg.services.order_validation_service.workflows.tomte.models.order import TomteOrder
-from cg.services.order_validation_service.workflows.tomte.models.sample import TomteSample
+from cg.services.order_validation_service.workflows.tomte.models.sample import (
+    TomteSample,
+)
 
 
 def create_sample(id: int) -> TomteSample:
@@ -18,7 +23,7 @@ def create_sample(id: int) -> TomteSample:
         source="source",
         status=StatusEnum.affected,
         subject_id="subject1",
-        well_position=f"A{id}",
+        well_position=f"A:{id}",
     )