Use LpaDataFormatter for LpaStore lpas

ministryofjustice · Nov 19, 2024 · b5cc270 · b5cc270
1 parent abb764a
commit b5cc270
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 6 deletions.
diff --git a/service-api/app/src/App/src/DataAccess/ApiGateway/DataStoreLpas.php b/service-api/app/src/App/src/DataAccess/ApiGateway/DataStoreLpas.php
@@ -5,6 +5,7 @@
 namespace App\DataAccess\ApiGateway;
 
 use App\Exception\ApiException;
+use App\Service\Lpa\LpaDataFormatter;
 use App\DataAccess\Repository\{LpasInterface, Response, Response\LpaInterface};
 use DateTimeImmutable;
 use Exception;
@@ -21,6 +22,7 @@ public function __construct(
         RequestFactoryInterface $requestFactory,
         StreamFactoryInterface $streamFactory,
         RequestSignerFactory $requestSignerFactory,
+        private LpaDataFormatter $lpaDataFormatter,
         string $apiBaseUri,
         string $traceId,
     ) {
@@ -67,9 +69,11 @@ public function get(string $uid): ?LpaInterface
         return match ($response->getStatusCode()) {
             StatusCodeInterface::STATUS_OK =>
                 new Response\Lpa(
-                    json_decode(
-                        $response->getBody()->getContents(),
-                        true
+                    ($this->lpaDataFormatter)(
+                        json_decode(
+                            $response->getBody()->getContents(),
+                            true,
+                        ),
                     ),
                     new DateTimeImmutable($response->getHeaderLine('Date'))
                 ),
@@ -97,7 +101,10 @@ public function lookup(array $uids): array
         $url = sprintf('%s/lpas', $this->apiBaseUri);
 
         // TODO this identifier needs to come from somewhere
-        $signer = ($this->requestSignerFactory)(SignatureType::DataStoreLpas, "UniqueUserIdentifier");
+        $signer = ($this->requestSignerFactory)(
+            SignatureType::DataStoreLpas,
+            'UniqueUserIdentifier'
+        );
 
         $request = $this->requestFactory
             ->createRequest('POST', $url)
@@ -122,7 +129,7 @@ public function lookup(array $uids): array
             StatusCodeInterface::STATUS_OK =>
                 array_map(
                     fn ($lpaData) => new Response\Lpa(
-                        $lpaData,
+                        ($this->lpaDataFormatter)($lpaData),
                         new DateTimeImmutable($response->getHeaderLine('Date'))
                     ),
                     json_decode(

diff --git a/service-api/app/src/App/src/DataAccess/ApiGateway/DataStoreLpasFactory.php b/service-api/app/src/App/src/DataAccess/ApiGateway/DataStoreLpasFactory.php
@@ -5,6 +5,7 @@
 namespace App\DataAccess\ApiGateway;
 
 use App\Service\Log\RequestTracing;
+use App\Service\Lpa\LpaDataFormatter;
 use Exception;
 use Psr\Container\ContainerInterface;
 use Psr\Http\Client\ClientInterface;
@@ -26,6 +27,7 @@ public function __invoke(ContainerInterface $container): DataStoreLpas
             $container->get(RequestFactoryInterface::class),
             $container->get(StreamFactoryInterface::class),
             $container->get(RequestSignerFactory::class),
+            $container->get(LpaDataFormatter::class),
             $config['lpa_data_store_api']['endpoint'],
             $container->get(RequestTracing::TRACE_PARAMETER_NAME),
         );

diff --git a/service-api/app/src/App/src/Service/Lpa/LpaDataFormatter.php b/service-api/app/src/App/src/Service/Lpa/LpaDataFormatter.php
@@ -30,7 +30,7 @@ public function __construct()
      * @throws UnableToHydrateObject
      * @throws RuntimeException
      */
-    public function __invoke(array $lpa)
+    public function __invoke(array $lpa): Lpa
     {
         $lpaObject = $this->hydrateObject($lpa);