Merge branch 'main' into UML-3620-rework-resolve-actor

ministryofjustice · Oct 9, 2024 · 976fa60 · 976fa60
2 parents 57cbe20 + 0f3b45c
commit 976fa60
Show file tree

Hide file tree

Showing 3 changed files with 112 additions and 5 deletions.
diff --git a/.github/workflows/_build-and-push.yml b/.github/workflows/_build-and-push.yml
@@ -113,7 +113,7 @@ jobs:
 
       - name: ecr login
         id: login_ecr
-        uses: aws-actions/amazon-ecr-login@f8cb900d38ecff281181b9924245b4f0ddc1860a # [email protected]
+        uses: aws-actions/amazon-ecr-login@d5dd46d537c86e506335323688c342319bedcfe1 # [email protected]
         with:
           registries: 311462405659
         if: |
@@ -258,7 +258,7 @@ jobs:
 
       - name: Trivy Image Vulnerability Scanner
         id: trivy_scan
-        uses: aquasecurity/trivy-action@97646fedde05bcd0961217c60b50e23f721e7ec7
+        uses: aquasecurity/trivy-action@a20de5420d57c4102486cdd9578b45609c99d7eb
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           TRIVY_DB_REPOSITORY: ${{ steps.login_ecr.outputs.registry }}/trivy-db-public-ecr/aquasecurity/trivy-db:2

diff --git a/service-api/app/src/App/src/Service/Lpa/IsValidLpa.php b/service-api/app/src/App/src/Service/Lpa/IsValidLpa.php
@@ -6,6 +6,8 @@
 
 use App\Service\Lpa\IsValid\LpaStatus;
 use Psr\Log\LoggerInterface;
+use App\Entity\Sirius\SiriusLpa;
+use App\Service\Lpa\SiriusLpa as OldSiriusLpa;
 
 class IsValidLpa
 {
@@ -19,10 +21,10 @@ public function __construct(
      *
      * This function is used by codes to check the validity of a LPA and its details to be displayed to user.
      *
-     * @param array|SiriusLpa $lpa An LPA data structure
+     * @param OldSiriusLpa|SiriusLpa $lpa An LPA data structure
      * @return bool True if status is Registered or Cancelled
      */
-    public function __invoke(array|SiriusLpa $lpa): bool
+    public function __invoke(OldSiriusLpa|SiriusLpa $lpa): bool
     {
         $status = $lpa->getStatus();
 
@@ -33,7 +35,7 @@ public function __invoke(array|SiriusLpa $lpa): bool
             $this->logger->notice(
                 'LPA with id {lpaUid} has an invalid status of {status}',
                 [
-                    'status' => $lpa['status'],
+                    'status' => $status,
                     'lpaUid' => $lpa->getUid(),
                 ]
             );

diff --git a/service-api/app/test/AppTest/Service/Lpa/IsValidLpaTest.php b/service-api/app/test/AppTest/Service/Lpa/IsValidLpaTest.php
@@ -84,4 +84,109 @@ public function check_if_lpa_valid_when_status_other_than_registered_or_cancelle
         $result   = $resolver($lpa);
         $this->assertFalse($result);
     }
+
+    #[Test]
+    public function check_if_lpa_valid_when_status_registered_combined_format(): void
+    {
+        $lpa = new \App\Entity\Sirius\SiriusLpa(
+            $applicationHasGuidance     = null,
+            $applicationHasRestrictions = null,
+            $applicationType            = null,
+            $attorneyActDecisions       = null,
+            $attorneys                  = null,
+            $caseSubtype                = null,
+            $channel                    = null,
+            $dispatchDate               = null,
+            $donor                      = null,
+            $hasSeveranceWarning        = null,
+            $invalidDate                = null,
+            $lifeSustainingTreatment    = null,
+            $lpaDonorSignatureDate      = null,
+            $lpaIsCleansed              = null,
+            $onlineLpaId                = null,
+            $receiptDate                = null,
+            $registrationDate           = null,
+            $rejectedDate               = null,
+            $replacementAttorneys       = null,
+            $status                     = 'Registered',
+            $statusDate                 = null,
+            $trustCorporations          = null,
+            $uId                        = '700000000001',
+            $withdrawnDate              = null
+        );
+
+        $resolver = $this->isValidLpaResolver();
+        $result = $resolver($lpa);
+        $this->assertTrue($result);
+    }
+
+    #[Test]
+    public function check_if_lpa_valid_when_status_cancelled_combined_format(): void
+    {
+        $lpa = new \App\Entity\Sirius\SiriusLpa(
+            $applicationHasGuidance     = null,
+            $applicationHasRestrictions = null,
+            $applicationType            = null,
+            $attorneyActDecisions       = null,
+            $attorneys                  = null,
+            $caseSubtype                = null,
+            $channel                    = null,
+            $dispatchDate               = null,
+            $donor                      = null,
+            $hasSeveranceWarning        = null,
+            $invalidDate                = null,
+            $lifeSustainingTreatment    = null,
+            $lpaDonorSignatureDate      = null,
+            $lpaIsCleansed              = null,
+            $onlineLpaId                = null,
+            $receiptDate                = null,
+            $registrationDate           = null,
+            $rejectedDate               = null,
+            $replacementAttorneys       = null,
+            $status                     = 'Cancelled',
+            $statusDate                 = null,
+            $trustCorporations          = null,
+            $uId                        = '700000000001',
+            $withdrawnDate              = null
+        );
+
+        $resolver = $this->isValidLpaResolver();
+        $result = $resolver($lpa);
+        $this->assertTrue($result);
+    }
+
+    #[Test]
+    public function check_if_lpa_valid_when_status_other_than_registered_or_cancelled_combined_format(): void
+    {
+        $lpa = new \App\Entity\Sirius\SiriusLpa(
+            $applicationHasGuidance     = null,
+            $applicationHasRestrictions = null,
+            $applicationType            = null,
+            $attorneyActDecisions       = null,
+            $attorneys                  = null,
+            $caseSubtype                = null,
+            $channel                    = null,
+            $dispatchDate               = null,
+            $donor                      = null,
+            $hasSeveranceWarning        = null,
+            $invalidDate                = null,
+            $lifeSustainingTreatment    = null,
+            $lpaDonorSignatureDate      = null,
+            $lpaIsCleansed              = null,
+            $onlineLpaId                = null,
+            $receiptDate                = null,
+            $registrationDate           = null,
+            $rejectedDate               = null,
+            $replacementAttorneys       = null,
+            $status                     = 'Revoked',
+            $statusDate                 = null,
+            $trustCorporations          = null,
+            $uId                        = '700000000001',
+            $withdrawnDate              = null
+        );
+
+        $resolver = $this->isValidLpaResolver();
+        $result   = $resolver($lpa);
+        $this->assertFalse($result);
+    }
 }