fix(ZMSKVR-140): fix invalid appointment timestamps array

it-at-m · Feb 21, 2025 · c82eeda · c82eeda
1 parent 6b8b1ca
commit c82eeda
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 26 deletions.
diff --git a/zmscitizenapi/src/Zmscitizenapi/Models/AvailableAppointments.php b/zmscitizenapi/src/Zmscitizenapi/Models/AvailableAppointments.php
@@ -11,7 +11,7 @@
 class AvailableAppointments extends Entity implements JsonSerializable
 {
     public static $schema = 'citizenapi/availableAppointments.json';
-/** @var array */
+    /** @var array */
     public array $appointmentTimestamps = [];
     public function __construct(array $appointmentTimestamps = [])
     {

diff --git a/zmscitizenapi/src/Zmscitizenapi/Services/Core/ZmsApiFacadeService.php b/zmscitizenapi/src/Zmscitizenapi/Services/Core/ZmsApiFacadeService.php
@@ -482,40 +482,39 @@ public static function getAvailableAppointments(string $date, array $officeIds,
         return new AvailableAppointments(array_values($timestamps)[0]);
     }
 
-    private static function processFreeSlots(ProcessList $freeSlots): array
-    {
+    private static function processFreeSlots(ProcessList $freeSlots): array {
         $errors = ValidationService::validateGetProcessFreeSlots($freeSlots);
         if (is_array($errors) && !empty($errors['errors'])) {
             return $errors;
         }
-
+    
         $currentTimestamp = time();
-        $appointmentTimestamps = array_reduce(iterator_to_array($freeSlots), function ($timestamps, $slot) use ($currentTimestamp) {
-
+        $allTimestamps = [];
+
+        // Collect all timestamps
+        foreach ($freeSlots as $slot) {
             if (isset($slot->appointments) && is_iterable($slot->appointments)) {
-                $providerId = (int) $slot->scope->provider->id;
                 foreach ($slot->appointments as $appointment) {
                     if (isset($appointment->date)) {
                         $timestamp = (int) $appointment->date;
                         if ($timestamp > $currentTimestamp) {
-                            $timestamps[$providerId][$timestamp] = true;
+                            $allTimestamps[] = $timestamp;
                         }
                     }
                 }
             }
-            return $timestamps;
-        }, []);
-        foreach ($appointmentTimestamps as $providerId => &$timestamps) {
-            $timestamps = array_keys($timestamps);
-            asort($timestamps);
         }
-
-        $errors = ValidationService::validateGetProcessByIdTimestamps($appointmentTimestamps);
+
+        // Final deduplication and sorting
+        $uniqueTimestamps = array_values(array_unique($allTimestamps));
+        sort($uniqueTimestamps);
+
+        $errors = ValidationService::validateGetProcessByIdTimestamps($uniqueTimestamps);
         if (is_array($errors) && !empty($errors['errors'])) {
             return $errors;
         }
-
-        return $appointmentTimestamps;
+    
+        return ['appointmentTimestamps' => $uniqueTimestamps];
     }
 
     public static function reserveTimeslot(Process $appointmentProcess, array $serviceIds, array $serviceCounts): ThinnedProcess|array

diff --git a/zmsentities/schema/citizenapi/availableAppointments.json b/zmsentities/schema/citizenapi/availableAppointments.json
@@ -1,16 +1,20 @@
 {
   "title": "AvailableAppointments",
-  "type": ["array", "object", "null"],
+  "type": ["array", "object"],
   "properties": {
     "appointmentTimestamps": {
-      "type": ["array", "null"],
+      "type": "array",
       "description": "Array of available appointment timestamps in seconds since epoch",
       "items": {
         "type": "integer",
-        "description": "Timestamp in seconds since epoch"
-      }
+        "description": "Timestamp in seconds since epoch",
+        "minimum": 0
+      },
+      "uniqueItems": true,
+      "minItems": 0
     }
   },
   "required": ["appointmentTimestamps"],
+  "additionalProperties": false,
   "description": "Schema defining the available appointments for a specific date, office, and service"
-}
+}
diff --git a/zmsentities/schema/citizenapi/availableAppointmentsByOffice.json b/zmsentities/schema/citizenapi/availableAppointmentsByOffice.json
@@ -13,11 +13,15 @@
             "description": "Office ID"
           },
           "appointmentTimestamps": {
-            "type": ["array", "null"],
-            "description": "Numeric timestamps (seconds) for each available slot.",
+            "type": "array",
+            "description": "Array of available appointment timestamps in seconds since epoch",
             "items": {
-              "type": "integer"
-            }
+              "type": "integer",
+              "description": "Timestamp in seconds since epoch",
+              "minimum": 0
+            },
+            "uniqueItems": true,
+            "minItems": 0
           }
         },
         "required": ["offices"]