fix(ZMS-3253): unit tests

it-at-m · Jan 29, 2025 · ff16fc0 · ff16fc0
1 parent 8d863ce
commit ff16fc0
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/zmsapi/src/Zmsapi/AvailabilityAdd.php b/zmsapi/src/Zmsapi/AvailabilityAdd.php
@@ -176,9 +176,12 @@ protected function checkForOverlaps(Collection $collection, \DateTimeImmutable $
     {
         foreach ($collection as $availability1) {
             foreach ($collection as $availability2) {
+                $scope1Id = is_array($availability1->scope) ? ($availability1->scope['id'] ?? null) : ($availability1->scope->id ?? null);
+                $scope2Id = is_array($availability2->scope) ? ($availability2->scope['id'] ?? null) : ($availability2->scope->id ?? null);
+
                 if ($availability1 !== $availability2 && 
                     $availability1->type == $availability2->type &&
-                    $availability1->scope->id == $availability2->scope->id &&
+                    $scope1Id == $scope2Id &&
                     $availability1->hasSharedWeekdayWith($availability2)) {
 
                     $start1 = (new \DateTimeImmutable())->setTimestamp($availability1->startDate)
@@ -189,7 +192,7 @@ protected function checkForOverlaps(Collection $collection, \DateTimeImmutable $
                         ->modify($availability2->startTime);
                     $end2 = (new \DateTimeImmutable())->setTimestamp($availability2->endDate)
                         ->modify($availability2->endTime);
-        
+
                     if ($start1 < $end2 && $start2 < $end1) {
                         throw new AvailabilityAddFailed('Neue Öffnungszeiten überschneiden sich.');
                     }

diff --git a/zmsapi/src/Zmsapi/AvailabilityUpdate.php b/zmsapi/src/Zmsapi/AvailabilityUpdate.php
@@ -185,9 +185,12 @@ protected function checkForOverlaps(Collection $collection, \DateTimeImmutable $
     {
         foreach ($collection as $availability1) {
             foreach ($collection as $availability2) {
+                $scope1Id = is_array($availability1->scope) ? ($availability1->scope['id'] ?? null) : ($availability1->scope->id ?? null);
+                $scope2Id = is_array($availability2->scope) ? ($availability2->scope['id'] ?? null) : ($availability2->scope->id ?? null);
+
                 if ($availability1 !== $availability2 && 
                     $availability1->type == $availability2->type &&
-                    $availability1->scope->id == $availability2->scope->id &&
+                    $scope1Id == $scope2Id &&
                     $availability1->hasSharedWeekdayWith($availability2)) {
 
                     $start1 = (new \DateTimeImmutable())->setTimestamp($availability1->startDate)
@@ -198,9 +201,9 @@ protected function checkForOverlaps(Collection $collection, \DateTimeImmutable $
                         ->modify($availability2->startTime);
                     $end2 = (new \DateTimeImmutable())->setTimestamp($availability2->endDate)
                         ->modify($availability2->endTime);
-        
+
                     if ($start1 < $end2 && $start2 < $end1) {
-                        throw new AvailabilityUpdateFailed('Neue Öffnungszeiten überschneiden sich.');
+                        throw new AvailabilityAddFailed('Neue Öffnungszeiten überschneiden sich.');
                     }
                 }
             }