Merge branch 'feature-db-changes'

SkyTruth · Nov 9, 2023 · 6e7abf4 · 6e7abf4
2 parents 789240b + 34028e0
commit 6e7abf4
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 11 deletions.
diff --git a/alembic/versions/3736e85bc273_add_exposed_funcs.py b/alembic/versions/3736e85bc273_add_exposed_funcs.py
@@ -67,7 +67,9 @@ def upgrade() -> None:
             OUT cls_long_name text,
             OUT aoi_type_1_ids bigint[],
             OUT aoi_type_2_ids bigint[],
-            OUT aoi_type_3_ids bigint[]
+            OUT aoi_type_3_ids bigint[],
+            OUT source_type_1_ids bigint[],
+            OUT source_type_2_ids bigint[]
         )
             RETURNS SETOF record
             LANGUAGE 'sql'
@@ -99,7 +101,9 @@ def upgrade() -> None:
                 sp.cls_long_name,
                 sp.aoi_type_1_ids,
                 sp.aoi_type_2_ids,
-                sp.aoi_type_3_ids
+                sp.aoi_type_3_ids,
+                sp.source_type_1_ids,
+                sp.source_type_2_ids
             FROM public.slick_plus sp
             LEFT JOIN slick_to_source sts ON sts.slick = sp.id AND source_id != 'NULL'
             LEFT JOIN slick_to_aoi sta ON sta.slick = sp.id AND aoi_id != 'NULL'
@@ -137,7 +141,9 @@ def upgrade() -> None:
             OUT cls_long_name text,
             OUT aoi_type_1_ids bigint[],
             OUT aoi_type_2_ids bigint[],
-            OUT aoi_type_3_ids bigint[]
+            OUT aoi_type_3_ids bigint[],
+            OUT source_type_1_ids bigint[],
+            OUT source_type_2_ids bigint[]
         )
             RETURNS SETOF record
             LANGUAGE 'sql'
@@ -169,7 +175,9 @@ def upgrade() -> None:
                 sp.cls_long_name,
                 sp.aoi_type_1_ids,
                 sp.aoi_type_2_ids,
-                sp.aoi_type_3_ids
+                sp.aoi_type_3_ids,
+                sp.source_type_1_ids,
+                sp.source_type_2_ids
             FROM public.slick_plus sp
             JOIN slick_to_source sts ON sts.slick = sp.id
             WHERE sts.source = ANY(string_to_array(source_id, ',')::int[])
@@ -205,7 +213,9 @@ def upgrade() -> None:
             OUT cls_long_name text,
             OUT aoi_type_1_ids bigint[],
             OUT aoi_type_2_ids bigint[],
-            OUT aoi_type_3_ids bigint[]
+            OUT aoi_type_3_ids bigint[],
+            OUT source_type_1_ids bigint[],
+            OUT source_type_2_ids bigint[]
         )
             RETURNS SETOF record
             LANGUAGE 'sql'
@@ -237,7 +247,9 @@ def upgrade() -> None:
                 sp.cls_long_name,
                 sp.aoi_type_1_ids,
                 sp.aoi_type_2_ids,
-                sp.aoi_type_3_ids
+                sp.aoi_type_3_ids,
+                sp.source_type_1_ids,
+                sp.source_type_2_ids
             FROM public.slick_plus sp
             JOIN slick_to_aoi sta ON sta.slick = sp.id
             WHERE sta.aoi = ANY(string_to_array(aoi_id, ',')::int[]);

diff --git a/alembic/versions/39277f6278f4_add_view.py b/alembic/versions/39277f6278f4_add_view.py
@@ -31,20 +31,28 @@ def upgrade() -> None:
         cls.long_name AS cls_long_name,
         aoi_agg.aoi_type_1_ids,
         aoi_agg.aoi_type_2_ids,
-        aoi_agg.aoi_type_3_ids
+        aoi_agg.aoi_type_3_ids,
+        source_agg.source_type_1_ids,
+        source_agg.source_type_2_ids
     FROM slick
     JOIN orchestrator_run ON orchestrator_run.id = slick.orchestrator_run
     JOIN sentinel1_grd ON sentinel1_grd.id = orchestrator_run.sentinel1_grd
     JOIN cls ON cls.id = slick.cls
-    JOIN (
+    LEFT JOIN (
         SELECT slick_to_aoi.slick,
             array_agg(aoi.id) FILTER (WHERE aoi.type = 1) AS aoi_type_1_ids,
             array_agg(aoi.id) FILTER (WHERE aoi.type = 2) AS aoi_type_2_ids,
             array_agg(aoi.id) FILTER (WHERE aoi.type = 3) AS aoi_type_3_ids
         FROM slick_to_aoi
         JOIN aoi ON slick_to_aoi.aoi = aoi.id
         GROUP BY slick_to_aoi.slick
-        ) aoi_agg ON aoi_agg.slick = slick.id;
+        ) aoi_agg ON aoi_agg.slick = slick.id
+     LEFT JOIN ( SELECT slick_to_source.slick,
+            array_agg(source.id) FILTER (WHERE source.type = 1) AS source_type_1_ids,
+            array_agg(source.id) FILTER (WHERE source.type = 2) AS source_type_2_ids
+           FROM slick_to_source
+             JOIN source ON slick_to_source.source = source.id
+          GROUP BY slick_to_source.slick) source_agg ON source_agg.slick = slick.id;
     """,
     )
     op.create_entity(slick_plus)

diff --git a/alembic/versions/7cd715196b8d_add_index.py b/alembic/versions/7cd715196b8d_add_index.py
@@ -70,8 +70,8 @@ def downgrade() -> None:
     op.drop_index("idx_orchestrator_run_git_hash", "orchestrator_run")
     op.drop_index("idx_orchestrator_run_sentinel1_grd", "orchestrator_run")
 
-    op.drop_index("idx_slick_to_aoi_aoi", "source")
-    op.drop_index("idx_slick_to_aoi_slick", "source")
+    op.drop_index("idx_slick_to_aoi_aoi", "slick_to_aoi")
+    op.drop_index("idx_slick_to_aoi_slick", "slick_to_aoi")
 
     op.drop_index("idx_source_name", "source")