From 5f31dc47a6fbf5dff82590fcd8588497798e1195 Mon Sep 17 00:00:00 2001 From: Victor San Kho Lin Date: Wed, 18 Sep 2024 20:13:12 +1000 Subject: [PATCH 1/2] Added viewing ctTSO sample analysis results from v2.6.0 pipeline --- data_portal/models/s3object.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/data_portal/models/s3object.py b/data_portal/models/s3object.py index 7a1d64f3..61ae9bc4 100644 --- a/data_portal/models/s3object.py +++ b/data_portal/models/s3object.py @@ -139,10 +139,11 @@ def get_subject_sash_results(self, subject_id: str, **kwargs) -> QuerySet: return qs def get_subject_cttsov2_results(self, subject_id: str, **kwargs) -> QuerySet: - # get cttsov2 libraries + # We are to show analysis done by cttsov2 pipeline from ICA v2 BYOB bucket + # Get both ctTSO and ctTSOv2 libraries of the Subject subject_meta_list: List[LabMetadata] = LabMetadata.objects.filter( subject_id=subject_id, - assay__iexact=str(LabMetadataAssay.CT_TSO_V2.value).lower() + assay__in=[str(LabMetadataAssay.CT_TSO_V2.value).lower(), str(LabMetadataAssay.CT_TSO.value).upper()], ).all() cttsov2_libraries: List[str] = list() From 4e607dd5f39d4a9eb9a1b682897d60cf7412593a Mon Sep 17 00:00:00 2001 From: Victor San Kho Lin Date: Thu, 19 Sep 2024 10:07:58 +1000 Subject: [PATCH 2/2] Fixed case check --- data_portal/models/s3object.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data_portal/models/s3object.py b/data_portal/models/s3object.py index 61ae9bc4..eefa9757 100644 --- a/data_portal/models/s3object.py +++ b/data_portal/models/s3object.py @@ -143,7 +143,7 @@ def get_subject_cttsov2_results(self, subject_id: str, **kwargs) -> QuerySet: # Get both ctTSO and ctTSOv2 libraries of the Subject subject_meta_list: List[LabMetadata] = LabMetadata.objects.filter( subject_id=subject_id, - assay__in=[str(LabMetadataAssay.CT_TSO_V2.value).lower(), str(LabMetadataAssay.CT_TSO.value).upper()], + assay__in=[LabMetadataAssay.CT_TSO_V2.value, LabMetadataAssay.CT_TSO.value], ).all() cttsov2_libraries: List[str] = list()