Merge pull request #115 from cultuurnet/bugfix/fix-missing-calendar-s…

…tart-and-end-date Update cultuurnet/udb3 dependency to make start and end date optional
cultuurnet · Sep 10, 2020 · 9776378 · 9776378
2 parents 803af36 + 9a6cc10
commit 9776378
Show file tree

Hide file tree

Showing 78 changed files with 184 additions and 167 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/src/ReadModel/OfferToCdbXmlProjector.php b/src/ReadModel/OfferToCdbXmlProjector.php
@@ -1499,6 +1499,14 @@ public function applyTypicalAgeRangeUpdated(
             $event->setAgeTo((int) $ageToString);
         }
 
+        // Workaround for backwards compatibility:
+        // Since III-3399 the age "from" is always 0 if no from is given.
+        // But to maintain compatibility with previous behaviour, we don't set it on the cdbxml
+        // if there's no "to" either.
+        if ($event->getAgeFrom() === 0 && $event->getAgeTo() === null) {
+            $event->setAgeFrom();
+        }
+
         // Change the lastupdated attribute.
         $event = $this->metadataCdbItemEnricher
             ->enrich($event, $metadata);

diff --git a/tests/CdbXmlDocument/samples/event.xml b/tests/CdbXmlDocument/samples/event.xml
@@ -9,13 +9,13 @@
       <timestamps>
         <timestamp>
           <date>2014-01-31</date>
-          <timestart>12:00:00</timestart>
+          <timestart>13:00:00</timestart>
           <timeend>15:00:00</timeend>
         </timestamp>
         <timestamp>
           <date>2014-02-20</date>
           <timestart>12:00:00</timestart>
-          <timeend>15:00:00</timeend>
+          <timeend>16:00:00</timeend>
         </timestamp>
       </timestamps>
     </calendar>

diff --git a/tests/ReadModel/AbstractCdbXmlProjectorTest.php b/tests/ReadModel/AbstractCdbXmlProjectorTest.php
@@ -109,12 +109,12 @@ public function entityDataProvider()
     {
         $timestamps = [
             new Timestamp(
-                \DateTime::createFromFormat(\DateTime::ATOM, '2014-01-31T12:00:00+01:00'),
+                \DateTime::createFromFormat(\DateTime::ATOM, '2014-01-31T13:00:00+01:00'),
                 \DateTime::createFromFormat(\DateTime::ATOM, '2014-01-31T15:00:00+01:00')
             ),
             new Timestamp(
                 \DateTime::createFromFormat(\DateTime::ATOM, '2014-02-20T12:00:00+01:00'),
-                \DateTime::createFromFormat(\DateTime::ATOM, '2014-02-20T15:00:00+01:00')
+                \DateTime::createFromFormat(\DateTime::ATOM, '2014-02-20T16:00:00+01:00')
             ),
         ];
 

diff --git a/tests/ReadModel/OfferToCdbXmlProjectorTest.php b/tests/ReadModel/OfferToCdbXmlProjectorTest.php
@@ -2739,12 +2739,12 @@ private function getTimestamps()
     {
         return [
             new Timestamp(
-                \DateTime::createFromFormat(\DateTime::ATOM, '2014-01-31T12:00:00+01:00'),
+                \DateTime::createFromFormat(\DateTime::ATOM, '2014-01-31T13:00:00+01:00'),
                 \DateTime::createFromFormat(\DateTime::ATOM, '2014-01-31T15:00:00+01:00')
             ),
             new Timestamp(
                 \DateTime::createFromFormat(\DateTime::ATOM, '2014-02-20T12:00:00+01:00'),
-                \DateTime::createFromFormat(\DateTime::ATOM, '2014-02-20T15:00:00+01:00')
+                \DateTime::createFromFormat(\DateTime::ATOM, '2014-02-20T16:00:00+01:00')
             ),
         ];
     }

diff --git a/tests/ReadModel/RelationsToCdbXmlProjectorTest.php b/tests/ReadModel/RelationsToCdbXmlProjectorTest.php
@@ -332,12 +332,12 @@ public function createEvent($eventId, $theme = true, $contactPoint = false)
     {
         $timestamps = [
             new Timestamp(
-                \DateTime::createFromFormat(\DateTime::ATOM, '2014-01-31T12:00:00+01:00'),
+                \DateTime::createFromFormat(\DateTime::ATOM, '2014-01-31T13:00:00+01:00'),
                 \DateTime::createFromFormat(\DateTime::ATOM, '2014-01-31T15:00:00+01:00')
             ),
             new Timestamp(
                 \DateTime::createFromFormat(\DateTime::ATOM, '2014-02-20T12:00:00+01:00'),
-                \DateTime::createFromFormat(\DateTime::ATOM, '2014-02-20T15:00:00+01:00')
+                \DateTime::createFromFormat(\DateTime::ATOM, '2014-02-20T16:00:00+01:00')
             ),
         ];
 

diff --git a/tests/ReadModel/Repository/samples/description/event-with-description-1.xml b/tests/ReadModel/Repository/samples/description/event-with-description-1.xml
@@ -9,13 +9,13 @@
       <timestamps>
         <timestamp>
           <date>2014-01-31</date>
-          <timestart>12:00:00</timestart>
+          <timestart>13:00:00</timestart>
           <timeend>15:00:00</timeend>
         </timestamp>
         <timestamp>
           <date>2014-02-20</date>
           <timestart>12:00:00</timestart>
-          <timeend>15:00:00</timeend>
+          <timeend>16:00:00</timeend>
         </timestamp>
       </timestamps>
     </calendar>

diff --git a/tests/ReadModel/Repository/samples/description/event-with-description-2.xml b/tests/ReadModel/Repository/samples/description/event-with-description-2.xml
@@ -9,13 +9,13 @@
       <timestamps>
         <timestamp>
           <date>2014-01-31</date>
-          <timestart>12:00:00</timestart>
+          <timestart>13:00:00</timestart>
           <timeend>15:00:00</timeend>
         </timestamp>
         <timestamp>
           <date>2014-02-20</date>
           <timestart>12:00:00</timestart>
-          <timeend>15:00:00</timeend>
+          <timeend>16:00:00</timeend>
         </timestamp>
       </timestamps>
     </calendar>

diff --git a/tests/ReadModel/Repository/samples/description/event-with-description-3.xml b/tests/ReadModel/Repository/samples/description/event-with-description-3.xml
@@ -9,13 +9,13 @@
       <timestamps>
         <timestamp>
           <date>2014-01-31</date>
-          <timestart>12:00:00</timestart>
+          <timestart>13:00:00</timestart>
           <timeend>15:00:00</timeend>
         </timestamp>
         <timestamp>
           <date>2014-02-20</date>
           <timestart>12:00:00</timestart>
-          <timeend>15:00:00</timeend>
+          <timeend>16:00:00</timeend>
         </timestamp>
       </timestamps>
     </calendar>

diff --git a/tests/ReadModel/Repository/samples/event-booking-info-availability-removed.xml b/tests/ReadModel/Repository/samples/event-booking-info-availability-removed.xml
@@ -9,13 +9,13 @@
       <timestamps>
         <timestamp>
           <date>2014-01-31</date>
-          <timestart>12:00:00</timestart>
+          <timestart>13:00:00</timestart>
           <timeend>15:00:00</timeend>
         </timestamp>
         <timestamp>
           <date>2014-02-20</date>
           <timestart>12:00:00</timestart>
-          <timeend>15:00:00</timeend>
+          <timeend>16:00:00</timeend>
         </timestamp>
       </timestamps>
     </calendar>

diff --git a/tests/ReadModel/Repository/samples/event-booking-info-updated.xml b/tests/ReadModel/Repository/samples/event-booking-info-updated.xml
@@ -9,13 +9,13 @@
       <timestamps>
         <timestamp>
           <date>2014-01-31</date>
-          <timestart>12:00:00</timestart>
+          <timestart>13:00:00</timestart>
           <timeend>15:00:00</timeend>
         </timestamp>
         <timestamp>
           <date>2014-02-20</date>
           <timestart>12:00:00</timestart>
-          <timeend>15:00:00</timeend>
+          <timeend>16:00:00</timeend>
         </timestamp>
       </timestamps>
     </calendar>

diff --git a/tests/ReadModel/Repository/samples/event-contact-point-updated.xml b/tests/ReadModel/Repository/samples/event-contact-point-updated.xml
@@ -9,13 +9,13 @@
       <timestamps>
         <timestamp>
           <date>2014-01-31</date>
-          <timestart>12:00:00</timestart>
+          <timestart>13:00:00</timestart>
           <timeend>15:00:00</timeend>
         </timestamp>
         <timestamp>
           <date>2014-02-20</date>
           <timestart>12:00:00</timestart>
-          <timeend>15:00:00</timeend>
+          <timeend>16:00:00</timeend>
         </timestamp>
       </timestamps>
     </calendar>

diff --git a/tests/ReadModel/Repository/samples/event-copied-original.xml b/tests/ReadModel/Repository/samples/event-copied-original.xml
@@ -9,13 +9,13 @@
       <timestamps>
         <timestamp>
           <date>2014-01-31</date>
-          <timestart>12:00:00</timestart>
+          <timestart>13:00:00</timestart>
           <timeend>15:00:00</timeend>
         </timestamp>
         <timestamp>
           <date>2014-02-20</date>
           <timestart>12:00:00</timestart>
-          <timeend>15:00:00</timeend>
+          <timeend>16:00:00</timeend>
         </timestamp>
       </timestamps>
     </calendar>

diff --git a/tests/ReadModel/Repository/samples/event-deleted.xml b/tests/ReadModel/Repository/samples/event-deleted.xml
@@ -9,13 +9,13 @@
       <timestamps>
         <timestamp>
           <date>2014-01-31</date>
-          <timestart>12:00:00</timestart>
+          <timestart>13:00:00</timestart>
           <timeend>15:00:00</timeend>
         </timestamp>
         <timestamp>
           <date>2014-02-20</date>
           <timestart>12:00:00</timestart>
-          <timeend>15:00:00</timeend>
+          <timeend>16:00:00</timeend>
         </timestamp>
       </timestamps>
     </calendar>

diff --git a/...Repository/samples/event-imported-with-short-description-merged-into-long-description.xml b/...Repository/samples/event-imported-with-short-description-merged-into-long-description.xml
@@ -9,13 +9,13 @@
       <timestamps>
         <timestamp>
           <date>2014-01-31</date>
-          <timestart>12:00:00</timestart>
+          <timestart>13:00:00</timestart>
           <timeend>15:00:00</timeend>
         </timestamp>
         <timestamp>
           <date>2014-02-20</date>
           <timestart>12:00:00</timestart>
-          <timeend>15:00:00</timeend>
+          <timeend>16:00:00</timeend>
         </timestamp>
       </timestamps>
     </calendar>

diff --git a/tests/ReadModel/Repository/samples/event-imported.xml b/tests/ReadModel/Repository/samples/event-imported.xml
@@ -9,13 +9,13 @@
       <timestamps>
         <timestamp>
           <date>2014-01-31</date>
-          <timestart>12:00:00</timestart>
+          <timestart>13:00:00</timestart>
           <timeend>15:00:00</timeend>
         </timestamp>
         <timestamp>
           <date>2014-02-20</date>
           <timestart>12:00:00</timestart>
-          <timeend>15:00:00</timeend>
+          <timeend>16:00:00</timeend>
         </timestamp>
       </timestamps>
     </calendar>

diff --git a/...dModel/Repository/samples/event-namespaced-with-short-description-different-from-long.xml b/...dModel/Repository/samples/event-namespaced-with-short-description-different-from-long.xml
@@ -9,13 +9,13 @@
             <cdb:timestamps>
                 <cdb:timestamp>
                     <cdb:date>2014-01-31</cdb:date>
-                    <cdb:timestart>12:00:00</cdb:timestart>
+                    <cdb:timestart>13:00:00</cdb:timestart>
                     <cdb:timeend>15:00:00</cdb:timeend>
                 </cdb:timestamp>
                 <cdb:timestamp>
                     <cdb:date>2014-02-20</cdb:date>
                     <cdb:timestart>12:00:00</cdb:timestart>
-                    <cdb:timeend>15:00:00</cdb:timeend>
+                    <cdb:timeend>16:00:00</cdb:timeend>
                 </cdb:timestamp>
             </cdb:timestamps>
         </cdb:calendar>

diff --git a/tests/ReadModel/Repository/samples/event-namespaced.xml b/tests/ReadModel/Repository/samples/event-namespaced.xml
@@ -9,13 +9,13 @@
             <cdb:timestamps>
                 <cdb:timestamp>
                     <cdb:date>2014-01-31</cdb:date>
-                    <cdb:timestart>12:00:00</cdb:timestart>
+                    <cdb:timestart>13:00:00</cdb:timestart>
                     <cdb:timeend>15:00:00</cdb:timeend>
                 </cdb:timestamp>
                 <cdb:timestamp>
                     <cdb:date>2014-02-20</cdb:date>
                     <cdb:timestart>12:00:00</cdb:timestart>
-                    <cdb:timeend>15:00:00</cdb:timeend>
+                    <cdb:timeend>16:00:00</cdb:timeend>
                 </cdb:timestamp>
             </cdb:timestamps>
         </cdb:calendar>

diff --git a/tests/ReadModel/Repository/samples/event-private.xml b/tests/ReadModel/Repository/samples/event-private.xml
@@ -9,13 +9,13 @@
       <timestamps>
         <timestamp>
           <date>2014-01-31</date>
-          <timestart>12:00:00</timestart>
+          <timestart>13:00:00</timestart>
           <timeend>15:00:00</timeend>
         </timestamp>
         <timestamp>
           <date>2014-02-20</date>
           <timestart>12:00:00</timestart>
-          <timeend>15:00:00</timeend>
+          <timeend>16:00:00</timeend>
         </timestamp>
       </timestamps>
     </calendar>

diff --git a/tests/ReadModel/Repository/samples/event-with-age-from-and-age-to.xml b/tests/ReadModel/Repository/samples/event-with-age-from-and-age-to.xml
@@ -11,13 +11,13 @@
       <timestamps>
         <timestamp>
           <date>2014-01-31</date>
-          <timestart>12:00:00</timestart>
+          <timestart>13:00:00</timestart>
           <timeend>15:00:00</timeend>
         </timestamp>
         <timestamp>
           <date>2014-02-20</date>
           <timestart>12:00:00</timestart>
-          <timeend>15:00:00</timeend>
+          <timeend>16:00:00</timeend>
         </timestamp>
       </timestamps>
     </calendar>