fix/OP-565 [Wishlist] Issue with multiple wishlists using the same token

Author: Paweł Piórkowski

spec/CommandHandler/Wishlist/CreateNewWishlistHandlerSpec.php

@@ -74,6 +74,7 @@ public function it_creates_new_wishlist_for_user(
         $tokenUserResolver->resolve($token)->willReturn($shopUser);
 
         $wishlistCookieTokenResolver->resolve()->willReturn('token');
+        $wishlistCookieTokenResolver->new()->willReturn('token');
         $wishlistFactory->createForUser($shopUser)->willReturn($wishlist);
 
         $wishlist->getShopUser()->willReturn($shopUser);
@@ -147,6 +148,7 @@ public function it_doesnt_add_duplicated_wishlist_name_for_user(
         $tokenUserResolver->resolve($token)->willReturn($shopUser);
 
         $wishlistCookieTokenResolver->resolve()->willReturn('token');
+        $wishlistCookieTokenResolver->new()->willReturn('token');
         $wishlistFactory->createForUser($shopUser)->willReturn($wishlist);
 
         $wishlist->getShopUser()->willReturn($shopUser);

src/CommandHandler/Wishlist/CreateNewWishlistHandler.php

@@ -61,9 +61,9 @@ public function __invoke(CreateNewWishlist $createNewWishlist): int
 
         if ('' !== $wishlistCookieToken) {
             if ($user instanceof ShopUserInterface) {
-                $wishlist->setToken($wishlistCookieToken);
-            } else {
                 $wishlist->setToken($this->wishlistCookieTokenResolver->new());
+            } else {
+                $wishlist->setToken($wishlistCookieToken);
             }
         }