From 7984b286b2be8c1807522549366377a2ae4cd9f6 Mon Sep 17 00:00:00 2001 From: islean Date: Thu, 29 Aug 2024 14:32:52 +0200 Subject: [PATCH] Remove unnecessary rules --- .../workflows/tomte/models/case.py | 10 ++++------ .../workflows/tomte/models/order.py | 10 ++++------ 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/cg/services/order_validation_service/workflows/tomte/models/case.py b/cg/services/order_validation_service/workflows/tomte/models/case.py index 75dad382f3..a6a3e28288 100644 --- a/cg/services/order_validation_service/workflows/tomte/models/case.py +++ b/cg/services/order_validation_service/workflows/tomte/models/case.py @@ -8,17 +8,15 @@ TomteSample, ) +NewSample = Annotated[TomteSample, Tag("new")] +OldSample = Annotated[ExistingSample, Tag("existing")] + class TomteCase(Case): cohorts: list[str] | None = None panels: list[str] synopsis: str | None = None - samples: list[ - Annotated[ - Annotated[TomteSample, Tag("new")] | Annotated[ExistingSample, Tag("existing")], - Discriminator(has_internal_id), - ] - ] + samples: list[Annotated[NewSample | OldSample, Discriminator(has_internal_id)]] def get_sample(self, sample_name: str) -> TomteSample | None: for sample in self.samples: diff --git a/cg/services/order_validation_service/workflows/tomte/models/order.py b/cg/services/order_validation_service/workflows/tomte/models/order.py index 720ca29ec5..68ffd53c55 100644 --- a/cg/services/order_validation_service/workflows/tomte/models/order.py +++ b/cg/services/order_validation_service/workflows/tomte/models/order.py @@ -9,12 +9,10 @@ ) from cg.services.order_validation_service.workflows.tomte.models.case import TomteCase +NewCase = Annotated[TomteCase, Tag("new")] +OldCase = Annotated[ExistingCase, Tag("existing")] + class TomteOrder(OrderWithCases): - cases: list[ - Annotated[ - Annotated[TomteCase, Tag("new")] | Annotated[ExistingCase, Tag("existing")], - Discriminator(has_internal_id), - ] - ] + cases: list[Annotated[NewCase | OldCase, Discriminator(has_internal_id)]] delivery_type: TomteDeliveryType