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

Patch Tomte delivery messages #4172

Merged
merged 2 commits into from
Jan 30, 2025
Merged

Patch Tomte delivery messages #4172

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1c6d9ea
Patch Tomte delivery messages
islean Jan 30, 2025
845fe5e
Fix RNA without scout
islean Jan 30, 2025
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
11 changes: 5 additions & 6 deletions cg/services/delivery_message/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@
from cg.services.delivery_message.messages.fastq_analysis_message import FastqAnalysisMessage
from cg.services.delivery_message.messages.microsalt_mwx_message import MicrosaltMwxMessage
from cg.services.delivery_message.messages.rna_delivery_message import (
RNAScoutStrategy,
RNAFastqStrategy,
RNAAnalysisStrategy,
RNADeliveryMessage,
RNAFastqAnalysisStrategy,
RNAFastqStrategy,
RNAScoutStrategy,
RNAUploadMessageStrategy,
RNADeliveryMessage,
)
from cg.store.models import Case, Sample
from cg.store.store import Store
Expand Down Expand Up @@ -60,7 +60,7 @@ def get_message_strategy(case: Case, store: Store) -> DeliveryMessage:
if case.data_analysis == Workflow.MUTANT:
return CovidMessage()

if case.data_analysis == Workflow.MIP_RNA:
if case.data_analysis in [Workflow.MIP_RNA, Workflow.TOMTE]:
return get_rna_message_strategy_from_data_delivery(case=case, store=store)

message_strategy: DeliveryMessage = get_message_strategy_from_data_delivery(case)
Expand All @@ -79,8 +79,7 @@ def get_rna_message_strategy_from_data_delivery(
If a scout delivery is required it will use the RNADeliveryMessage class that links RNA to DNA cases.
Otherwise it used the conventional delivery message strategy.
"""
message_strategy = RNA_STRATEGY_MAP[case.data_delivery]
if message_strategy:
if message_strategy := RNA_STRATEGY_MAP.get(case.data_delivery):
return RNADeliveryMessage(store=store, strategy=message_strategy())
return MESSAGE_MAP[case.data_delivery]()

Expand Down
Loading