Merge pull request #172 from Eastern-Research-Group/develop

Update staging for planSummaryLink column
Eastern-Research-Group · Jan 22, 2024 · f778a2a · f778a2a
2 parents 55849fb + 2455f32
commit f778a2a
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 10 deletions.
diff --git a/app/cypress/e2e/action.cy.ts b/app/cypress/e2e/action.cy.ts
@@ -6,9 +6,9 @@ describe('Data Profile Action', () => {
   });
 
   const columnsValue =
-    'columns=objectId&columns=region&columns=state&columns=organizationType&columns=organizationId&columns=organizationName&columns=waterType&columns=parameterGroup&columns=parameter&columns=actionType&columns=actionId&columns=actionName&columns=actionAgency&columns=inIndianCountry&columns=includeInMeasure&columns=completionDate&columns=assessmentUnitId&columns=assessmentUnitName&columns=fiscalYearEstablished&columns=locationDescription&columns=waterSize&columns=waterSizeUnits';
+    'columns=objectId&columns=region&columns=state&columns=organizationType&columns=organizationId&columns=organizationName&columns=waterType&columns=parameterGroup&columns=parameter&columns=actionType&columns=actionId&columns=actionName&columns=actionAgency&columns=inIndianCountry&columns=includeInMeasure&columns=completionDate&columns=assessmentUnitId&columns=assessmentUnitName&columns=fiscalYearEstablished&columns=locationDescription&columns=waterSize&columns=waterSizeUnits&columns=planSummaryLink';
   const columnsValueCurl =
-    '"columns":["objectId","region","state","organizationType","organizationId","organizationName","waterType","parameterGroup","parameter","actionType","actionId","actionName","actionAgency","inIndianCountry","includeInMeasure","completionDate","assessmentUnitId","assessmentUnitName","fiscalYearEstablished","locationDescription","waterSize","waterSizeUnits"]';
+    '"columns":["objectId","region","state","organizationType","organizationId","organizationName","waterType","parameterGroup","parameter","actionType","actionId","actionName","actionAgency","inIndianCountry","includeInMeasure","completionDate","assessmentUnitId","assessmentUnitName","fiscalYearEstablished","locationDescription","waterSize","waterSizeUnits","planSummaryLink"]';
 
   const location = window.location;
   const origin =

diff --git a/app/cypress/e2e/copy-box.cy.ts b/app/cypress/e2e/copy-box.cy.ts
@@ -75,7 +75,7 @@ describe('CopyBox', () => {
         .focus()
         .realClick();
       const columnsValue =
-        'columns=objectId&columns=region&columns=state&columns=organizationType&columns=organizationId&columns=organizationName&columns=waterType&columns=parameterGroup&columns=parameter&columns=actionType&columns=actionId&columns=actionName&columns=actionAgency&columns=inIndianCountry&columns=includeInMeasure&columns=completionDate&columns=assessmentUnitId&columns=assessmentUnitName&columns=fiscalYearEstablished&columns=locationDescription&columns=waterSize&columns=waterSizeUnits';
+        'columns=objectId&columns=region&columns=state&columns=organizationType&columns=organizationId&columns=organizationName&columns=waterType&columns=parameterGroup&columns=parameter&columns=actionType&columns=actionId&columns=actionName&columns=actionAgency&columns=inIndianCountry&columns=includeInMeasure&columns=completionDate&columns=assessmentUnitId&columns=assessmentUnitName&columns=fiscalYearEstablished&columns=locationDescription&columns=waterSize&columns=waterSizeUnits&columns=planSummaryLink';
       cy.clipboardValue(
         `${origin}/api/attains/actions?${columnsValue}&format=csv&api_key=<YOUR_API_KEY>`,
       );
@@ -93,7 +93,7 @@ describe('CopyBox', () => {
         .focus()
         .realClick();
       const columnsValueCurl =
-        '"columns":["objectId","region","state","organizationType","organizationId","organizationName","waterType","parameterGroup","parameter","actionType","actionId","actionName","actionAgency","inIndianCountry","includeInMeasure","completionDate","assessmentUnitId","assessmentUnitName","fiscalYearEstablished","locationDescription","waterSize","waterSizeUnits"]';
+        '"columns":["objectId","region","state","organizationType","organizationId","organizationName","waterType","parameterGroup","parameter","actionType","actionId","actionName","actionAgency","inIndianCountry","includeInMeasure","completionDate","assessmentUnitId","assessmentUnitName","fiscalYearEstablished","locationDescription","waterSize","waterSizeUnits","planSummaryLink"]';
       cy.clipboardValue(
         `curl -X POST --json ${JSON.stringify(
           `{"filters":{},"options":{"format":"csv"},${columnsValueCurl}}`,

diff --git a/app/cypress/e2e/total-maximum-daily-load.cy.ts b/app/cypress/e2e/total-maximum-daily-load.cy.ts
@@ -6,9 +6,9 @@ describe('Data Profile Total Maximum Daily Load', () => {
   });
 
   const columnsValue =
-    'columns=objectId&columns=region&columns=state&columns=organizationType&columns=organizationId&columns=organizationName&columns=waterType&columns=pollutantGroup&columns=pollutant&columns=addressedParameterGroup&columns=addressedParameter&columns=sourceType&columns=npdesIdentifier&columns=otherIdentifier&columns=actionId&columns=actionName&columns=actionAgency&columns=inIndianCountry&columns=explicitMarginOfSafety&columns=implicitMarginOfSafety&columns=includeInMeasure&columns=completionDate&columns=tmdlDate&columns=fiscalYearEstablished&columns=assessmentUnitId&columns=assessmentUnitName&columns=loadAllocation&columns=loadAllocationUnits&columns=locationDescription&columns=tmdlEndpoint&columns=waterSize&columns=waterSizeUnits&columns=wasteLoadAllocation';
+    'columns=objectId&columns=region&columns=state&columns=organizationType&columns=organizationId&columns=organizationName&columns=waterType&columns=pollutantGroup&columns=pollutant&columns=addressedParameterGroup&columns=addressedParameter&columns=sourceType&columns=npdesIdentifier&columns=otherIdentifier&columns=actionId&columns=actionName&columns=actionAgency&columns=inIndianCountry&columns=explicitMarginOfSafety&columns=implicitMarginOfSafety&columns=includeInMeasure&columns=completionDate&columns=tmdlDate&columns=fiscalYearEstablished&columns=assessmentUnitId&columns=assessmentUnitName&columns=loadAllocation&columns=loadAllocationUnits&columns=locationDescription&columns=tmdlEndpoint&columns=waterSize&columns=waterSizeUnits&columns=wasteLoadAllocation&columns=planSummaryLink';
   const columnsValueCurl =
-    '"columns":["objectId","region","state","organizationType","organizationId","organizationName","waterType","pollutantGroup","pollutant","addressedParameterGroup","addressedParameter","sourceType","npdesIdentifier","otherIdentifier","actionId","actionName","actionAgency","inIndianCountry","explicitMarginOfSafety","implicitMarginOfSafety","includeInMeasure","completionDate","tmdlDate","fiscalYearEstablished","assessmentUnitId","assessmentUnitName","loadAllocation","loadAllocationUnits","locationDescription","tmdlEndpoint","waterSize","waterSizeUnits","wasteLoadAllocation"]';
+    '"columns":["objectId","region","state","organizationType","organizationId","organizationName","waterType","pollutantGroup","pollutant","addressedParameterGroup","addressedParameter","sourceType","npdesIdentifier","otherIdentifier","actionId","actionName","actionAgency","inIndianCountry","explicitMarginOfSafety","implicitMarginOfSafety","includeInMeasure","completionDate","tmdlDate","fiscalYearEstablished","assessmentUnitId","assessmentUnitName","loadAllocation","loadAllocationUnits","locationDescription","tmdlEndpoint","waterSize","waterSizeUnits","wasteLoadAllocation","planSummaryLink"]';
 
   const location = window.location;
   const origin =

diff --git a/app/server/app/content/config/profiles.json b/app/server/app/content/config/profiles.json
@@ -24,7 +24,8 @@
       "fiscalYearEstablished",
       "locationDescription",
       "waterSize",
-      "waterSizeUnits"
+      "waterSizeUnits",
+      "planSummaryLink"
     ],
     "label": "Actions",
     "resource": "actions"
@@ -234,7 +235,8 @@
       "tmdlEndpoint",
       "waterSize",
       "waterSizeUnits",
-      "wasteLoadAllocation"
+      "wasteLoadAllocation",
+      "planSummaryLink"
     ],
     "label": "Total Maximum Daily Load",
     "resource": "tmdl"

diff --git a/app/server/app/content/swagger/api-public.json b/app/server/app/content/swagger/api-public.json
@@ -1960,6 +1960,9 @@
                 "parameterGroup": {
                   "type": "string"
                 },
+                "planSummaryLink": {
+                  "type": "string"
+                },
                 "region": {
                   "type": "string"
                 },
@@ -3402,6 +3405,9 @@
                 "otherIdentifier": {
                   "type": "string"
                 },
+                "planSummaryLink": {
+                  "type": "string"
+                },
                 "pollutant": {
                   "type": "string"
                 },

diff --git a/etl/app/content-private/tableConfig.json b/etl/app/content-private/tableConfig.json
@@ -2,7 +2,7 @@
   "actions": {
     "tableName": "actions",
     "idColumn": "objectid",
-    "createQuery": "CREATE TABLE IF NOT EXISTS actions ( objectid INTEGER PRIMARY KEY, state VARCHAR(4000), region VARCHAR(2), organizationid VARCHAR(30) NOT NULL, organizationname VARCHAR(150) NOT NULL, organizationtype VARCHAR(30) NOT NULL, assessmentunitid VARCHAR(50), assessmentunitname VARCHAR(255), actionid VARCHAR(45) NOT NULL, actionname VARCHAR(255) NOT NULL, completiondate DATE, fiscalyearestablished VARCHAR (4), parameter VARCHAR(240), parametergroup VARCHAR(60), locationdescription VARCHAR(2000), actiontype VARCHAR(50) NOT NULL, watertype VARCHAR(40), watersize NUMERIC(18,4), watersizeunits VARCHAR(15), actionagency VARCHAR(10) NOT NULL, inindiancountry VARCHAR(1), includeinmeasure VARCHAR(1) )",
+    "createQuery": "CREATE TABLE IF NOT EXISTS actions ( objectid INTEGER PRIMARY KEY, state VARCHAR(4000), region VARCHAR(2), organizationid VARCHAR(30) NOT NULL, organizationname VARCHAR(150) NOT NULL, organizationtype VARCHAR(30) NOT NULL, assessmentunitid VARCHAR(50), assessmentunitname VARCHAR(255), actionid VARCHAR(45) NOT NULL, actionname VARCHAR(255) NOT NULL, completiondate DATE, fiscalyearestablished VARCHAR (4), parameter VARCHAR(240), parametergroup VARCHAR(60), locationdescription VARCHAR(2000), actiontype VARCHAR(50) NOT NULL, watertype VARCHAR(40), watersize NUMERIC(18,4), watersizeunits VARCHAR(15), actionagency VARCHAR(10) NOT NULL, inindiancountry VARCHAR(1), includeinmeasure VARCHAR(1), plansummarylink VARCHAR(116) )",
     "columns": [
       {
         "name": "objectid",
@@ -82,6 +82,11 @@
         "name": "parametergroup",
         "alias": "parameterGroup"
       },
+      {
+        "name": "plansummarylink",
+        "alias": "planSummaryLink",
+        "skipIndex": true
+      },
       {
         "name": "region",
         "alias": "region"
@@ -1319,7 +1324,7 @@
   "tmdl": {
     "tableName": "tmdl",
     "idColumn": "objectid",
-    "createQuery": "CREATE TABLE IF NOT EXISTS tmdl ( objectid INTEGER PRIMARY KEY, state VARCHAR(4000), region VARCHAR(2), organizationid VARCHAR(30) NOT NULL, organizationname VARCHAR(150) NOT NULL, organizationtype VARCHAR(30) NOT NULL, assessmentunitid VARCHAR(50), assessmentunitname VARCHAR(255), actionid VARCHAR(45) NOT NULL, actionname VARCHAR(255) NOT NULL, completiondate DATE, tmdldate DATE, fiscalyearestablished VARCHAR(4), pollutant VARCHAR(240), pollutantgroup VARCHAR(60), sourcetype VARCHAR(40), addressedparameter VARCHAR(240), addressedparametergroup VARCHAR(60), locationdescription VARCHAR(2000), watertype VARCHAR(40), watersize NUMERIC(18,4), watersizeunits VARCHAR(15), actionagency VARCHAR(10) NOT NULL, loadallocation NUMERIC(21,3), loadallocationunits VARCHAR(40), explicitmarginofsafety VARCHAR(255), implicitmarginofsafety VARCHAR(255), tmdlendpoint1 TEXT, tmdlendpoint2 TEXT, tmdlendpoint3 TEXT, npdesidentifier VARCHAR(60), otheridentifier VARCHAR(4000), wasteloadallocation NUMERIC(24,3), inindiancountry VARCHAR(1), includeinmeasure VARCHAR(1), tmdlendpoint TEXT GENERATED ALWAYS AS (coalesce(tmdlendpoint1, '') || coalesce(tmdlendpoint2, '') || coalesce(tmdlendpoint3, '')) STORED )",
+    "createQuery": "CREATE TABLE IF NOT EXISTS tmdl ( objectid INTEGER PRIMARY KEY, state VARCHAR(4000), region VARCHAR(2), organizationid VARCHAR(30) NOT NULL, organizationname VARCHAR(150) NOT NULL, organizationtype VARCHAR(30) NOT NULL, assessmentunitid VARCHAR(50), assessmentunitname VARCHAR(255), actionid VARCHAR(45) NOT NULL, actionname VARCHAR(255) NOT NULL, completiondate DATE, tmdldate DATE, fiscalyearestablished VARCHAR(4), pollutant VARCHAR(240), pollutantgroup VARCHAR(60), sourcetype VARCHAR(40), addressedparameter VARCHAR(240), addressedparametergroup VARCHAR(60), locationdescription VARCHAR(2000), watertype VARCHAR(40), watersize NUMERIC(18,4), watersizeunits VARCHAR(15), actionagency VARCHAR(10) NOT NULL, loadallocation NUMERIC(21,3), loadallocationunits VARCHAR(40), explicitmarginofsafety VARCHAR(255), implicitmarginofsafety VARCHAR(255), tmdlendpoint1 TEXT, tmdlendpoint2 TEXT, tmdlendpoint3 TEXT, npdesidentifier VARCHAR(60), otheridentifier VARCHAR(4000), wasteloadallocation NUMERIC(24,3), inindiancountry VARCHAR(1), includeinmeasure VARCHAR(1), plansummarylink VARCHAR(116), tmdlendpoint TEXT GENERATED ALWAYS AS (coalesce(tmdlendpoint1, '') || coalesce(tmdlendpoint2, '') || coalesce(tmdlendpoint3, '')) STORED )",
     "overrideWorkMemory": "790MB",
     "columns": [
       {
@@ -1423,6 +1428,11 @@
         "name": "otheridentifier",
         "alias": "otherIdentifier"
       },
+      {
+        "name": "plansummarylink",
+        "alias": "planSummaryLink",
+        "skipIndex": true
+      },
       {
         "name": "pollutant",
         "alias": "pollutant"