OP-291: Refactor, simplify processing logic

BitBagCommerce · Jul 22, 2024 · 6561922 · 6561922
1 parent 1984c2d
commit 6561922
Show file tree

Hide file tree

Showing 10 changed files with 18 additions and 62 deletions.
diff --git a/spec/Checker/ProductProcessingCheckerSpec.php b/spec/Checker/ProductProcessingCheckerSpec.php
@@ -22,14 +22,6 @@
 
 final class ProductProcessingCheckerSpec extends ObjectBehavior
 {
-    public function let(
-        ProductQuantityCheckerInterface $productQuantityChecker,
-    ): void {
-        $this->beConstructedWith(
-            $productQuantityChecker,
-        );
-    }
-
     public function it_is_initializable(): void
     {
         $this->shouldHaveType(ProductProcessingChecker::class);
@@ -39,44 +31,22 @@ public function it_can_be_processed(
         WishlistItem $wishlistProduct,
         AddToCartCommandInterface $addToCartCommand,
         OrderItemInterface $orderItem,
-        ProductQuantityCheckerInterface $productQuantityChecker,
     ): void {
         $wishlistProduct->getCartItem()->willReturn($addToCartCommand);
         $addToCartCommand->getCartItem()->willReturn($orderItem);
-        $wishlistProduct->getOrderItemQuantity()->willReturn(5);
-        $productQuantityChecker->hasPositiveQuantity($orderItem)->willReturn(true);
+        $orderItem->getQuantity()->willReturn(5);
 
         $this->canBeProcessed($wishlistProduct)->shouldReturn(true);
     }
 
-    public function it_can_not_be_processed_due_to_lack_in_stock(
-        WishlistItem $wishlistProduct,
-        AddToCartCommandInterface $addToCartCommand,
-        OrderItemInterface $orderItem,
-        ProductQuantityCheckerInterface $productQuantityChecker,
-        FlashBagInterface $flashBag,
-        TranslatorInterface $translator,
-    ): void {
-        $wishlistProduct->getCartItem()->willReturn($addToCartCommand);
-        $addToCartCommand->getCartItem()->willReturn($orderItem);
-        $wishlistProduct->getOrderItemQuantity()->willReturn(5);
-        $productQuantityChecker->hasPositiveQuantity($orderItem)->willReturn(false);
-
-        $this->canBeProcessed($wishlistProduct)->shouldReturn(false);
-    }
-
-    public function it_can_not_be_processed_due_to_lack_in_quantity(
+    public function it_cannot_be_processed(
         WishlistItem $wishlistProduct,
         AddToCartCommandInterface $addToCartCommand,
         OrderItemInterface $orderItem,
-        ProductQuantityCheckerInterface $productQuantityChecker,
-        FlashBagInterface $flashBag,
-        TranslatorInterface $translator,
     ): void {
         $wishlistProduct->getCartItem()->willReturn($addToCartCommand);
         $addToCartCommand->getCartItem()->willReturn($orderItem);
-        $wishlistProduct->getOrderItemQuantity()->willReturn(0);
-        $productQuantityChecker->hasPositiveQuantity($orderItem)->willReturn(false);
+        $orderItem->getQuantity()->willReturn(0);
 
         $this->canBeProcessed($wishlistProduct)->shouldReturn(false);
     }

diff --git a/spec/CommandHandler/Wishlist/CreateNewWishlistHandlerSpec.php b/spec/CommandHandler/Wishlist/CreateNewWishlistHandlerSpec.php
@@ -11,7 +11,6 @@
 
 namespace spec\BitBag\SyliusWishlistPlugin\CommandHandler\Wishlist;
 
-use BitBag\SyliusWishlistPlugin\Checker\WishlistNameCheckerInterface;
 use BitBag\SyliusWishlistPlugin\Command\Wishlist\CreateNewWishlist;
 use BitBag\SyliusWishlistPlugin\CommandHandler\Wishlist\CreateNewWishlistHandler;
 use BitBag\SyliusWishlistPlugin\Entity\WishlistInterface;
@@ -35,7 +34,6 @@ public function let(
         WishlistFactoryInterface $wishlistFactory,
         WishlistCookieTokenResolverInterface $wishlistCookieTokenResolver,
         ChannelRepositoryInterface $channelRepository,
-        WishlistNameCheckerInterface $wishlistNameChecker,
         TokenUserResolverInterface $tokenUserResolver,
     ): void {
         $this->beConstructedWith(
@@ -44,7 +42,6 @@ public function let(
             $wishlistFactory,
             $wishlistCookieTokenResolver,
             $channelRepository,
-            $wishlistNameChecker,
             $tokenUserResolver,
         );
     }
@@ -59,7 +56,6 @@ public function it_creates_new_wishlist_for_user(
         TokenStorageInterface $tokenStorage,
         WishlistFactoryInterface $wishlistFactory,
         WishlistCookieTokenResolverInterface $wishlistCookieTokenResolver,
-        WishlistNameCheckerInterface $wishlistNameChecker,
         ChannelRepositoryInterface $channelRepository,
         TokenInterface $token,
         ShopUserInterface $shopUser,
@@ -85,7 +81,6 @@ public function it_creates_new_wishlist_for_user(
         $wishlist->setChannel($channel)->shouldBeCalled();
 
         $existingWishlist->getName()->willReturn('existing');
-        $wishlistNameChecker->check('existing', 'New wishlist')->willReturn(false);
         $wishlist->setName('New wishlist');
 
         $wishlistRepository->add($wishlist)->shouldBeCalled();
@@ -132,7 +127,6 @@ public function it_doesnt_add_duplicated_wishlist_name_for_user(
         TokenStorageInterface $tokenStorage,
         WishlistFactoryInterface $wishlistFactory,
         WishlistCookieTokenResolverInterface $wishlistCookieTokenResolver,
-        WishlistNameCheckerInterface $wishlistNameChecker,
         ChannelRepositoryInterface $channelRepository,
         TokenInterface $token,
         ShopUserInterface $shopUser,
@@ -158,7 +152,6 @@ public function it_doesnt_add_duplicated_wishlist_name_for_user(
         $wishlist->setChannel($channel)->shouldBeCalled();
 
         $existingWishlist->getName()->willReturn('existing');
-        $wishlistNameChecker->check('existing', 'existing')->willReturn(true);
         $wishlist->setName('existing')->shouldNotBeCalled();
 
         $wishlistRepository->add($wishlist)->shouldNotBeCalled();

diff --git a/src/Checker/ProductProcessingChecker.php b/src/Checker/ProductProcessingChecker.php
@@ -16,11 +16,6 @@
 
 final class ProductProcessingChecker implements ProductProcessingCheckerInterface
 {
-    public function __construct(
-        private readonly ProductQuantityCheckerInterface $productQuantityChecker,
-    ) {
-    }
-
     public function canBeProcessed(WishlistItemInterface $wishlistItem): bool
     {
         /** @var ?AddToCartCommandInterface $addToCartCommand */
@@ -32,15 +27,6 @@ public function canBeProcessed(WishlistItemInterface $wishlistItem): bool
 
         $cartItem = $addToCartCommand->getCartItem();
 
-        return $this->isInStock($wishlistItem) && $this->productQuantityChecker->hasPositiveQuantity($cartItem);
-    }
-
-    private function isInStock(WishlistItemInterface $wishlistItem): bool
-    {
-        if (0 < $wishlistItem->getOrderItemQuantity()) {
-            return true;
-        }
-
-        return false;
+        return 0 < $cartItem->getQuantity();
     }
 }
diff --git a/src/Checker/ProductQuantityChecker.php b/src/Checker/ProductQuantityChecker.php
@@ -13,6 +13,9 @@
 
 use Sylius\Component\Order\Model\OrderItemInterface;
 
+/**
+ * @deprecated
+ */
 final class ProductQuantityChecker implements ProductQuantityCheckerInterface
 {
     public function hasPositiveQuantity(OrderItemInterface $product): bool

diff --git a/src/Checker/ProductQuantityCheckerInterface.php b/src/Checker/ProductQuantityCheckerInterface.php
@@ -13,6 +13,9 @@
 
 use Sylius\Component\Order\Model\OrderItemInterface;
 
+/**
+ * @deprecated
+ */
 interface ProductQuantityCheckerInterface
 {
     public function hasPositiveQuantity(OrderItemInterface $product): bool;

diff --git a/src/Checker/WishlistNameChecker.php b/src/Checker/WishlistNameChecker.php
@@ -11,6 +11,9 @@
 
 namespace BitBag\SyliusWishlistPlugin\Checker;
 
+/**
+ * @deprecated
+ */
 final class WishlistNameChecker implements WishlistNameCheckerInterface
 {
     public function check(string $existingWishlistName, string $wishlistToCreate): bool

diff --git a/src/Checker/WishlistNameCheckerInterface.php b/src/Checker/WishlistNameCheckerInterface.php
@@ -11,6 +11,9 @@
 
 namespace BitBag\SyliusWishlistPlugin\Checker;
 
+/**
+ * @deprecated
+ */
 interface WishlistNameCheckerInterface
 {
     public function check(string $existingWishlistName, string $wishlistToCreate): bool;

diff --git a/src/CommandHandler/Wishlist/CreateNewWishlistHandler.php b/src/CommandHandler/Wishlist/CreateNewWishlistHandler.php
@@ -11,7 +11,6 @@
 
 namespace BitBag\SyliusWishlistPlugin\CommandHandler\Wishlist;
 
-use BitBag\SyliusWishlistPlugin\Checker\WishlistNameCheckerInterface;
 use BitBag\SyliusWishlistPlugin\Command\Wishlist\CreateNewWishlist;
 use BitBag\SyliusWishlistPlugin\Entity\WishlistInterface;
 use BitBag\SyliusWishlistPlugin\Exception\WishlistNameIsTakenException;
@@ -34,7 +33,6 @@ public function __construct(
         private WishlistFactoryInterface $wishlistFactory,
         private WishlistCookieTokenResolverInterface $wishlistCookieTokenResolver,
         private ChannelRepositoryInterface $channelRepository,
-        private WishlistNameCheckerInterface $wishlistNameChecker,
         private TokenUserResolverInterface $tokenUserResolver,
     ) {
     }
@@ -73,7 +71,7 @@ public function __invoke(CreateNewWishlist $createNewWishlist): int
         } else {
             /** @var WishlistInterface $newWishlist */
             foreach ($wishlists as $newWishlist) {
-                if (!$this->wishlistNameChecker->check((string) $newWishlist->getName(), $createNewWishlist->getName())) {
+                if ((string) $newWishlist->getName() !== $createNewWishlist->getName()) {
                     $wishlist->setName($createNewWishlist->getName());
                 } else {
                     throw new WishlistNameIsTakenException();

diff --git a/src/Resources/config/services/checker.xml b/src/Resources/config/services/checker.xml
@@ -9,8 +9,6 @@
 
         <service id="bitbag_sylius_wishlist_plugin.services.product_quantity_checker" class="BitBag\SyliusWishlistPlugin\Checker\ProductQuantityChecker"/>
 
-        <service id="bitbag_sylius_wishlist_plugin.services.product_processing_checker" class="BitBag\SyliusWishlistPlugin\Checker\ProductProcessingChecker">
-            <argument type="service" id="bitbag_sylius_wishlist_plugin.services.product_quantity_checker"/>
-        </service>
+        <service id="bitbag_sylius_wishlist_plugin.services.product_processing_checker" class="BitBag\SyliusWishlistPlugin\Checker\ProductProcessingChecker"/>
     </services>
 </container>
diff --git a/src/Resources/config/services/message_handler.xml b/src/Resources/config/services/message_handler.xml
@@ -113,7 +113,6 @@
             <argument type="service" id="bitbag_sylius_wishlist_plugin.factory.wishlist"/>
             <argument type="service" id="bitbag_sylius_wishlist_plugin.resolver.wishlist_cookie_token_resolver"/>
             <argument type="service" id="sylius.repository.channel"/>
-            <argument type="service" id="bitbag_sylius_wishlist_plugin.checker.wishlist_name_checker"/>
             <argument type="service" id="bitbag_sylius_wishlist_plugin.resolver.token_user_resolver"/>
             <tag name="messenger.message_handler"/>
         </service>