Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow all order types in JSON orders #4286

Merged
merged 1 commit into from
Mar 13, 2025
Merged

Allow all order types in JSON orders #4286

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cg/apps/orderform/json_orderform_parser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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")
Expand Down
3 changes: 2 additions & 1 deletion cg/models/orders/json_sample.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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
Expand Down
Loading