Merge Dev to Prod

.github/workflows/deployStatic.yml

@@ -19,6 +19,11 @@ jobs:
     name: Check Env variables
     runs-on: ubuntu-latest
     steps:
+      - name: Install CLI tools from OpenShift Mirror
+        uses: redhat-actions/openshift-tools-installer@v1
+        with:
+          oc: 4.14.37
+
       - name: Print Env Vars
         run: |
           echo Git Base Ref: ${{ github.base_ref }}
@@ -44,11 +49,16 @@ jobs:
         with:
           node-version: 10.16
 
+      - name: Install CLI tools from OpenShift Mirror
+        uses: redhat-actions/openshift-tools-installer@v1
+        with:
+          oc: 4.14.37
+
       # Log in to OpenShift.
       # Note: The secrets needed to log in are NOT available if the PR comes from a FORK.
       # PR's must originate from a branch off the original repo or else all openshift `oc` commands will fail.
       - name: Log in to OpenShift
-        run: oc login --token=${{secrets.TOOLS_SA_TOKEN}} --server=https://api.silver.devops.gov.bc.ca:6443
+        run: oc login --token=${{ secrets.TOOLS_SA_TOKEN }} --server=https://api.silver.devops.gov.bc.ca:6443
 
       # Build the api images
       - name: Build API Images
@@ -75,6 +85,11 @@ jobs:
         with:
           node-version: 10.16
 
+      - name: Install CLI tools from OpenShift Mirror
+        uses: redhat-actions/openshift-tools-installer@v1
+        with:
+          oc: 4.14.37
+
       # Log in to OpenShift.
       # Note: The secrets needed to log in are NOT available if the PR comes from a FORK.
       # PR's must originate from a branch off the original repo or else all openshift `oc` commands will fail.
@@ -110,6 +125,11 @@ jobs:
         with:
           node-version: 10.16
 
+      - name: Install CLI tools from OpenShift Mirror
+        uses: redhat-actions/openshift-tools-installer@v1
+        with:
+          oc: 4.14.37
+
       # Log in to OpenShift.
       # Note: The secrets needed to log in are NOT available if the PR comes from a FORK.
       # PR's must originate from a branch off the original repo or else all openshift `oc` commands will fail.
@@ -154,6 +174,11 @@ jobs:
         uses: actions/setup-node@v2
         with:
           node-version: 10.16
+
+      - name: Install CLI tools from OpenShift Mirror
+        uses: redhat-actions/openshift-tools-installer@v1
+        with:
+          oc: 4.14.37
 
       # Log in to OpenShift.
       # Note: The secrets needed to log in are NOT available if the PR comes from a FORK.
@@ -200,6 +225,11 @@ jobs:
         with:
           node-version: 10.16
 
+      - name: Install CLI tools from OpenShift Mirror
+        uses: redhat-actions/openshift-tools-installer@v1
+        with:
+          oc: 4.14.37
+
       # Log in to OpenShift.
       # Note: The secrets needed to log in are NOT available if the PR comes from a FORK.
       # PR's must originate from a branch off the original repo or else all openshift `oc` commands will fail.
@@ -246,6 +276,11 @@ jobs:
         with:
           node-version: 10.16
 
+      - name: Install CLI tools from OpenShift Mirror
+        uses: redhat-actions/openshift-tools-installer@v1
+        with:
+          oc: 4.14.37
+
       # Log in to OpenShift.
       # Note: The secrets needed to log in are NOT available if the PR comes from a FORK.
       # PR's must originate from a branch off the original repo or else all openshift `oc` commands will fail.
@@ -290,6 +325,11 @@ jobs:
         with:
           node-version: 10.16
 
+      - name: Install CLI tools from OpenShift Mirror
+        uses: redhat-actions/openshift-tools-installer@v1
+        with:
+          oc: 4.14.37
+
       # Log in to OpenShift.
       # Note: The secrets needed to log in are NOT available if the PR comes from a FORK.
       # PR's must originate from a branch off the original repo or else all openshift `oc` commands will fail.

api/.docker/db/Dockerfile.dev

@@ -3,7 +3,7 @@ FROM centos/postgresql-95-centos7
 USER root
 
 ENV POSTGISV 2.5
-ENV TZ America/New_York
+ENV TZ UTC
 
 # add addressing dictionary
 RUN mkdir -p /opt/apps

api/.docker/db/Dockerfile.local

@@ -1,7 +1,7 @@
 FROM postgres:14.6
 
 ENV POSTGISV 3
-ENV TZ America/New_York
+ENV TZ UTC
 ENV PORT 5432
 
 # add addressing dictionary

api/api_sources/resources/jsons/musselsApp/DaysOutOfWater.json

@@ -1,4 +1,7 @@
 [
+    {
+        "Days_Out_Of_Water": "Unknown"
+    },
     {
         "Days_Out_Of_Water": "0-10 days"
     },

api/api_sources/resources/jsons/musselsApp/MusselStationNames.json

@@ -1,77 +1,59 @@
 [
-  {
-    "Station_Name": "Cascade"
-  },
-  {
-    "Station_Name": "Cutts (Hwy 93)"
-  },
-  {
-    "Station_Name": "Dawson Creek"
-  },
-  {
-    "Station_Name": "Fraser Valley Roving"
-  },
-  {
-    "Station_Name": "Golden"
-  },
-  {
-    "Station_Name": "Keremeos (Hwy 3)"
-  },
-  {
-    "Station_Name": "Kootenay Sgt"
-  },
-  {
-    "Station_Name": "Midway"
-  },
-  {
-    "Station_Name": "Mt. Robson"
-  },
-  {
-    "Station_Name": "Olsen (Hwy 3)"
-  },
-  {
-    "Station_Name": "Okanagan Sgt"
-  },
-  {
-    "Station_Name": "Osoyoos"
-  },
-  {
-    "Station_Name": "Other"
-  },
-  {
-    "Station_Name": "Pacific Border"
-  },
-  {
-    "Station_Name": "Penticton Roving"
-  },
-  {
-    "Station_Name": "Radium"
-  },
-  {
-    "Station_Name": "Rocky Mountain Sgt"
-  },
-  {
-    "Station_Name": "Scheduled Inspection (AB notification)"
-  },
-  {
-    "Station_Name": "Scheduled Inspection (CBSA notification)"
-  },
-  {
-    "Station_Name": "Scheduled Inspection (New boat)"
-  },
-  {
-    "Station_Name": "Scheduled Inspection (other notification)"
-  },
-  {
-    "Station_Name": "Scheduled Inspection (RAPP notification)"
-  },
-  {
-    "Station_Name": "Sumas Border"
-  },
-  {
-    "Station_Name": "Valemount"
-  },
-  {
-    "Station_Name": "Yahk"
-  }
-]
+  { "Station_Name": "Cutts (Hwy 93)" },
+
+  { "Station_Name": "Dawson Creek" },
+
+  { "Station_Name": "Golden" },
+
+  { "Station_Name": "Mt. Robson" },
+
+  { "Station_Name": "Olsen (Hwy 3)" },
+
+  { "Station_Name": "Osoyoos" },
+
+  { "Station_Name": "Radium" },
+
+  { "Station_Name": "Yahk" },
+
+  { "Station_Name": "Lower Mainland Roving - Aldergrove" },
+
+  { "Station_Name": "Lower Mainland Roving - Douglas" },
+
+  { "Station_Name": "Lower Mainland Roving - Huntington" },
+
+  { "Station_Name": "Lower Mainland Roving - Outreach" },
+
+  { "Station_Name": "Lower Mainland Roving - Scheduled Inspection" },
+
+  { "Station_Name": "Pacific Border" },
+
+  { "Station_Name": "Penticton Roving - Carson" },
+
+  { "Station_Name": "Penticton Roving - Cascade" },
+
+  { "Station_Name": "Penticton Roving - Midway" },
+
+  { "Station_Name": "Penticton Roving - Outreach" },
+
+  { "Station_Name": "Penticton Roving - Scheduled Inspection" },
+
+  { "Station_Name": "Cranbrook Roving - Nelway" },
+
+  { "Station_Name": "Cranbrook Roving - Outreach" },
+
+  { "Station_Name": "Cranbrook Roving - Patterson" },
+
+  { "Station_Name": "Cranbrook Roving - Rykerts" },
+
+  { "Station_Name": "Cranbrook Roving - Scheduled Inspection" },
+
+  { "Station_Name": "Cranbrook Roving - Waneta" },
+
+  { "Station_Name": "Sumas" },
+
+  { "Station_Name": "Emergency Response" },
+
+  { "Station_Name": "Other" },
+
+  { "Station_Name": "Project" }
+]

api/api_sources/schema-files/observerWorkflow.schema.yaml

@@ -57,6 +57,11 @@ schemas:
         comment: 'This column will store user comment on end of the day'
         definition: VARCHAR(300) NULL
         required: false
+      stationInformation:
+        name: 'station_information'
+        comment: 'This column will store additional information about the station'
+        definition: VARCHAR(300) NULL
+        required: false
       # Counter
       motorizedBlowBys:
         name: 'motorized_blow_bys_counter'