[CatalogPromotion] fix service typo, stateMachine error fixed

Sylius · Oct 22, 2021 · e116388 · e116388
1 parent bb8772d
commit e116388
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 5 deletions.
diff --git a/src/Sylius/Bundle/CoreBundle/Processor/CatalogPromotionClearer.php b/src/Sylius/Bundle/CoreBundle/Processor/CatalogPromotionClearer.php
@@ -54,7 +54,9 @@ public function clear(): void
         $catalogPromotions = $this->catalogPromotionRepository->findByCodes($appliedPromotionsCodes);
         foreach ($catalogPromotions as $catalogPromotion) {
             $stateMachine = $this->stateMachine->get($catalogPromotion, CatalogPromotionTransitions::GRAPH);
-            $stateMachine->apply(CatalogPromotionTransitions::TRANSITION_DEACTIVATE);
+            if ($stateMachine->can(CatalogPromotionTransitions::TRANSITION_DEACTIVATE)) {
+                $stateMachine->apply(CatalogPromotionTransitions::TRANSITION_DEACTIVATE);
+            }
         }
     }
 

diff --git a/src/Sylius/Bundle/CoreBundle/Resources/config/services/listeners.xml b/src/Sylius/Bundle/CoreBundle/Resources/config/services/listeners.xml
@@ -146,7 +146,7 @@
             <tag name="messenger.message_handler" bus="sylius.event_bus" />
         </service>
 
-        <service id="Sylius\Bundle\CoreBundle\Listener\FailedMessageListener">
+        <service id="Sylius\Bundle\CoreBundle\Listener\CatalogPromotionUpdateFailedMessageListener">
             <argument type="service" id="sylius.event_bus" />
             <tag name="kernel.event_listener" event="Symfony\Component\Messenger\Event\WorkerMessageFailedEvent" method="onMessageFailed" />
         </service>

diff --git a/src/Sylius/Bundle/PromotionBundle/Criteria/DateRange.php b/src/Sylius/Bundle/PromotionBundle/Criteria/DateRange.php
@@ -31,7 +31,7 @@ public function filterQueryBuilder(QueryBuilder $queryBuilder): QueryBuilder
 
         $queryBuilder
             ->andWhere(sprintf('%s.startDate IS NULL OR %s.startDate <= :date', $root, $root))
-            ->andWhere(sprintf('%s.endDate IS NULL OR %s.endDate >= :date', $root, $root))
+            ->andWhere(sprintf('%s.endDate IS NULL OR %s.endDate > :date', $root, $root))
             ->setParameter('date', $this->calendar->now())
         ;
 

diff --git a/tests/DataFixtures/ORM/resources/catalog_promotions.yml b/tests/DataFixtures/ORM/resources/catalog_promotions.yml
@@ -4,14 +4,14 @@ Sylius\Component\Core\Model\CatalogPromotion:
         name: Sale1
         enabled: true
         start_date: "<(new \\DateTime('2021-10-12 00:00:00'))>"
-        end_date: "<(new \\DateTime('2021-10-12 23:59:59'))>"
+        end_date: "<(new \\DateTime('2021-10-12 23:59:58'))>"
         state: inactive
     sale_2:
         code: sale2
         name: Sale2
         enabled: true
         start_date: "<(new \\DateTime('2021-10-12 00:00:01'))>"
-        end_date: "<(new \\DateTime('2021-10-12 23:59:59'))>"
+        end_date: "<(new \\DateTime('2021-10-12 23:59:58'))>"
         state: inactive
     sale_3:
         code: sale3

diff --git a/tests/Functional/EligibleCatalogPromotionsProcessorTest.php b/tests/Functional/EligibleCatalogPromotionsProcessorTest.php
@@ -70,4 +70,33 @@ public function it_provides_catalog_promotions_with_precision_to_seconds(): void
 
         unlink(self::$kernel->getProjectDir() . '/var/temporaryDate.txt');
     }
+
+    /** @test */
+    public function it_provides_catalog_promotions_with_precision_to_seconds_for_end_date(): void
+    {
+        /** @var EligibleCatalogPromotionsProvider $eligibleCatalogPromotionsProvider */
+        $eligibleCatalogPromotionsProvider = self::$container->get('Sylius\Bundle\PromotionBundle\Provider\EligibleCatalogPromotionsProviderInterface');
+
+        file_put_contents(self::$kernel->getProjectDir() . '/var/temporaryDate.txt', '2021-10-12 23:59:58');
+
+        $dateRangeCriteria = self::$container->get('sylius.catalog_promotion.criteria.date_range');
+
+        $eligibleCatalogPromotions = $eligibleCatalogPromotionsProvider->provide([$dateRangeCriteria]);
+
+        $expectedDateTimes = [
+            new \DateTime('2021-10-12 23:59:59'),
+            new \DateTime('2021-10-12 23:59:59'),
+        ];
+
+        $actualDateTimes = [];
+
+        /** @var CatalogPromotionInterface $eligibleCatalogPromotion */
+        foreach ($eligibleCatalogPromotions as $eligibleCatalogPromotion) {
+            $actualDateTimes[] = $eligibleCatalogPromotion->getEndDate();
+        }
+
+        $this->assertTrue(($expectedDateTimes == $actualDateTimes));
+
+        unlink(self::$kernel->getProjectDir() . '/var/temporaryDate.txt');
+    }
 }