Uml 3394 combined lpa manager

docker-compose.dependencies.yml

@@ -30,7 +30,6 @@ services:
         condition: service_healthy
       mock-one-login:
         condition: service_started
-        restart: true
     environment:
       SIRIUS_API_ENDPOINT: http://api-gateway:5000
       LPA_CODES_API_ENDPOINT: http://codes-gateway:4343

service-api/app/composer.json

@@ -65,6 +65,7 @@
         "paragonie/hidden-string": "^1.0",
         "psr/clock": "^1.0",
         "ramsey/uuid": "^4.0",
+        "spatie/php-cloneable": "^1.0.2",
         "symfony/console": "^6.1",
         "web-token/jwt-signature-algorithm-ecdsa": "^3.2",
         "web-token/jwt-encryption-algorithm-aeskw": "^3.4.0"
@@ -132,7 +133,7 @@
         "clear-config-cache": "php bin/clear-config-cache.php",
         "dc": [
             "Composer\\Config::disableProcessTimeout",
-            "docker-compose -f ../../docker-compose.yml -f ../../docker-compose.dependencies.yml"
+            "docker compose -f ../../docker-compose.yml -f ../../docker-compose.dependencies.yml  -f ../../docker-compose.testing.yml -f ../../docker-compose.override.yml"
         ],
         "dc-run": "@dc run --rm api-app",
         "dc-php": "@dc-run php",

service-api/app/config/pipeline.php

@@ -2,19 +2,19 @@
 
 declare(strict_types=1);
 
-use Psr\Container\ContainerInterface;
+use Laminas\Stratigility\Middleware\ErrorHandler;
 use Mezzio\Application;
 use Mezzio\Handler\NotFoundHandler;
+use Mezzio\Helper\BodyParams\BodyParamsMiddleware;
 use Mezzio\Helper\ServerUrlMiddleware;
 use Mezzio\Helper\UrlHelperMiddleware;
 use Mezzio\MiddlewareFactory;
-use Mezzio\Helper\BodyParams\BodyParamsMiddleware;
 use Mezzio\Router\Middleware\DispatchMiddleware;
 use Mezzio\Router\Middleware\ImplicitHeadMiddleware;
 use Mezzio\Router\Middleware\ImplicitOptionsMiddleware;
 use Mezzio\Router\Middleware\MethodNotAllowedMiddleware;
 use Mezzio\Router\Middleware\RouteMiddleware;
-use Laminas\Stratigility\Middleware\ErrorHandler;
+use Psr\Container\ContainerInterface;
 
 /**
  * Setup middleware pipeline:

service-api/app/config/routes.php

@@ -30,7 +30,6 @@
 use App\Handler\UserHandler;
 use App\Handler\ViewerCodeFullHandler;
 use App\Handler\ViewerCodeSummaryHandler;
-use App\Handler\LpasCollectionV2Handler;
 use Mezzio\Application;
 use Mezzio\MiddlewareFactory;
 use Psr\Container\ContainerInterface;
@@ -65,8 +64,6 @@
     $app->get('/healthcheck', HealthcheckHandler::class, 'healthcheck');
 
     $app->get('/v1/lpas', LpasCollectionHandler::class, 'lpa.collection');
-
-    $app->get('/v2/lpas', LpasCollectionV2Handler::class, 'lpa.collection.v2');
 
     $app->post(
         '/v1/older-lpa/validate',

service-api/app/docs/examples/lpa-response-example.yaml

@@ -0,0 +1,95 @@
+summary: User has LPAs
+value:
+  1c72b660-0da0-4acf-9c27-2de57c1a255b:
+    user-lpa-actor-token: 1c72b660-0da0-4acf-9c27-2de57c1a255b
+    date: 2024-11-22T15:20:16+00:00
+    actor:
+      details:
+        addressLine1: 81 NighOnTimeWeBuiltIt Street
+        addressLine2: null
+        addressLine3: null
+        country: GB
+        county: null
+        dob: 1982-07-24
+        email: null
+        firstnames: Herman
+        name: null
+        postcode: null
+        surname: Seakrest
+        systemStatus: active
+        town: Mahhhhhhhhhh
+        type: null
+        uId: 9ac5cb7c-fc75-40c7-8e53-059f36dbbe3d
+      type: donor
+    lpa:
+      applicationHasGuidance: null
+      applicationHasRestrictions: null
+      applicationType: null
+      attorneyActDecisions: jointly
+      attorneys:
+        - addressLine1: 81 NighOnTimeWeBuiltIt Street
+          addressLine2: null
+          addressLine3: null
+          country: GB
+          county: null
+          dob: '1982-07-24'
+          email: null
+          firstnames: Herman
+          name: null
+          postcode: null
+          surname: Seakrest
+          systemStatus: active
+          town: Mahhhhhhhhhh
+          type: null
+          uId: 9ac5cb7c-fc75-40c7-8e53-059f36dbbe3d
+      caseSubtype: hw
+      channel: online
+      dispatchDate: null
+      donor:
+        addressLine1: 74 Cloob Close
+        addressLine2: null
+        addressLine3: null
+        country: GB
+        county: null
+        dob: '1970-01-24'
+        email: [email protected]
+        firstnames: Feeg
+        name: null
+        postcode: null
+        surname: Bundlaaaa
+        systemStatus:
+        town: Mahhhhhhhhhh
+        type: null
+        uId: eda719db-8880-4dda-8c5d-bb9ea12c236f
+      hasSeveranceWarning: null
+      invalidDate: null
+      lifeSustainingTreatment: option-a
+      lpaDonorSignatureDate: '2024-01-10T23:00:00Z'
+      lpaIsCleansed: null
+      onlineLpaId: null
+      receiptDate: null
+      registrationDate: '2024-01-12T00:00:00Z'
+      rejectedDate: null
+      replacementAttorneys: []
+      status: registered
+      statusDate: null
+      trustCorporations:
+        - addressLine1: 103 Line 1
+          addressLine2: null
+          addressLine3: null
+          country: GB
+          county: null
+          dob: null
+          email: null
+          firstnames: null
+          name: Trust us Corp.
+          postcode: null
+          surname: null
+          systemStatus: active
+          town: Town
+          type: null
+          uId: 1d95993a-ffbb-484c-b2fe-f4cca51801da
+      uId: M-789Q-P4DF-4UX3
+      whenCanLpaBeUsed: when-capacity-lost
+      withdrawnDate: null
+    added: 2024-09-18T12:23:45+00:00

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

@@ -21,9 +21,9 @@
 use App\Service\Lpa\AddLpa\AddLpa;
 use App\Service\Lpa\FindActorInLpa\ActorMatch;
 use App\Service\Lpa\GetInstructionsAndPreferencesImages;
+use App\Service\Lpa\LpaManagerInterface;
 use App\Service\Lpa\RemoveLpa;
 use App\Service\Lpa\SiriusLpa;
-use App\Service\Lpa\SiriusLpaManager;
 use App\Service\Lpa\SiriusPerson;
 use App\Service\ViewerCodes\ViewerCodeService;
 use Aws\CommandInterface;
@@ -74,7 +74,7 @@ class LpaContext extends BaseIntegrationContext
     private string $codesApiPactProvider;
     private string $iapImagesApiPactProvider;
     private RemoveLpa $deleteLpa;
-    private SiriusLpaManager $lpaService;
+    private LpaManagerInterface $lpaService;
 
     /**
      * @Given I have previously requested the addition of a paper LPA to my account
@@ -205,7 +205,7 @@ public function aRecordOfTheLPARequestedIsSavedToTheDatabase(): void
             )
         );
 
-        $lpa = $this->lpaService->getAllForUser($this->userId);
+        $lpa = $this->lpaService->getAllActiveForUser($this->userId);
 
         Assert::assertArrayHasKey($this->userLpaActorToken, $lpa);
         Assert::assertEquals($lpa[$this->userLpaActorToken]['user-lpa-actor-token'], $this->userLpaActorToken);
@@ -602,7 +602,7 @@ public function iRequestToAddAnLPAThatIHaveRequestedAnActivationKeyFor(): void
 
         Assert::assertArrayHasKey('actor', $validatedLpa);
         Assert::assertArrayHasKey('lpa', $validatedLpa);
-        Assert::assertEquals($validatedLpa['lpa']['uId'], $this->lpaUid);
+        Assert::assertEquals($validatedLpa['lpa']->getUid(), $this->lpaUid);
     }
 
     /**
@@ -793,7 +793,7 @@ public function iCanSeeThatMyLPAHasWithExpiryDates($noActiveCodes, $code1Expiry,
             $this->lpa
         );
 
-        $lpa = $this->lpaService->getAllForUser($this->userId);
+        $lpa = $this->lpaService->getAllActiveForUser($this->userId);
 
         Assert::assertArrayHasKey($this->userLpaActorToken, $lpa);
         Assert::assertEquals($lpa[$this->userLpaActorToken]['user-lpa-actor-token'], $this->userLpaActorToken);
@@ -940,7 +940,7 @@ public function iCanSeeThatNoOrganisationsHaveAccessToMyLPA(): void
             $this->lpa
         );
 
-        $lpa = $this->lpaService->getAllForUser($this->userId);
+        $lpa = $this->lpaService->getAllActiveForUser($this->userId);
 
         Assert::assertArrayHasKey($this->userLpaActorToken, $lpa);
         Assert::assertEquals($lpa[$this->userLpaActorToken]['user-lpa-actor-token'], $this->userLpaActorToken);
@@ -1280,8 +1280,8 @@ public function iClickToCheckMyAccessCodes(): void
         Assert::assertArrayHasKey('date', $lpaData);
         Assert::assertArrayHasKey('actor', $lpaData);
         Assert::assertEquals($this->userLpaActorToken, $lpaData['user-lpa-actor-token']);
-        Assert::assertEquals($this->lpa->uId, $lpaData['lpa']['uId']);
-        Assert::assertEquals($this->actorLpaId, $lpaData['actor']->actor['uId']);
+        Assert::assertEquals($this->lpa->uId, $lpaData['lpa']->getUid());
+        Assert::assertEquals($this->actorLpaId, $lpaData['actor']->actor->getUid());
 
         // Get the share codes
 
@@ -2031,7 +2031,7 @@ public function iRequestToAddAnLPAWithValidDetails(): void
 
         Assert::assertArrayHasKey('actor', $validatedLpa);
         Assert::assertArrayHasKey('lpa', $validatedLpa);
-        Assert::assertEquals($validatedLpa['lpa']['uId'], $this->lpaUid);
+        Assert::assertEquals($validatedLpa['lpa']->getUid(), $this->lpaUid);
     }
 
     /**
@@ -2220,7 +2220,7 @@ public function theFullLPAIsDisplayedWithTheCorrect($message)
      */
     public function theLPAHasNotBeenAdded(): void
     {
-        $lpas = $this->lpaService->getAllForUser($this->userId);
+        $lpas = $this->lpaService->getAllActiveForUser($this->userId);
 
         Assert::assertEmpty($lpas);
     }
@@ -2397,7 +2397,7 @@ public function theLPAIsRemoved(): void
      */
     public function theLPAIsSuccessfullyAdded(): void
     {
-        $now = (new DateTime())->format('Y-m-d\TH:i:s.u\Z');
+        $now                     = (new DateTime())->format('Y-m-d\TH:i:s.u\Z');
         $this->userLpaActorToken = '13579';
 
         // UserLpaActorMap::getUsersLpas
@@ -2463,7 +2463,7 @@ protected function prepareContext(): void
 
         $this->apiFixtures = $this->container->get(MockHandler::class);
         $this->awsFixtures = $this->container->get(AwsMockHandler::class);
-        $this->lpaService  = $this->container->get(SiriusLpaManager::class);
+        $this->lpaService  = $this->container->get(LpaManagerInterface::class);
         $this->deleteLpa   = $this->container->get(RemoveLpa::class);
 
         $config                         = $this->container->get('config');
@@ -2513,7 +2513,7 @@ public function theStatusOfTheLPAChangedFromRegisteredToSuspended(): void
             $this->lpa
         );
 
-        $lpa = $this->lpaService->getAllForUser($this->userId);
+        $lpa = $this->lpaService->getAllActiveForUser($this->userId);
 
         Assert::assertEmpty($lpa);
     }
@@ -2604,7 +2604,7 @@ public function anLPAGivesAnUnexpectedError(): void
             $this->lpa
         );
 
-        $lpa = $this->lpaService->getAllForUser($this->userId);
+        $lpa = $this->lpaService->getAllActiveForUser($this->userId);
 
         assertEquals(1, sizeof($lpa));
     }