Merge pull request #1268 from cityofaustin/v2.4.1

v2.4.1
cityofaustin · Feb 3, 2024 · 3ec161b · 3ec161b
2 parents d5a1538 + ecd95af
commit 3ec161b
Show file tree

Hide file tree

Showing 7 changed files with 2,468 additions and 20 deletions.
diff --git a/moped-database/migrations/1706897389736_fix_sub_comp_date_dash/down.sql b/moped-database/migrations/1706897389736_fix_sub_comp_date_dash/down.sql
diff --git a/moped-database/migrations/1706897389736_fix_sub_comp_date_dash/up.sql b/moped-database/migrations/1706897389736_fix_sub_comp_date_dash/up.sql
diff --git a/moped-database/views/component_arcgis_online_view.sql b/moped-database/views/component_arcgis_online_view.sql
diff --git a/moped-database/views/project_list_view.sql b/moped-database/views/project_list_view.sql
@@ -1,6 +1,4 @@
--- latest version 1705115280578_more_calc_fields
-DROP VIEW project_list_view CASCADE;
-
+-- latest version 1706897389736_fix_sub_comp_date_dash
 CREATE OR REPLACE VIEW public.project_list_view
 AS WITH project_person_list_lookup AS (
     SELECT
@@ -89,7 +87,7 @@ AS WITH project_person_list_lookup AS (
     work_activities.task_order_names_short,
     work_activities.task_orders,
     'placeholder text' as project_development_status,
-    '2024-01-01T00:00:00−06:00' as project_development_status_date,
+    '2024-01-01T00:00:00-06:00' as project_development_status_date,
     9999 as project_development_status_date_calendar_year,
     'placeholder text' as project_development_status_date_calendar_year_month,
     'placeholder text' as project_development_status_date_calendar_year_month_numeric,

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.4.0",
+  "version": "2.4.1",
   "homepage": "/moped",
   "private": false,
   "repository": {

diff --git a/moped-etl/arcgis/components_to_agol.py b/moped-etl/arcgis/components_to_agol.py
@@ -66,6 +66,7 @@ def main():
     # lines and points must be stored in different layers in AGOL
     all_features = {"lines": [], "points": [], "combined": []}
 
+    logger.info("Building Esri feature objects...")
     for component in data:
         # extract geometry and line geometry from component data
         # for line features, the line geometry is redundant/identical to geometry

diff --git a/moped-etl/arcgis/settings.py b/moped-etl/arcgis/settings.py
@@ -3,64 +3,84 @@
 LAYER_IDS = {"points": 0, "lines": 1, "combined": 2}
 
 COMPONENTS_QUERY = """
-query {
+{
   component_arcgis_online_view {
-    added_by
     completion_date
     completion_end_date
+    component_categories
     component_description
     component_id
+    component_location_description
     component_name
     component_name_full
     component_phase_id
     component_phase_name
     component_phase_name_simple
+    component_subcomponents
     component_subtype
     component_tags
     component_url
+    component_work_types
     construction_start_date
     contract_numbers
     council_districts
+    council_districts_searchable
     current_phase_name
     current_phase_name_simple
     ecapris_subproject_id
     feature_ids
     funding_source_name
     geometry
-    line_geometry
     interim_project_component_id
     interim_project_id
-    is_project_component_deleted
-    is_project_deleted
+    is_within_city_limits
     knack_data_tracker_project_record_id
     length_feet_total
-    location_description
+    length_miles_total
+    line_geometry
+    parent_project_id
+    parent_project_name
+    parent_project_name_with_descriptor
+    parent_project_url
+    project_added_by
     project_component_id
     project_description
     project_designer
+    project_development_status
+    project_development_status_date
+    project_development_status_date_calendar_year
+    project_development_status_date_calendar_year_month
+    project_development_status_date_calendar_year_month_numeric
+    project_development_status_date_calendar_year_quarter
+    project_development_status_date_fiscal_year
+    project_development_status_date_fiscal_year_quarter
     project_id
     project_inspector
     project_lead
     project_name
-    project_note
-    project_note_date_created
-    project_partner
+    project_name_descriptor
+    project_name_with_descriptor
+    project_partners
     project_phase_id
     project_phase_name
     project_phase_name_simple
     project_sponsor
+    project_status_update
+    project_status_update_date_created
     project_tags
     project_team_members
+    project_updated_at
     project_url
+    project_website
     public_process_status
+    related_project_ids
+    related_project_ids_searchable
     signal_ids
     srts_id
-    subcomponents
     substantial_completion_date
+    substantial_completion_date_estimated
     task_order_names
     type_name
-    updated_at
-    work_types
     workgroup_contractors
   }
 }