UML-3671 rework find actor lpa

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']);
     }
 
     /**

service-api/app/features/context/Integration/LpaContext.php

@@ -6,14 +6,17 @@
 
 use App\DataAccess\Repository\Response\InstructionsAndPreferencesImages;
 use App\DataAccess\Repository\Response\InstructionsAndPreferencesImagesResult;
+use App\Entity\Sirius\SiriusLpa;
 use App\Exception\ApiException;
 use App\Exception\BadRequestException;
 use App\Exception\NotFoundException;
 use App\Service\ActorCodes\ActorCodeService;
 use App\Service\Log\RequestTracing;
 use App\Service\Lpa\AccessForAll\AccessForAllLpaService;
+use App\Service\Lpa\AccessForAll\AccessForAllValidation;
 use App\Service\Lpa\AccessForAll\AddAccessForAllLpa;
 use App\Service\Lpa\AddLpa\AddLpa;
+use App\Service\Lpa\FindActorInLpa\ActorMatch;
 use App\Service\Lpa\GetInstructionsAndPreferencesImages;
 use App\Service\Lpa\RemoveLpa;
 use App\Service\Lpa\SiriusLpaManager;
@@ -309,16 +312,10 @@ public function iAttemptToAddTheSameLPAAgain(): void
         );
 
         $addLpaService = $this->container->get(AddLpa::class);
-
         $expectedResponse = [
-            'donor' => [
-                'uId'         => $this->lpa->donor->uId,
-                'firstname'   => $this->lpa->donor->firstname,
-                'middlenames' => $this->lpa->donor->middlenames,
-                'surname'     => $this->lpa->donor->surname,
-            ],
-            'caseSubtype'   => $this->lpa->caseSubtype,
-            'lpaActorToken' => $this->userLpaActorToken,
+            'donor'                => new SiriusPerson(json_decode(json_encode($this->lpa->donor), true)),
+            'caseSubtype'          => $this->lpa->caseSubtype,
+            'lpaActorToken'        => $this->userLpaActorToken,
         ];
 
         try {
@@ -385,24 +382,19 @@ public function iProvideTheAttorneyDetailsFromAValidPaperLPADocument(): void
 
         $lpaMatchResponse = $addOlderLpa->validateRequest($this->userId, $data);
 
-        $expectedResponse = [
-            'actor'       => new SiriusPerson(json_decode(json_encode($this->lpa->attorneys[0]), true)),
-            'role'        => 'attorney',
-            'lpa-id'      => $this->lpa->uId,
-            'caseSubtype' => $this->lpa->caseSubtype,
-            'donor'       => [
-                'uId'         => $this->lpa->donor->uId,
-                'firstname'   => $this->lpa->donor->firstname,
-                'middlenames' => $this->lpa->donor->middlenames,
-                'surname'     => $this->lpa->donor->surname,
-            ],
-            'attorney'    => [
-                'uId'         => $this->lpa->attorneys[0]->uId,
-                'firstname'   => $this->lpa->attorneys[0]->firstname,
-                'middlenames' => $this->lpa->attorneys[0]->middlenames,
-                'surname'     => $this->lpa->attorneys[0]->surname,
-            ],
-        ];
+        $expectedLpaArray = json_decode(json_encode($this->lpa), true);
+        $expectedLpaArray['original_attorneys'] = $expectedLpaArray['attorneys'];
+        $expectedLpaArray['activeAttorneys'] = $expectedLpaArray['attorneys'];
+        $expectedLpaArray['inactiveAttorneys'] = [];
+        $expectedLpa = new \App\Service\Lpa\SiriusLpa($expectedLpaArray);
+        $expectedResponse = new AccessForAllValidation(
+            new ActorMatch(
+                new SiriusPerson(json_decode(json_encode($this->lpa->attorneys[0]), true)),
+                'attorney',
+                $this->lpa->uId),
+                $expectedLpa,
+            null,
+        );
 
         Assert::assertEquals($expectedResponse, $lpaMatchResponse);
     }
@@ -1601,18 +1593,19 @@ public function iConfirmDetailsShownToMeOfTheFoundLPAAreCorrect(): void
 
         $lpaMatchResponse = $addOlderLpa->validateRequest($this->userId, $data);
 
-        $expectedResponse = [
-            'actor'       => new SiriusPerson(json_decode(json_encode($lpa->donor), true)),
-            'role'        => 'donor',
-            'lpa-id'      => $lpa->uId,
-            'caseSubtype' => $lpa->caseSubtype,
-            'donor'       => [
-                'uId'         => $lpa->donor->uId,
-                'firstname'   => $lpa->donor->firstname,
-                'middlenames' => $lpa->donor->middlenames,
-                'surname'     => $lpa->donor->surname,
-            ],
-        ];
+        $expectedLpaArray = json_decode(json_encode($this->lpa), true);
+        $expectedLpaArray['original_attorneys'] = $expectedLpaArray['attorneys'];
+        $expectedLpaArray['activeAttorneys'] = $expectedLpaArray['attorneys'];
+        $expectedLpaArray['inactiveAttorneys'] = [];
+        $expectedLpa = new \App\Service\Lpa\SiriusLpa($expectedLpaArray);
+        $expectedResponse = new AccessForAllValidation(
+            new ActorMatch(
+                new SiriusPerson(json_decode(json_encode($lpa->donor), true)),
+                'donor',
+                $lpa->uId),
+                $expectedLpa,
+            null,
+        );
 
         Assert::assertEquals($expectedResponse, $lpaMatchResponse);
     }
@@ -1881,18 +1874,19 @@ public function iProvideDetailsThatMatchAValidPaperDocument($firstnames, $lastna
         $addAccessForAllLpa = $this->container->get(AddAccessForAllLpa::class);
         $lpaMatchResponse   = $addAccessForAllLpa->validateRequest($this->userId, $data);
 
-        $expectedResponse = [
-            'actor'       => new SiriusPerson(json_decode(json_encode($this->lpa->donor), true)),
-            'role'        => 'donor',
-            'lpa-id'      => $this->lpa->uId,
-            'caseSubtype' => $this->lpa->caseSubtype,
-            'donor'       => [
-                'uId'         => $this->lpa->donor->uId,
-                'firstname'   => $this->lpa->donor->firstname,
-                'middlenames' => $this->lpa->donor->middlenames,
-                'surname'     => $this->lpa->donor->surname,
-            ],
-        ];
+        $expectedLpaArray = json_decode(json_encode($this->lpa), true);
+        $expectedLpaArray['original_attorneys'] = $expectedLpaArray['attorneys'];
+        $expectedLpaArray['activeAttorneys'] = $expectedLpaArray['attorneys'];
+        $expectedLpaArray['inactiveAttorneys'] = [];
+        $expectedLpa = new \App\Service\Lpa\SiriusLpa($expectedLpaArray);
+        $expectedResponse = new AccessForAllValidation(
+            new ActorMatch(
+                new SiriusPerson(json_decode(json_encode($this->lpa->donor), true)),
+                'donor',
+                $this->lpa->uId),
+                $expectedLpa,
+        null
+        );
 
         Assert::assertEquals($expectedResponse, $lpaMatchResponse);
     }
@@ -1943,18 +1937,19 @@ public function iProvideTheDetailsFromAValidPaperLPADocument(): void
         $addOlderLpa      = $this->container->get(AddAccessForAllLpa::class);
         $lpaMatchResponse = $addOlderLpa->validateRequest($this->userId, $data);
 
-        $expectedResponse = [
-            'actor'       => new SiriusPerson(json_decode(json_encode($this->lpa->donor), true)),
-            'role'        => 'donor',
-            'lpa-id'      => $this->lpa->uId,
-            'caseSubtype' => $this->lpa->caseSubtype,
-            'donor'       => [
-                'uId'         => $this->lpa->donor->uId,
-                'firstname'   => $this->lpa->donor->firstname,
-                'middlenames' => $this->lpa->donor->middlenames,
-                'surname'     => $this->lpa->donor->surname,
-            ],
-        ];
+        $expectedLpaArray = json_decode(json_encode($this->lpa), true);
+        $expectedLpaArray['original_attorneys'] = $expectedLpaArray['attorneys'];
+        $expectedLpaArray['activeAttorneys'] = $expectedLpaArray['attorneys'];
+        $expectedLpaArray['inactiveAttorneys'] = [];
+        $expectedLpa = new \App\Service\Lpa\SiriusLpa($expectedLpaArray);
+        $expectedResponse = new AccessForAllValidation(
+            new ActorMatch(
+                new SiriusPerson(json_decode(json_encode($this->lpa->donor), true)),
+                'donor',
+                    $this->lpa->uId),
+                    $expectedLpa,
+            null
+        );
 
         Assert::assertEquals($expectedResponse, $lpaMatchResponse);
     }
@@ -2015,12 +2010,7 @@ public function iProvideTheDetailsFromAValidPaperDocumentThatAlreadyHasAnActivat
             Assert::assertEquals('LPA has an activation key already', $ex->getMessage());
             Assert::assertEquals(
                 [
-                    'donor' => [
-                        'uId'         => $this->lpa->donor->uId,
-                        'firstname'   => $this->lpa->donor->firstname,
-                        'middlenames' => $this->lpa->donor->middlenames,
-                        'surname'     => $this->lpa->donor->surname,
-                    ],
+                    'donor'                => new SiriusPerson(json_decode(json_encode($this->lpa->donor), true)),
                     'caseSubtype'          => $this->lpa->caseSubtype,
                     'activationKeyDueDate' => $activationKeyDueDate,
                 ],
@@ -2751,18 +2741,19 @@ public function iRequestForANewActivationKeyAgain(): void
         $addOlderLpa = $this->container->get(AddAccessForAllLpa::class);
         $response = $addOlderLpa->validateRequest($this->userId, $data);
 
-        $expectedResponse = [
-            'actor'       => new SiriusPerson(json_decode(json_encode($this->lpa->donor), true)),
-            'role'        => 'donor',
-            'lpa-id'      => $this->lpa->uId,
-            'caseSubtype' => $this->lpa->caseSubtype,
-            'donor'       => [
-                'uId'         => $this->lpa->donor->uId,
-                'firstname'   => $this->lpa->donor->firstname,
-                'middlenames' => $this->lpa->donor->middlenames,
-                'surname'     => $this->lpa->donor->surname,
-            ],
-        ];
+        $expectedLpaArray = json_decode(json_encode($this->lpa), true);
+        $expectedLpaArray['original_attorneys'] = $expectedLpaArray['attorneys'];
+        $expectedLpaArray['activeAttorneys'] = $expectedLpaArray['attorneys'];
+        $expectedLpaArray['inactiveAttorneys'] = [];
+        $expectedLpa = new \App\Service\Lpa\SiriusLpa($expectedLpaArray);
+        $expectedResponse = new AccessForAllValidation(
+            new ActorMatch(
+                new SiriusPerson(json_decode(json_encode($this->lpa->donor), true)),
+                'donor',
+                $this->lpa->uId),
+                $expectedLpa,
+            null
+        );
 
         Assert::assertEquals($expectedResponse, $response);
     }
@@ -2834,13 +2825,12 @@ public function iProvideTheDetailsFromAValidPaperLPAWhichIHaveAlreadyAddedToMyAc
             StatusCodeInterface::STATUS_OK,
             $this->lpa
         );
-
         $expectedResponse = [
-            'donor' => [
-                'uId'         => $this->lpa->donor->uId,
-                'firstname'   => $this->lpa->donor->firstname,
-                'middlenames' => $this->lpa->donor->middlenames,
-                'surname'     => $this->lpa->donor->surname,
+            'donor'                => [
+                    'uId'         => $this->lpa->donor->uId,
+                    'firstname'   => $this->lpa->donor->firstname,
+                    'middlenames' => $this->lpa->donor->middlenames,
+                    'surname'     => $this->lpa->donor->surname,
             ],
             'caseSubtype'          => $this->lpa->caseSubtype,
             'lpaActorToken'        => $this->userLpaActorToken,

service-api/app/src/App/src/Entity/Lpa.php

@@ -7,12 +7,20 @@
 use App\Enum\HowAttorneysMakeDecisions;
 use App\Enum\LifeSustainingTreatment;
 use App\Enum\LpaType;
+use App\Service\Lpa\IsValid\IsValidInterface;
+use App\Service\Lpa\ResolveActor\CombinedHasActorTrait;
+use App\Service\Lpa\ResolveActor\HasActorInterface;
 use DateTimeImmutable;
-use EventSauce\ObjectHydrator\DoNotSerialize;
+use DateTimeZone;
 use JsonSerializable;
 
-class Lpa implements JsonSerializable
+class Lpa implements
+    JsonSerializable,
+    HasActorInterface,
+    IsValidInterface
 {
+    use CombinedHasActorTrait;
+
     public function __construct(
         public readonly ?bool $applicationHasGuidance,
         public readonly ?bool $applicationHasRestrictions,
@@ -22,7 +30,7 @@ public function __construct(
         public readonly ?LpaType $caseSubtype,
         public readonly ?string $channel,
         public readonly ?DateTimeImmutable $dispatchDate,
-        public readonly ?object $donor,
+        public readonly ?Person $donor,
         public readonly ?bool $hasSeveranceWarning,
         public readonly ?DateTimeImmutable $invalidDate,
         public readonly ?LifeSustainingTreatment $lifeSustainingTreatment,
@@ -41,17 +49,37 @@ public function __construct(
     ) {
     }
 
-    #[DoNotSerialize]
-    public function jsonSerialize(): mixed
+    public function jsonSerialize(): array
     {
         $data = get_object_vars($this);
 
         array_walk($data, function (&$value) {
             if ($value instanceof DateTimeImmutable) {
-                $value = $value->format('Y-m-d H:i:s.uO');
+                $value = $value->setTimezone(new DateTimeZone('UTC'));
+                $value = $value->format('Y-m-d\TH:i:s\Z');
             }
         });
 
         return $data;
     }
+
+    public function getAttorneys(): array
+    {
+        return $this->attorneys ?? [];
+    }
+
+    public function getStatus(): string
+    {
+        return $this->status ?? '';
+    }
+
+    public function getUid(): string
+    {
+        return $this->uId ?? '';
+    }
+
+    private function getTrustCorporations(): array
+    {
+        return $this->trustCorporations ?? [];
+    }
 }