Merge pull request #1543 from cityofaustin/patch/2.30.1

Patch v2.30.1
cityofaustin · Feb 19, 2025 · 07d1eb3 · 07d1eb3
2 parents ae02ad0 + 8e40b0c
commit 07d1eb3
Show file tree

Hide file tree

Showing 6 changed files with 1,114 additions and 8 deletions.
diff --git a/moped-database/migrations/1739832264644_update_districts_to_jsonb/down.sql b/moped-database/migrations/1739832264644_update_districts_to_jsonb/down.sql
diff --git a/moped-database/migrations/1739832264644_update_districts_to_jsonb/up.sql b/moped-database/migrations/1739832264644_update_districts_to_jsonb/up.sql
diff --git a/moped-database/views/component_arcgis_online_view.sql b/moped-database/views/component_arcgis_online_view.sql
@@ -1,4 +1,4 @@
--- Most recent migration: moped-database/migrations/1737754622032_deprecate_type_tables/up.sql
+-- Most recent migration: moped-database/migrations/1739832264644_update_districts_to_jsonb/up.sql
 
 CREATE OR REPLACE VIEW component_arcgis_online_view AS WITH work_types AS (
     SELECT

diff --git a/moped-database/views/exploded_component_arcgis_online_view.sql b/moped-database/views/exploded_component_arcgis_online_view.sql
@@ -1,4 +1,4 @@
--- Most recent migration: moped-database/migrations/1737754622032_deprecate_type_tables/up.sql
+-- Most recent migration: moped-database/migrations/1739832264644_update_districts_to_jsonb/up.sql
 
 CREATE OR REPLACE VIEW exploded_component_arcgis_online_view AS SELECT
     component_arcgis_online_view.project_id,

diff --git a/moped-database/views/project_list_view.sql b/moped-database/views/project_list_view.sql
@@ -1,4 +1,4 @@
--- Most recent migration: moped-database/migrations/1737754622032_deprecate_type_tables/up.sql
+-- Most recent migration: moped-database/migrations/1739832264644_update_districts_to_jsonb/up.sql
 
 CREATE OR REPLACE VIEW project_list_view AS WITH project_person_list_lookup AS (
     SELECT
@@ -105,8 +105,8 @@ parent_child_project_map AS (
 
     SELECT
         projects.project_id,
-        array_agg(DISTINCT project_districts.council_district_id) FILTER (WHERE project_districts.council_district_id IS NOT null) AS project_council_districts,
-        array_agg(DISTINCT project_and_children_districts.council_district_id) FILTER (WHERE project_and_children_districts.council_district_id IS NOT null) AS project_and_child_project_council_districts
+        jsonb_agg(DISTINCT project_districts.council_district_id) FILTER (WHERE project_districts.council_district_id IS NOT null) AS project_council_districts,
+        jsonb_agg(DISTINCT project_and_children_districts.council_district_id) FILTER (WHERE project_and_children_districts.council_district_id IS NOT null) AS project_and_child_project_council_districts
     FROM parent_child_project_map projects
     LEFT JOIN project_council_district_map project_and_children_districts ON projects.self_and_children_project_ids = project_and_children_districts.project_id
     LEFT JOIN project_council_district_map project_districts ON projects.project_id = project_districts.project_id
@@ -173,8 +173,8 @@ project_component_work_types AS (
             ORDER BY mwt.name
         ) AS component_work_type_names
     FROM moped_proj_components mpc
-    LEFT JOIN moped_proj_component_work_types mpcwt ON mpcwt.project_component_id = mpc.project_component_id
-    LEFT JOIN moped_work_types mwt ON mwt.id = mpcwt.work_type_id
+    LEFT JOIN moped_proj_component_work_types mpcwt ON mpc.project_component_id = mpcwt.project_component_id
+    LEFT JOIN moped_work_types mwt ON mpcwt.work_type_id = mwt.id
     WHERE true AND mpc.is_deleted = false AND mpcwt.is_deleted = false
     GROUP BY mpc.project_id
 )

diff --git a/moped-editor/package.json b/moped-editor/package.json
@@ -2,7 +2,7 @@
   "name": "atd-moped-editor",
   "author": "ATD Data & Technology Services",
   "license": "CC0-1.0",
-  "version": "2.30.0",
+  "version": "2.30.1",
   "homepage": "/moped",
   "private": false,
   "repository": {