extend dataset response by collection

GenomicDataInfrastructure · Jul 19, 2023 · ec8810d · ec8810d
1 parent 9cd3cc5
commit ec8810d
Showing 1 changed file with 31 additions and 6 deletions.
diff --git a/beacon/response/build_response.py b/beacon/response/build_response.py
@@ -117,12 +117,37 @@ def build_beacon_resultset_response_by_dataset(data,
     for doc in data:
         for dataset_dict in list_of_dataset_dicts:
             try:
-                if doc['id'] in dataset_dict['ids'][0]['biosampleIds']:
-                    dataset_id = dataset_dict['dataset']
-                    response_dict[dataset_id].append(doc)
-                elif doc['id'] in dataset_dict['ids'][0]['individualIds']:
-                    dataset_id = dataset_dict['dataset']
-                    response_dict[dataset_id].append(doc)
+                LOG.debug(doc)
+                LOG.debug(entity_schema)
+                if str(entity_schema) == 'DefaultSchemas.GENOMICVARIATIONS':
+                    for element in doc['caseLevelData']:
+                        if element['biosampleId'] in dataset_dict['ids'][0]['biosampleIds']:
+                            dataset_id = dataset_dict['dataset']
+                            response_dict[dataset_id].append(doc)
+                        elif element['biosampleId'] in dataset_dict['ids'][0]['individualIds']:
+                            dataset_id = dataset_dict['dataset']
+                            response_dict[dataset_id].append(doc)
+                elif str(entity_schema) == 'DefaultSchemas.ANALYSES':
+                        if doc['biosampleId'] in dataset_dict['ids'][0]['biosampleIds']:
+                            dataset_id = dataset_dict['dataset']
+                            response_dict[dataset_id].append(doc)
+                        elif doc['individualId'] in dataset_dict['ids'][0]['individualIds']:
+                            dataset_id = dataset_dict['dataset']
+                            response_dict[dataset_id].append(doc)
+                elif str(entity_schema) == 'DefaultSchemas.RUNS':
+                        if doc['biosampleId'] in dataset_dict['ids'][0]['biosampleIds']:
+                            dataset_id = dataset_dict['dataset']
+                            response_dict[dataset_id].append(doc)
+                        elif doc['individualId'] in dataset_dict['ids'][0]['individualIds']:
+                            dataset_id = dataset_dict['dataset']
+                            response_dict[dataset_id].append(doc)
+                else:
+                        if doc['id'] in dataset_dict['ids'][0]['biosampleIds']:
+                            dataset_id = dataset_dict['dataset']
+                            response_dict[dataset_id].append(doc)
+                        elif doc['id'] in dataset_dict['ids'][0]['individualIds']:
+                            dataset_id = dataset_dict['dataset']
+                            response_dict[dataset_id].append(doc)
             except Exception as e:
                 LOG.debug(e)
     length_to_rest=0