Merge branch 'main' into #3268_Application_DB_connection_Changes

bcgov · Aug 8, 2024 · 5197994 · 5197994
2 parents bc729d9 + a0b6f91
commit 5197994
Show file tree

Hide file tree

Showing 33 changed files with 986 additions and 1,305 deletions.
diff --git a/.github/workflows/env-setup-build-forms-server.yml b/.github/workflows/env-setup-build-forms-server.yml
@@ -29,7 +29,7 @@ jobs:
           echo BRANCH: $BUILD_REF
       # Checkout the PR branch
       - name: Checkout Target Branch
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: ${{ inputs.gitRef }}
       # Log in to OpenShift.

diff --git a/.github/workflows/env-setup-deploy-forms-server.yml b/.github/workflows/env-setup-deploy-forms-server.yml
@@ -37,7 +37,7 @@ jobs:
           echo HOST_PREFIX: $HOST_PREFIX
       # Checkout the PR branch
       - name: Checkout Target Branch
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: ${{ inputs.gitRef }}
       # Log in to OpenShift.

diff --git a/.github/workflows/env-setup-deploy-secrets.yml b/.github/workflows/env-setup-deploy-secrets.yml
@@ -56,7 +56,7 @@ jobs:
       S3_REGION: ${{ secrets.S3_REGION }}
     steps:
       - name: Checkout Target Branch
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: ${{ inputs.gitRef }}
       - name: Log in to OpenShift

diff --git a/.github/workflows/env-setup-redis-recovery.yml b/.github/workflows/env-setup-redis-recovery.yml
@@ -24,7 +24,7 @@ jobs:
       NAMESPACE: ${{ secrets.OPENSHIFT_ENV_NAMESPACE }}
     steps:
       - name: Checkout Target Branch
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: ${{ inputs.gitRef }}
       - name: Log in to OpenShift

diff --git a/.github/workflows/prune-images.yml b/.github/workflows/prune-images.yml
@@ -53,7 +53,7 @@ jobs:
           echo "Minimum Tags: ${MIN_TAGS}"
 
       - name: Checkout source code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Login to OpenShift
         run: |

diff --git a/.github/workflows/release-build-all.yml b/.github/workflows/release-build-all.yml
@@ -43,7 +43,7 @@ jobs:
           result-encoding: string
       # Checkout the code to apply the tag.
       - name: Checkout the code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: ${{ github.ref_name }}
       # Create tag.
@@ -69,7 +69,7 @@ jobs:
           echo BUILD NAMESPACE: $BUILD_NAMESPACE
           echo BRANCH: ${{ needs.createTag.outputs.newTag }}
       - name: Checkout Target Branch
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: ${{ needs.createTag.outputs.newTag }}
       - name: Log in to OpenShift
@@ -93,7 +93,7 @@ jobs:
           echo BUILD NAMESPACE: $BUILD_NAMESPACE
           echo BRANCH: ${{ needs.createTag.outputs.newTag }}
       - name: Checkout Target Branch
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: ${{ needs.createTag.outputs.newTag }}
       - name: Log in to OpenShift
@@ -117,7 +117,7 @@ jobs:
           echo BUILD NAMESPACE: $BUILD_NAMESPACE
           echo BRANCH: ${{ needs.createTag.outputs.newTag }}
       - name: Checkout Target Branch
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: ${{ needs.createTag.outputs.newTag }}
       - name: Log in to OpenShift
@@ -141,7 +141,7 @@ jobs:
           echo BUILD NAMESPACE: $BUILD_NAMESPACE
           echo BRANCH: ${{ needs.createTag.outputs.newTag }}
       - name: Checkout Target Branch
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: ${{ needs.createTag.outputs.newTag }}
       - name: Log in to OpenShift
@@ -165,7 +165,7 @@ jobs:
           echo BUILD NAMESPACE: $BUILD_NAMESPACE
           echo BRANCH: ${{ needs.createTag.outputs.newTag }}
       - name: Checkout Target Branch
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: ${{ needs.createTag.outputs.newTag }}
       - name: Log in to OpenShift

diff --git a/.github/workflows/release-create-branch.yml b/.github/workflows/release-create-branch.yml
@@ -27,7 +27,7 @@ jobs:
     steps:
       # Create the branch.
       - name: Create branch
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: ${{ inputs.gitRef }}
       - run: |

diff --git a/.github/workflows/release-deploy-all.yml b/.github/workflows/release-deploy-all.yml
@@ -104,7 +104,7 @@ jobs:
           echo BUILD NAMESPACE: $BUILD_NAMESPACE
 
       - name: Checkout Target Branch
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: ${{ inputs.gitRef }}
 
@@ -131,7 +131,7 @@ jobs:
           echo BUILD NAMESPACE: $BUILD_NAMESPACE
 
       - name: Checkout Target Branch
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: ${{ inputs.gitRef }}
 
@@ -159,7 +159,7 @@ jobs:
           echo GIT REF: ${{ inputs.gitRef }}
 
       - name: Checkout Target Branch
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: ${{ inputs.gitRef }}
 
@@ -186,7 +186,7 @@ jobs:
           echo BUILD NAMESPACE: $BUILD_NAMESPACE
 
       - name: Checkout Target Branch
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: ${{ inputs.gitRef }}
 
@@ -213,7 +213,7 @@ jobs:
           echo BUILD NAMESPACE: $BUILD_NAMESPACE
 
       - name: Checkout Target Branch
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: ${{ inputs.gitRef }}
 

diff --git a/.github/workflows/release-deploy-camunda-definitions.yml b/.github/workflows/release-deploy-camunda-definitions.yml
@@ -46,7 +46,7 @@ jobs:
           echo ZEEBE_ADDRESS: $ZEEBE_ADDRESS
           echo RESOURCES_FOLDER: $RESOURCES_FOLDER
       - name: Checkout Target Branch
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: ${{ inputs.gitRef }}
       - name: Setup Nodejs

diff --git a/.github/workflows/release-deploy-formio-definitions.yml b/.github/workflows/release-deploy-formio-definitions.yml
@@ -39,7 +39,7 @@ jobs:
       FORMS_SA_PASSWORD: ${{ secrets.FORMS_SA_PASSWORD }}
     steps:
       - name: Checkout Target Branch
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: ${{ inputs.gitRef }}
       - name: Setup Nodejs

diff --git a/.github/workflows/repo-checks-tests.yml b/.github/workflows/repo-checks-tests.yml
@@ -48,7 +48,7 @@ jobs:
     steps:
       # Checkout the PR branch.
       - name: Checkout Target Branch
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       # Generate the coverage report for API
       - name: Run Tests
         working-directory: "./sources/tests/"
@@ -75,7 +75,7 @@ jobs:
     steps:
       # Checkout the PR branch.
       - name: Checkout Target Branch
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       # Generate the coverage report for Workflow Workers
       - name: Run Tests
         working-directory: "./sources/tests/"
@@ -99,7 +99,7 @@ jobs:
     steps:
       # Checkout the PR branch.
       - name: Checkout Target Branch
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       # Run e2e tests for workflow.
       - name: Run Tests
         working-directory: "./sources/tests/"
@@ -118,7 +118,7 @@ jobs:
     steps:
       # Checkout the PR branch.
       - name: Checkout Target Branch
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       # Generate the coverage report for Queue Consumers
       - name: Run Tests
         working-directory: "./sources/tests/"
@@ -142,7 +142,7 @@ jobs:
     steps:
       # Checkout the PR branch.
       - name: Checkout Target Branch
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Setup Nodejs
         uses: actions/setup-node@v3
         with:

diff --git a/...ces/packages/backend/workflow/src/workflow-definitions/fulltime-assessment-2022-2023.bpmn b/...ces/packages/backend/workflow/src/workflow-definitions/fulltime-assessment-2022-2023.bpmn
@@ -1135,7 +1135,7 @@ or (calculatedDataPartnerFedralProvincialPDReceiptCost &gt; 0)</bpmn:conditionEx
     <bpmn:intermediateThrowEvent id="Event_0jry7fc" name="calculatedDataTotalParentNetIncome">
       <bpmn:extensionElements>
         <zeebe:ioMapping>
-          <zeebe:output source="=studentDataPleaseProvideAnEstimationOfYourParentsIncome" target="calculatedDataTotalParentNetIncome" />
+          <zeebe:output source="=studentDataStudentParentsTotalIncome" target="calculatedDataTotalParentNetIncome" />
         </zeebe:ioMapping>
       </bpmn:extensionElements>
       <bpmn:incoming>Flow_0g6wvij</bpmn:incoming>

diff --git a/...ces/packages/backend/workflow/src/workflow-definitions/fulltime-assessment-2023-2024.bpmn b/...ces/packages/backend/workflow/src/workflow-definitions/fulltime-assessment-2023-2024.bpmn
@@ -1135,7 +1135,7 @@ or (calculatedDataPartnerFedralProvincialPDReceiptCost &gt; 0)</bpmn:conditionEx
     <bpmn:intermediateThrowEvent id="Event_0jry7fc" name="calculatedDataTotalParentNetIncome">
       <bpmn:extensionElements>
         <zeebe:ioMapping>
-          <zeebe:output source="=studentDataPleaseProvideAnEstimationOfYourParentsIncome" target="calculatedDataTotalParentNetIncome" />
+          <zeebe:output source="=studentDataStudentParentsTotalIncome" target="calculatedDataTotalParentNetIncome" />
         </zeebe:ioMapping>
       </bpmn:extensionElements>
       <bpmn:incoming>Flow_0g6wvij</bpmn:incoming>

diff --git a/...ces/packages/backend/workflow/src/workflow-definitions/fulltime-assessment-2024-2025.bpmn b/...ces/packages/backend/workflow/src/workflow-definitions/fulltime-assessment-2024-2025.bpmn
@@ -1144,7 +1144,7 @@ or (calculatedDataPartnerFedralProvincialPDReceiptCost &gt; 0)</bpmn:conditionEx
     <bpmn:intermediateThrowEvent id="Event_0jry7fc" name="calculatedDataTotalParentNetIncome">
       <bpmn:extensionElements>
         <zeebe:ioMapping>
-          <zeebe:output source="=studentDataPleaseProvideAnEstimationOfYourParentsIncome" target="calculatedDataTotalParentNetIncome" />
+          <zeebe:output source="=studentDataStudentParentsTotalIncome" target="calculatedDataTotalParentNetIncome" />
         </zeebe:ioMapping>
       </bpmn:extensionElements>
       <bpmn:incoming>Flow_0g6wvij</bpmn:incoming>

diff --git a/...packages/backend/workflow/src/workflow-definitions/load-assessment-consolidated-data.bpmn b/...packages/backend/workflow/src/workflow-definitions/load-assessment-consolidated-data.bpmn
@@ -23,7 +23,7 @@
           <zeebe:header key="partner1TotalIncome" value="$.supportingUsers.Partner1.supportingData.totalIncome" />
           <zeebe:header key="applicationId" value="$.applicationId" />
           <zeebe:header key="studentDataEstimatedSpouseIncome" value="$.data.estimatedSpouseIncome" />
-          <zeebe:header key="studentDataPleaseProvideAnEstimationOfYourParentsIncome" value="$.data.pleaseProvideAnEstimationOfYourParentsIncome" />
+          <zeebe:header key="studentDataStudentParentsTotalIncome" value="$.data.studentParentsTotalIncome" />
           <zeebe:header key="studentDataWhenDidYouGraduateOrLeaveHighSchool" value="$.data.whenDidYouGraduateOrLeaveHighSchool" />
           <zeebe:header key="studentDataLivingathomeRent" value="$.data.livingathomeRent" />
           <zeebe:header key="studentDataTransportationCost" value="$.data.transportationCost" />

diff --git a/...ces/packages/backend/workflow/src/workflow-definitions/parttime-assessment-2022-2023.bpmn b/...ces/packages/backend/workflow/src/workflow-definitions/parttime-assessment-2022-2023.bpmn
@@ -768,9 +768,9 @@ dmnX (comes from dmn)</bpmn:text>
     <bpmn:intermediateThrowEvent id="Event_13hierd" name="calculate BCAG">
       <bpmn:extensionElements>
         <zeebe:ioMapping>
-          <zeebe:output source="=  if (calculatedDataTotalFamilyIncome &#60;= dmnPartTimeAwardFamilySizeVariables.limitAwardBCAGIncomeCap)&#10;then dmnPartTimeAwardAllowableLimits.limitAwardBCAGAmount&#10;else&#10;  max(dmnPartTimeAwardAllowableLimits.limitAwardBCAGAmount - ((calculatedDataTotalFamilyIncome - dmnPartTimeAwardFamilySizeVariables.limitAwardBCAGIncomeCap) * dmnPartTimeAwardFamilySizeVariables.limitAwardBCAGSlope),&#10;     100&#10;  )" target="federalAwardBCAGAmount" />
+          <zeebe:output source="=  if (calculatedDataTotalFamilyIncome &#60;= dmnPartTimeAwardFamilySizeVariables.limitAwardBCAGIncomeCap)&#10;then dmnPartTimeAwardAllowableLimits.limitAwardBCAGAmount&#10;else&#10;  max(dmnPartTimeAwardAllowableLimits.limitAwardBCAGAmount - ((calculatedDataTotalFamilyIncome - dmnPartTimeAwardFamilySizeVariables.limitAwardBCAGIncomeCap) * dmnPartTimeAwardFamilySizeVariables.limitAwardBCAGSlope),&#10;     100&#10;  )" target="provincialAwardBCAGAmount" />
           <zeebe:output source="=dmnPartTimeAwardAllowableLimits.limitAwardBCAGAmount - programYearTotalPartTimeBCAG" target="limitAwardBCAGRemaining" />
-          <zeebe:output source="=if (awardEligibilityBCAG = true and federalAwardBCAGAmount &#62;= 100 and limitAwardBCAGRemaining &#62;= 100)&#10;then&#10;  min(calculatedDataTotalRemainingNeed3, limitAwardBCAGRemaining, federalAwardBCAGAmount)&#10;else&#10;0" target="provincialAwardNetBCAGAmount" />
+          <zeebe:output source="=if (awardEligibilityBCAG = true and provincialAwardBCAGAmount &#62;= 100 and limitAwardBCAGRemaining &#62;= 100)&#10;then&#10;  min(calculatedDataTotalRemainingNeed3, limitAwardBCAGRemaining, provincialAwardBCAGAmount)&#10;else&#10;0" target="provincialAwardNetBCAGAmount" />
           <zeebe:output source="=calculatedDataTotalRemainingNeed3 - provincialAwardNetBCAGAmount" target="calculatedDataTotalRemainingNeed4" />
         </zeebe:ioMapping>
       </bpmn:extensionElements>

diff --git a/...ces/packages/backend/workflow/src/workflow-definitions/parttime-assessment-2023-2024.bpmn b/...ces/packages/backend/workflow/src/workflow-definitions/parttime-assessment-2023-2024.bpmn
@@ -768,9 +768,9 @@ dmnX (comes from dmn)</bpmn:text>
     <bpmn:intermediateThrowEvent id="Event_13hierd" name="calculate BCAG">
       <bpmn:extensionElements>
         <zeebe:ioMapping>
-          <zeebe:output source="=  if (calculatedDataTotalFamilyIncome &#60;= dmnPartTimeAwardFamilySizeVariables.limitAwardBCAGIncomeCap)&#10;then dmnPartTimeAwardAllowableLimits.limitAwardBCAGAmount&#10;else&#10;  max(dmnPartTimeAwardAllowableLimits.limitAwardBCAGAmount - ((calculatedDataTotalFamilyIncome - dmnPartTimeAwardFamilySizeVariables.limitAwardBCAGIncomeCap) * dmnPartTimeAwardFamilySizeVariables.limitAwardBCAGSlope),&#10;     100&#10;  )" target="federalAwardBCAGAmount" />
+          <zeebe:output source="=  if (calculatedDataTotalFamilyIncome &#60;= dmnPartTimeAwardFamilySizeVariables.limitAwardBCAGIncomeCap)&#10;then dmnPartTimeAwardAllowableLimits.limitAwardBCAGAmount&#10;else&#10;  max(dmnPartTimeAwardAllowableLimits.limitAwardBCAGAmount - ((calculatedDataTotalFamilyIncome - dmnPartTimeAwardFamilySizeVariables.limitAwardBCAGIncomeCap) * dmnPartTimeAwardFamilySizeVariables.limitAwardBCAGSlope),&#10;     100&#10;  )" target="provincialAwardBCAGAmount" />
           <zeebe:output source="=dmnPartTimeAwardAllowableLimits.limitAwardBCAGAmount - programYearTotalPartTimeBCAG" target="limitAwardBCAGRemaining" />
-          <zeebe:output source="=if (awardEligibilityBCAG = true and federalAwardBCAGAmount &#62;= 100 and limitAwardBCAGRemaining &#62;= 100)&#10;then&#10;  min(calculatedDataTotalRemainingNeed3, limitAwardBCAGRemaining, federalAwardBCAGAmount)&#10;else&#10;0" target="provincialAwardNetBCAGAmount" />
+          <zeebe:output source="=if (awardEligibilityBCAG = true and provincialAwardBCAGAmount &#62;= 100 and limitAwardBCAGRemaining &#62;= 100)&#10;then&#10;  min(calculatedDataTotalRemainingNeed3, limitAwardBCAGRemaining, provincialAwardBCAGAmount)&#10;else&#10;0" target="provincialAwardNetBCAGAmount" />
           <zeebe:output source="=calculatedDataTotalRemainingNeed3 - provincialAwardNetBCAGAmount" target="calculatedDataTotalRemainingNeed4" />
         </zeebe:ioMapping>
       </bpmn:extensionElements>

diff --git a/...ces/packages/backend/workflow/src/workflow-definitions/parttime-assessment-2024-2025.bpmn b/...ces/packages/backend/workflow/src/workflow-definitions/parttime-assessment-2024-2025.bpmn
@@ -768,9 +768,9 @@ dmnX (comes from dmn)</bpmn:text>
     <bpmn:intermediateThrowEvent id="Event_13hierd" name="calculate BCAG">
       <bpmn:extensionElements>
         <zeebe:ioMapping>
-          <zeebe:output source="=  if (calculatedDataTotalFamilyIncome &#60;= dmnPartTimeAwardFamilySizeVariables.limitAwardBCAGIncomeCap)&#10;then dmnPartTimeAwardAllowableLimits.limitAwardBCAGAmount&#10;else&#10;  max(dmnPartTimeAwardAllowableLimits.limitAwardBCAGAmount - ((calculatedDataTotalFamilyIncome - dmnPartTimeAwardFamilySizeVariables.limitAwardBCAGIncomeCap) * dmnPartTimeAwardFamilySizeVariables.limitAwardBCAGSlope),&#10;     100&#10;  )" target="federalAwardBCAGAmount" />
+          <zeebe:output source="=  if (calculatedDataTotalFamilyIncome &#60;= dmnPartTimeAwardFamilySizeVariables.limitAwardBCAGIncomeCap)&#10;then dmnPartTimeAwardAllowableLimits.limitAwardBCAGAmount&#10;else&#10;  max(dmnPartTimeAwardAllowableLimits.limitAwardBCAGAmount - ((calculatedDataTotalFamilyIncome - dmnPartTimeAwardFamilySizeVariables.limitAwardBCAGIncomeCap) * dmnPartTimeAwardFamilySizeVariables.limitAwardBCAGSlope),&#10;     100&#10;  )" target="provincialAwardBCAGAmount" />
           <zeebe:output source="=dmnPartTimeAwardAllowableLimits.limitAwardBCAGAmount - programYearTotalPartTimeBCAG" target="limitAwardBCAGRemaining" />
-          <zeebe:output source="=if (awardEligibilityBCAG = true and federalAwardBCAGAmount &#62;= 100 and limitAwardBCAGRemaining &#62;= 100)&#10;then&#10;  min(calculatedDataTotalRemainingNeed3, limitAwardBCAGRemaining, federalAwardBCAGAmount)&#10;else&#10;0" target="provincialAwardNetBCAGAmount" />
+          <zeebe:output source="=if (awardEligibilityBCAG = true and provincialAwardBCAGAmount &#62;= 100 and limitAwardBCAGRemaining &#62;= 100)&#10;then&#10;  min(calculatedDataTotalRemainingNeed3, limitAwardBCAGRemaining, provincialAwardBCAGAmount)&#10;else&#10;0" target="provincialAwardNetBCAGAmount" />
           <zeebe:output source="=calculatedDataTotalRemainingNeed3 - provincialAwardNetBCAGAmount" target="calculatedDataTotalRemainingNeed4" />
         </zeebe:ioMapping>
       </bpmn:extensionElements>