diff --git a/cg/apps/orderform/json_orderform_parser.py b/cg/apps/orderform/json_orderform_parser.py index 851ca10968..3cf0ff8422 100644 --- a/cg/apps/orderform/json_orderform_parser.py +++ b/cg/apps/orderform/json_orderform_parser.py @@ -1,5 +1,5 @@ from cg.apps.orderform.orderform_parser import OrderformParser -from cg.constants import DataDelivery, Workflow +from cg.constants import DataDelivery from cg.exc import OrderFormError from cg.models.orders.constants import OrderType from cg.models.orders.json_sample import JsonSample @@ -18,7 +18,7 @@ def get_project_type(self) -> str: raise OrderFormError(f"mixed 'Data Analysis' types: {', '.join(data_analyses)}") data_analysis: str = data_analyses.pop() - if data_analysis in Workflow.__members__.values(): + if data_analysis in OrderType.__members__.values(): return data_analysis raise OrderFormError(f"Unsupported data_analysis: {data_analyses} for json data") diff --git a/cg/models/orders/json_sample.py b/cg/models/orders/json_sample.py index 572784c51f..4bb29f096b 100644 --- a/cg/models/orders/json_sample.py +++ b/cg/models/orders/json_sample.py @@ -2,6 +2,7 @@ from typing_extensions import Annotated from cg.constants import DataDelivery, Workflow +from cg.models.orders.constants import OrderType from cg.models.orders.sample_base import OrderSample from cg.models.orders.validators.json_sample_validators import convert_well, join_list @@ -12,7 +13,7 @@ class JsonSample(OrderSample): concentration_ng_ul: str | None = None concentration_sample: str | None = None control: str | None = None - data_analysis: Workflow = Workflow.MIP_DNA + data_analysis: OrderType = Workflow.MIP_DNA data_delivery: DataDelivery = DataDelivery.SCOUT index: str | None = None panels: list[str] | None = None