Merge pull request #730 from bcgov/dev-marshal-DV-merge-main-1

changes from main to dev-marshal (foi-docreviewer)
bcgov · Jan 19, 2024 · 949a182 · 949a182
2 parents 12917df + 721a408
commit 949a182
Show file tree

Hide file tree

Showing 45 changed files with 894 additions and 561 deletions.
diff --git a/.github/workflows/api-cd.yml b/.github/workflows/api-cd.yml
@@ -8,6 +8,8 @@ on:
       - main
       - dev-marshal
       - test-marshal
+      - dev-rook
+      - test-rook
     paths:
       - "api/**"
       - ".github/workflows/api-cd.yml"
@@ -59,7 +61,21 @@ jobs:
           echo "TAG_NAME=test-marshal" >> $GITHUB_ENV
           echo "BRANCH_NAME=test-marshal" >> $GITHUB_ENV
           echo "ENV_NAME=test" >> $GITHUB_ENV
+      - name: Set ENV variables for dev-rook branch
+        if: ${{ github.ref_name == 'dev-rook' }}
+        run: |
+          echo "For ${{ github.ref_name }} branch"
+          echo "TAG_NAME=dev-rook" >> $GITHUB_ENV
+          echo "BRANCH_NAME=dev-rook" >> $GITHUB_ENV
+          echo "ENV_NAME=dev" >> $GITHUB_ENV
 
+      - name: Set ENV variables for test-rook branch
+        if: ${{ github.ref_name == 'test-rook' }}
+        run: |
+          echo "For ${{ github.ref_name }} branch"
+          echo "TAG_NAME=test-rook" >> $GITHUB_ENV
+          echo "BRANCH_NAME=test-rook" >> $GITHUB_ENV
+          echo "ENV_NAME=test" >> $GITHUB_ENV
       - name: Login Openshift
         shell: bash
         run: |

diff --git a/.github/workflows/dedupe-cd.yml b/.github/workflows/dedupe-cd.yml
@@ -8,6 +8,8 @@ on:
       - main
       - dev-marshal
       - test-marshal
+      - dev-rook
+      - test-rook
     paths:
       - "computingservices/DedupeServices/**"
       - ".github/workflows/dedupe-cd.yml"
@@ -62,6 +64,22 @@ jobs:
           echo "BRANCH_NAME=test-marshal" >> $GITHUB_ENV
           echo "ENV_NAME=test" >> $GITHUB_ENV
 
+      - name: Set ENV variables for dev-rook branch
+        if: ${{ github.ref_name == 'dev-rook' }}
+        run: |
+          echo "For ${{ github.ref_name }} branch"
+          echo "TAG_NAME=dev-rook" >> $GITHUB_ENV
+          echo "BRANCH_NAME=dev-rook" >> $GITHUB_ENV
+          echo "ENV_NAME=dev" >> $GITHUB_ENV
+
+      - name: Set ENV variables for test-rook branch
+        if: ${{ github.ref_name == 'test-rook' }}
+        run: |
+          echo "For ${{ github.ref_name }} branch"
+          echo "TAG_NAME=test-rook" >> $GITHUB_ENV
+          echo "BRANCH_NAME=test-rook" >> $GITHUB_ENV
+          echo "ENV_NAME=test" >> $GITHUB_ENV
+
       - name: Login Openshift
         shell: bash
         run: |

diff --git a/.github/workflows/fileconv-cd.yml b/.github/workflows/fileconv-cd.yml
@@ -8,6 +8,8 @@ on:
       - main
       - dev-marshal
       - test-marshal
+      - dev-rook
+      - test-rook
     paths:
       - "MCS.FOI.S3FileConversion/**"
       - ".github/workflows/fileconv-cd.yml"
@@ -62,6 +64,22 @@ jobs:
           echo "BRANCH_NAME=test-marshal" >> $GITHUB_ENV
           echo "ENV_NAME=test" >> $GITHUB_ENV
 
+      - name: Set ENV variables for dev-rook branch
+        if: ${{ github.ref_name == 'dev-rook' }}
+        run: |
+          echo "For ${{ github.ref_name }} branch"
+          echo "TAG_NAME=dev-rook" >> $GITHUB_ENV
+          echo "BRANCH_NAME=dev-rook" >> $GITHUB_ENV
+          echo "ENV_NAME=dev" >> $GITHUB_ENV
+
+      - name: Set ENV variables for test-rook branch
+        if: ${{ github.ref_name == 'test-rook' }}
+        run: |
+          echo "For ${{ github.ref_name }} branch"
+          echo "TAG_NAME=test-rook" >> $GITHUB_ENV
+          echo "BRANCH_NAME=test-rook" >> $GITHUB_ENV
+          echo "ENV_NAME=test" >> $GITHUB_ENV
+
       - name: Login Openshift
         shell: bash
         run: |

diff --git a/.github/workflows/pdfstitch-cd.yml b/.github/workflows/pdfstitch-cd.yml
@@ -8,6 +8,8 @@ on:
       - main
       - dev-marshal
       - test-marshal
+      - dev-rook
+      - test-rook
     paths:
       - "computingservices/PDFStitchServices/**"
       - ".github/workflows/pdfstitch-cd.yml"
@@ -61,6 +63,22 @@ jobs:
           echo "TAG_NAME=test-marshal" >> $GITHUB_ENV
           echo "BRANCH_NAME=test-marshal" >> $GITHUB_ENV
           echo "ENV_NAME=test" >> $GITHUB_ENV
+      
+      - name: Set ENV variables for dev-rook branch
+        if: ${{ github.ref_name == 'dev-rook' }}
+        run: |
+          echo "For ${{ github.ref_name }} branch"
+          echo "TAG_NAME=dev-rook" >> $GITHUB_ENV
+          echo "BRANCH_NAME=dev-rook" >> $GITHUB_ENV
+          echo "ENV_NAME=dev" >> $GITHUB_ENV
+
+      - name: Set ENV variables for test-rook branch
+        if: ${{ github.ref_name == 'test-rook' }}
+        run: |
+          echo "For ${{ github.ref_name }} branch"
+          echo "TAG_NAME=test-rook" >> $GITHUB_ENV
+          echo "BRANCH_NAME=test-rook" >> $GITHUB_ENV
+          echo "ENV_NAME=test" >> $GITHUB_ENV
 
       - name: Login Openshift
         shell: bash

diff --git a/.github/workflows/pdfstitch-ci.yml b/.github/workflows/pdfstitch-ci.yml
@@ -8,6 +8,8 @@ on:
       - dev
       - dev-marshal
       - test-marshal
+      - dev-rook
+      - test-rook
     paths:
       - "computingservices/PDFStitchServices/**"
 

diff --git a/.github/workflows/web-cd.yml b/.github/workflows/web-cd.yml
@@ -8,6 +8,8 @@ on:
       - main
       - dev-marshal
       - test-marshal
+      - dev-rook
+      - test-rook
     paths:
       - "web/**"
       - ".github/workflows/web-cd.yml"
@@ -61,6 +63,22 @@ jobs:
           echo "TAG_NAME=test-marshal" >> $GITHUB_ENV
           echo "BRANCH_NAME=test-marshal" >> $GITHUB_ENV
           echo "ENV_NAME=test" >> $GITHUB_ENV
+      
+      - name: Set ENV variables for dev-rook branch
+        if: ${{ github.ref_name == 'dev-rook' }}
+        run: |
+          echo "For ${{ github.ref_name }} branch"
+          echo "TAG_NAME=dev-rook" >> $GITHUB_ENV
+          echo "BRANCH_NAME=dev-rook" >> $GITHUB_ENV
+          echo "ENV_NAME=dev" >> $GITHUB_ENV
+
+      - name: Set ENV variables for test-rook branch
+        if: ${{ github.ref_name == 'test-rook' }}
+        run: |
+          echo "For ${{ github.ref_name }} branch"
+          echo "TAG_NAME=test-rook" >> $GITHUB_ENV
+          echo "BRANCH_NAME=test-rook" >> $GITHUB_ENV
+          echo "ENV_NAME=test" >> $GITHUB_ENV
 
       - name: Login Openshift
         shell: bash

diff --git a/.github/workflows/zippingservice-cd.yml b/.github/workflows/zippingservice-cd.yml
@@ -8,6 +8,8 @@ on:
       - main
       - dev-marshal
       - test-marshal
+      - dev-rook
+      - test-rook
     paths:
       - "computingservices/ZippingServices/**"
       - ".github/workflows/zippingservice-cd.yml"
@@ -61,6 +63,22 @@ jobs:
           echo "TAG_NAME=test-marshal" >> $GITHUB_ENV
           echo "BRANCH_NAME=test-marshal" >> $GITHUB_ENV
           echo "ENV_NAME=test" >> $GITHUB_ENV
+      
+      - name: Set ENV variables for dev-rook branch
+        if: ${{ github.ref_name == 'dev-rook' }}
+        run: |
+          echo "For ${{ github.ref_name }} branch"
+          echo "TAG_NAME=dev-rook" >> $GITHUB_ENV
+          echo "BRANCH_NAME=dev-rook" >> $GITHUB_ENV
+          echo "ENV_NAME=dev" >> $GITHUB_ENV
+
+      - name: Set ENV variables for test-rook branch
+        if: ${{ github.ref_name == 'test-rook' }}
+        run: |
+          echo "For ${{ github.ref_name }} branch"
+          echo "TAG_NAME=test-rook" >> $GITHUB_ENV
+          echo "BRANCH_NAME=test-rook" >> $GITHUB_ENV
+          echo "ENV_NAME=test" >> $GITHUB_ENV
 
       - name: Login Openshift
         shell: bash

diff --git a/.github/workflows/zippingservice-ci.yml b/.github/workflows/zippingservice-ci.yml
@@ -8,6 +8,8 @@ on:
       - dev
       - dev-marshal
       - test-marshal
+      - dev-rook
+      - test-rook
     paths:
       - "computingservices/ZippingServices/**"
 

diff --git a/api/migrations/versions/549893ea9059_oipc.py b/api/migrations/versions/549893ea9059_oipc.py
@@ -0,0 +1,43 @@
+"""empty message
+
+Revision ID: 549893ea9059
+Revises: 2045c976ea60
+Create Date: 2023-11-23 22:53:32.071886
+
+"""
+from alembic import op
+import sqlalchemy as sa
+from sqlalchemy.dialects import postgresql
+
+# revision identifiers, used by Alembic.
+revision = '549893ea9059'
+down_revision = '2045c976ea60'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('AnnotationSections', sa.Column('redactionlayerid', sa.Integer, nullable=False, server_default='1'))
+    op.create_foreign_key(None, 'AnnotationSections', 'RedactionLayers', ['redactionlayerid'], ['redactionlayerid'])
+    op.execute(
+        'ALTER TABLE public."AnnotationSections" DROP CONSTRAINT "annotationsection_version_key";'
+    )
+    op.execute(
+        'ALTER TABLE public."AnnotationSections" ADD CONSTRAINT annotationsection_version_redactionlayerid_key UNIQUE (annotationname, version, redactionlayerid);'
+    )
+    op.execute('Update public."AnnotationSections" set redactionlayerid = 1 where redactionlayerid is null ')
+
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column('AnnotationSections', 'redactionlayerid')
+    op.execute(
+        'ALTER TABLE public."AnnotationSections" DROP CONSTRAINT "annotationsection_version_redactionlayerid_key";'
+    )
+    op.execute(
+        'ALTER TABLE public."AnnotationSections" ADD CONSTRAINT annotationsection_version_key UNIQUE (annotationname, version);'
+    )
+    # ### end Alembic commands ###