Merge d70c47e into 8f31e6b

NIPTool/API/external/utils.py

@@ -250,17 +250,16 @@ def get_tris_control_normal(adapter, chr):
         {"$match": {f"status_{chr}": {"$eq": "Normal"}, "include": {"$eq": True}}},
         {
             "$group": {
-                "_id": {f"status_T{chr}": f"$status_T{chr}"},
+                "_id": {f"status_{chr}": f"$status_{chr}"},
                 "values": {"$push": f"$Zscore_{chr}"},
                 "names": {"$push": "$sample_id"},
                 "count": {"$sum": 1},
             }
         },
     ]
     if not list(find.sample_aggregate(pipe=pipe, adapter=adapter)):
-        return []
-    data = list(find.sample_aggregate(pipe=pipe, adapter=adapter))[0]
-
+        return {}
+    data = find.sample_aggregate(pipe=pipe, adapter=adapter)[0]
     data["values"] = [value for value in data.get("values", [])]
 
     return data
@@ -355,6 +354,7 @@ def get_normal_for_samp_tris_plot(adapter):
     data_per_abnormaliy = {}
     x_axis = 1
     for abn in ["13", "18", "21"]:
+
         data = get_tris_control_normal(adapter, abn)
         data["x_axis"] = [x_axis] * data.get("count", 0)
         data_per_abnormaliy[abn] = data

NIPTool/crud/find.py

@@ -45,13 +45,13 @@ def batches(adapter: NiptAdapter) -> List[Batch]:
 def sample_aggregate(adapter: NiptAdapter, pipe: list) -> list:
     """Aggregates a query pipeline on the sample collection"""
 
-    return adapter.sample_collection.aggregate(pipe)
+    return list(adapter.sample_collection.aggregate(pipe))
 
 
 def batch_aggregate(adapter: NiptAdapter, pipe: list) -> List[Batch]:
     """Aggregates a query pipeline on the sample collection"""
 
-    return adapter.batch_collection.aggregate(pipe)
+    return list(adapter.batch_collection.aggregate(pipe))
 
 
 def batch_samples(adapter: NiptAdapter, batch_id: str) -> List[Sample]: