dataset on batch level

Clinical-Genomics · Apr 25, 2022 · 9bc09c5 · 9bc09c5
1 parent 93b7155
commit 9bc09c5
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/statina/crud/find/plots/coverage_plot_data.py b/statina/crud/find/plots/coverage_plot_data.py
@@ -35,15 +35,17 @@ def get_scatter_data_for_coverage_plot(
     return data
 
 
-def get_box_data_for_coverage_plot(samples: List[DataBaseSample]) -> Dict[int, List[float]]:
+def get_box_data_for_coverage_plot(
+    validated_samples: List[DataBaseSample],
+) -> Dict[int, List[float]]:
     """Coverage Ratio data for Coverage Plot."""
 
-    data = {}
+    box_data = {}
     for chromosome in range(1, 23):
-        data[chromosome] = []
-        for sample in samples:
+        box_data[chromosome] = []
+        for sample in validated_samples:
             ratio = sample.dict().get(f"Chr{chromosome}_Ratio")
             if ratio is None:
                 continue
-            data[chromosome].append(ratio)
-    return data
+            box_data[chromosome].append(ratio)
+    return box_data
diff --git a/statina/models/database/batch.py b/statina/models/database/batch.py
@@ -21,6 +21,7 @@ class DatabaseBatch(BaseModel):
     Stdev_X: Optional[float]
     Stdev_Y: Optional[float]
     comment: Optional[str] = ""
+    dataset: Optional[str] = None
 
     class Config:
         validate_assignment = True

diff --git a/statina/models/database/sample.py b/statina/models/database/sample.py
@@ -104,7 +104,6 @@ class DataBaseSample(BaseModel):
     status_change_XXX: Optional[str] = ""
     status_change_XXY: Optional[str] = ""
     status_change_XYY: Optional[str] = ""
-    dataset: Optional[str] = None
 
     class Config:
         allow_population_by_field_name = True