Adjust published data for groups.swiss

public/typo3conf/ext/ep_products/Classes/Service/GroupsSwissService.php

@@ -119,7 +119,13 @@ class GroupsSwissService implements SingletonInterface, LoggerAwareInterface
                 $events = [];
             }
 
-            $this->generateAvailabilityChart(
+//            $this->generateAvailabilityChart(
+//                $events,
+//                $config['key'],
+//                $config['number']
+//            );
+
+            $this->generateChart(
                 $events,
                 $config['key'],
                 $config['number']
@@ -171,20 +177,23 @@ class GroupsSwissService implements SingletonInterface, LoggerAwareInterface
      * @param string $apiKey
      * @param int $houseNumber
      */
-    protected function generateBlockedChart(array $events, $apiKey, $houseNumber): void
+    protected function generateChart(array $events, $apiKey, $houseNumber): void
     {
         $itemCount = 0;
         $item = null;
+        $status = null;
 
         foreach ($events as $event) {
             /** @var Contingent $event */
-            if (null === $item && (Contingent::STATUS_BLOCKED === $event->getStatus() || Contingent::STATUS_ONREQUEST === $event->getStatus())) {
+            if (null === $item && Contingent::STATUS_OK !== $event->getStatus()) {
+                $status = $event->getStatus();
                 $item = [
                     'from' => $event->getBegin(),
                 ];
-            } elseif (true === is_array($item) && Contingent::STATUS_OK === $event->getStatus()) {
+            } elseif (true === is_array($item) && $status !== $event->getStatus()) {
                 $item['to'] = $event->getEnd();
-                $this->addItem($item, 2, $apiKey, $houseNumber);
+                $statusCode = Contingent::STATUS_ONREQUEST === $status ? 1 : 2;
+                $this->addItem($item, $statusCode, $apiKey, $houseNumber);
                 $item = null;
                 $itemCount++;
             }