fix(MPDZBS-877): Optimize next loops and schema typing

Author: Thomas Fink

zmscitizenapi/src/Zmscitizenapi/Models/Office.php

@@ -8,7 +8,6 @@
 
 class Office extends Entity implements JsonSerializable
 {
-
     public static $schema = 'zmsentities/schema/citizenapi/office.json';
 
     /** @var int */
@@ -40,10 +39,36 @@ public function __construct(int $id, string $name, ?array $address = null, ?arra
         $this->id = $id;
         $this->name = $name;
         $this->address = $address;
-        $this->geo = $geo;
+        $this->geo = $this->validateGeo($geo);
         $this->scope = $scope;
     }
 
+    /**
+     * Validate and convert geo data to an array of floats.
+     *
+     * @param array|null $geo
+     * @return array|null
+     * @throws \InvalidArgumentException If geo values are out of bounds.
+     */
+    private function validateGeo(?array $geo): ?array
+    {
+        if (isset($geo['lat'], $geo['lon'])) {
+            $lat = (float)$geo['lat'];
+            $lon = (float)$geo['lon'];
+
+            if ($lat < -90 || $lat > 90) {
+                throw new \InvalidArgumentException("Latitude must be between -90 and 90.");
+            }
+
+            if ($lon < -180 || $lon > 180) {
+                throw new \InvalidArgumentException("Longitude must be between -180 and 180.");
+            }
+
+            return ['lat' => $lat, 'lon' => $lon];
+        }
+        return null;
+    }
+
     /**
      * Converts the model data back into an array for serialization.
      *

zmscitizenapi/src/Zmscitizenapi/Models/Service.php

@@ -2,6 +2,7 @@
 
 namespace BO\Zmscitizenapi\Models;
 
+use BO\Zmscitizenapi\Models\Combinable;
 use BO\Zmsentities\Schema\Entity;
 use JsonSerializable;
 

zmscitizenapi/src/Zmscitizenapi/Services/MapperService.php

@@ -31,18 +31,18 @@ class MapperService
     public static function mapOfficesWithScope(ProviderList $providerList): OfficeList
     {
         $offices = [];
-        $scopes = new ScopeList(ZmsApiClientService::getScopes() ?? []);
+        $scopes = ZmsApiClientService::getScopes() ?? new ScopeList();
 
         foreach ($providerList as $provider) {
             $providerScope = ZmsApiFacadeService::getScopeForProvider($provider->id, $scopes);
 
             $offices[] = new Office(
-                id: (int)$provider->id,
+                id: (int) $provider->id,
                 name: $provider->displayName ?? $provider->name,
                 address: $provider->data['address'] ?? null,
                 geo: $provider->data['geo'] ?? null,
                 scope: isset($providerScope) && !isset($providerScope['errors']) ? new ThinnedScope(
-                    id: (int)($providerScope->id ?? 0),
+                    id: (int) ($providerScope->id ?? 0),
                     provider: $providerScope->provider ?? null,
                     shortName: $providerScope->shortName ?? null,
                     telephoneActivated: $providerScope->telephoneActivated ?? null,
@@ -64,18 +64,27 @@ public static function mapCombinable(array $serviceCombinations): ?Combinable
         return !empty($serviceCombinations) ? new Combinable($serviceCombinations) : null;
     }
 
+    /**
+     * Map services with combinations based on request and relation lists.
+     *
+     * @param RequestList $requestList
+     * @param RequestRelationList $relationList
+     * @return ServiceList
+     */
     public static function mapServicesWithCombinations(RequestList $requestList, RequestRelationList $relationList): ServiceList
     {
+        /** @var array<string, array<int>> $servicesProviderIds */
         $servicesProviderIds = [];
         foreach ($relationList as $relation) {
-            if (!isset($servicesProviderIds[$relation->request->id])) {
-                $servicesProviderIds[$relation->request->id] = [];
-            }
-            $servicesProviderIds[$relation->request->id][] = $relation->provider->id;
+            $serviceId = $relation->request->id;
+            $servicesProviderIds[$serviceId] ??= [];
+            $servicesProviderIds[$serviceId][] = $relation->provider->id;
         }
 
+        /** @var Service[] $services */
         $services = [];
         foreach ($requestList as $service) {
+            /** @var array<string, array<int>> $serviceCombinations */
             $serviceCombinations = [];
             $combinableData = $service->getAdditionalData()['combinable'] ?? [];
 
@@ -90,7 +99,7 @@ public static function mapServicesWithCombinations(RequestList $requestList, Req
             $combinable = self::mapCombinable($serviceCombinations);
 
             $services[] = new Service(
-                id: (int)$service->getId(),
+                id: (int) $service->getId(),
                 name: $service->getName(),
                 maxQuantity: $service->getAdditionalData()['maxQuantity'] ?? 1,
                 combinable: $combinable ?? new Combinable()
@@ -100,14 +109,13 @@ public static function mapServicesWithCombinations(RequestList $requestList, Req
         return new ServiceList($services);
     }
 
-
     public static function mapRelations(RequestRelationList $relationList): OfficeServiceRelationList
     {
         $relations = [];
         foreach ($relationList as $relation) {
             $relations[] = new OfficeServiceRelation(
-                officeId: (string)$relation->provider->id,
-                serviceId: (string)$relation->request->id,
+                officeId: (string) $relation->provider->id,
+                serviceId: (string) $relation->request->id,
                 slots: intval($relation->slots)
             );
         }
@@ -287,7 +295,7 @@ public static function thinnedProcessToProcess(ThinnedProcess $thinnedProcess):
     public static function providerToThinnedProvider(Provider $provider): ThinnedProvider
     {
         return new ThinnedProvider(
-            id: isset($provider->id) ? (int)$provider->id : null,
+            id: isset($provider->id) ? (int) $provider->id : null,
             name: $provider->name ?? null,
             source: $provider->source ?? null,
             contact: $provider->contact ?? null,
@@ -303,7 +311,7 @@ public static function providerToThinnedProvider(Provider $provider): ThinnedPro
     public static function thinnedProviderToProvider(ThinnedProvider $thinnedProvider): Provider
     {
         $provider = new Provider();
-        $provider->id = isset($thinnedProvider->id) ? (string)$thinnedProvider->id : null; // Convert int ID to string
+        $provider->id = isset($thinnedProvider->id) ? (string) $thinnedProvider->id : null; // Convert int ID to string
         $provider->name = $thinnedProvider->name ?? null;
         $provider->source = $thinnedProvider->source ?? null;