Merge branch 'main' into UML-3570-refactor-templates-to-work-with-com…

…bined-format-summary
ministryofjustice · Nov 19, 2024 · 276205d · 276205d
2 parents 704c1fc + 0062994
commit 276205d
Show file tree

Hide file tree

Showing 77 changed files with 2,424 additions and 1,653 deletions.
diff --git a/.github/workflows/_build-and-push.yml b/.github/workflows/_build-and-push.yml
@@ -76,7 +76,7 @@ jobs:
             run_integration_tests: 'false'
             artifact_to_dl: ''
     steps:
-      - uses: actions/checkout@3b9b8c884f6b4bb4d5be2779c26374abadae0871
+      - uses: actions/checkout@cbb722410c2e876e24abbe8de2cc27693e501dcb
 
       - name: cache node modules
         id: cache-npm
@@ -256,7 +256,7 @@ jobs:
             docker build --file service-${SVC_PREFIX}/docker/web/Dockerfile --tag ${SVC_PREFIX}_web:latest .
 
           elif [[ "${SVC_SUFFIX}" = "lambda" ]]; then
-            docker build --file lambda-functions/upload-statistics/Dockerfile --tag stats_upload_lambda:latest lambda-functions/upload-statistics
+            docker build --no-cache --file lambda-functions/upload-statistics/Dockerfile --tag stats_upload_lambda:latest lambda-functions/upload-statistics
 
           fi
         if: (inputs.specific_path == 'all' || inputs.specific_path == matrix.svc_prefix)

diff --git a/.github/workflows/_codecov.yml b/.github/workflows/_codecov.yml
@@ -15,7 +15,7 @@ jobs:
   code_coverage:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@3b9b8c884f6b4bb4d5be2779c26374abadae0871 # pin@v3
+      - uses: actions/checkout@cbb722410c2e876e24abbe8de2cc27693e501dcb # pin@v3
       - name: download artifact for front tests
         id: download-artifact-front-tests
         uses: actions/download-artifact@d0ce8fd1167ed839810201de977912a090ab10a7
@@ -43,7 +43,7 @@ jobs:
           ${{ inputs.specific_path }} == 'all' ||
           ${{ inputs.specific_path }} == 'admin'
       - name: service front codecov upload
-        uses: codecov/codecov-action@v4
+        uses: codecov/codecov-action@v5
         with:
           name: use-an-lpa-front
           directory: ./service-front
@@ -54,7 +54,7 @@ jobs:
         if: |
           ( success() || failure() ) && inputs.specific_path == 'all'
       - name: service api codecov upload
-        uses: codecov/codecov-action@v4
+        uses: codecov/codecov-action@v5
         with:
           name: use-an-lpa-api
           directory: ./service-api
@@ -65,7 +65,7 @@ jobs:
         if: |
           ( success() || failure() ) && inputs.specific_path == 'all'
       - name: service admin codecov upload
-        uses: codecov/codecov-action@v4
+        uses: codecov/codecov-action@v5
         with:
           name: use-an-lpa-admin
           directory: ./service-admin

diff --git a/.github/workflows/_ecr-scanning.yml b/.github/workflows/_ecr-scanning.yml
@@ -15,7 +15,7 @@ jobs:
   ecr-scan-results:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@3b9b8c884f6b4bb4d5be2779c26374abadae0871 # pin@v3
+      - uses: actions/checkout@cbb722410c2e876e24abbe8de2cc27693e501dcb # pin@v3
 
       - name: configure AWS credentials ECR scan results
         uses: aws-actions/configure-aws-credentials@97834a484a5ab3c40fa9e2eb40fcf8041105a573 # [email protected]

diff --git a/.github/workflows/_lint-terraform.yml b/.github/workflows/_lint-terraform.yml
@@ -21,7 +21,7 @@ jobs:
           - folder: 'environment'
           - folder: 'account'
     steps:
-      - uses: actions/checkout@3b9b8c884f6b4bb4d5be2779c26374abadae0871 # pin@v3
+      - uses: actions/checkout@cbb722410c2e876e24abbe8de2cc27693e501dcb # pin@v3
 
       - name: Set Terraform version
         working-directory: ./terraform/${{ matrix.folder }}
@@ -30,7 +30,7 @@ jobs:
           TF_VERSION=$(cat .terraform-version)
           echo "TF_VERSION=$TF_VERSION" >> $GITHUB_OUTPUT
 
-      - uses: hashicorp/setup-terraform@4fab0119030f0b41039f372591efdbf7dbcd8fd8 # [email protected]
+      - uses: hashicorp/setup-terraform@fd3bf06534214722507d89f9d499612bf7799787 # [email protected]
         with:
           terraform_version: ${{ steps.set-terraform-version.outputs.TF_VERSION }}
 

diff --git a/.github/workflows/_node-build.yml b/.github/workflows/_node-build.yml
@@ -11,7 +11,7 @@ jobs:
   build-web:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@3b9b8c884f6b4bb4d5be2779c26374abadae0871 # pin@v3
+      - uses: actions/checkout@cbb722410c2e876e24abbe8de2cc27693e501dcb # pin@v3
       - uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # [email protected]
         with:
           node-version-file: '.nvmrc'

diff --git a/.github/workflows/_node-test.yml b/.github/workflows/_node-test.yml
@@ -11,7 +11,7 @@ jobs:
   unit-test:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@3b9b8c884f6b4bb4d5be2779c26374abadae0871 # pin@v3
+      - uses: actions/checkout@cbb722410c2e876e24abbe8de2cc27693e501dcb # pin@v3
       - uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # [email protected]
         with:
           node-version-file: '.nvmrc'

diff --git a/.github/workflows/_run-behat-tests.yml b/.github/workflows/_run-behat-tests.yml
@@ -16,7 +16,7 @@ jobs:
   build-web:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@3b9b8c884f6b4bb4d5be2779c26374abadae0871 # pin@v3
+      - uses: actions/checkout@cbb722410c2e876e24abbe8de2cc27693e501dcb # pin@v3
 
       - name: install python
         uses: actions/setup-python@55aad42e4674b58b2b2fb7d8e7552402d922b4e7 # [email protected]
@@ -30,7 +30,7 @@ jobs:
           chrome-version: stable
 
       - name: Setup PHP
-        uses: shivammathur/setup-php@ce2f681d2257b1c64228aa701fefa22db84edf4b # [email protected]
+        uses: shivammathur/setup-php@944fb41c67bf260d77ef9eab76dfb859c2fd9cb2 # [email protected]
         with:
           php-version: 8.3
 

diff --git a/.github/workflows/_run-terraform.yml b/.github/workflows/_run-terraform.yml
@@ -58,7 +58,7 @@ jobs:
             echo "admin-tag=$(echo ${TAG})" >> $GITHUB_OUTPUT
           fi
 
-      - uses: actions/checkout@3b9b8c884f6b4bb4d5be2779c26374abadae0871 # pin@v3
+      - uses: actions/checkout@cbb722410c2e876e24abbe8de2cc27693e501dcb # pin@v3
         with:
           fetch-depth: '0'
 
@@ -71,7 +71,7 @@ jobs:
 
       - uses: unfor19/install-aws-cli-action@27d6061dae5d39e89be4d2246824f15e111a7e06 # [email protected]
 
-      - uses: hashicorp/setup-terraform@4fab0119030f0b41039f372591efdbf7dbcd8fd8 # [email protected]
+      - uses: hashicorp/setup-terraform@fd3bf06534214722507d89f9d499612bf7799787 # [email protected]
         with:
           terraform_version: ${{ steps.set-terraform-version.outputs.TF_VERSION }}
 

diff --git a/.github/workflows/_seed-database.yml b/.github/workflows/_seed-database.yml
@@ -10,7 +10,7 @@ jobs:
   terraform_workflow:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@3b9b8c884f6b4bb4d5be2779c26374abadae0871 # pin@v3
+      - uses: actions/checkout@cbb722410c2e876e24abbe8de2cc27693e501dcb # pin@v3
         with:
           fetch-depth: '0'
 

diff --git a/.github/workflows/_slack-notification.yml b/.github/workflows/_slack-notification.yml
@@ -28,7 +28,7 @@ jobs:
   send-slack-notification:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@3b9b8c884f6b4bb4d5be2779c26374abadae0871 # pin@v3
+      - uses: actions/checkout@cbb722410c2e876e24abbe8de2cc27693e501dcb # pin@v3
 
       - name: install python
         uses: actions/setup-python@55aad42e4674b58b2b2fb7d8e7552402d922b4e7 # [email protected]

diff --git a/.github/workflows/path-to-live.yml b/.github/workflows/path-to-live.yml
@@ -35,11 +35,11 @@ jobs:
       semver_tag: ${{ steps.semver_tag.outputs.created_tag }}
       specific_path: ${{ steps.variables.outputs.path }}
     steps:
-      - uses: actions/checkout@3b9b8c884f6b4bb4d5be2779c26374abadae0871 # pin@v3
+      - uses: actions/checkout@cbb722410c2e876e24abbe8de2cc27693e501dcb # pin@v3
 
       - name: get changed docs files in any folder
         id: changed-files-docs
-        uses: tj-actions/changed-files@3f646a35495417b5549f98c7f7b78b41cbfaf43d
+        uses: tj-actions/changed-files@fe1bc0e3d35d94ed03a43d070f62cce13ce558ff
         with:
           files: |
             **/*.md
@@ -135,7 +135,7 @@ jobs:
       - workflow_variables
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@3b9b8c884f6b4bb4d5be2779c26374abadae0871 # pin@v3
+      - uses: actions/checkout@cbb722410c2e876e24abbe8de2cc27693e501dcb # pin@v3
       - name: download artifact for front tests
         uses: actions/download-artifact@d0ce8fd1167ed839810201de977912a090ab10a7
         with:
@@ -151,7 +151,7 @@ jobs:
         with:
           name: service-admin
           path: service-admin
-      - uses: codecov/codecov-action@v4
+      - uses: codecov/codecov-action@v5
         with:
           name: codecov-use-an-lpa
 
@@ -245,7 +245,7 @@ jobs:
     needs:
       - terraform_apply_production
     steps:
-      - uses: actions/checkout@3b9b8c884f6b4bb4d5be2779c26374abadae0871 # pin@v3
+      - uses: actions/checkout@cbb722410c2e876e24abbe8de2cc27693e501dcb # pin@v3
         with:
           fetch-depth: '0'
       - name: download cluster_config

diff --git a/.github/workflows/pull-request-path.yml b/.github/workflows/pull-request-path.yml
@@ -40,7 +40,7 @@ jobs:
       workspace_name: ${{ steps.set_workspace_name.outputs.workspace_name }}
 
     steps:
-      - uses: actions/checkout@3b9b8c884f6b4bb4d5be2779c26374abadae0871 # pin@v3
+      - uses: actions/checkout@cbb722410c2e876e24abbe8de2cc27693e501dcb # pin@v3
         with:
           fetch-depth: 2
 
@@ -50,19 +50,19 @@ jobs:
 
       - name: get changed files in the admin folder
         id: changed-files-admin
-        uses: tj-actions/changed-files@3f646a35495417b5549f98c7f7b78b41cbfaf43d
+        uses: tj-actions/changed-files@fe1bc0e3d35d94ed03a43d070f62cce13ce558ff
         with:
           files: |
             service-admin/**
       - name: get changed files in the terraform folder
         id: changed-files-terraform
-        uses: tj-actions/changed-files@3f646a35495417b5549f98c7f7b78b41cbfaf43d
+        uses: tj-actions/changed-files@fe1bc0e3d35d94ed03a43d070f62cce13ce558ff
         with:
           files: |
             terraform/**
       - name: get changed docs files in any folder
         id: changed-files-docs
-        uses: tj-actions/changed-files@3f646a35495417b5549f98c7f7b78b41cbfaf43d
+        uses: tj-actions/changed-files@fe1bc0e3d35d94ed03a43d070f62cce13ce558ff
         with:
           files: |
             **/*.md

diff --git a/.github/workflows/scheduled-codeql-analysis.yml b/.github/workflows/scheduled-codeql-analysis.yml
@@ -30,7 +30,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@3b9b8c884f6b4bb4d5be2779c26374abadae0871 # pin@v3
+      uses: actions/checkout@cbb722410c2e876e24abbe8de2cc27693e501dcb # pin@v3
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL

diff --git a/.github/workflows/scheduled-tfsec.yml b/.github/workflows/scheduled-tfsec.yml
@@ -13,7 +13,7 @@ jobs:
       contents: read
       security-events: write
     steps:
-      - uses: actions/checkout@3b9b8c884f6b4bb4d5be2779c26374abadae0871 # pin@v3
+      - uses: actions/checkout@cbb722410c2e876e24abbe8de2cc27693e501dcb # pin@v3
         with:
           persist-credentials: false
 

diff --git a/.github/workflows/scheduled-workspace-cleanup.yml b/.github/workflows/scheduled-workspace-cleanup.yml
@@ -22,7 +22,7 @@ jobs:
   terraform_environment_cleanup:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@3b9b8c884f6b4bb4d5be2779c26374abadae0871 # pin@v3
+      - uses: actions/checkout@cbb722410c2e876e24abbe8de2cc27693e501dcb # pin@v3
 
       - name: Set Terraform version
         working-directory: ./terraform/environment
@@ -31,7 +31,7 @@ jobs:
           TF_VERSION=$(cat .terraform-version)
           echo "TF_VERSION=$TF_VERSION" >> $GITHUB_OUTPUT
 
-      - uses: hashicorp/setup-terraform@4fab0119030f0b41039f372591efdbf7dbcd8fd8 # pin@v2
+      - uses: hashicorp/setup-terraform@fd3bf06534214722507d89f9d499612bf7799787 # pin@v2
         with:
           terraform_version: ${{ steps.set-terraform-version.outputs.TF_VERSION }}
           terraform_wrapper: false

diff --git a/.github/workflows/trivy_scan_alert_report.yml b/.github/workflows/trivy_scan_alert_report.yml
@@ -12,7 +12,7 @@ jobs:
   trivy_scan_alert_report:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@3b9b8c884f6b4bb4d5be2779c26374abadae0871 # pin@v3
+      - uses: actions/checkout@cbb722410c2e876e24abbe8de2cc27693e501dcb # pin@v3
 
       - name: install python
         uses: actions/setup-python@55aad42e4674b58b2b2fb7d8e7552402d922b4e7 # [email protected]

diff --git a/.github/workflows/workflow-deploy-ref-to-env.yml b/.github/workflows/workflow-deploy-ref-to-env.yml
@@ -53,20 +53,20 @@ jobs:
       short_sha:  ${{ steps.variables.outputs.short_sha }}
       specific_path: ${{ steps.variables.outputs.path }}
     steps:
-      - uses: actions/checkout@3b9b8c884f6b4bb4d5be2779c26374abadae0871 # pin@v4
+      - uses: actions/checkout@cbb722410c2e876e24abbe8de2cc27693e501dcb # pin@v4
         with:
           fetch-depth: 2
           ref: ${{ inputs.git_ref }}
 
       - name: get changed files in the admin folder
         id: changed-files-admin
-        uses: tj-actions/changed-files@3f646a35495417b5549f98c7f7b78b41cbfaf43d
+        uses: tj-actions/changed-files@fe1bc0e3d35d94ed03a43d070f62cce13ce558ff
         with:
           files: |
             service-admin/**
       - name: get changed files in the terraform folder
         id: changed-files-terraform
-        uses: tj-actions/changed-files@3f646a35495417b5549f98c7f7b78b41cbfaf43d
+        uses: tj-actions/changed-files@fe1bc0e3d35d94ed03a43d070f62cce13ce558ff
         with:
           files: |
             terraform/**

diff --git a/.idea/opg-use-an-lpa.iml b/.idea/opg-use-an-lpa.iml
diff --git a/.idea/phpunit.xml b/.idea/phpunit.xml
diff --git a/.idea/runConfigurations/API_Integration__Single_Scenario.xml b/.idea/runConfigurations/API_Integration__Single_Scenario.xml
diff --git a/service-api/app/features/context/Acceptance/LpaContext.php b/service-api/app/features/context/Acceptance/LpaContext.php
@@ -3089,18 +3089,24 @@ public function iProvideTheDetailsFromAValidPaperDocumentThatAlreadyHasAnActivat
 
         $expectedResponse = [
             'donor'                => [
+                'id'          => $this->lpa->donor->id,
                 'uId'         => $this->lpa->donor->uId,
+                'email'       => $this->lpa->donor->email,
+                'dob'         => $this->lpa->donor->dob,
+                'salutation'  => $this->lpa->donor->salutation,
                 'firstname'   => $this->lpa->donor->firstname,
                 'middlenames' => $this->lpa->donor->middlenames,
                 'surname'     => $this->lpa->donor->surname,
+                'companyName' => $this->lpa->donor->companyName,
+                'addresses'   => json_decode(json_encode($this->lpa->donor->addresses), true)
             ],
             'caseSubtype'          => $this->lpa->caseSubtype,
             'activationKeyDueDate' => $activationKeyDueDate,
         ];
         $this->ui->assertSession()->statusCodeEquals(StatusCodeInterface::STATUS_BAD_REQUEST);
         $this->ui->assertSession()->responseContains('LPA has an activation key already');
 
-        Assert::assertEquals($expectedResponse, $this->getResponseAsJson()['data']);
+        Assert::assertEquals($expectedResponse,$this->getResponseAsJson()['data']);
     }
 
     /**