Skip to content

Commit

Permalink
Patch case addition to order form (#3990) (patch)
Browse files Browse the repository at this point in the history
### Fixed

- The cases field in the response from the order form parser is only populated for relevant order types
  • Loading branch information
islean authored Dec 3, 2024
1 parent 8108c6a commit ecc06d3
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 3 deletions.
8 changes: 5 additions & 3 deletions cg/apps/orderform/orderform_parser.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

from pydantic import BaseModel, ConfigDict, constr

from cg.apps.orderform.utils import ORDER_TYPES_WITH_CASES
from cg.constants import DataDelivery
from cg.exc import OrderFormError
from cg.models.orders.order import OrderType
Expand Down Expand Up @@ -142,10 +143,11 @@ def expand_case(case_id: str, case_samples: list[OrderSample]) -> OrderCase:

def generate_orderform(self) -> Orderform:
"""Generate an orderform"""
cases_map: dict[str, list[OrderSample]] = self.group_cases()
case_objs: list[OrderCase] = []
for case_id in cases_map:
case_objs.append(self.expand_case(case_id=case_id, case_samples=cases_map[case_id]))
if self.project_type in ORDER_TYPES_WITH_CASES:
cases_map: dict[str, list[OrderSample]] = self.group_cases()
for case_id in cases_map:
case_objs.append(self.expand_case(case_id=case_id, case_samples=cases_map[case_id]))
return Orderform(
comment=self.order_comment,
samples=self.samples,
Expand Down
11 changes: 11 additions & 0 deletions cg/apps/orderform/utils.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,16 @@
from cg.models.orders.constants import OrderType
from cg.models.orders.excel_sample import ExcelSample

ORDER_TYPES_WITH_CASES = [
OrderType.BALSAMIC,
OrderType.BALSAMIC_QC,
OrderType.BALSAMIC_UMI,
OrderType.MIP_DNA,
OrderType.MIP_RNA,
OrderType.RNAFUSION,
OrderType.TOMTE,
]


def are_all_samples_metagenome(samples: list[ExcelSample]) -> bool:
"""Check if all samples are metagenome samples"""
Expand Down

0 comments on commit ecc06d3

Please sign in to comment.