Merge pull request #244 from Setono/move-flush-outside-applicator

Move the flush of order outside the applicator
Setono · Feb 27, 2023 · 1f575d4 · 1f575d4
2 parents 0d934ad + 258b1ad
commit 1f575d4
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 18 deletions.
diff --git a/src/Applicator/GiftCardApplicator.php b/src/Applicator/GiftCardApplicator.php
@@ -4,7 +4,6 @@
 
 namespace Setono\SyliusGiftCardPlugin\Applicator;
 
-use Doctrine\Persistence\ObjectManager;
 use RuntimeException;
 use Setono\SyliusGiftCardPlugin\Exception\ChannelMismatchException;
 use Setono\SyliusGiftCardPlugin\Exception\GiftCardNotFoundException;
@@ -19,16 +18,12 @@ final class GiftCardApplicator implements GiftCardApplicatorInterface
 
     private OrderProcessorInterface $orderProcessor;
 
-    private ObjectManager $orderManager;
-
     public function __construct(
         GiftCardRepositoryInterface $giftCardRepository,
-        OrderProcessorInterface $orderProcessor,
-        ObjectManager $orderManager
+        OrderProcessorInterface $orderProcessor
     ) {
         $this->giftCardRepository = $giftCardRepository;
         $this->orderProcessor = $orderProcessor;
-        $this->orderManager = $orderManager;
     }
 
     /**
@@ -65,8 +60,6 @@ public function apply(OrderInterface $order, $giftCard): void
         $order->addGiftCard($giftCard);
 
         $this->orderProcessor->process($order);
-
-        $this->orderManager->flush();
     }
 
     /**
@@ -81,8 +74,6 @@ public function remove(OrderInterface $order, $giftCard): void
         $order->removeGiftCard($giftCard);
 
         $this->orderProcessor->process($order);
-
-        $this->orderManager->flush();
     }
 
     private function getGiftCard(string $giftCardCode): GiftCardInterface

diff --git a/src/Controller/Action/AddGiftCardToOrderAction.php b/src/Controller/Action/AddGiftCardToOrderAction.php
@@ -4,6 +4,8 @@
 
 namespace Setono\SyliusGiftCardPlugin\Controller\Action;
 
+use Doctrine\Persistence\ManagerRegistry;
+use Setono\DoctrineObjectManagerTrait\ORM\ORMManagerTrait;
 use Setono\SyliusGiftCardPlugin\Applicator\GiftCardApplicatorInterface;
 use Setono\SyliusGiftCardPlugin\Form\Type\AddGiftCardToOrderType;
 use Setono\SyliusGiftCardPlugin\Model\OrderInterface;
@@ -20,6 +22,8 @@
 
 final class AddGiftCardToOrderAction
 {
+    use ORMManagerTrait;
+
     private FormFactoryInterface $formFactory;
 
     private CartContextInterface $cartContext;
@@ -35,13 +39,15 @@ public function __construct(
         CartContextInterface $cartContext,
         GiftCardApplicatorInterface $giftCardApplicator,
         RedirectUrlResolverInterface $redirectRouteResolver,
-        Environment $twig
+        Environment $twig,
+        ManagerRegistry $managerRegistry
     ) {
         $this->formFactory = $formFactory;
         $this->cartContext = $cartContext;
         $this->giftCardApplicator = $giftCardApplicator;
         $this->redirectRouteResolver = $redirectRouteResolver;
         $this->twig = $twig;
+        $this->managerRegistry = $managerRegistry;
     }
 
     public function __invoke(Request $request): Response
@@ -62,6 +68,8 @@ public function __invoke(Request $request): Response
             Assert::notNull($giftCard);
             $this->giftCardApplicator->apply($order, $giftCard);
 
+            $this->getManager($order)->flush();
+
             $session = $request->getSession();
             if ($session instanceof Session) {
                 $session->getFlashBag()->add('success', 'setono_sylius_gift_card.gift_card_added');

diff --git a/src/Controller/Action/RemoveGiftCardFromOrderAction.php b/src/Controller/Action/RemoveGiftCardFromOrderAction.php
@@ -4,6 +4,8 @@
 
 namespace Setono\SyliusGiftCardPlugin\Controller\Action;
 
+use Doctrine\Persistence\ManagerRegistry;
+use Setono\DoctrineObjectManagerTrait\ORM\ORMManagerTrait;
 use Setono\SyliusGiftCardPlugin\Applicator\GiftCardApplicatorInterface;
 use Setono\SyliusGiftCardPlugin\Model\GiftCardInterface;
 use Setono\SyliusGiftCardPlugin\Model\OrderInterface;
@@ -17,6 +19,8 @@
 
 final class RemoveGiftCardFromOrderAction
 {
+    use ORMManagerTrait;
+
     private CartContextInterface $cartContext;
 
     private GiftCardApplicatorInterface $giftCardApplicator;
@@ -26,11 +30,13 @@ final class RemoveGiftCardFromOrderAction
     public function __construct(
         CartContextInterface $cartContext,
         GiftCardApplicatorInterface $giftCardApplicator,
-        RedirectUrlResolverInterface $redirectRouteResolver
+        RedirectUrlResolverInterface $redirectRouteResolver,
+        ManagerRegistry $managerRegistry
     ) {
         $this->cartContext = $cartContext;
         $this->giftCardApplicator = $giftCardApplicator;
         $this->redirectRouteResolver = $redirectRouteResolver;
+        $this->managerRegistry = $managerRegistry;
     }
 
     public function __invoke(Request $request): Response
@@ -44,6 +50,8 @@ public function __invoke(Request $request): Response
 
         $this->giftCardApplicator->remove($order, $giftCard);
 
+        $this->getManager($order)->flush();
+
         $session = $request->getSession();
         if ($session instanceof Session) {
             $session->getFlashBag()->add('success', 'setono_sylius_gift_card.gift_card_removed');

diff --git a/src/Resources/config/services/applicator.xml b/src/Resources/config/services/applicator.xml
@@ -3,15 +3,11 @@
 <container xmlns="http://symfony.com/schema/dic/services"
            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
-
     <services>
         <service id="setono_sylius_gift_card.applicator.gift_card"
                  class="Setono\SyliusGiftCardPlugin\Applicator\GiftCardApplicator">
-            <argument type="service" id="setono_sylius_gift_card.repository.gift_card" />
-            <argument type="service" id="sylius.order_processing.order_processor.composite" />
-            <argument type="service" id="sylius.manager.order" />
+            <argument type="service" id="setono_sylius_gift_card.repository.gift_card"/>
+            <argument type="service" id="sylius.order_processing.order_processor.composite"/>
         </service>
-
     </services>
-
 </container>
diff --git a/src/Resources/config/services/controller.xml b/src/Resources/config/services/controller.xml
@@ -14,13 +14,15 @@
             <argument type="service" id="setono_sylius_gift_card.applicator.gift_card"/>
             <argument type="service" id="setono_sylius_gift_card.resolver.redirect_url"/>
             <argument type="service" id="twig"/>
+            <argument type="service" id="doctrine"/>
         </service>
 
         <service id="setono_sylius_gift_card.controller.action.remove_gift_card_from_order"
                  class="Setono\SyliusGiftCardPlugin\Controller\Action\RemoveGiftCardFromOrderAction">
             <argument type="service" id="sylius.context.cart"/>
             <argument type="service" id="setono_sylius_gift_card.applicator.gift_card"/>
             <argument type="service" id="setono_sylius_gift_card.resolver.redirect_url"/>
+            <argument type="service" id="doctrine"/>
         </service>
 
         <service id="setono_sylius_gift_card.controller.action.gift_card_balance"