test fixes and additions

ministryofjustice · Oct 14, 2024 · 9916ce0 · 9916ce0
1 parent c6508fe
commit 9916ce0
Show file tree

Hide file tree

Showing 15 changed files with 397 additions and 16 deletions.
diff --git a/service-api/.idea/.gitignore b/service-api/.idea/.gitignore
diff --git a/service-api/.idea/modules.xml b/service-api/.idea/modules.xml
diff --git a/service-api/.idea/php-test-framework.xml b/service-api/.idea/php-test-framework.xml
diff --git a/service-api/.idea/php.xml b/service-api/.idea/php.xml
diff --git a/service-api/.idea/phpunit.xml b/service-api/.idea/phpunit.xml
diff --git a/service-api/.idea/vcs.xml b/service-api/.idea/vcs.xml
diff --git a/service-front/app/src/Common/src/Entity/CombinedLpa.php b/service-front/app/src/Common/src/Entity/CombinedLpa.php
@@ -8,8 +8,10 @@
 use Common\Enum\LifeSustainingTreatment;
 use Common\Enum\LpaType;
 use DateTimeImmutable;
+use EventSauce\ObjectHydrator\DoNotSerialize;
+use JsonSerializable;
 
-class CombinedLpa
+class CombinedLpa implements JsonSerializable
 {
     public function __construct(
         public readonly ?bool $applicationHasGuidance,
@@ -38,4 +40,18 @@ public function __construct(
         public readonly ?DateTimeImmutable $withdrawnDate,
     ) {
     }
+
+    #[DoNotSerialize]
+    public function jsonSerialize(): mixed
+    {
+        $data = get_object_vars($this);
+
+        array_walk($data, function (&$value) {
+            if ($value instanceof DateTimeImmutable) {
+                $value = $value->format('Y-m-d H:i:s.uO');
+            }
+        });
+
+        return $data;
+    }
 }
diff --git a/service-front/app/src/Common/src/Entity/LpaStore/LpaStore.php b/service-front/app/src/Common/src/Entity/LpaStore/LpaStore.php
@@ -13,10 +13,13 @@
 use Common\Enum\LifeSustainingTreatment;
 use Common\Enum\LpaType;
 use DateTimeImmutable;
+use EventSauce\ObjectHydrator\DoNotSerialize;
 use EventSauce\ObjectHydrator\MapFrom;
 use EventSauce\ObjectHydrator\PropertyCasters\CastListToType;
+use JsonSerializable;
 
-class LpaStore extends CombinedLpa
+
+class LpaStore extends CombinedLpa implements JsonSerializable
 {
     public function __construct(
         ?bool $applicationHasGuidance,
@@ -82,4 +85,18 @@ public function __construct(
             $withdrawnDate
         );
     }
+
+    #[DoNotSerialize]
+    public function jsonSerialize(): mixed
+    {
+        $data = get_object_vars($this);
+
+        array_walk($data, function (&$value) {
+            if ($value instanceof DateTimeImmutable) {
+                $value = $value->format('Y-m-d H:i:s.uO');
+            }
+        });
+
+        return $data;
+    }
 }
diff --git a/service-front/app/src/Common/src/Entity/LpaStore/LpaStoreAttorney.php b/service-front/app/src/Common/src/Entity/LpaStore/LpaStoreAttorney.php
@@ -9,9 +9,11 @@
 use Common\Entity\Casters\ExtractTownFromLpaStore;
 use Common\Entity\Person;
 use DateTimeImmutable;
+use EventSauce\ObjectHydrator\DoNotSerialize;
 use EventSauce\ObjectHydrator\MapFrom;
+use JsonSerializable;
 
-class LpaStoreAttorney extends Person
+class LpaStoreAttorney extends Person implements JsonSerializable
 {
     public function __construct(
         #[MapFrom('address')]
@@ -64,4 +66,18 @@ public function __construct(
             $uId,
         );
     }
+
+    #[DoNotSerialize]
+    public function jsonSerialize(): mixed
+    {
+        $data = get_object_vars($this);
+
+        array_walk($data, function (&$value) {
+            if ($value instanceof DateTimeImmutable) {
+                $value = $value->format('Y-m-d H:i:s.uO');
+            }
+        });
+
+        return $data;
+    }
 }