Merge pull request #171 from BitBagCommerce/OPSRC-672/Validate_creati…

…ng_wishlist Opsrc 672/validate creating wishlist
BitBagCommerce · Aug 24, 2022 · 6d6b7fc · 6d6b7fc
2 parents 36c7c84 + dec396b
commit 6d6b7fc
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/src/CommandHandler/Wishlist/CreateNewWishlistHandler.php b/src/CommandHandler/Wishlist/CreateNewWishlistHandler.php
@@ -72,7 +72,11 @@ public function __invoke(CreateNewWishlist $createNewWishlist): void
             $wishlist->setChannel($channel);
         }
 
-        $wishlists = $this->wishlistRepository->findAllByToken($wishlistCookieToken);
+        if ($user instanceof ShopUserInterface) {
+            $wishlists = $this->wishlistRepository->findAllByShopUser($user->getId());
+        } else {
+            $wishlists = $this->wishlistRepository->findAllByAnonymous($wishlistCookieToken);
+        }
 
         /** @var WishlistInterface $wishlist */
         foreach ($wishlists as $newWishlist) {

diff --git a/src/Repository/WishlistRepository.php b/src/Repository/WishlistRepository.php
@@ -25,7 +25,7 @@ public function findOneByShopUser(ShopUserInterface $shopUser): ?WishlistInterfa
             ->getQuery()
             ->setMaxResults(1)
             ->getOneOrNullResult()
-        ;
+            ;
     }
 
     public function findByToken(string $token): ?WishlistInterface
@@ -36,7 +36,7 @@ public function findByToken(string $token): ?WishlistInterface
             ->getQuery()
             ->setMaxResults(1)
             ->getOneOrNullResult()
-        ;
+            ;
     }
 
     public function findAllByToken(string $token): ?array
@@ -104,7 +104,7 @@ public function findAllByAnonymousAndChannel(?string $token, ChannelInterface $c
             ->andWhere('o.channel = :channel')
             ->andWhere('o.shopUser IS NULL')
             ->setParameter('channel', $channel)
-            ;
+        ;
 
         if (null !== $token) {
             $qb
@@ -140,5 +140,4 @@ public function findOneByShopUserAndName(ShopUserInterface $shopUser, string $na
             ->getOneOrNullResult()
             ;
     }
-
 }