4021: Added test

Author: tuj

src/Feed/CalendarApiFeedType.php

@@ -63,8 +63,6 @@ public function __construct(
     public function getData(Feed $feed): array
     {
         try {
-            $results = [];
-
             $configuration = $feed->getConfiguration();
 
             $enabledModifiers = $configuration['enabledModifiers'] ?? [];
@@ -76,25 +74,28 @@ public function getData(Feed $feed): array
             }
 
             $resources = $configuration['resources'];
-            foreach ($resources as $resource) {
-                $events = $this->getResourceEvents($resource);
 
-                $results += static::applyModifiersToEvents($events, $this->eventModifiers, $enabledModifiers);
+            $events = [];
+
+            foreach ($resources as $resource) {
+                $events += $this->getResourceEvents($resource);
             }
 
-            $results = array_map(fn (CalendarEvent $event) => [
+            $modifiedResults = static::applyModifiersToEvents($events, $this->eventModifiers, $enabledModifiers);
+
+            $resultsAsArray = array_map(fn (CalendarEvent $event) => [
                 'id' => Ulid::generate(),
                 'title' => $event->title,
                 'startTime' => $event->startTimeTimestamp,
                 'endTime' => $event->endTimeTimestamp,
                 'resourceTitle' => $event->resourceDisplayName,
                 'resourceId' => $event->resourceId,
-            ], $results);
+            ], $modifiedResults);
 
             // Sort bookings by start time.
-            usort($results, fn (array $a, array $b) => $a['startTime'] > $b['startTime'] ? 1 : -1);
+            usort($resultsAsArray, fn (array $a, array $b) => $a['startTime'] > $b['startTime'] ? 1 : -1);
 
-            return $results;
+            return $resultsAsArray;
         } catch (\Throwable $throwable) {
             $this->logger->error('{code}: {message}', [
                 'code' => $throwable->getCode(),

tests/Feed/CalendarApiFeedTypeTest.php

@@ -19,12 +19,22 @@ public function testApplyModifiersToEvents(): void
         $this->assertEquals('title3', $result[0]->title);
         $this->assertEquals('Optaget', $result[1]->title);
 
+        $data = new CalendarApiFeedTypeData();
+
         $result = CalendarApiFeedType::applyModifiersToEvents($data->events, $data->modifiers, ['onlyShowAsOptaget']);
 
         $this->assertEquals(4, count($result));
         $this->assertEquals('Optaget', $result[0]->title);
         $this->assertEquals('Optaget', $result[1]->title);
         $this->assertEquals('Optaget', $result[2]->title);
         $this->assertEquals('Optaget', $result[3]->title);
+
+        $data = new CalendarApiFeedTypeData();
+
+        $result = CalendarApiFeedType::applyModifiersToEvents($data->events, $data->modifiers, ['excludeIfNotContainsListe', 'onlyShowAsOptaget']);
+
+        $this->assertEquals(2, count($result));
+        $this->assertEquals('Optaget', $result[0]->title);
+        $this->assertEquals('Optaget', $result[1]->title);
     }
 }