III-1778: Remove bookingperiod when bookingInfo availability is removed

cultuurnet · Jan 17, 2017 · 34b2b69 · 34b2b69
1 parent c17b009
commit 34b2b69
Show file tree

Hide file tree

Showing 6 changed files with 160 additions and 19 deletions.
diff --git a/composer.json b/composer.json
@@ -16,7 +16,7 @@
         "cultuurnet/geocoding": "~0.1",
         "cultuurnet/silex-amqp": "~1.0",
         "cultuurnet/udb3": "~0.1",
-        "cultuurnet/cdb": "~2.2",
+        "cultuurnet/cdb": "dev-feature/III-1778 as 2.2",
         "cultuurnet/udb2-domain-events": "~1.0",
         "crell/api-problem": "^1.7",
         "doctrine/dbal": "^2.4",

diff --git a/composer.lock b/composer.lock
diff --git a/src/ReadModel/OfferToCdbXmlProjector.php b/src/ReadModel/OfferToCdbXmlProjector.php
@@ -1687,21 +1687,24 @@ private function updateCdbItemByBookingInfo(
     ) {
         // Add the booking Period.
         if ($cdbItem instanceof CultureFeed_Cdb_Item_Event) {
-            $bookingPeriod = $cdbItem->getBookingPeriod();
-            if (empty($bookingPeriod)) {
-                $bookingPeriod = new CultureFeed_Cdb_Data_Calendar_BookingPeriod(
-                    null,
-                    null
-                );
-            }
+            $startDate = null;
+            $endDate = null;
 
             if ($bookingInfo->getAvailabilityStarts()) {
                 $startDate = new DateTime($bookingInfo->getAvailabilityStarts());
-                $bookingPeriod->setDateFrom($startDate->getTimestamp());
+                $startDate = $startDate->getTimestamp();
             }
             if ($bookingInfo->getAvailabilityEnds()) {
                 $endDate = new DateTime($bookingInfo->getAvailabilityEnds());
-                $bookingPeriod->setDateTill($endDate->getTimestamp());
+                $endDate = $endDate->getTimestamp();
+            }
+
+            $bookingPeriod = null;
+            if (null !== $startDate || null !== $endDate) {
+                $bookingPeriod = new CultureFeed_Cdb_Data_Calendar_BookingPeriod(
+                    $startDate,
+                    $endDate
+                );
             }
 
             $cdbItem->setBookingPeriod($bookingPeriod);

diff --git a/tests/ReadModel/OfferToCdbXmlProjectorTest.php b/tests/ReadModel/OfferToCdbXmlProjectorTest.php
@@ -849,6 +849,54 @@ public function it_projects_booking_info_events(
         $this->execute($test);
     }
 
+    /**
+     * @test
+     * @group issue-III-1778
+     * @dataProvider genericOfferTestDataProvider
+     *
+     * @param OfferType $offerType
+     * @param $id
+     * @param $cdbXmlType
+     */
+    public function it_removes_bookingperiod_when_booking_availability_is_removed(
+        OfferType $offerType,
+        $id,
+        $cdbXmlType
+    ) {
+        $test = $this->given($offerType)
+            ->apply(
+                new BookingInfoUpdated(
+                    $id,
+                    new BookingInfo(
+                        'http://tickets.example.com',
+                        'Tickets on Example.com',
+                        '+32 666 666',
+                        'tickets@example.com',
+                        '2014-01-31T12:00:00',
+                        '2014-02-20T15:00:00',
+                        'booking name'
+                    )
+                )
+            )
+            ->apply(
+                new BookingInfoUpdated(
+                    $id,
+                    new BookingInfo(
+                        'http://tickets.example.com',
+                        'Tickets on Example.com',
+                        '+32 666 666',
+                        'tickets@example.com',
+                        '',
+                        '',
+                        'booking name'
+                    )
+                )
+            )
+            ->expect($cdbXmlType . '-booking-info-availability-removed.xml');
+
+        $this->execute($test);
+    }
+
     /**
      * @test
      */

diff --git a/tests/ReadModel/Repository/samples/actor-place-booking-info-availability-removed.xml b/tests/ReadModel/Repository/samples/actor-place-booking-info-availability-removed.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<cdbxml xmlns="http://www.cultuurdatabank.com/XMLSchema/CdbXSD/3.3/FINAL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.cultuurdatabank.com/XMLSchema/CdbXSD/3.3/FINAL http://www.cultuurdatabank.com/XMLSchema/CdbXSD/3.3/FINAL/CdbXSD.xsd">
+  <actor availableto="2100-01-01T01:00:00" cdbid="C4ACF936-1D5F-48E8-B2EC-863B313CBDE6" createdby="foobar" creationdate="2016-04-15T11:01:47" externalurl="http://foo.be/item/404EE8DE-E828-9C07-FE7D12DC4EB24480" lastupdated="2016-04-15T11:01:47" lastupdatedby="foo@bar.com" wfstatus="draft" asset="true">
+    <actordetails>
+      <actordetail lang="nl">
+        <title>My Place</title>
+      </actordetail>
+    </actordetails>
+    <categories>
+      <category catid="8.15.0.0.0" type="actortype">Locatie</category>
+    </categories>
+    <contactinfo>
+      <address>
+        <physical>
+          <city>Leuven</city>
+          <country>BE</country>
+          <housenr>1</housenr>
+          <street>Bondgenotenlaan</street>
+          <zipcode>3000</zipcode>
+        </physical>
+      </address>
+      <mail reservation="true">tickets@example.com</mail>
+      <phone reservation="true">+32 666 666</phone>
+      <url reservation="true">http://tickets.example.com</url>
+    </contactinfo>
+  </actor>
+</cdbxml>
diff --git a/tests/ReadModel/Repository/samples/event-booking-info-availability-removed.xml b/tests/ReadModel/Repository/samples/event-booking-info-availability-removed.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<cdbxml xmlns="http://www.cultuurdatabank.com/XMLSchema/CdbXSD/3.3/FINAL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.cultuurdatabank.com/XMLSchema/CdbXSD/3.3/FINAL http://www.cultuurdatabank.com/XMLSchema/CdbXSD/3.3/FINAL/CdbXSD.xsd">
+  <event availableto="2014-02-20T16:00:00" cdbid="404EE8DE-E828-9C07-FE7D12DC4EB24480" createdby="foobar" creationdate="2016-04-15T11:01:47" externalurl="http://foo.be/item/404EE8DE-E828-9C07-FE7D12DC4EB24480" lastupdated="2016-04-15T11:01:47" lastupdatedby="foo@bar.com" private="false" wfstatus="draft">
+    <categories>
+      <category catid="0.50.6.0.0" type="eventtype">film</category>
+      <category catid="1.7.6.0.0" type="theme">Griezelfilm of horror</category>
+    </categories>
+    <calendar>
+      <timestamps>
+        <timestamp>
+          <date>2014-01-31</date>
+          <timestart>12: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>
+        </timestamp>
+      </timestamps>
+    </calendar>
+    <contactinfo>
+      <address>
+        <physical>
+          <city>Leuven</city>
+          <country>BE</country>
+          <housenr>1</housenr>
+          <street>Bondgenotenlaan</street>
+          <zipcode>3000</zipcode>
+        </physical>
+      </address>
+      <mail reservation="true">tickets@example.com</mail>
+      <phone reservation="true">+32 666 666</phone>
+      <url reservation="true">http://tickets.example.com</url>
+    </contactinfo>
+    <eventdetails>
+      <eventdetail lang="nl">
+        <title>Griezelfilm of horror</title>
+      </eventdetail>
+    </eventdetails>
+    <location>
+      <address>
+        <physical>
+          <city>Leuven</city>
+          <country>BE</country>
+          <housenr>1</housenr>
+          <street>Bondgenotenlaan</street>
+          <zipcode>3000</zipcode>
+        </physical>
+      </address>
+      <label cdbid="C4ACF936-1D5F-48E8-B2EC-863B313CBDE6">Bibberburcht</label>
+    </location>
+  </event>
+</cdbxml>