From 60441c3a7aa8b006d30014fa3508a377779a821d Mon Sep 17 00:00:00 2001 From: islean Date: Wed, 15 Jan 2025 10:29:30 +0100 Subject: [PATCH] Fix fixture --- .../orders_fixtures/order_to_submit_fixtures.py | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/tests/fixture_plugins/orders_fixtures/order_to_submit_fixtures.py b/tests/fixture_plugins/orders_fixtures/order_to_submit_fixtures.py index ee006f2ff9..0a16087bad 100644 --- a/tests/fixture_plugins/orders_fixtures/order_to_submit_fixtures.py +++ b/tests/fixture_plugins/orders_fixtures/order_to_submit_fixtures.py @@ -10,8 +10,13 @@ from cg.models.orders.order import OrderIn from cg.services.order_validation_service.workflows.balsamic.models.order import BalsamicOrder from cg.services.order_validation_service.workflows.fastq.models.order import FastqOrder +from cg.services.order_validation_service.workflows.microbial_fastq.models.order import ( + MicrobialFastqOrder, +) +from cg.services.order_validation_service.workflows.microsalt.models.order import MicrosaltOrder from cg.services.order_validation_service.workflows.mip_dna.models.order import MipDnaOrder from cg.services.order_validation_service.workflows.mip_rna.models.order import MipRnaOrder +from cg.services.order_validation_service.workflows.mutant.models.order import MutantOrder from cg.services.order_validation_service.workflows.pacbio_long_read.models.order import PacbioOrder @@ -126,6 +131,7 @@ def all_orders_to_submit( fluffy_order_to_submit: dict, metagenome_order_to_submit: dict, microbial_order_to_submit: dict, + microbial_fastq_order_to_submit: dict, mip_dna_order_to_submit: dict, mip_rna_order_to_submit: dict, pacbio_order_to_submit: dict, @@ -141,15 +147,14 @@ def all_orders_to_submit( OrderType.METAGENOME: OrderIn.parse_obj( metagenome_order_to_submit, project=OrderType.METAGENOME ), - # OrderType.MICROSALT: OrderIn.parse_obj( - # microbial_order_to_submit, project=OrderType.MICROSALT - # ), + OrderType.MICROBIAL_FASTQ: MicrobialFastqOrder.model_validate( + microbial_fastq_order_to_submit + ), + OrderType.MICROSALT: MicrosaltOrder.model_validate(microbial_order_to_submit), OrderType.MIP_DNA: MipDnaOrder.model_validate(mip_dna_order_to_submit), OrderType.MIP_RNA: MipRnaOrder.model_validate(mip_rna_order_to_submit), OrderType.PACBIO_LONG_READ: PacbioOrder.model_validate(pacbio_order_to_submit), # OrderType.RML: OrderIn.parse_obj(rml_order_to_submit, project=OrderType.RML), # OrderType.RNAFUSION: RnaFusionOrder.model_validate(rnafusion_order_to_submit), - # OrderType.SARS_COV_2: OrderIn.parse_obj( - # sarscov2_order_to_submit, project=OrderType.SARS_COV_2 - # ), + OrderType.SARS_COV_2: MutantOrder.model_validate(sarscov2_order_to_submit), }