Merge branch 'release-0.2.0' into LCFS-1426-UploadFileAttachements-Co…

…mplianceReports
bcgov · Dec 17, 2024 · eb01c04 · eb01c04
2 parents 912048e + 5b29999
commit eb01c04
Show file tree

Hide file tree

Showing 55 changed files with 1,975 additions and 367 deletions.
diff --git a/.github/workflows/dev-ci.yml b/.github/workflows/dev-ci.yml
@@ -23,9 +23,36 @@ concurrency:
 
 jobs:
 
+  install-oc:
+    runs-on: ubuntu-latest
+    outputs:
+      cache-hit: ${{ steps.cache.outputs.cache-hit }}
+    steps:
+      - name: Check out repository
+        uses: actions/[email protected]
+
+      - name: Set up cache for OpenShift CLI
+        id: cache
+        uses: actions/[email protected]
+        with:
+          path: /usr/local/bin/oc  # Path where the `oc` binary will be installed
+          key: oc-cli-${{ runner.os }}
+
+      - name: Install OpenShift CLI (if not cached)
+        if: steps.cache.outputs.cache-hit != 'true'
+        run: |
+          curl -LO https://mirror.openshift.com/pub/openshift-v4/clients/ocp/stable/openshift-client-linux.tar.gz
+          tar -xvf openshift-client-linux.tar.gz
+          sudo mv oc /usr/local/bin/
+          oc version --client
+
+      - name: Confirm OpenShift CLI is Available
+        run: oc version --client
+
   set-pre-release:
     name: Calculate pre-release number
     runs-on: ubuntu-latest
+    needs: [install-oc]
 
     outputs:
       output1: ${{ steps.set-pre-release.outputs.PRE_RELEASE }}
@@ -49,6 +76,12 @@ jobs:
       - name: Check out repository
         uses: actions/[email protected]
 
+      - name: Restore oc command from Cache
+        uses: actions/[email protected]
+        with:
+          path: /usr/local/bin/oc
+          key: oc-cli-${{ runner.os }}
+
       - name: Log in to Openshift
         uses: redhat-actions/[email protected]
         with:

diff --git a/.github/workflows/pr-build.yaml b/.github/workflows/pr-build.yaml
@@ -19,17 +19,51 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
+  install-oc:
+    runs-on: ubuntu-latest
+    outputs:
+      cache-hit: ${{ steps.cache.outputs.cache-hit }}
+    steps:
+      - name: Check out repository
+        uses: actions/[email protected]
+
+      - name: Set up cache for OpenShift CLI
+        id: cache
+        uses: actions/[email protected]
+        with:
+          path: /usr/local/bin/oc  # Path where the `oc` binary will be installed
+          key: oc-cli-${{ runner.os }}
+
+      - name: Install OpenShift CLI (if not cached)
+        if: steps.cache.outputs.cache-hit != 'true'
+        run: |
+          curl -LO https://mirror.openshift.com/pub/openshift-v4/clients/ocp/stable/openshift-client-linux.tar.gz
+          tar -xvf openshift-client-linux.tar.gz
+          sudo mv oc /usr/local/bin/
+          oc version --client
+
+      - name: Confirm OpenShift CLI is Available
+        run: oc version --client
+
   get-version:
     if: >
       (github.event.action == 'labeled' && github.event.label.name == 'build' && github.event.pull_request.base.ref == github.event.repository.default_branch) ||
       (github.event.action == 'synchronize' && contains(github.event.pull_request.labels.*.name, 'build') && github.event.pull_request.base.ref == github.event.repository.default_branch)
     name: Retrieve version
     runs-on: ubuntu-latest
+    needs: [install-oc]
 
     outputs:
       output1: ${{ steps.get-version.outputs.VERSION }}
 
     steps:
+
+      - name: Restore oc command from Cache
+        uses: actions/[email protected]
+        with:
+          path: /usr/local/bin/oc
+          key: oc-cli-${{ runner.os }}
+
       - name: Log in to Openshift
         uses: redhat-actions/[email protected]
         with:
@@ -69,6 +103,12 @@ jobs:
         with:
           ref: ${{ github.event.pull_request.head.ref }}
 
+      - name: Restore oc command from Cache
+        uses: actions/[email protected]
+        with:
+          path: /usr/local/bin/oc
+          key: oc-cli-${{ runner.os }}
+
       - name: Log in to Openshift
         uses: redhat-actions/[email protected]
         with:
@@ -123,6 +163,12 @@ jobs:
           ref: main
           ssh-key: ${{ secrets.MANIFEST_REPO_DEPLOY_KEY }}
 
+      - name: Restore oc command from Cache
+        uses: actions/[email protected]
+        with:
+          path: /usr/local/bin/oc
+          key: oc-cli-${{ runner.os }}
+
       - name: Log in to Openshift
         uses: redhat-actions/[email protected]
         with:

diff --git a/.github/workflows/pr-teardown.yaml b/.github/workflows/pr-teardown.yaml
@@ -13,16 +13,48 @@ concurrency:
   cancel-in-progress: true  
 
 jobs:
+  install-oc:
+    runs-on: ubuntu-latest
+    outputs:
+      cache-hit: ${{ steps.cache.outputs.cache-hit }}
+    steps:
+      - name: Check out repository
+        uses: actions/[email protected]
+
+      - name: Set up cache for OpenShift CLI
+        id: cache
+        uses: actions/[email protected]
+        with:
+          path: /usr/local/bin/oc  # Path where the `oc` binary will be installed
+          key: oc-cli-${{ runner.os }}
+
+      - name: Install OpenShift CLI (if not cached)
+        if: steps.cache.outputs.cache-hit != 'true'
+        run: |
+          curl -LO https://mirror.openshift.com/pub/openshift-v4/clients/ocp/stable/openshift-client-linux.tar.gz
+          tar -xvf openshift-client-linux.tar.gz
+          sudo mv oc /usr/local/bin/
+          oc version --client
+
+      - name: Confirm OpenShift CLI is Available
+        run: oc version --client
 
   teardown:
     if: >
       (github.event.action == 'unlabeled' && github.event.label.name == 'build') || 
       (github.event.action == 'closed' && contains(github.event.pull_request.labels.*.name, 'build') )
     name: PR Teardown
     runs-on: ubuntu-latest
+    needs: [install-oc]
     timeout-minutes: 60
 
     steps:
+
+      - name: Restore oc command from Cache
+        uses: actions/[email protected]
+        with:
+          path: /usr/local/bin/oc
+          key: oc-cli-${{ runner.os }}
 
       - name: Log in to Openshift
         uses: redhat-actions/[email protected]

diff --git a/.github/workflows/prod-ci.yaml b/.github/workflows/prod-ci.yaml
@@ -14,12 +14,38 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
+  install-oc:
+    runs-on: ubuntu-latest
+    outputs:
+      cache-hit: ${{ steps.cache.outputs.cache-hit }}
+    steps:
+      - name: Check out repository
+        uses: actions/[email protected]
+
+      - name: Set up cache for OpenShift CLI
+        id: cache
+        uses: actions/[email protected]
+        with:
+          path: /usr/local/bin/oc  # Path where the `oc` binary will be installed
+          key: oc-cli-${{ runner.os }}
+
+      - name: Install OpenShift CLI (if not cached)
+        if: steps.cache.outputs.cache-hit != 'true'
+        run: |
+          curl -LO https://mirror.openshift.com/pub/openshift-v4/clients/ocp/stable/openshift-client-linux.tar.gz
+          tar -xvf openshift-client-linux.tar.gz
+          sudo mv oc /usr/local/bin/
+          oc version --client
+
+      - name: Confirm OpenShift CLI is Available
+        run: oc version --client
 
   # Read the image tag from test environment
   get-image-tag:
 
     name: Get the image-tag from values-test.yaml
     runs-on: ubuntu-latest
+    needs: [install-oc]
 
     outputs:
       IMAGE_TAG: ${{ steps.get-image-tag.outputs.IMAGE_TAG }}
@@ -84,6 +110,12 @@ jobs:
           approvers: AlexZorkin,kuanfandevops,hamed-valiollahi,airinggov,areyeslo,dhaselhan,Grulin
           minimum-approvals: 2
           issue-title: "LCFS ${{env.IMAGE_TAG }} Prod Deployment at ${{ env.CURRENT_TIME }}."
+
+      - name: Restore oc command from Cache
+        uses: actions/[email protected]
+        with:
+          path: /usr/local/bin/oc
+          key: oc-cli-${{ runner.os }}
 
       - name: Log in to Openshift
         uses: redhat-actions/[email protected]

diff --git a/.github/workflows/test-ci.yaml b/.github/workflows/test-ci.yaml
@@ -14,9 +14,36 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
+  install-oc:
+    runs-on: ubuntu-latest
+    outputs:
+      cache-hit: ${{ steps.cache.outputs.cache-hit }}
+    steps:
+      - name: Check out repository
+        uses: actions/[email protected]
+
+      - name: Set up cache for OpenShift CLI
+        id: cache
+        uses: actions/[email protected]
+        with:
+          path: /usr/local/bin/oc  # Path where the `oc` binary will be installed
+          key: oc-cli-${{ runner.os }}
+
+      - name: Install OpenShift CLI (if not cached)
+        if: steps.cache.outputs.cache-hit != 'true'
+        run: |
+          curl -LO https://mirror.openshift.com/pub/openshift-v4/clients/ocp/stable/openshift-client-linux.tar.gz
+          tar -xvf openshift-client-linux.tar.gz
+          sudo mv oc /usr/local/bin/
+          oc version --client
+
+      - name: Confirm OpenShift CLI is Available
+        run: oc version --client
+
   run-tests:
     name: Run Tests
     runs-on: ubuntu-latest
+    needs: [install-oc]
 
     steps:
       - uses: actions/checkout@v3
@@ -229,6 +256,12 @@ jobs:
           minimum-approvals: 1
           issue-title: "LCFS ${{ env.VERSION }}-${{ env.PRE_RELEASE }} Test Deployment"
 
+      - name: Restore oc command from Cache
+        uses: actions/[email protected]
+        with:
+          path: /usr/local/bin/oc
+          key: oc-cli-${{ runner.os }}
+
       - name: Log in to Openshift
         uses: redhat-actions/[email protected]
         with:

diff --git a/backend/lcfs/db/migrations/versions/2024-12-17-11-23_f93546eaec61.py b/backend/lcfs/db/migrations/versions/2024-12-17-11-23_f93546eaec61.py
@@ -0,0 +1,33 @@
+"""update notification message model
+
+Revision ID: f93546eaec61
+Revises: 5d729face5ab
+Create Date: 2024-12-17 11:23:19.563138
+
+"""
+
+import sqlalchemy as sa
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision = "f93546eaec61"
+down_revision = "5d729face5ab"
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column("notification_message", sa.Column("type", sa.Text(), nullable=False))
+    op.add_column(
+        "notification_message",
+        sa.Column("related_transaction_id", sa.Text(), nullable=False),
+    )
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column("notification_message", "related_transaction_id")
+    op.drop_column("notification_message", "type")
+    # ### end Alembic commands ###
diff --git a/backend/lcfs/db/models/notification/NotificationMessage.py b/backend/lcfs/db/models/notification/NotificationMessage.py
@@ -20,6 +20,7 @@ class NotificationMessage(BaseModel, Auditable):
     is_warning = Column(Boolean, default=False)
     is_error = Column(Boolean, default=False)
     is_archived = Column(Boolean, default=False)
+    type = Column(Text, nullable=False)
     message = Column(Text, nullable=False)
 
     related_organization_id = Column(
@@ -32,12 +33,9 @@ class NotificationMessage(BaseModel, Auditable):
     notification_type_id = Column(
         Integer, ForeignKey("notification_type.notification_type_id")
     )
+    related_transaction_id = Column(Text, nullable=False)
 
-    # Models not created yet
-    # related_transaction_id = Column(Integer,ForeignKey(''))
-    # related_document_id = Column(Integer, ForeignKey('document.id'))
-    # related_report_id = Column(Integer, ForeignKey('compliance_report.id'))
-
+    # Relationships
     related_organization = relationship(
         "Organization", back_populates="notification_messages"
     )