From aae240ba345b7ad9ff77d4b76138c61d3bbaff81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joachim=20L=C3=B8vgaard?= <joachim@loevgaard.dk>
Date: Tue, 3 Dec 2024 09:19:44 +0100
Subject: [PATCH] Added some optimizations

---
 src/Checker/WishlistChecker.php               | 28 ++++++++++++++
 src/Checker/WishlistCheckerInterface.php      | 16 ++++++++
 .../FirstWishlistRedirectAction.php           |  1 -
 src/Provider/CachedWishlistProvider.php       | 38 +++++++++++++++++++
 src/Resources/config/services.xml             |  1 +
 src/Resources/config/services/checker.xml     | 12 ++++++
 src/Resources/config/services/provider.xml    |  5 +++
 src/Resources/config/services/twig.xml        |  2 +-
 src/Twig/Runtime.php                          | 22 ++---------
 9 files changed, 105 insertions(+), 20 deletions(-)
 create mode 100644 src/Checker/WishlistChecker.php
 create mode 100644 src/Checker/WishlistCheckerInterface.php
 create mode 100644 src/Provider/CachedWishlistProvider.php
 create mode 100644 src/Resources/config/services/checker.xml

diff --git a/src/Checker/WishlistChecker.php b/src/Checker/WishlistChecker.php
new file mode 100644
index 0000000..62f8524
--- /dev/null
+++ b/src/Checker/WishlistChecker.php
@@ -0,0 +1,28 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Setono\SyliusWishlistPlugin\Checker;
+
+use Setono\SyliusWishlistPlugin\Provider\WishlistProviderInterface;
+use Sylius\Component\Core\Model\ProductInterface;
+use Sylius\Component\Core\Model\ProductVariantInterface;
+
+final class WishlistChecker implements WishlistCheckerInterface
+{
+    public function __construct(private readonly WishlistProviderInterface $wishlistProvider)
+    {
+    }
+
+    public function onWishlist(ProductInterface|ProductVariantInterface $product): bool
+    {
+        foreach ($this->wishlistProvider->getWishlists() as $wishlist) {
+            $hasProduct = $product instanceof ProductInterface ? $wishlist->hasProduct($product) : $wishlist->hasProductVariant($product);
+            if ($hasProduct) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+}
diff --git a/src/Checker/WishlistCheckerInterface.php b/src/Checker/WishlistCheckerInterface.php
new file mode 100644
index 0000000..46bbdb5
--- /dev/null
+++ b/src/Checker/WishlistCheckerInterface.php
@@ -0,0 +1,16 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Setono\SyliusWishlistPlugin\Checker;
+
+use Sylius\Component\Core\Model\ProductInterface;
+use Sylius\Component\Core\Model\ProductVariantInterface;
+
+interface WishlistCheckerInterface
+{
+    /**
+     * Returns true if the given product/variant is on _any_ wishlist
+     */
+    public function onWishlist(ProductInterface|ProductVariantInterface $product): bool;
+}
diff --git a/src/Controller/FirstWishlistRedirectAction.php b/src/Controller/FirstWishlistRedirectAction.php
index 35a1462..5213339 100644
--- a/src/Controller/FirstWishlistRedirectAction.php
+++ b/src/Controller/FirstWishlistRedirectAction.php
@@ -16,7 +16,6 @@
  */
 final class FirstWishlistRedirectAction
 {
-
     public function __construct(
         private readonly WishlistProviderInterface $wishlistProvider,
         private readonly UrlGeneratorInterface $urlGenerator,
diff --git a/src/Provider/CachedWishlistProvider.php b/src/Provider/CachedWishlistProvider.php
new file mode 100644
index 0000000..1d1c7ed
--- /dev/null
+++ b/src/Provider/CachedWishlistProvider.php
@@ -0,0 +1,38 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Setono\SyliusWishlistPlugin\Provider;
+
+use Setono\SyliusWishlistPlugin\Model\WishlistInterface;
+
+final class CachedWishlistProvider implements WishlistProviderInterface
+{
+    /** @var list<WishlistInterface>|null */
+    private ?array $wishlists = null;
+
+    /** @var list<WishlistInterface>|null */
+    private ?array $preSelectedWishlists = null;
+
+    public function __construct(private readonly WishlistProviderInterface $decorated)
+    {
+    }
+
+    public function getWishlists(): array
+    {
+        if (null === $this->wishlists) {
+            $this->wishlists = $this->decorated->getWishlists();
+        }
+
+        return $this->wishlists;
+    }
+
+    public function getPreSelectedWishlists(): array
+    {
+        if (null === $this->preSelectedWishlists) {
+            $this->preSelectedWishlists = $this->decorated->getWishlists();
+        }
+
+        return $this->preSelectedWishlists;
+    }
+}
diff --git a/src/Resources/config/services.xml b/src/Resources/config/services.xml
index ca54dab..020f749 100644
--- a/src/Resources/config/services.xml
+++ b/src/Resources/config/services.xml
@@ -2,6 +2,7 @@
 <container xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://symfony.com/schema/dic/services"
            xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
     <imports>
+        <import resource="services/checker.xml"/>
         <import resource="services/controller.xml"/>
         <import resource="services/event_listener.xml"/>
         <import resource="services/event_subscriber.xml"/>
diff --git a/src/Resources/config/services/checker.xml b/src/Resources/config/services/checker.xml
new file mode 100644
index 0000000..ec6d95a
--- /dev/null
+++ b/src/Resources/config/services/checker.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<container xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://symfony.com/schema/dic/services"
+           xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
+    <services>
+        <service id="Setono\SyliusWishlistPlugin\Checker\WishlistCheckerInterface"
+                 alias="Setono\SyliusWishlistPlugin\Checker\WishlistChecker"/>
+
+        <service id="Setono\SyliusWishlistPlugin\Checker\WishlistChecker">
+            <argument type="service" id="Setono\SyliusWishlistPlugin\Provider\WishlistProviderInterface"/>
+        </service>
+    </services>
+</container>
diff --git a/src/Resources/config/services/provider.xml b/src/Resources/config/services/provider.xml
index b88eb0f..e2d3739 100644
--- a/src/Resources/config/services/provider.xml
+++ b/src/Resources/config/services/provider.xml
@@ -20,5 +20,10 @@
 
             <tag name="setono_sylius_wishlist.wishlist_provider" priority="-50"/>
         </service>
+
+        <service id="Setono\SyliusWishlistPlugin\Provider\CachedWishlistProvider"
+                 decorates="Setono\SyliusWishlistPlugin\Provider\WishlistProviderInterface" decoration-priority="64">
+            <argument type="service" id="Setono\SyliusWishlistPlugin\Provider\CachedWishlistProvider.inner"/>
+        </service>
     </services>
 </container>
diff --git a/src/Resources/config/services/twig.xml b/src/Resources/config/services/twig.xml
index 0a7333b..09df1fa 100644
--- a/src/Resources/config/services/twig.xml
+++ b/src/Resources/config/services/twig.xml
@@ -8,7 +8,7 @@
 
         <service id="Setono\SyliusWishlistPlugin\Twig\Runtime">
             <argument type="service" id="Setono\SyliusWishlistPlugin\Provider\WishlistProviderInterface"/>
-            <argument type="service" id="doctrine"/>
+            <argument type="service" id="Setono\SyliusWishlistPlugin\Checker\WishlistCheckerInterface"/>
 
             <tag name="twig.runtime"/>
         </service>
diff --git a/src/Twig/Runtime.php b/src/Twig/Runtime.php
index b263113..4e95ed4 100644
--- a/src/Twig/Runtime.php
+++ b/src/Twig/Runtime.php
@@ -4,8 +4,7 @@
 
 namespace Setono\SyliusWishlistPlugin\Twig;
 
-use Doctrine\Persistence\ManagerRegistry;
-use Setono\Doctrine\ORMTrait;
+use Setono\SyliusWishlistPlugin\Checker\WishlistCheckerInterface;
 use Setono\SyliusWishlistPlugin\Provider\WishlistProviderInterface;
 use Sylius\Component\Core\Model\ProductInterface;
 use Sylius\Component\Core\Model\ProductVariantInterface;
@@ -13,32 +12,19 @@
 
 final class Runtime implements RuntimeExtensionInterface
 {
-    use ORMTrait;
-
     public function __construct(
         private readonly WishlistProviderInterface $wishlistProvider,
-        ManagerRegistry $managerRegistry,
+        private readonly WishlistCheckerInterface $wishlistChecker,
     ) {
-        $this->managerRegistry = $managerRegistry;
     }
 
     public function onWishlist(ProductInterface|ProductVariantInterface $product): bool
     {
-        // todo should be optimized
-        foreach ($this->wishlistProvider->getWishlists() as $wishlist) {
-            $hasProduct = $product instanceof ProductInterface ? $wishlist->hasProduct($product) : $wishlist->hasProductVariant($product);
-            if ($hasProduct) {
-                return true;
-            }
-        }
-
-        return false;
+        return $this->wishlistChecker->onWishlist($product);
     }
 
     public function hasWishlist(): bool
     {
-        $wishlist = $this->wishlistProvider->getWishlists()[0];
-
-        return $this->getManager($wishlist)->contains($wishlist);
+        return $this->wishlistProvider->getWishlists() !== [];
     }
 }