Merge pull request #10 from cityofaustin/charlie/locations

add Maximo service address to dataset

Author: Charlie-Henry

env_template

@@ -1,10 +1,10 @@
-# Socrata aka City datahub
+# Socrata aka City datahub (1pass: Socrata Key ID, Secret, and Token)
 SO_KEY=
 SO_SECRET=
 SO_TOKEN=
 SO_WEB=
 
-# Maximo Data Warehouse DB
+# Maximo Data Warehouse DB (1pass: Maximo Data Warehouse)
 MAXIMO_DB_PASS=
 MAXIMO_DB_USER=
 MAXIMO_HOST=

etl/queries.py

@@ -34,8 +34,8 @@
        w.OUTMATCOST,
        w.OUTTOOLCOST,
        w.WOPRIORITY,
-       lkp.DESCRIPTION AS PROBLEMCODE,
-       lkf.DESCRIPTION AS FAILURECODE,
+       lkp.DESCRIPTION         AS PROBLEMCODE,
+       lkf.DESCRIPTION         AS FAILURECODE,
        w.HASFOLLOWUPWORK,
        w.SENDERSYSID,
        w.ORGID,
@@ -54,16 +54,18 @@
        w.CSR311NUMBER,
        w.ROW_PERMIT,
        w.ROW_EXPDATE,
-       l.NUMVALUE      AS CTM_SEGMENT_ID,
-       w.DIM_OWNER_PERSON_SK, 
+       l.NUMVALUE              AS CTM_SEGMENT_ID,
+       w.DIM_OWNER_PERSON_SK,
        w.SUPERINTENDENT,
        w.REPORTEDBY,
        w.DIM_LEAD_PERSON_SK,
        w.HOLDREASON,
-       cc.DESCRIPTION  AS CAUSE,
-       rc.DESCRIPTION  AS REMEDY,
+       cc.DESCRIPTION          AS CAUSE,
+       rc.DESCRIPTION          AS REMEDY,
        w.ALTREF,
-       '{base_url}' || w.WONUM as WO_LINK
+       wosa.DESCRIPTION        AS SERVICE_ADDRESS,
+       wosa.SADDRESSCODE       AS SERVICE_ADDRESS_CODE,
+       '{base_url}' || w.WONUM AS WO_LINK
 FROM MAXIMO_DM.FCT_WORKORDER w
          LEFT OUTER JOIN (SELECT *
                           FROM MAXIMO_DM.DIM_LOCATIONSPEC
@@ -82,6 +84,11 @@
                     WHERE TYPE = 'REMEDY') rc ON rc.WONUM = w.WONUM
          LEFT JOIN MAXIMO_DM.LKP_FAILURECODE lkp ON lkp.FAILURECODE = w.PROBLEMCODE
          LEFT JOIN MAXIMO_DM.LKP_FAILURECODE lkf ON lkf.FAILURECODE = w.FAILURECODE
+         LEFT JOIN (SELECT WONUM,
+                           DESCRIPTION,
+                           SADDRESSCODE
+                    FROM MAXIMO_DM.DIM_WOSERVICEADDRESS
+                    WHERE SITEID = 'SBO') wosa ON w.WONUM = wosa.WONUM
 WHERE w.SITEID = 'SBO'
   AND w.CHANGEDATE BETWEEN TO_DATE('{start}', 'MM/DD/YYYY')
     AND TO_DATE('{end}', 'MM/DD/YYYY')

readme.md

@@ -12,11 +12,11 @@ The three parameters this script takes is `--start`, `--end`, and `--query`, the
 
 Publishing work orders to the city datahub between August 31st, 2023 and September 9th, 2023:
 
-`$ python etl/maximo_to_socrata.py --query work_orders --start 2023-08-31 --end 2023-09-09`
+`python etl/maximo_to_socrata.py --query work_orders --start 2023-08-31 --end 2023-09-09`
 
 Leaving out `--start` will default to 7 days ago. Leaving out `--end` will default to today. Publishing the work orders for the past week:
 
-`$ python etl/maximo_to_socrata.py --query work_orders`
+`python etl/maximo_to_socrata.py --query work_orders`
 
 The `--query` determines which query `etl/queries.py` (defined as QUERIES) is run. All queries configured there must take `--start` and `--end` arguments.  
 
@@ -28,14 +28,14 @@ Note that you also must be on the City network to be able to access the Maximo d
 
 This repo can be used with a docker container. You can either build it yourself with:
 
-`$ docker build . -t dts-maximo-reporting:production`
+`docker build . -t dts-maximo-reporting:production`
 
 or pull from our dockerhub account:
 
-`$ docker pull atddocker/dts-maximo-reporting:production`
+`docker pull atddocker/dts-maximo-reporting:production`
 
 Then, provide the environment variables described in env_template to the docker image:
 
-`$ docker run -it --env-file env_file dts-maximo-reporting:production /bin/bash` 
+`docker run -it --env-file env_file dts-maximo-reporting:production /bin/bash` 
 
 Then, provide the command you would like to run.