Skip to content

Commit

Permalink
Fix order messages (#4147) (patch)
Browse files Browse the repository at this point in the history
### Fixed

- New lines for every sample
- Use sample priority name to avoid ints
  • Loading branch information
islean authored Jan 27, 2025
1 parent 8cec5df commit ad73202
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions cg/services/orders/submitter/ticket_handler.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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,
Expand All @@ -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,
Expand Down

0 comments on commit ad73202

Please sign in to comment.