Merge branch 'master' into improve-order-flow-main

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 64.5.29
+current_version = 64.5.30
 commit = True
 tag = True
 tag_name = v{new_version}

cg/__init__.py

@@ -1,2 +1,2 @@
 __title__ = "cg"
-__version__ = "64.5.29"
+__version__ = "64.5.30"

cg/services/orders/validate_order_services/validate_microbial_order.py

@@ -1,7 +1,7 @@
 from cg.exc import OrderError
 from cg.models.orders.constants import OrderType
 from cg.models.orders.order import OrderIn
-from cg.models.orders.samples import SarsCov2Sample
+from cg.models.orders.samples import MicrobialFastqSample, SarsCov2Sample
 from cg.services.orders.submitters.order_submitter import ValidateOrderService
 from cg.store.models import Customer
 from cg.store.store import Store
@@ -15,18 +15,25 @@ def __init__(self, status_db: Store):
     def validate_order(self, order: OrderIn) -> None:
         if order.order_type == OrderType.SARS_COV_2:
             self._validate_sample_names_are_available(
-                samples=order.samples, customer_id=order.customer
+                samples=order.samples, customer_id=order.customer, is_sars_cov_2=True
+            )
+        elif order.order_type == OrderType.MICROBIAL_FASTQ:
+            self._validate_sample_names_are_available(
+                samples=order.samples, customer_id=order.customer, is_sars_cov_2=False
             )
 
     def _validate_sample_names_are_available(
-        self, samples: list[SarsCov2Sample], customer_id: str
+        self,
+        samples: list[SarsCov2Sample] | list[MicrobialFastqSample],
+        customer_id: str,
+        is_sars_cov_2: bool,
     ) -> None:
         """Validate names of all samples are not already in use."""
         customer: Customer = self.status_db.get_customer_by_internal_id(
             customer_internal_id=customer_id
         )
         for sample in samples:
-            if sample.control:
+            if is_sars_cov_2 and sample.control:
                 continue
             if self.status_db.get_sample_by_customer_and_name(
                 customer_entry_id=[customer.id], sample_name=sample.name

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "cg"
-version = "64.5.29"
+version = "64.5.30"
 description = "Clinical Genomics command center"
 authors = ["Clinical Genomics <[email protected]>"]
 readme = "README.md"