bcgov
diff --git a/‎.github/workflows/.dbdeployer.yml‎
Lines changed: 2 additions & 1 deletion b/‎.github/workflows/.dbdeployer.yml‎
Lines changed: 2 additions & 1 deletion
diff --git a/‎.github/workflows/.deployer.yml‎
Lines changed: 7 additions & 1 deletion b/‎.github/workflows/.deployer.yml‎
Lines changed: 7 additions & 1 deletion
diff --git a/‎.github/workflows/merge-dev-cats-deploy-prod.yml‎
Lines changed: 50 additions & 0 deletions b/‎.github/workflows/merge-dev-cats-deploy-prod.yml‎
Lines changed: 50 additions & 0 deletions
diff --git a/‎backend/applications/package-lock.json‎
Lines changed: 10 additions & 0 deletions b/‎backend/applications/package-lock.json‎
Lines changed: 10 additions & 0 deletions
diff --git a/‎backend/applications/src/app/constants/applicationType.ts‎
Lines changed: 10 additions & 0 deletions b/‎backend/applications/src/app/constants/applicationType.ts‎
Lines changed: 10 additions & 0 deletions
diff --git a/‎backend/applications/src/app/services/cats.service.spec.ts‎
Lines changed: 33 additions & 28 deletions b/‎backend/applications/src/app/services/cats.service.spec.ts‎
Lines changed: 33 additions & 28 deletions
@@ -108,7 +108,8 @@ jobs:
         run: |
           echo 'Deploying crunchy helm chart'
           if [ ${{ inputs.s3_enabled }} == true ]; then
-            helm upgrade --install --wait --set crunchy.pgBackRest.s3.enabled=true --debug \
+          echo "Remove helm dry run after testing"
+            helm upgrade --debug --install --wait \
              --set-string crunchy.pgBackRest.s3.accessKey=${{ secrets.s3_access_key }} \
               --set-string crunchy.pgBackRest.s3.secretKey=${{ secrets.s3_secret_key }} \
               --values ${{ inputs.values }} postgres  .
 
@@ -157,14 +157,20 @@ jobs:
           DEPLOY_TIMEOUT=$((${{ inputs.timeout-minutes }}-1)) 
           
           # Helm upgrade/rollout - atomic, timeout
-          helm upgrade \
+
+          helm upgrade --debug \
             --set-string global.repository=${{ github.repository }} \
             --set-string global.tag=${{ steps.vars.outputs.tag }} \
             --set-string global.secrets.keycloakSecret="${{ secrets.KEYCLOAK_SECRET }}" \
             --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.KEYCLOAK_SITE_SERVICE_CLIENT_SECRET="${{ secrets.KEYCLOAK_SITE_SERVICE_CLIENT_SECRET }}" \
             --set-string global.secrets.chesClientID="${{ secrets.CHES_CLIENT_ID }}" \
+            --set-string global.secrets.s3StorageBucket="${{ secrets.VITE_S3_STORAGE_BUCKET }}" \
+            --set-string global.secrets.s3StorageAccessKeyId="${{ secrets.VITE_S3_STORAGE_ACCESS_KEY_ID }}" \
+            --set-string global.secrets.s3StorageSecretAccessKey="${{ secrets.VITE_S3_STORAGE_SECRET_ACCESS_KEY }}" \
+            --set-string global.secrets.s3StorageEndpoint="${{ secrets.VITE_S3_STORAGE_ENDPOINT }}" \
             --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 }} \
 
@@ -0,0 +1,50 @@
+name: Dev Merge CATS - Deploy to PROD
+
+on:
+  push:
+    branches:
+      - main
+      - feat/cats-prod # todo: this can be removed in future, just for active dev.
+
+concurrency:
+  # Cancel in progress for PR open and close
+  group: prod
+  cancel-in-progress: false
+
+jobs:
+  get-pr-info:
+    runs-on: ubuntu-24.04
+    outputs:
+      pr: ${{ steps.vars.outputs.pr }}
+    steps:
+      - id: vars
+        uses: bcgov-nr/action-get-pr@v0.0.1
+      - name: Echo PR number
+        run: |
+          echo "PR: ${{ steps.vars.outputs.pr }}"
+
+  deploy_db:
+    name: Deploys Database
+    uses: ./.github/workflows/.dbdeployer.yml
+    secrets: inherit
+    with:
+      environment: prod
+      values: 'values-prod.yaml'
+      app_values: 'values.yaml' # PROD env specific values file for the APP
+  deploys:
+    name: Deploys to PROD
+    uses: ./.github/workflows/.deployer.yml
+    secrets: inherit
+    needs: [get-pr-info, deploy_db]
+    with:
+      environment: prod
+      tag:  '${{ needs.get-pr-info.outputs.pr }}'
+      values: 'values.yaml' # PROD env specific values file
+
+  schemaspy:
+    name: Schemaspy
+    uses: ./.github/workflows/.schema-spy.yml
+    secrets: inherit
+    needs: [deploys]
+    with:
+      tag: prod
@@ -0,0 +1,10 @@
+enum ApplicationType {
+  SIR = 'IR',
+  DERA = 'DERA',
+  NOM = 'NOM',
+  SRCR = 'SRCR',
+  NIR = 'NIR',
+  SoSC = 'SOSC',
+}
+
+export default ApplicationType;
@@ -16,7 +16,7 @@ describe('CatsService', () => {
     const submissionId = 'sub123';
     const formId = 'form123';
     const formData = {
-      siteId: 101,
+      siteId: '101, 123',
       hdnAppType: 'TYPE_A',
       applicationId: 100001,
     };
@@ -44,38 +44,28 @@ describe('CatsService', () => {
 
       expect(mockedAxios.post).toHaveBeenCalledWith(
         process.env.CATS_API,
-        expect.objectContaining({
+        {
           query: expect.stringContaining('mutation CreateNewApplication'),
           variables: {
             application: expect.objectContaining({
-              siteId: formData.siteId,
-              appTypeAbbrev: formData.hdnAppType,
+              siteIds: [101, 123],
+              appTypeAbbrev: 'TYPE_A',
+              receivedDate: expect.anything(), // could be string or Date
               applicationStatus: expect.arrayContaining([
                 expect.objectContaining({
-                  formId,
-                  submissionId,
-                  formsflowAppId: formData.applicationId,
+                  applicationId: 0,
+                  formId: 'form123',
+                  submissionId: 'sub123',
+                  formsflowAppId: 100001,
+                  isCurrent: true,
+                  statusTypeAbbrev: 'New',
                 }),
               ]),
             }),
           },
-        }),
-        { headers: { 'Content-Type': 'application/json' } }
-      );
-    });
-
-    it('should not call axios.post and log error if siteId is missing', async () => {
-      const consoleSpy = jest.spyOn(console, 'error').mockImplementation();
-      const invalidFormData = { ...formData, siteId: null };
-
-      await service.submitToCats(invalidFormData, submissionId, formId);
-
-      expect(mockedAxios.post).not.toHaveBeenCalled();
-      expect(consoleSpy).toHaveBeenCalledWith(
-        expect.stringContaining('Site Id not available, application not created in CATS'),
+        },
+        { headers: { 'Content-Type': 'application/json' } },
       );
-
-      consoleSpy.mockRestore();
     });
 
     it('should log error if axios.post throws', async () => {
@@ -95,7 +85,14 @@ describe('CatsService', () => {
   describe('updateCatsApplication', () => {
     const submissionId = 'sub456';
     const formId = 'form456';
-    const formData = { applicationId: 99999 };
+    const formData = {
+      applicationId: 99999,
+      applicationStatus: 'New',
+      siteId: '123,111',
+    };
+
+    const statusTypeAbbrev = 'New';
+    const siteIds = [123, 111];
 
     it('should call axios.post and return the response data', async () => {
       const mockResponse = {
@@ -116,7 +113,11 @@ describe('CatsService', () => {
 
       mockedAxios.post.mockResolvedValueOnce(mockResponse);
 
-      const result = await service.updateCatsApplication(submissionId, formId, formData);
+      const result = await service.updateCatsApplication(
+        submissionId,
+        formId,
+        formData,
+      );
 
       expect(mockedAxios.post).toHaveBeenCalledWith(
         process.env.CATS_API,
@@ -126,11 +127,13 @@ describe('CatsService', () => {
             appStatusInput: {
               submissionId,
               formId,
-              formsflowAppId: formData.applicationId,
+              formsflowAppId: Number(formData.applicationId),
+              statusTypeAbbrev,
+              siteIds,
             },
           },
         }),
-        { headers: { 'Content-Type': 'application/json' } }
+        { headers: { 'Content-Type': 'application/json' } },
       );
 
       expect(result).toEqual(mockResponse.data);
@@ -140,7 +143,9 @@ describe('CatsService', () => {
       const error = new Error('Update failed');
       mockedAxios.post.mockRejectedValueOnce(error);
 
-      await expect(service.updateCatsApplication(submissionId, formId, formData)).rejects.toThrow('Update failed');
+      await expect(
+        service.updateCatsApplication(submissionId, formId, formData),
+      ).rejects.toThrow('Update failed');
     });
   });
 });