fix(ZMSKVR-134): filter out non bookable days in getFreeDays (#889)

* fix(ZMSKVR-134): filter out non bookable days in getFreeDays * clean(ZMSKVR-134): imports * clean(ZMSKVR-134): imports --------- Co-authored-by: Thomas Fink <tom@Thomass-MacBook-Air.local>
it-at-m · Feb 21, 2025 · da896f7 · da896f7
1 parent 7b4c489
commit da896f7
Show file tree

Hide file tree

Showing 9 changed files with 451 additions and 133 deletions.
diff --git a/zmsadmin/package-lock.json b/zmsadmin/package-lock.json
diff --git a/zmsadmin/package.json b/zmsadmin/package.json
@@ -56,6 +56,7 @@
     "react-to-print": "^2.14.10",
     "redux-json-schema": "^1.0.0",
     "stream-http": "^3.2.0",
+    "svgo": "^3.3.2",
     "url": "^0.11.0",
     "util": "^0.12.5"
   },
@@ -66,4 +67,4 @@
     "chart.js": "^4.4.2",
     "react-chartjs-2": "^5.2.0"
   }
-}
+}
diff --git a/zmscalldisplay/package-lock.json b/zmscalldisplay/package-lock.json
diff --git a/zmscalldisplay/package.json b/zmscalldisplay/package.json
@@ -44,6 +44,7 @@
     "parcel": "^2.6.2",
     "postcss": "^8.4.16",
     "qrcode-generator": "1.4.4",
-    "sass": "^1.54.4"
+    "sass": "^1.54.4",
+    "svgo": "^3.3.2"
   }
-}
+}
diff --git a/zmscitizenapi/src/Zmscitizenapi/Services/Core/ZmsApiClientService.php b/zmscitizenapi/src/Zmscitizenapi/Services/Core/ZmsApiClientService.php
@@ -10,6 +10,7 @@
 use BO\Zmsentities\Calendar;
 use BO\Zmsentities\Process;
 use BO\Zmsentities\Source;
+use BO\Zmsentities\Collection\DayList;
 use BO\Zmsentities\Collection\ProcessList;
 use BO\Zmsentities\Collection\ProviderList;
 use BO\Zmsentities\Collection\RequestList;
@@ -111,9 +112,18 @@ public static function getFreeDays(ProviderList $providers, RequestList $request
             $calendar->requests = $requests;
             $result = \App::$http->readPostResult('/calendar/', $calendar);
             $entity = $result?->getEntity();
+
             if (!$entity instanceof Calendar) {
                 return new Calendar();
             }
+            $bookableDays = new DayList();
+            foreach ($entity->days as $day) {
+                if (isset($day['status']) && $day['status'] === 'bookable') {
+                    $bookableDays->addEntity($day);
+                }
+            }
+            $entity->days = $bookableDays;
+
             return $entity;
         } catch (\Exception $e) {
             ExceptionService::handleException($e);