bcgov
diff --git a/‎.github/workflows/.dbdeployer.yml‎
Lines changed: 1 addition & 1 deletion b/‎.github/workflows/.dbdeployer.yml‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎.github/workflows/.deployer.yml‎
Lines changed: 7 additions & 0 deletions b/‎.github/workflows/.deployer.yml‎
Lines changed: 7 additions & 0 deletions
diff --git a/‎.github/workflows/_code-cov.yml‎
Lines changed: 1 addition & 1 deletion b/‎.github/workflows/_code-cov.yml‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎.github/workflows/cats-pr-open.yml‎
Lines changed: 14 additions & 12 deletions b/‎.github/workflows/cats-pr-open.yml‎
Lines changed: 14 additions & 12 deletions
diff --git a/‎.github/workflows/merge-dev-cats.yml‎
Lines changed: 77 additions & 0 deletions b/‎.github/workflows/merge-dev-cats.yml‎
Lines changed: 77 additions & 0 deletions
diff --git a/‎.gitignore‎
Lines changed: 2 additions & 0 deletions b/‎.gitignore‎
Lines changed: 2 additions & 0 deletions
diff --git a/‎backend/applications/src/app.controller.ts‎
Lines changed: 1 addition & 1 deletion b/‎backend/applications/src/app.controller.ts‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎backend/applications/src/app/controllers/form.controller.spec.ts‎
Lines changed: 4 additions & 1 deletion b/‎backend/applications/src/app/controllers/form.controller.spec.ts‎
Lines changed: 4 additions & 1 deletion
diff --git a/‎backend/applications/src/app/controllers/form.controller.ts‎
Lines changed: 6 additions & 3 deletions b/‎backend/applications/src/app/controllers/form.controller.ts‎
Lines changed: 6 additions & 3 deletions
diff --git a/‎backend/cats/codegen.mts‎
Lines changed: 27 additions & 0 deletions b/‎backend/cats/codegen.mts‎
Lines changed: 27 additions & 0 deletions
@@ -108,7 +108,7 @@ jobs:
         run: |
           echo 'Deploying crunchy helm chart'
           if [ ${{ inputs.s3_enabled }} == true ]; then
-            helm upgrade --install --wait --set crunchy.pgBackRest.s3.enabled=true \
+            helm upgrade --install --wait --set crunchy.pgBackRest.s3.enabled=true --debug \
              --set-string crunchy.pgBackRest.s3.accessKey=${{ secrets.s3_access_key }} \
               --set-string crunchy.pgBackRest.s3.secretKey=${{ secrets.s3_secret_key }} \
               --values ${{ inputs.values }} postgres  .
 
@@ -55,6 +55,10 @@ on:
         default: 'values.yaml'
         required: false
         type: string
+      redirect_uri:
+        description: 'Redirect URI for Keycloak'
+        required: false
+        type: string
 
     outputs:
       triggered:
@@ -160,6 +164,9 @@ jobs:
             --set-string global.secrets.keycloakRealm="${{ secrets.KEYCLOAK_REALM }}" \
             --set-string global.secrets.keycloakClientID="${{ secrets.KEYCLOAK_CLIENTID }}" \
             --set-string global.secrets.keycloakAuthURL="${{ secrets.KEYCLOAK_AUTH_URL }}" \
+            --set-string global.secrets.chesClientID="${{ secrets.CHES_CLIENT_ID }}" \
+            --set-string global.secrets.chesClientSecret="${{ secrets.CHES_CLIENT_SECRET }}" \
+            --set-string global.config.REACT_APP_AUTH_LOGOUT_REDIRECT_URI="${{ inputs.redirect_uri}}" \
             --set-string global.config.dbUser=${{ inputs.db_user }} \
             ${{ inputs.params }} \
             --install --wait --atomic ${{ steps.vars.outputs.release }} --debug \
 
@@ -51,7 +51,7 @@ jobs:
           key: coverage-${{ inputs.component }}-${{ github.run_number }}
           restore-keys: |
             coverage-${{ inputs.component }}-
-
+      
       - name: Tests
         run: |
           cd ${{ inputs.component }}
 
@@ -2,18 +2,13 @@ name: CATS PR
 
 on:
   pull_request:
-    types: [opened, synchronize, reopened, ready_for_review] # ready for review is not included by default, More than one activity type triggers this event. For information about each activity type, see "Webhook events and payloads." By default, a workflow only runs when a pull_request event's activity type is opened, synchronize, or reopened. To trigger workflows by different activity types, use the types keyword. For more information, see "Workflow syntax for GitHub Actions."
     branches:
-      - srs-605 # this is the default branch and not main
-      #- srs-605 #test branch
-    # paths:
-    #   - 'backend/cats/**'
-    #   - 'cats-frontend/**'  
-
+      - dev
 
 concurrency:
   # Cancel in progress for PR open and close
-  group: ${{ github.event.number }}
+  # group: ${{ github.event.number }}
+  group: ${{ github.event.pull_request.number || github.run_id }}
   cancel-in-progress: true
 
 jobs:
@@ -23,11 +18,14 @@ jobs:
     runs-on: ubuntu-24.04
     strategy:
       matrix:
-        package: [backend, cats-frontend ]
+        package: [backend, backend-migration, cats-frontend]
         include:
           - package: backend
             build_file: ./backend/cats/Dockerfile
             build_context: backend/cats
+          - package: backend-migration
+            build_file: ./backend/cats/Dockerfile-migrations-openshift
+            build_context: backend/cats
           - package: cats-frontend
             build_file: ./cats-frontend/Dockerfile
             build_context: cats-frontend
@@ -36,7 +34,8 @@ jobs:
       - uses: bcgov-nr/action-builder-ghcr@v2.2.0
         with:
           package: ${{ matrix.package }}
-          tag: ${{ github.event.number }}
+          # tag: ${{ github.event.number }}
+          tag: ${{ github.event.pull_request.number || github.run_id }}
           tag_fallback: latest
           triggers: ('${{ matrix.package }}/')
           build_file: ${{ matrix.build_file }}
@@ -48,6 +47,8 @@ jobs:
     uses: ./.github/workflows/.dbdeployer.yml
     secrets: inherit
     with:
+      # Can revert to below trigger, this line just forces db deploy when updating this file, good for active dev.
+      # triggers: ('charts/crunchy/' '.github/workflows/cats-pr-open.yml')
       triggers: ('charts/crunchy/')
       values: 'values-dev.yaml'
       app_values:  'values-pr.yaml' # PR specific values file.
@@ -61,9 +62,10 @@ jobs:
     with:
       triggers: ('backend/cats/' 'cats-frontend/' 'charts/' '.github/workflows/')
       values: 'values-pr.yaml' # PR specific values file.
+      redirect_uri: https://logontest7.gov.bc.ca/clp-cgi/logoff.cgi?retnow=1&returl=https://epd-keycloak-dev.apps.silver.devops.gov.bc.ca/auth/realms/forms-flow-ai/protocol/openid-connect/logout?post_logout_redirect_uri=https://nr-epd-digital-services-${{ github.event.pull_request.number}}-frontend.apps.silver.devops.gov.bc.ca/
       db_user: cats-${{ github.event.number }}
-      timeout-minutes: 60
-
+      timeout-minutes: 20
+  
   results:
     name: PR Results
     needs: [builds, deploys]
 
@@ -0,0 +1,77 @@
+name: CATS PR
+
+on:
+  push:
+    branches:
+      - dev 
+
+concurrency:
+  group: test
+  cancel-in-progress: false
+
+jobs:
+  # https://github.com/bcgov-nr/action-builder-ghcr
+  builds:
+    name: Builds
+    runs-on: ubuntu-24.04
+    strategy:
+      matrix:
+        package: [backend, backend-migration, cats-frontend]
+        include:
+          - package: backend
+            build_file: ./backend/cats/Dockerfile
+            build_context: backend/cats
+          - package: backend-migration
+            build_file: ./backend/cats/Dockerfile-migrations-openshift
+            build_context: backend/cats
+          - package: cats-frontend
+            build_file: ./cats-frontend/Dockerfile
+            build_context: cats-frontend
+    timeout-minutes: 10
+    steps:
+      - uses: bcgov-nr/action-builder-ghcr@v2.2.0
+        with:
+          package: ${{ matrix.package }}
+          # tag: ${{ github.event.number }}
+          tag: test
+          tag_fallback: latest
+          triggers: ('${{ matrix.package }}/')
+          build_file: ${{ matrix.build_file }}
+          build_context: ${{ matrix.build_context }}
+
+          
+  deploy_db:
+    name: Deploys Database (test)
+    uses: ./.github/workflows/.dbdeployer.yml
+    secrets: inherit
+    with:
+      # Todo - Can revert to below trigger, this line just forces db deploy when updating this file, good for active dev.
+      triggers: ('charts/crunchy/' '.github/workflows/cats-pr-open.yml')
+      # triggers: ('charts/crunchy/')
+      values: 'values-dev.yaml'
+      app_values:  'values-test.yaml' 
+      environment: test
+    # https://github.com/bcgov/quickstart-openshift-helpers
+  deploys:
+    name: Deploys (test)
+    needs: [builds, deploy_db]
+    # needs: [builds]
+    uses: ./.github/workflows/.deployer.yml
+    secrets: inherit
+    with:
+      triggers: ('backend/cats/' 'cats-frontend/' 'charts/' '.github/workflows/')
+      values: 'values-test.yaml'
+      redirect_uri: https://logontest7.gov.bc.ca/clp-cgi/logoff.cgi?retnow=1&returl=https://epd-keycloak-test.apps.silver.devops.gov.bc.ca/auth/realms/forms-flow-ai/protocol/openid-connect/logout?post_logout_redirect_uri=https://nr-epd-digital-services-${{ github.event.pull_request.number}}-frontend.apps.silver.devops.gov.bc.ca/
+      db_user: cats-test
+      timeout-minutes: 20
+      environment: test
+  
+  results:
+    name: PR Results
+    needs: [builds, deploys]
+    if: always()
+    runs-on: ubuntu-24.04
+    steps:
+      - if: contains(needs.*.result, 'failure')
+        run: echo "At least one job has failed." && exit 1
+      - run: echo "Success!"
@@ -30,6 +30,7 @@ lcov.*
 
 # Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files)
 .grunt
+.DS_STORE
 
 # Bower dependency directory (https://bower.io/)
 bower_components
@@ -131,3 +132,4 @@ forms-flow-ai/forms-flow-ai-ee/forms-flow-bpm/id_rsa_epd.pub
 
 .vscode/settings.json
 .vscode/launch.json
+backups/
@@ -5,7 +5,7 @@ import { AppService } from './app.service';
 import { Request } from 'express';
 
 @Controller()
-@Resource('user-service')
+@Resource('cats-service')
 export class AppController {
   constructor(private readonly appService: AppService) {}
 
 
@@ -82,9 +82,12 @@ describe('FormController', () => {
       createdDate: new Date(),
       modifiedDate: new Date(),
     };
+    const mockRequest = {
+      headers: { origin: 'https://example.com' },
+    } as unknown as Request;
 
     mockFormService.create.mockResolvedValue(savedSubmission);
-    const result = await controller.save(formId, content);
+    const result = await controller.save(formId, content, mockRequest);
 
     expect(mockFormService.create).toHaveBeenCalledWith(formId, formData);
     expect(mockCatsService.submitToCats).toHaveBeenCalledWith(
 
@@ -1,4 +1,4 @@
-import { Body, Controller, Get, Param, Patch, Post, Put } from '@nestjs/common';
+import { Body, Controller, Get, Param, Patch, Post, Put, Req } from '@nestjs/common';
 import { Unprotected } from 'nest-keycloak-connect';
 import { SubmissionResponse } from '../dto/submissionResponse.dto';
 import { Form } from '../entities/form.entity';
@@ -66,12 +66,15 @@ export class FormController {
    */
   @Post(':formId/submission') async save(
     @Param('formId') formId,
-    @Body() content,
+    @Body() content, @Req() request,
   ): Promise<SubmissionResponse> {
+    console.log('Request headers---', request.headers);
+    const origin = request.headers.origin;
     const savedSubmission = await this.formService.create(formId, content.data);
     const submissionResponse: SubmissionResponse =
       this.transformResult(savedSubmission);
-    await this.catsService.submitToCats(content.data, savedSubmission.id, savedSubmission.formId);
+    if (origin)
+      await this.catsService.submitToCats(content.data, savedSubmission.id, savedSubmission.formId);
     return submissionResponse;
   }
 
 
@@ -0,0 +1,27 @@
+import { CodegenConfig } from '@graphql-codegen/cli';
+
+require('dotenv').config();
+
+const config: CodegenConfig = {
+  overwrite: true,
+  schema: process.env.SITE_SERVICE_URL_CODEGEN || process.env.SITE_SERVICE_URL,
+  documents: ['src/**/*.graphql'],
+  generates: {
+    'src/generated/types.ts': {
+      plugins: ['typescript'],
+    },
+    'src/': {
+      preset: 'near-operation-file',
+      presetConfig: {
+        extension: '.generated.ts',
+        baseTypesPath: 'generated/types.ts',
+      },
+      plugins: ['typescript-operations', 'typescript-graphql-request'],
+    },
+    'graphql.schema.json': {
+      plugins: ['introspection'],
+    },
+  },
+};
+
+export default config;