diff --git a/src/UiTPASEventSaga.php b/src/UiTPASEventSaga.php index 80df542..01607b2 100644 --- a/src/UiTPASEventSaga.php +++ b/src/UiTPASEventSaga.php @@ -10,9 +10,7 @@ use CultuurNet\UDB3\Cdb\CdbId\EventCdbIdExtractorInterface; use CultuurNet\UDB3\Cdb\EventItemFactory; use CultuurNet\UDB3\Event\Events\EventCreated; -use CultuurNet\UDB3\Event\Events\EventCreatedFromCdbXml; use CultuurNet\UDB3\Event\Events\EventImportedFromUDB2; -use CultuurNet\UDB3\Event\Events\EventUpdatedFromCdbXml; use CultuurNet\UDB3\Event\Events\EventUpdatedFromUDB2; use CultuurNet\UDB3\Event\Events\OrganizerDeleted; use CultuurNet\UDB3\Event\Events\OrganizerUpdated; @@ -85,8 +83,7 @@ public static function configuration() ); }; - $cdbXmlEventCallback = function ($event) { - /* @var EventUpdatedFromUDB2|EventUpdatedFromCdbXml $event */ + $updateFromUdb2Callback = function (EventUpdatedFromUDB2 $event) { return new Criteria( ['uitpasAggregateId' => (string) $event->getEventId()] ); @@ -95,9 +92,7 @@ public static function configuration() return [ 'EventCreated' => $initialEventCallback, 'EventImportedFromUDB2' => $initialEventCallback, - 'EventCreatedFromCdbXml' => $initialEventCallback, - 'EventUpdatedFromUDB2' => $cdbXmlEventCallback, - 'EventUpdatedFromCdbXml' => $cdbXmlEventCallback, + 'EventUpdatedFromUDB2' => $updateFromUdb2Callback, 'OrganizerUpdated' => $offerEventCallback, 'OrganizerDeleted' => $offerEventCallback, 'PriceInfoUpdated' => $offerEventCallback, @@ -140,27 +135,6 @@ public function handleEventImportedFromUDB2(EventImportedFromUDB2 $eventImported return $state; } - /** - * @param EventCreatedFromCdbXml $eventCreatedFromCdbXml - * @param State $state - * @return State - */ - public function handleEventCreatedFromCdbXml(EventCreatedFromCdbXml $eventCreatedFromCdbXml, State $state) - { - $state->set('uitpasAggregateId', $eventCreatedFromCdbXml->getEventId()); - $state->set('syncCount', 0); - - $state = $this->updateStateFromCdbXml( - $state, - (string) $eventCreatedFromCdbXml->getEventXmlString(), - (string) $eventCreatedFromCdbXml->getCdbXmlNamespaceUri() - ); - - $this->triggerSyncWhenConditionsAreMet($state); - - return $state; - } - /** * @param EventUpdatedFromUDB2 $eventUpdatedFromUDB2 * @param State $state @@ -179,24 +153,6 @@ public function handleEventUpdatedFromUDB2(EventUpdatedFromUDB2 $eventUpdatedFro return $state; } - /** - * @param EventUpdatedFromCdbXml $eventUpdatedFromCdbXml - * @param State $state - * @return State - */ - public function handleEventUpdatedFromCdbXml(EventUpdatedFromCdbXml $eventUpdatedFromCdbXml, State $state) - { - $state = $this->updateStateFromCdbXml( - $state, - (string) $eventUpdatedFromCdbXml->getEventXmlString(), - (string) $eventUpdatedFromCdbXml->getCdbXmlNamespaceUri() - ); - - $this->triggerSyncWhenConditionsAreMet($state); - - return $state; - } - /** * @param OrganizerUpdated $organizerUpdated * @param State $state diff --git a/tests/UiTPASEventSagaTest.php b/tests/UiTPASEventSagaTest.php index bf9f26c..71c9c18 100644 --- a/tests/UiTPASEventSagaTest.php +++ b/tests/UiTPASEventSagaTest.php @@ -19,9 +19,7 @@ use CultuurNet\UDB3\CalendarType; use CultuurNet\UDB3\Cdb\CdbId\EventCdbIdExtractor; use CultuurNet\UDB3\Event\Events\EventCreated; -use CultuurNet\UDB3\Event\Events\EventCreatedFromCdbXml; use CultuurNet\UDB3\Event\Events\EventImportedFromUDB2; -use CultuurNet\UDB3\Event\Events\EventUpdatedFromCdbXml; use CultuurNet\UDB3\Event\Events\EventUpdatedFromUDB2; use CultuurNet\UDB3\Event\Events\OrganizerDeleted; use CultuurNet\UDB3\Event\Events\OrganizerUpdated; @@ -555,42 +553,6 @@ public function it_creates_a_new_uitpas_aggregate_and_registers_an_uitpas_event_ ); } - /** - * @test - */ - public function it_creates_a_new_uitpas_aggregate_and_registers_an_uitpas_event_for_events_created_from_cdbxml() - { - $cdbXml = file_get_contents(__DIR__ . '/cdbxml-samples/event-with-uitpas-organizer-and-price.xml'); - - $cdbXmlNamespaceUri = 'http://www.cultuurdatabank.com/XMLSchema/CdbXSD/3.3/FINAL'; - - $expectedPriceInfo = new PriceInfo( - new BasePrice( - Price::fromFloat(5.5), - Currency::fromNative('EUR') - ) - ); - - $this->scenario - ->when( - new EventCreatedFromCdbXml( - new StringLiteral($this->eventId), - new EventXmlString($cdbXml), - new StringLiteral($cdbXmlNamespaceUri) - ) - ) - ->then( - [ - new CreateUiTPASAggregate($this->eventId, []), - new RegisterUiTPASEvent( - $this->eventId, - $this->uitpasOrganizerId, - $expectedPriceInfo - ), - ] - ); - } - /** * @test */ @@ -629,50 +591,6 @@ public function it_updates_an_uitpas_event_when_updated_from_udb2() ); } - /** - * @test - */ - public function it_updates_an_uitpas_event_when_updated_from_cdbxml() - { - $cdbXml = file_get_contents(__DIR__ . '/cdbxml-samples/event-with-uitpas-organizer-and-price.xml'); - - $cdbXmlNamespaceUri = 'http://www.cultuurdatabank.com/XMLSchema/CdbXSD/3.3/FINAL'; - - $expectedPriceInfo = new PriceInfo( - new BasePrice( - Price::fromFloat(5.5), - Currency::fromNative('EUR') - ) - ); - - $this->scenario - ->given( - [ - $this->eventCreated, - new OrganizerUpdated($this->eventId, $this->uitpasOrganizerId), - new PriceInfoUpdated($this->eventId, $this->priceInfo), - $this->uitpasAggregateCreated, - ] - ) - ->when( - new EventUpdatedFromCdbXml( - new StringLiteral($this->eventId), - new EventXmlString($cdbXml), - new StringLiteral($cdbXmlNamespaceUri) - ) - ) - ->then( - [ - new UpdateUiTPASEvent( - $this->eventId, - $this->uitpasOrganizerId, - $expectedPriceInfo, - $this->distributionKeys - ), - ] - ); - } - /** * @test */