Merge develop -> main for new release ver 1.3.6

.azuredevops/build-and-push-dev.yml

@@ -0,0 +1,86 @@
+trigger:
+  - develop
+
+pr: none
+
+variables:
+  azureContainerRegistry.repository: 'oas/eligibility-estimator'
+  azureContainerRegistry.name: 'DTSShared-December/2023'
+  azureContainerRegistry.domain: 'dtsshared.azurecr.io'
+  app.environment: development
+  app.buildDate: $[ format('{0:yyyy}-{0:MM}-{0:dd}', pipeline.startTime) ]
+  app.domain: 'https://app-eligibilityestimator-dev.azurewebsites.net/'
+  app.logLevel: 'info'
+  image.tag: '$(Build.SourceVersion)'
+  System.Debug: false
+
+stages:
+  - stage: Cache
+    displayName: Pull latest image for caching
+    jobs:
+      - job:
+        displayName: Pull latest image
+        steps:
+          - task: Docker@2
+            inputs:
+              containerRegistry: '$(azureContainerRegistry.name)'
+              repository: '$(azureContainerRegistry.repository)'
+              command: 'login'
+
+          - script: 'docker pull $(azureContainerRegistry.domain)/$(azureContainerRegistry.repository):latest'
+            displayName: Pull latest for layer caching
+            continueOnError: true
+
+  - stage: Build
+    displayName: Build and Push to ACR
+    jobs:
+      - job: Build
+        displayName: Build and Push Container
+        steps:
+          - bash: |
+              short_hash=`git rev-parse --short=7 HEAD`
+              echo ""
+              echo "Full git hash:  $(Build.SourceVersion)"
+              echo "Short git hash: $short_hash"
+              echo "##vso[task.setvariable variable=image.tag]$short_hash"
+            workingDirectory: $(Build.SourcesDirectory)
+            displayName: Get short git hash
+          - task: AzureKeyVault@2
+            inputs:
+              azureSubscription: 'id-eligibilityestimator-dev'
+              KeyVaultName: 'kv-oas-ee-dev'
+              SecretsFilter: 'DEV-ADOBE-ANALYTICS-URL, NEXT-AUTH-PASSWORD, NEXT-AUTH-USERCODE'
+              RunAsPreJob: false
+
+          - task: Docker@2
+            inputs:
+              containerRegistry: '$(azureContainerRegistry.name)'
+              repository: '$(azureContainerRegistry.repository)'
+              command: 'build'
+              Dockerfile: './Dockerfile'
+              tags: |
+                $(image.tag)
+                latest
+                release-candidate
+              arguments: |
+                --pull
+                --cache-from $(azureContainerRegistry.domain)/$(azureContainerRegistry.repository):latest
+                --build-arg home=/app
+                --build-arg NEXT_BUILD_DATE=$(app.buildDate)
+                --build-arg NEXTAUTH_URL=$(app.domain)
+                --build-arg NEXT_AUTH_USERNAME=$(NEXT-AUTH-USERCODE)
+                --build-arg NEXT_AUTH_PASSWORD=$(NEXT-AUTH-PASSWORD)
+                --build-arg NEXTAUTH_SECRET=$(NEXT_AUTH_SECRET)
+                --build-arg ADOBE_ANALYTICS_URL=$(DEV-ADOBE-ANALYTICS-URL)
+                --build-arg APP_ENV=$(app.environment)
+                --build-arg LOGGING_LEVEL=$(app.logLevel)
+
+          - task: Docker@2
+            inputs:
+              containerRegistry: '$(azureContainerRegistry.name)'
+              repository: '$(azureContainerRegistry.repository)'
+              command: 'push'
+              tags: |
+                $(image.tag)
+                latest
+                release-candidate

.azuredevops/build-and-push-prod.yml

@@ -0,0 +1,84 @@
+trigger:
+  - main
+
+pr: none
+
+variables:
+  azureContainerRegistry.repository: 'oas/eligibility-estimator'
+  azureContainerRegistry.name: 'DTSShared-December/2023'
+  azureContainerRegistry.domain: 'dtsshared.azurecr.io'
+  app.environment: production
+  app.buildDate: $[ format('{0:yyyy}-{0:MM}-{0:dd}', pipeline.startTime) ]
+  app.domain: 'https://app-eligibilityestimator-prod.azurewebsites.net/'
+  app.logLevel: 'info'
+  image.tag: '$(Build.SourceVersion)'
+
+stages:
+  - stage: Cache
+    displayName: Pull latest image for caching
+    jobs:
+      - job:
+        displayName: Pull latest image
+        steps:
+          - task: Docker@2
+            inputs:
+              containerRegistry: '$(azureContainerRegistry.name)'
+              repository: '$(azureContainerRegistry.repository)'
+              command: 'login'
+
+          - script: 'docker pull $(azureContainerRegistry.domain)/$(azureContainerRegistry.repository):latest'
+            displayName: Pull latest for layer caching
+            continueOnError: true
+  - stage: Build
+    displayName: Build and Push to ACR
+    jobs:
+      - job: Build
+        displayName: Build and Push Container
+        steps:
+          - bash: |
+              short_hash=`git rev-parse --short=7 HEAD`
+              echo ""
+              echo "Full git hash:  $(Build.SourceVersion)"
+              echo "Short git hash: $short_hash"
+              echo "##vso[task.setvariable variable=image.tag]$short_hash"
+            workingDirectory: $(Build.SourcesDirectory)
+            displayName: Get short git hash
+          - task: AzureKeyVault@2
+            inputs:
+              azureSubscription: 'id-eligibilityestimator-prod'
+              KeyVaultName: 'kv-oas-ee-prod'
+              SecretsFilter: 'PROD-ADOBE-ANALYTICS-URL, NEXT-AUTH-PASSWORD, NEXT-AUTH-USERCODE'
+              RunAsPreJob: false
+
+          - task: Docker@2
+            inputs:
+              containerRegistry: '$(azureContainerRegistry.name)'
+              repository: '$(azureContainerRegistry.repository)'
+              command: 'build'
+              Dockerfile: './Dockerfile'
+              tags: |
+                $(image.tag)
+                latest
+                production-release
+              arguments: |
+                --pull
+                --cache-from $(azureContainerRegistry.domain)/$(azureContainerRegistry.repository):latest
+                --build-arg home=/app
+                --build-arg NEXT_BUILD_DATE=$(app.buildDate)
+                --build-arg NEXTAUTH_URL=$(app.domain)
+                --build-arg NEXT_AUTH_USERNAME=$(NEXT-AUTH-USERCODE)
+                --build-arg NEXT_AUTH_PASSWORD=$(NEXT-AUTH-PASSWORD)
+                --build-arg NEXTAUTH_SECRET=$(NEXT_AUTH_SECRET)
+                --build-arg ADOBE_ANALYTICS_URL=$(PROD-ADOBE-ANALYTICS-URL)
+                --build-arg APP_ENV=$(app.environment)
+                --build-arg LOGGING_LEVEL=$(app.logLevel)
+
+          - task: Docker@2
+            inputs:
+              containerRegistry: '$(azureContainerRegistry.name)'
+              repository: '$(azureContainerRegistry.repository)'
+              command: 'push'
+              tags: |
+                $(image.tag)
+                latest
+                production-release

.azuredevops/dynamic-branches.yml

@@ -0,0 +1,98 @@
+trigger:
+  - none
+
+pr: develop
+
+variables:
+  azure.servicePrincipal: ''
+  webapp.name: ''
+  webapp.resourceGroup: ''
+  webapp.slotName: null
+  azureContainerRegistry.name: ''
+  azureContainerRegistry.repository: ''
+  azureContainerRegistry.domain: ''
+  azureContainerRegistry.tag: ''
+  System.Debug: false
+
+steps:
+  - task: Docker@2
+    inputs:
+      containerRegistry: '$(azureContainerRegistry.name)'
+      repository: '$(azureContainerRegistry.repository)'
+      command: 'login'
+  - script: 'docker pull $(azureContainerRegistry.domain)/$(azureContainerRegistry.repository):latest'
+    displayName: Pull latest for layer caching
+    continueOnError: true
+
+  - task: Docker@2
+    displayName: 'Build image'
+    inputs:
+      containerRegistry: '$(azureContainerRegistry.name)'
+      repository: '$(azureContainerRegistry.repository)'
+      command: 'build'
+      Dockerfile: '**/Dockerfile'
+      tags: |
+        $(azureContainerRegistry.tag)
+        latest
+      arguments: |
+        --cache-from $(azureContainerRegistry.domain)/$(azureContainerRegistry.repository):latest
+
+  - task: Docker@2
+    displayName: 'Push image'
+    inputs:
+      containerRegistry: '$(azureContainerRegistry.name)'
+      repository: '$(azureContainerRegistry.repository)'
+      command: 'push'
+      tags: |
+        $(azureContainerRegistry.tag)
+        latest
+
+  - task: PowerShell@2
+    displayName: 'Decide which AppService slot to put this preview in'
+    inputs:
+      targetType: 'inline'
+      script: |
+        [int] $slotNumber = $(System.PullRequest.PullRequestId) % 4
+        Write-Host "Generated slot number:"
+        Write-Host "$slotNumber"
+        Write-Host "From PRID"
+        Write-Host "$(System.PullRequest.PullRequestId)"
+        Write-Host "##vso[task.setvariable variable=webapp.slotName]$slotNumber"
+
+  - task: AzureCLI@2
+    displayName: 'Create new slot in App Service'
+    inputs:
+      azureSubscription: $(azure.servicePrincipal)
+      scriptType: 'bash'
+      scriptLocation: 'inlineScript'
+      inlineScript: |
+        az webapp deployment slot create \
+        --name $(webapp.name) \
+        --resource-group $(webapp.resourceGroup) \
+        --slot pr-preview-$(webapp.slotName) \
+        --configuration-source $(webapp.name)
+        az webapp identity assign \
+        -g $(webapp.resourceGroup) \
+        -n $(webapp.name) \
+        --slot pr-preview-$(webapp.slotName) \
+        --identities /subscriptions/400c5730-25f5-4ee6-a933-8b289b9ccb0d/resourcegroups/rg-dts-id-shared/providers/Microsoft.ManagedIdentity/userAssignedIdentities/id-SCLabs-Shared
+
+  - task: AzureCLI@2
+    displayName: 'Deploy pr image to new slot'
+    inputs:
+      azureSubscription: $(azure.servicePrincipal)
+      scriptType: 'bash'
+      scriptLocation: 'inlineScript'
+      inlineScript: |
+        az webapp config container set \
+        --docker-custom-image-name $(azureContainerRegistry.domain)/$(azureContainerRegistry.repository):$(azureContainerRegistry.tag) \
+        --name $(webapp.name) \
+        --slot pr-preview-$(webapp.slotName) \
+        --resource-group $(webapp.resourceGroup)
+
+  - task: GitHubComment@0
+    displayName: 'Post a comment with a link to the new PR preview'
+    inputs:
+      gitHubConnection: "Adam'sGitHub-9/15/2023"
+      repositoryName: '$(Build.Repository.Name)'
+      comment: 'Check out a preview of your pull request here: https://$(webapp.name)-pr-preview-$(webapp.slotName).azurewebsites.net'

Dockerfile

@@ -93,4 +93,6 @@ COPY --chown=55:$group public ./public
 RUN VERSION_NEXT=`node -p -e "require('./package.json').dependencies.next"`&& yarn add next@"$VERSION_NEXT"
 USER $user
 
+EXPOSE 3000
+
 CMD [ "yarn", "start" ]

__tests__/pages/api/general.test.ts

@@ -39,11 +39,11 @@ describe('translation checks', () => {
 describe('country checks', () => {
   const COUNTRY_COUNT = 196
   const handlerEn = new BenefitHandler({ _language: Language.EN })
-  handlerEn.requiredFields = [FieldKey.LIVING_COUNTRY]
-  const fieldDataEn = handlerEn.fieldData as Array<FieldConfigDropdown>
+  handlerEn.fields.requiredFields = [FieldKey.LIVING_COUNTRY]
+  const fieldDataEn = handlerEn.fields.fieldData as Array<FieldConfigDropdown>
   const handlerFr = new BenefitHandler({ _language: Language.FR })
-  handlerFr.requiredFields = [FieldKey.LIVING_COUNTRY]
-  const fieldDataFr = handlerFr.fieldData as Array<FieldConfigDropdown>
+  handlerFr.fields.requiredFields = [FieldKey.LIVING_COUNTRY]
+  const fieldDataFr = handlerFr.fields.fieldData as Array<FieldConfigDropdown>
   it(`produces a list of ${COUNTRY_COUNT} countries (EN and FR)`, async () => {
     expect(fieldDataEn[0].values.length).toEqual(COUNTRY_COUNT)
     expect(fieldDataFr[0].values.length).toEqual(COUNTRY_COUNT)

__tests__/pages/api/gisCoupleAlwBenefit.test.ts

@@ -154,12 +154,12 @@ describe('gisCoupleALWBenefit', () => {
     const res = await mockGetRequest(extractedPayload)
 
     //client results
-    expectOasEligible(res, EntitlementResultType.FULL, 1045.11)
+    expectOasEligible(res, EntitlementResultType.FULL, 768.46)
     expectGisEligible(res, 241.52)
     expectAlwTooOld(res)
     expectAlwsMarital(res)
     //Future Benefit
-    expectFutureOasGisBenefitEligible(res, 100, 1045.11, 8.3, 0)
+    expectFutureOasGisBenefitEligible(res, 100, 768.46, 8.3, 0)
 
     //partner results
     expectOasNotEligible(res, true)
@@ -177,12 +177,12 @@ describe('gisCoupleALWBenefit', () => {
     const res = await mockGetRequest(extractedPayload)
 
     //client results
-    expectOasEligible(res, EntitlementResultType.PARTIAL, 857.6)
-    expectGisEligible(res, 318.37)
+    expectOasEligible(res, EntitlementResultType.FULL, 768.46)
+    expectGisEligible(res, 241.52)
     expectAlwTooOld(res)
     expectAlwsMarital(res)
     //Future Benefit
-    expectFutureOasGisBenefitEligible(res, 94, 857.6, 72.15, 0)
+    expectFutureOasGisBenefitEligible(res, 94, 768.46, 0, 0)
 
     //partner results
     expectOasNotEligible(res, true)

__tests__/pages/api/gisCoupleOnePenBenefit.test.ts

@@ -108,17 +108,18 @@ describe('gisCoupleOnePenBenefit', () => {
   it('should pass 51 test - CALC-51', async () => {
     const desiredName = 'CALC-51' // Replace with the desired name
     const extractedPayload = getTransformedPayloadByName(filePath, desiredName)
+
     const res = await mockGetRequest(extractedPayload)
 
     //client results
-    expectOasEligible(res, EntitlementResultType.FULL, 1045.11)
+    expectOasEligible(res, EntitlementResultType.FULL, 768.46)
     expectGisEligible(res, 0.82)
     expectAlwTooOld(res)
     expectAlwsMarital(res)
 
     //Future Benefit
-    expectFutureOasGisBenefitEligible(res, 82, 1045.11, 0.82, 0)
-    expectFutureOasGisBenefitEligible(res, 87, 1045.11, 0.0, 1)
+    expectFutureOasGisBenefitEligible(res, 82, 768.46, 0.82, 0)
+    expectFutureOasGisBenefitEligible(res, 87, 768.46, 0.0, 1)
 
     //partner results
     expectAllIneligible(res, true)

__tests__/pages/api/gisCoupleTwoPensBenefit.test.ts

@@ -296,8 +296,8 @@ describe('gisCoupleTwoPensBenefit', () => {
     const res = await mockGetRequest(extractedPayload)
 
     //client results
-    expectOasEligible(res, EntitlementResultType.PARTIAL, 731.57)
-    expectGisEligible(res, 1066.99)
+    expectOasEligible(res, EntitlementResultType.PARTIAL, 717.6)
+    expectGisEligible(res, 1047.78)
     expectAlwTooOld(res)
     expectAlwsMarital(res)
 
@@ -314,7 +314,7 @@ describe('gisCoupleTwoPensBenefit', () => {
     const res = await mockGetRequest(extractedPayload)
 
     //client results
-    expectOasEligible(res, EntitlementResultType.FULL, 1045.11)
+    expectOasEligible(res, EntitlementResultType.FULL, 999)
     expectGisEligible(res, 561.45)
     expectAlwTooOld(res)
     expectAlwsMarital(res)
@@ -332,7 +332,7 @@ describe('gisCoupleTwoPensBenefit', () => {
     const res = await mockGetRequest(extractedPayload)
 
     //client results
-    expectOasEligible(res, EntitlementResultType.FULL, 1045.11)
+    expectOasEligible(res, EntitlementResultType.FULL, 860.68)
     expectGisEligible(res, 92.82)
     expectAlwTooOld(res)
     expectAlwsMarital(res)
@@ -350,7 +350,7 @@ describe('gisCoupleTwoPensBenefit', () => {
     const res = await mockGetRequest(extractedPayload)
 
     //client results
-    expectOasEligible(res, EntitlementResultType.PARTIAL, 857.6)
+    expectOasEligible(res, EntitlementResultType.FULL, 768.46)
     expectGisEligible(res, 0.0)
     expect(res.body.results.gis.eligibility.reason).toEqual(ResultReason.INCOME)
     expectAlwTooOld(res)

__tests__/pages/api/gisSingleBenefit.test.ts

@@ -192,8 +192,8 @@ describe('gisSingleBenefit', () => {
     const res = await mockGetRequest(extractedPayload)
 
     //client results
-    expectOasEligible(res, EntitlementResultType.PARTIAL, 267.89)
-    expectGisEligible(res, 537.74)
+    expectOasEligible(res, EntitlementResultType.PARTIAL, 288.18)
+    expectGisEligible(res, 480.11)
     expectAlwTooOld(res)
     expectAlwsMarital(res)
   })