Merge pull request #1527 from cityofaustin/2.28.0-release-candidate

Zacate Creek

moped-database/metadata/tables.yaml

@@ -1669,37 +1669,40 @@
     - role: moped-admin
       permission:
         columns:
+          - date_added
           - department_id
           - entity_id
-          - organization_id
-          - workgroup_id
           - entity_name
-          - date_added
           - entity_uuid
+          - is_deleted
+          - organization_id
+          - workgroup_id
         filter: {}
         allow_aggregations: true
     - role: moped-editor
       permission:
         columns:
+          - date_added
           - department_id
           - entity_id
-          - organization_id
-          - workgroup_id
           - entity_name
-          - date_added
           - entity_uuid
+          - is_deleted
+          - organization_id
+          - workgroup_id
         filter: {}
         allow_aggregations: true
     - role: moped-viewer
       permission:
         columns:
+          - date_added
           - department_id
           - entity_id
-          - organization_id
-          - workgroup_id
           - entity_name
-          - date_added
           - entity_uuid
+          - is_deleted
+          - organization_id
+          - workgroup_id
         filter: {}
         allow_aggregations: true
 - table:
@@ -5493,6 +5496,9 @@
           - workgroup_name
         filter: {}
         allow_aggregations: true
+- table:
+    name: project_funding_view
+    schema: public
 - table:
     name: project_geography
     schema: public

moped-database/migrations/1735855851119_update_atd_project_owner_to_tpw_project_owner/down.sql

@@ -0,0 +1,10 @@
+INSERT INTO moped_project_roles (project_role_id, project_role_name, active_role, role_order, project_role_description)
+VALUES (0, 'Unknown', TRUE, 999, 'Unknown Role');
+
+UPDATE moped_project_roles
+SET project_role_description = 'Supervises contractor activities for approval before invoicing; accepts work on behalf of ATD and coordinates with other divisions'
+WHERE project_role_id = 12;
+
+UPDATE moped_project_roles
+SET project_role_name = 'ATD Project Owner'
+WHERE project_role_id = 5;

moped-database/migrations/1735855851119_update_atd_project_owner_to_tpw_project_owner/up.sql

@@ -0,0 +1,10 @@
+UPDATE moped_project_roles
+SET project_role_name = 'TPW Project Owner'
+WHERE project_role_id = 5;
+
+UPDATE moped_project_roles
+SET project_role_description = 'Supervises contractor activities for approval before invoicing; accepts work on behalf of TPW and coordinates with other divisions'
+WHERE project_role_id = 12;
+
+DELETE FROM moped_project_roles
+WHERE project_role_id = 0;

moped-database/migrations/1736291471358_add_proj_fund_view/down.sql

@@ -0,0 +1 @@
+DROP VIEW project_funding_view;

moped-database/migrations/1736291471358_add_proj_fund_view/up.sql

@@ -0,0 +1,22 @@
+CREATE OR REPLACE VIEW project_funding_view AS
+SELECT
+    mp.project_id,
+    mpf.proj_funding_id,
+    mpf.funding_amount,
+    mpf.funding_description,
+    mpf.fund_dept_unit,
+    mpf.created_at,
+    mpf.updated_at,
+    mfs.funding_source_name,
+    mfp.funding_program_name,
+    mfst.funding_status_name
+FROM
+    moped_project AS mp
+LEFT JOIN moped_proj_funding AS mpf ON mp.project_id = mpf.project_id
+LEFT JOIN moped_fund_sources AS mfs ON mpf.funding_source_id = mfs.funding_source_id
+LEFT JOIN moped_fund_programs AS mfp ON mpf.funding_program_id = mfp.funding_program_id
+LEFT JOIN moped_fund_status AS mfst ON mpf.funding_status_id = mfst.funding_status_id
+WHERE
+    TRUE
+    AND mp.is_deleted = FALSE
+    AND mpf.is_deleted = FALSE;

moped-database/migrations/1736442550315_update_entities/down.sql

@@ -0,0 +1,3 @@
+-- Updating moped_entity table will be up only. If we need to revert, we will need do it manually or
+-- update with a future migration.
+SELECT 0;

moped-database/migrations/1736442550315_update_entities/up.sql

@@ -0,0 +1,251 @@
+-- Make is_deleted non-nullable in moped_workgroup and moped_department
+ALTER TABLE moped_workgroup
+ALTER COLUMN is_deleted SET NOT NULL;
+
+ALTER TABLE moped_department
+ALTER COLUMN is_deleted SET NOT NULL;
+
+-- Add is_deleted to moped_entity
+ALTER TABLE moped_entity
+ADD COLUMN is_deleted BOOLEAN DEFAULT FALSE NOT NULL;
+
+
+-- Soft delete the old entities
+UPDATE moped_entity
+SET is_deleted = TRUE
+WHERE entity_name IN ('COA PWD Sidewalks & Special Projects', 'COA PWD Urban Trails', 'COA ATD', 'COA PWD');
+
+-- Insert new COA TPW Sidewalks and Urban Trails entity with appropriate department_id, workgroup_id, and organization_id
+WITH
+workgroup AS (
+    SELECT workgroup_id
+    FROM
+        moped_workgroup
+    WHERE
+        workgroup_name = 'Sidewalks and Urban Trails'
+),
+
+organization AS (
+    SELECT organization_id
+    FROM
+        moped_organization
+    WHERE
+        organization_name = 'City of Austin'
+),
+
+department AS (
+    SELECT department_id
+    FROM
+        moped_department
+    WHERE
+        department_name = 'Austin Transportation and Public Works'
+)
+
+INSERT INTO
+moped_entity (entity_name, department_id, workgroup_id, organization_id)
+SELECT
+    'COA TPW Sidewalks and Urban Trails' AS entity_name,
+    department.department_id,
+    workgroup.workgroup_id,
+    organization.organization_id
+FROM
+    department,
+    workgroup,
+    organization;
+
+-- Insert new row for COA TPW with appropriate department_id and organization_id (no associated workgroup)
+WITH organization AS (
+    SELECT organization_id FROM moped_organization WHERE organization_name = 'City of Austin'
+),
+
+department AS (
+    SELECT department_id FROM moped_department WHERE department_name = 'Austin Transportation and Public Works'
+)
+
+INSERT INTO moped_entity (entity_name, department_id, workgroup_id, organization_id, is_deleted)
+SELECT
+    'COA TPW' AS entity_name,
+    department.department_id,
+    NULL AS workgroup_id,
+    organization.organization_id,
+    FALSE AS is_deleted
+FROM department, organization;
+
+-- Find any records (except the soft-deleted above) that have either ATD or PWD in them and replace with TPW
+UPDATE moped_entity
+SET
+    entity_name = REPLACE(REPLACE(entity_name, 'ATD', 'TPW'), 'PWD', 'TPW')
+WHERE
+    (
+        entity_name LIKE '%ATD%'
+        OR entity_name LIKE '%PWD%'
+    )
+    AND (entity_name NOT IN ('COA PWD Sidewalks & Special Projects', 'COA PWD Urban Trails', 'COA ATD', 'COA PWD'));
+
+-- UPDATE PROJECT SPONSORS
+
+-- Find and update projects that need sponsor to be updated to COA TPW Sidewalks and Urban Trails
+WITH project_sponsor_todos AS (
+    SELECT entity_id AS ids
+    FROM
+        moped_entity
+    WHERE
+        entity_name IN (
+            'COA PWD Sidewalks & Special Projects',
+            'COA PWD Urban Trails'
+        )
+),
+
+new_entity_row AS (
+    SELECT entity_id AS id
+    FROM
+        moped_entity
+    WHERE
+        entity_name = 'COA TPW Sidewalks and Urban Trails'
+)
+
+UPDATE
+moped_project
+SET
+    project_sponsor = (SELECT id FROM new_entity_row)
+WHERE
+    project_sponsor IN (SELECT ids FROM project_sponsor_todos);
+
+-- Find and update projects that need sponsor to be updated to COA TPW
+WITH project_sponsor_todos AS (
+    SELECT entity_id AS ids
+    FROM
+        moped_entity
+    WHERE
+        entity_name IN (
+            'COA ATD',
+            'COA PWD'
+        )
+),
+
+new_entity_row AS (
+    SELECT entity_id AS id
+    FROM
+        moped_entity
+    WHERE
+        entity_name = 'COA TPW'
+)
+
+UPDATE
+moped_project
+SET
+    project_sponsor = (SELECT id FROM new_entity_row)
+WHERE
+    project_sponsor IN (SELECT ids FROM project_sponsor_todos);
+
+-- UPDATE PROJECT LEADS
+
+-- Find and update projects that need lead to be updated to COA TPW Sidewalks and Urban Trails
+WITH project_lead_todos AS (
+    SELECT entity_id AS ids
+    FROM
+        moped_entity
+    WHERE
+        entity_name IN (
+            'COA PWD Sidewalks & Special Projects',
+            'COA PWD Urban Trails'
+        )
+),
+
+new_entity_row AS (
+    SELECT entity_id AS id
+    FROM
+        moped_entity
+    WHERE
+        entity_name = 'COA TPW Sidewalks and Urban Trails'
+)
+
+UPDATE
+moped_project
+SET
+    project_lead_id = (SELECT id FROM new_entity_row)
+WHERE
+    project_lead_id IN (SELECT ids FROM project_lead_todos);
+
+-- Find and update projects that need lead to be updated to COA TPW
+WITH project_lead_todos AS (
+    SELECT entity_id AS ids
+    FROM
+        moped_entity
+    WHERE
+        entity_name IN (
+            'COA ATD',
+            'COA PWD'
+        )
+),
+
+new_entity_row AS (
+    SELECT entity_id AS id
+    FROM
+        moped_entity
+    WHERE
+        entity_name = 'COA TPW'
+)
+
+UPDATE
+moped_project
+SET
+    project_lead_id = (SELECT id FROM new_entity_row)
+WHERE
+    project_lead_id IN (SELECT ids FROM project_lead_todos);
+
+-- UPDATE PROJECT PARTNERS
+
+-- Find and update projects that need lead to be updated to COA TPW Sidewalks and Urban Trails
+WITH project_partner_todos AS (
+    SELECT entity_id AS ids
+    FROM
+        moped_entity
+    WHERE
+        entity_name IN (
+            'COA PWD Sidewalks & Special Projects',
+            'COA PWD Urban Trails'
+        )
+),
+
+new_entity_row AS (
+    SELECT entity_id AS id
+    FROM
+        moped_entity
+    WHERE
+        entity_name = 'COA TPW Sidewalks and Urban Trails'
+)
+
+UPDATE
+moped_proj_partners
+SET
+    entity_id = (SELECT id FROM new_entity_row)
+WHERE
+    entity_id IN (SELECT ids FROM project_partner_todos);
+
+-- Find and update projects that need lead to be updated to COA TPW
+WITH project_partner_todos AS (
+    SELECT entity_id AS ids
+    FROM
+        moped_entity
+    WHERE
+        entity_name IN (
+            'COA ATD',
+            'COA PWD'
+        )
+),
+
+new_entity_row AS (
+    SELECT entity_id AS id
+    FROM
+        moped_entity
+    WHERE
+        entity_name = 'COA TPW'
+)
+
+UPDATE
+moped_proj_partners
+SET
+    entity_id = (SELECT id FROM new_entity_row)
+WHERE
+    entity_id IN (SELECT ids FROM project_partner_todos);

moped-database/recipes/copy_component_work_types_from_other_component.sql

@@ -0,0 +1,26 @@
+-- This example inserts the same moped_component_work_types work types as the Trail - Shared Use Path (Paved) component
+-- into the new Trail - Shared Use Path (Paved Dual Trail) component.
+-- This is useful when creating a new component that is similar to an existing component.
+-- See https://github.com/cityofaustin/atd-moped/pull/1191
+WITH inserts_todo AS (
+    SELECT
+        work_type_id,
+        'Trail' AS component_name,
+        'Shared Use Path (Paved Dual Trail)' AS component_subtype
+    FROM
+        moped_component_work_types AS mcwt
+    LEFT JOIN moped_work_types AS mwt ON mcwt.work_type_id = mwt.id
+    LEFT JOIN moped_components AS mc ON mcwt.component_id = mc.component_id
+    WHERE
+        mc.component_subtype LIKE 'Shared Use Path (Paved)'
+)
+
+INSERT INTO moped_component_work_types (component_id, work_type_id)
+SELECT
+    mc.component_id,
+    inserts_todo.work_type_id
+FROM
+    inserts_todo
+    -- gets the component id of the new component we created
+LEFT JOIN moped_components AS mc ON inserts_todo.component_name = mc.component_name
+    AND inserts_todo.component_subtype = mc.component_subtype;