Skip to content

Commit

Permalink
Merge pull request #1368 from cityofaustin/v2.13.1-patch
Browse files Browse the repository at this point in the history
v2.13.1 Patch
  • Loading branch information
mddilley authored Jun 25, 2024
2 parents 965d3b6 + 46a3d2f commit a83c859
Show file tree
Hide file tree
Showing 11 changed files with 1,466 additions and 40 deletions.
2 changes: 1 addition & 1 deletion moped-database/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Architecture Independent Docker Stack Components for Moped Development Environment
services:
hasura:
image: hasura/graphql-engine:v2.39.2
image: hasura/graphql-engine:v2.40.0
restart: always
depends_on:
- moped-pgsql
Expand Down
18 changes: 9 additions & 9 deletions moped-database/metadata/tables.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -44,16 +44,16 @@
- funding_source_name
- knack_data_tracker_project_record_id
- parent_project_name
- parent_project_name_with_descriptor
- parent_project_name_full
- parent_project_url
- project_added_by
- project_description
- project_designer
- project_inspector
- project_lead
- project_name
- project_name_descriptor
- project_name_with_descriptor
- project_name_secondary
- project_name_full
- project_partners
- project_phase_name
- project_phase_name_simple
Expand Down Expand Up @@ -126,16 +126,16 @@
- funding_source_name
- knack_data_tracker_project_record_id
- parent_project_name
- parent_project_name_with_descriptor
- parent_project_name_full
- parent_project_url
- project_added_by
- project_description
- project_designer
- project_inspector
- project_lead
- project_name
- project_name_descriptor
- project_name_with_descriptor
- project_name_secondary
- project_name_full
- project_partners
- project_phase_name
- project_phase_name_simple
Expand Down Expand Up @@ -208,16 +208,16 @@
- funding_source_name
- knack_data_tracker_project_record_id
- parent_project_name
- parent_project_name_with_descriptor
- parent_project_name_full
- parent_project_url
- project_added_by
- project_description
- project_designer
- project_inspector
- project_lead
- project_name
- project_name_descriptor
- project_name_with_descriptor
- project_name_secondary
- project_name_full
- project_partners
- project_phase_name
- project_phase_name_simple
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,193 @@
DROP VIEW IF EXISTS component_arcgis_online_view;

CREATE OR REPLACE VIEW component_arcgis_online_view AS WITH work_types AS (
SELECT
mpcwt.project_component_id,
string_agg(mwt.name, ', '::text) AS work_types
FROM moped_proj_component_work_types AS mpcwt
LEFT JOIN moped_work_types AS mwt ON mpcwt.work_type_id = mwt.id
WHERE mpcwt.is_deleted = false
GROUP BY mpcwt.project_component_id
),

council_districts AS (
SELECT
features.component_id AS project_component_id,
string_agg(DISTINCT features_council_districts.council_district_id::text, ', '::text) AS council_districts
FROM features_council_districts
LEFT JOIN features ON features_council_districts.feature_id = features.id
WHERE features.is_deleted = false
GROUP BY features.component_id
),

comp_geography AS (
SELECT
feature_union.component_id AS project_component_id,
string_agg(DISTINCT feature_union.id::text, ', '::text) AS feature_ids,
st_asgeojson(st_union(array_agg(feature_union.geography)))::json AS geometry,
st_asgeojson(st_union(array_agg(feature_union.line_geography)))::json AS line_geometry,
string_agg(DISTINCT feature_union.signal_id::text, ', '::text) AS signal_ids,
sum(feature_union.length_feet) AS length_feet_total
FROM (
SELECT
feature_signals.id,
feature_signals.component_id,
feature_signals.geography::geometry AS geography,
st_exteriorring(st_buffer(feature_signals.geography, 7::double precision)::geometry) AS line_geography,
feature_signals.signal_id,
null::integer AS length_feet
FROM feature_signals
WHERE feature_signals.is_deleted = false
UNION ALL
SELECT
feature_street_segments.id,
feature_street_segments.component_id,
feature_street_segments.geography::geometry AS geography,
feature_street_segments.geography::geometry AS line_geography,
null::integer AS signal_id,
feature_street_segments.length_feet
FROM feature_street_segments
WHERE feature_street_segments.is_deleted = false
UNION ALL
SELECT
feature_intersections.id,
feature_intersections.component_id,
feature_intersections.geography::geometry AS geography,
st_exteriorring(st_buffer(feature_intersections.geography, 7::double precision)::geometry) AS line_geography,
null::integer AS signal_id,
null::integer AS length_feet
FROM feature_intersections
WHERE feature_intersections.is_deleted = false
UNION ALL
SELECT
feature_drawn_points.id,
feature_drawn_points.component_id,
feature_drawn_points.geography::geometry AS geography,
st_exteriorring(st_buffer(feature_drawn_points.geography, 7::double precision)::geometry) AS line_geography,
null::integer AS signal_id,
null::integer AS length_feet
FROM feature_drawn_points
WHERE feature_drawn_points.is_deleted = false
UNION ALL
SELECT
feature_drawn_lines.id,
feature_drawn_lines.component_id,
feature_drawn_lines.geography::geometry AS geography,
feature_drawn_lines.geography::geometry AS line_geography,
null::integer AS signal_id,
feature_drawn_lines.length_feet
FROM feature_drawn_lines
WHERE feature_drawn_lines.is_deleted = false
) AS feature_union
GROUP BY feature_union.component_id
),

subcomponents AS (
SELECT
mpcs.project_component_id,
string_agg(ms.subcomponent_name, ', '::text) AS subcomponents
FROM moped_proj_components_subcomponents AS mpcs
LEFT JOIN moped_subcomponents AS ms ON mpcs.subcomponent_id = ms.subcomponent_id
WHERE mpcs.is_deleted = false
GROUP BY mpcs.project_component_id
),

component_tags AS (
SELECT
mpct.project_component_id,
string_agg((mct.type || ' - '::text) || mct.name, ', '::text) AS component_tags
FROM moped_proj_component_tags AS mpct
LEFT JOIN moped_component_tags AS mct ON mpct.component_tag_id = mct.id
WHERE mpct.is_deleted = false
GROUP BY mpct.project_component_id
)

SELECT
mpc.project_id,
comp_geography.project_component_id,
comp_geography.feature_ids,
mpc.component_id,
comp_geography.geometry,
comp_geography.line_geometry,
comp_geography.signal_ids,
council_districts.council_districts,
'placeholder text'::text AS council_districts_searchable,
NOT coalesce(council_districts.council_districts IS null OR council_districts.council_districts = ''::text, false) AS is_within_city_limits,
comp_geography.length_feet_total,
round(comp_geography.length_feet_total::numeric / 5280::numeric, 2) AS length_miles_total,
mc.component_name,
mc.component_subtype,
mc.component_name_full,
'placeholder text'::text AS component_categories,
subcomponents.subcomponents AS component_subcomponents,
work_types.work_types AS component_work_types,
component_tags.component_tags,
mpc.description AS component_description,
mpc.interim_project_component_id,
mpc.completion_date,
coalesce(mpc.completion_date, plv.substantial_completion_date) AS substantial_completion_date,
'2024-01-01T00:00:00-06:00'::text AS substantial_completion_date_estimated,
mpc.srts_id,
mpc.location_description AS component_location_description,
plv.project_name,
'placeholder text'::text AS project_name_descriptor,
'placeholder text'::text AS project_name_with_descriptor,
plv.project_description,
plv.ecapris_subproject_id,
plv.project_website,
plv.updated_at AS project_updated_at,
mpc.phase_id AS component_phase_id,
mph.phase_name AS component_phase_name,
mph.phase_name_simple AS component_phase_name_simple,
current_phase.phase_id AS project_phase_id,
current_phase.phase_name AS project_phase_name,
current_phase.phase_name_simple AS project_phase_name_simple,
coalesce(mph.phase_name, current_phase.phase_name) AS current_phase_name,
coalesce(mph.phase_name_simple, current_phase.phase_name_simple) AS current_phase_name_simple,
plv.project_team_members,
plv.project_sponsor,
plv.project_lead,
plv.public_process_status,
plv.interim_project_id,
plv.project_partners,
plv.task_order_names,
plv.funding_source_name,
plv.type_name,
plv.project_status_update,
plv.project_status_update_date_created,
plv.construction_start_date,
plv.completion_end_date,
plv.project_inspector,
plv.project_designer,
plv.project_tags,
plv.workgroup_contractors,
plv.contract_numbers,
plv.parent_project_id,
plv.parent_project_name,
plv.parent_project_url,
'placeholder text'::text AS parent_project_name_with_descriptor,
'placeholder text'::text AS related_project_ids,
'placeholder text'::text AS related_project_ids_searchable,
plv.knack_project_id AS knack_data_tracker_project_record_id,
plv.project_url,
(plv.project_url || '?tab=map&project_component_id='::text) || mpc.project_component_id::text AS component_url,
plv.project_development_status,
plv.project_development_status_date,
plv.project_development_status_date_calendar_year,
plv.project_development_status_date_calendar_year_month,
plv.project_development_status_date_calendar_year_month_numeric,
plv.project_development_status_date_calendar_year_quarter,
plv.project_development_status_date_fiscal_year,
plv.project_development_status_date_fiscal_year_quarter,
plv.added_by AS project_added_by
FROM moped_proj_components AS mpc
LEFT JOIN comp_geography ON mpc.project_component_id = comp_geography.project_component_id
LEFT JOIN council_districts ON mpc.project_component_id = council_districts.project_component_id
LEFT JOIN subcomponents ON mpc.project_component_id = subcomponents.project_component_id
LEFT JOIN work_types ON mpc.project_component_id = work_types.project_component_id
LEFT JOIN component_tags ON mpc.project_component_id = component_tags.project_component_id
LEFT JOIN project_list_view AS plv ON mpc.project_id = plv.project_id
LEFT JOIN current_phase_view AS current_phase ON mpc.project_id = current_phase.project_id
LEFT JOIN moped_phases AS mph ON mpc.phase_id = mph.phase_id
LEFT JOIN moped_components AS mc ON mpc.component_id = mc.component_id
WHERE mpc.is_deleted = false AND plv.is_deleted = false;
Loading

0 comments on commit a83c859

Please sign in to comment.