Merge pull request #580 from ayobi/vocab_samples_issues

patch existing observations for project 118 and 160

Author: cassidysymons

microsetta_private_api/db/patches/0142.sql

@@ -0,0 +1,18 @@
+-- August 26, 2024
+-- Patching 0141 Sample Observation Project Association 
+-- to add projects 118 and 160.
+
+WITH all_observations AS (
+    SELECT observation_id FROM barcodes.sample_observations
+),
+add_projects AS (
+    SELECT project_id
+    FROM (VALUES (118), (160)) AS np(project_id)
+    WHERE EXISTS (
+        SELECT 1 FROM barcodes.project WHERE project.project_id = np.project_id
+    )
+)
+INSERT INTO barcodes.sample_observation_project_associations (observation_id, project_id)
+SELECT observation_id, project_id
+FROM all_observations
+CROSS JOIN add_projects;

microsetta_private_api/repo/admin_repo.py

@@ -409,9 +409,6 @@ def _rows_to_dicts_list(rows):
                 LEFT JOIN
                     barcodes.sample_observations so
                         ON bso.observation_id = so.observation_id
-                LEFT JOIN
-                    barcodes.sample_observation_project_associations sopa
-                        ON so.observation_id = sopa.observation_id
                 WHERE
                     bs.barcode = %s
                 GROUP BY