Merge branch 'master' into fix-remaining-tests

.bumpversion.cfg

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

cg/__init__.py

@@ -1,2 +1,2 @@
 __title__ = "cg"
-__version__ = "67.0.3"
+__version__ = "67.0.4"

cg/services/orders/submitter/ticket_handler.py

@@ -119,14 +119,12 @@ def add_sample_case_name_to_message(message: str, case_name: str | None) -> str:
     def add_existing_sample_info_to_message(
         self, message: str, customer_id: str, internal_id: str, case_name: str
     ) -> str:
-
         existing_sample: Sample = self.status_db.get_sample_by_internal_id(internal_id=internal_id)
 
         sample_customer = ""
         if existing_sample.customer_id != customer_id:
             sample_customer = " from " + existing_sample.customer.internal_id
-
-        message += f"{existing_sample.name}, application: {existing_sample.application_version.application.tag}, case: {case_name} (already existing sample{sample_customer}), priority: {existing_sample.priority}"
+        message += f"{existing_sample.name}, application: {existing_sample.application_version.application.tag}, case: {case_name} (already existing sample{sample_customer}), priority: {existing_sample.priority.name.lower()}"
         return message
 
     @staticmethod
@@ -180,6 +178,7 @@ def create_case_xml_sample_list(self, order, message: str) -> str:
             if not case.is_new:
                 db_case = self.status_db.get_case_by_internal_id(case.internal_id)
                 for sample in db_case.samples:
+                    message += self.NEW_LINE
                     message = self.add_existing_sample_info_to_message(
                         message=message,
                         customer_id=sample.customer.internal_id,
@@ -189,6 +188,7 @@ def create_case_xml_sample_list(self, order, message: str) -> str:
             else:
                 for sample in case.samples:
                     if not sample.is_new:
+                        message += self.NEW_LINE
                         message = self.add_existing_sample_info_to_message(
                             message=message,
                             customer_id=order.customer,

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [project]
 name = "cg"
-version = "67.0.3"
+version = "67.0.4"
 description = "Clinical Genomics command center"
 readme = {file = "README.md", content-type = "text/markdown"}
 homepage = "https://github.com/Clinical-Genomics/cg"