diff --git a/cg/services/orders/store_order_services/store_fastq_order_service.py b/cg/services/orders/store_order_services/store_fastq_order_service.py index abaf936fe3..1938051ccd 100644 --- a/cg/services/orders/store_order_services/store_fastq_order_service.py +++ b/cg/services/orders/store_order_services/store_fastq_order_service.py @@ -26,7 +26,7 @@ def store_order(self, order: FastqOrder) -> dict: project_data, lims_map = self.lims.process_lims( samples=order.samples, - ticket=order.ticket_number, + ticket=order._generated_ticket_id, order_name=order.name, workflow=Workflow.RAW_DATA, customer=order.customer, @@ -57,18 +57,17 @@ def create_maf_case(self, sample_obj: Sample, order: Order) -> None: def store_items_in_status(self, order: FastqOrder) -> list[Sample]: """Store fastq samples in the status database including family connection and delivery""" - ticket_id: str | None = order._generated_ticket_id + ticket_id: int = order._generated_ticket_id customer: Customer = self.status_db.get_customer_by_internal_id( customer_internal_id=order.customer ) new_samples = [] case: Case = self.status_db.get_case_by_name_and_customer( - customer=customer, case_name=ticket_id + customer=customer, case_name=str(ticket_id) ) - status_db_order = Order( + status_db_order: Order = self.status_db.add_order( customer=customer, - order_date=datetime.now(), - ticket_id=int(ticket_id), + ticket_id=ticket_id, ) with self.status_db.session.no_autoflush: for sample in order.samples: @@ -79,7 +78,7 @@ def store_items_in_status(self, order: FastqOrder) -> list[Sample]: internal_id=sample._generated_lims_id, order=order.name, ordered=datetime.now(), - original_ticket=ticket_id, + original_ticket=str(ticket_id), priority=sample.priority, tumour=sample.tumour, capture_kit=sample.capture_kit, @@ -96,9 +95,9 @@ def store_items_in_status(self, order: FastqOrder) -> list[Sample]: case = self.status_db.add_case( data_analysis=Workflow.RAW_DATA, data_delivery=DataDelivery.FASTQ, - name=ticket_id, + name=str(ticket_id), priority=sample.priority, - ticket=ticket_id, + ticket=str(ticket_id), ) if ( not new_sample.is_tumour diff --git a/cg/services/orders/store_order_services/store_microbial_fastq_order_service.py b/cg/services/orders/store_order_services/store_microbial_fastq_order_service.py index a8824201bb..c410edef3e 100644 --- a/cg/services/orders/store_order_services/store_microbial_fastq_order_service.py +++ b/cg/services/orders/store_order_services/store_microbial_fastq_order_service.py @@ -24,7 +24,7 @@ def store_order(self, order: MicrobialFastqOrder) -> dict: """Store the order in the statusDB and LIMS, return the database samples and LIMS info.""" project_data, lims_map = self.lims.process_lims( samples=order.samples, - ticket=order.ticket_number, + ticket=order._generated_ticket_id, order_name=order.name, workflow=Workflow.RAW_DATA, customer=order.customer, @@ -76,7 +76,7 @@ def _create_db_case_for_sample( return case def _create_db_order(self, order: MicrobialFastqOrder) -> Order: - ticket_id: str = order._generated_ticket_id + ticket_id: int = order._generated_ticket_id customer: Customer = self.status_db.get_customer_by_internal_id( customer_internal_id=order.customer ) diff --git a/cg/store/crud/create.py b/cg/store/crud/create.py index 7c820bee89..89e878143d 100644 --- a/cg/store/crud/create.py +++ b/cg/store/crud/create.py @@ -398,12 +398,12 @@ def add_organism( **kwargs, ) - def add_order(self, customer: Customer, ticket_id: str | int) -> Order: + def add_order(self, customer: Customer, ticket_id: int) -> Order: """Build a new Order record.""" order = Order( customer=customer, order_date=datetime.now(), - ticket_id=int(ticket_id), + ticket_id=ticket_id, ) return order