[SSP-2065] customer's user cart is now overwritten with the incoming cart if logged in in 3rd order step

UPGRADE-14.0.md

@@ -991,3 +991,8 @@ Follow the instructions in relevant sections, e.g. `shopsys/coding-standards` or
     -   fix Add to cart popup product link type
     -   fix Bestsellers product link type
 -   add scroll to cart order personal pick up place select modal ([#2979](https://github.com/shopsys/shopsys/pull/2979))
+
+-   customer's user cart is now overwritten with the incoming cart if logged in in 3rd order step ([#2978](https://github.com/shopsys/shopsys/pull/2978))
+    -   new optional parameter `shouldOverwriteCustomerUserCart` was added to `LoginMutation`
+    -   you can use it if in certain scenarios it makes more sense to overwrite customer user's cart instead of merging it
+    -   see #project-base-diff to update your project

packages/frontend-api/src/Resources/config/graphql-types/LoginInputDecorator.types.yaml

@@ -13,3 +13,7 @@ LoginInputDecorator:
                 type: "[Uuid!]!"
                 description: "Uuids of product lists that should be merged to the product lists of the user"
                 defaultValue: []
+            shouldOverwriteCustomerUserCart:
+                type: "Boolean!"
+                description: "A boolean pointer to indicate if the current customer user cart should be overwritten by the cart with cartUuid"
+                defaultValue: false

project-base/app/schema.graphql

@@ -776,6 +776,8 @@ input LoginInput {
   password: Password!
   "Uuids of product lists that should be merged to the product lists of the user"
   productListsUuids: [Uuid!]! = []
+  "A boolean pointer to indicate if the current customer user cart should be overwritten by the cart with cartUuid"
+  shouldOverwriteCustomerUserCart: Boolean! = false
 }
 
 type LoginResult {

project-base/app/src/FrontendApi/Model/Cart/MergeCartFacade.php

@@ -42,6 +42,22 @@ public function mergeCartByUuidToCustomerCart(string $cartUuid, CustomerUser $cu
         $this->mergeCarts($oldCart, $customerCart);
     }
 
+    /**
+     * @param string $cartUuid
+     * @param \App\Model\Customer\User\CustomerUser $customerUser
+     */
+    public function overwriteCustomerCartWithCartByUuid(string $cartUuid, CustomerUser $customerUser): void
+    {
+        $oldCart = $this->cartFacade->getCartCreateIfNotExists(null, $cartUuid);
+        $customerCart = $this->cartFacade->getCartCreateIfNotExists($customerUser, null);
+
+        $oldCart->assignCartToCustomerUser($customerUser);
+
+        $this->entityManager->flush();
+
+        $this->cartFacade->deleteCart($customerCart);
+    }
+
     /**
      * @param \App\Model\Cart\Cart $cart
      * @param \App\Model\Cart\Cart $currentCart

project-base/app/src/FrontendApi/Mutation/Login/LoginMutation.php

@@ -74,7 +74,11 @@ public function loginWithResultMutation(Argument $argument): array
         }
 
         if (array_key_exists('cartUuid', $input) && $input['cartUuid'] !== null) {
-            $this->mergeCartFacade->mergeCartByUuidToCustomerCart($input['cartUuid'], $user);
+            if (array_key_exists('shouldOverwriteCustomerUserCart', $input) && $input['shouldOverwriteCustomerUserCart']) {
+                $this->mergeCartFacade->overwriteCustomerCartWithCartByUuid($input['cartUuid'], $user);
+            } else {
+                $this->mergeCartFacade->mergeCartByUuidToCustomerCart($input['cartUuid'], $user);
+            }
         }
 
         if (array_key_exists('productListsUuids', $input)) {

project-base/app/src/Model/Cart/Cart.php

@@ -317,4 +317,14 @@ public function setPaymentWatchedPrice(?Money $paymentWatchedPrice): void
     {
         $this->paymentWatchedPrice = $paymentWatchedPrice;
     }
+
+    /**
+     * @param \App\Model\Customer\User\CustomerUser|null $customerUser
+     */
+    public function assignCartToCustomerUser(?CustomerUser $customerUser): void
+    {
+        $this->customerUser = $customerUser;
+        $this->cartIdentifier = '';
+        $this->setModifiedNow();
+    }
 }

project-base/app/tests/FrontendApiBundle/Functional/Cart/MergeCartsTest.php

@@ -96,6 +96,55 @@ public function testCartIsMergedAfterLogin(): void
         self::assertNull($oldCart);
     }
 
+    public function testCartIsOverwrittenAfterLogin(): void
+    {
+        /** @var \App\Model\Product\Product $productAddedToCustomerUserCart */
+        $productAddedToCustomerUserCart = $this->getReference(ProductDataFixture::PRODUCT_PREFIX . '5');
+        $productAddedToCustomerUserCartQuantity = 6;
+        $this->addProductToCustomerCart($productAddedToCustomerUserCart, $productAddedToCustomerUserCartQuantity);
+
+        /** @var \App\Model\Product\Product $productAddedToCustomerUserCart2 */
+        $productAddedToCustomerUserCart2 = $this->getReference(ProductDataFixture::PRODUCT_PREFIX . '1');
+        $productAddedToCustomerUserCart2Quantity = 1;
+        $this->addProductToCustomerCart($productAddedToCustomerUserCart2, $productAddedToCustomerUserCart2Quantity);
+
+        $testCartUuid = CartDataFixture::CART_UUID;
+
+        $response = $this->getResponseContentForGql(
+            __DIR__ . '/graphql/OverwriteCartAfterLogin.graphql',
+            [
+                'email' => 'no-reply@shopsys.com',
+                'password' => 'user123',
+                'cartUuid' => $testCartUuid,
+                'shouldOverwriteCustomerUserCart' => true,
+            ],
+        );
+
+        $data = $this->getResponseDataForGraphQlType($response, 'Login');
+
+        $cart = $this->findCartOfCurrentCustomer();
+
+        self::assertNotNull($cart);
+
+        self::assertFalse($data['showCartMergeInfo']);
+
+        $cartItems = $cart->getItems();
+        self::assertCount(2, $cartItems);
+
+        /** @var \App\Model\Product\Product $firstProduct */
+        $firstProduct = $this->getReference(ProductDataFixture::PRODUCT_PREFIX . '72');
+        self::assertEquals($firstProduct->getFullname(), $cartItems[0]->getName(), 'First product name mismatch');
+        self::assertEquals(2, $cartItems[0]->getQuantity(), 'First product quantity mismatch');
+
+        /** @var \App\Model\Product\Product $secondProduct */
+        $secondProduct = $this->getReference(ProductDataFixture::PRODUCT_PREFIX . '1');
+        self::assertEquals($secondProduct->getFullname(), $cartItems[1]->getName(), 'Second product name mismatch');
+        self::assertEquals(2, $cartItems[1]->getQuantity(), 'Second product quantity mismatch');
+
+        $oldCart = $this->cartFacade->findCartByCartIdentifier($testCartUuid);
+        self::assertNull($oldCart);
+    }
+
     public function testCartIsMergedAfterRegister(): void
     {
         $testCartUuid = CartDataFixture::CART_UUID;

project-base/app/tests/FrontendApiBundle/Functional/Cart/graphql/OverwriteCartAfterLogin.graphql

@@ -0,0 +1,21 @@
+mutation OverwriteCartAfterLogin(
+    $email: String!
+    $password: Password!
+    $cartUuid: Uuid
+    $shouldOverwriteCustomerUserCart: Boolean!
+) {
+    Login(
+        input: {
+            email: $email
+            password: $password
+            cartUuid: $cartUuid
+            shouldOverwriteCustomerUserCart: $shouldOverwriteCustomerUserCart
+        }
+    ) {
+        tokens {
+            accessToken
+            refreshToken
+        }
+        showCartMergeInfo
+    }
+}

project-base/storefront/components/Blocks/Popup/Login/Login.tsx

@@ -22,11 +22,12 @@ import * as Yup from 'yup';
 
 type LoginProps = {
     defaultEmail?: string;
+    shouldOverwriteCustomerUserCart?: boolean;
 };
 
 const TEST_IDENTIFIER = 'blocks-popup-login';
 
-export const Login: FC<LoginProps> = ({ defaultEmail }) => {
+export const Login: FC<LoginProps> = ({ defaultEmail, shouldOverwriteCustomerUserCart }) => {
     const { t } = useTranslation();
     const cartUuid = usePersistStore((store) => store.cartUuid);
     const { url } = useDomainConfig();
@@ -44,6 +45,7 @@ export const Login: FC<LoginProps> = ({ defaultEmail }) => {
             email: data.email,
             password: data.password,
             previousCartUuid: cartUuid,
+            shouldOverwriteCustomerUserCart,
         });
 
         handleFormErrors(

project-base/storefront/graphql/docs/schema.md

@@ -8617,6 +8617,15 @@ The user password.
 
 Uuids of product lists that should be merged to the product lists of the user
 
+</td>
+</tr>
+<tr>
+<td colspan="2" valign="top"><strong>shouldOverwriteCustomerUserCart</strong></td>
+<td valign="top"><a href="#boolean">Boolean</a>!</td>
+<td>
+
+A boolean pointer to indicate if the current customer user cart should be overwritten by the cart with cartUuid
+
 </td>
 </tr>
 </tbody>

project-base/storefront/graphql/generated/index.tsx

@@ -944,6 +944,8 @@ export type LoginInputApi = {
   password: Scalars['Password']['input'];
   /** Uuids of product lists that should be merged to the product lists of the user */
   productListsUuids: Array<Scalars['Uuid']['input']>;
+  /** A boolean pointer to indicate if the current customer user cart should be overwritten by the cart with cartUuid */
+  shouldOverwriteCustomerUserCart: Scalars['Boolean']['input'];
 };
 
 export type LoginResultApi = {
@@ -2923,6 +2925,7 @@ export type LoginVariablesApi = Exact<{
   password: Scalars['Password']['input'];
   previousCartUuid: InputMaybe<Scalars['Uuid']['input']>;
   productListsUuids: Array<Scalars['Uuid']['input']> | Scalars['Uuid']['input'];
+  shouldOverwriteCustomerUserCart?: InputMaybe<Scalars['Boolean']['input']>;
 }>;
 
 
@@ -5100,9 +5103,9 @@ export function useBlogArticlesQueryApi(options?: Omit<Urql.UseQueryArgs<BlogArt
   return Urql.useQuery<BlogArticlesQueryApi, BlogArticlesQueryVariablesApi>({ query: BlogArticlesQueryDocumentApi, ...options });
 };
 export const LoginDocumentApi = gql`
-    mutation Login($email: String!, $password: Password!, $previousCartUuid: Uuid, $productListsUuids: [Uuid!]!) {
+    mutation Login($email: String!, $password: Password!, $previousCartUuid: Uuid, $productListsUuids: [Uuid!]!, $shouldOverwriteCustomerUserCart: Boolean = false) {
   Login(
-    input: {email: $email, password: $password, cartUuid: $previousCartUuid, productListsUuids: $productListsUuids}
+    input: {email: $email, password: $password, cartUuid: $previousCartUuid, productListsUuids: $productListsUuids, shouldOverwriteCustomerUserCart: $shouldOverwriteCustomerUserCart}
   ) {
     tokens {
       ...TokenFragments

project-base/storefront/graphql/requests/auth/mutations/LoginMutation.graphql

@@ -1,5 +1,19 @@
-mutation Login($email: String!, $password: Password!, $previousCartUuid: Uuid, $productListsUuids: [Uuid!]!) {
-    Login(input: { email: $email, password: $password, cartUuid: $previousCartUuid, productListsUuids: $productListsUuids }) {
+mutation Login(
+    $email: String!
+    $password: Password!
+    $previousCartUuid: Uuid
+    $productListsUuids: [Uuid!]!
+    $shouldOverwriteCustomerUserCart: Boolean = false
+) {
+    Login(
+        input: {
+            email: $email
+            password: $password
+            cartUuid: $previousCartUuid
+            productListsUuids: $productListsUuids
+            shouldOverwriteCustomerUserCart: $shouldOverwriteCustomerUserCart
+        }
+    ) {
         tokens {
             ...TokenFragments
         }

project-base/storefront/pages/order/contact-information.tsx

@@ -25,7 +25,6 @@ import { useGtmPageViewEvent } from 'gtm/hooks/useGtmPageViewEvent';
 import { GtmMessageOriginType, GtmPageType } from 'gtm/types/enums';
 import { handleFormErrors } from 'helpers/forms/handleFormErrors';
 import { getInternationalizedStaticUrls } from 'helpers/getInternationalizedStaticUrls';
-import { isStoreHydrated } from 'helpers/isStoreHydrated';
 import { getIsPaymentWithPaymentGate } from 'helpers/mappers/payment';
 import { getServerSidePropsWrapper } from 'helpers/serverSide/getServerSidePropsWrapper';
 import { initServerSideProps, ServerSidePropsType } from 'helpers/serverSide/initServerSideProps';
@@ -54,8 +53,8 @@ const ContactInformationPage: FC<ServerSidePropsType> = () => {
     const updateCartUuid = usePersistStore((store) => store.updateCartUuid);
     const resetContactInformation = usePersistStore((store) => store.resetContactInformation);
     const customer = usePersistStore((store) => store.contactInformation.customer);
-    const [transportAndPaymentUrl, orderConfirmationUrl, cartUrl] = getInternationalizedStaticUrls(
-        ['/order/transport-and-payment', '/order-confirmation', '/cart'],
+    const [transportAndPaymentUrl, orderConfirmationUrl] = getInternationalizedStaticUrls(
+        ['/order/transport-and-payment', '/order-confirmation'],
         domainConfig.url,
     );
     const [orderCreating, setOrderCreating] = useState(false);
@@ -88,16 +87,6 @@ const ContactInformationPage: FC<ServerSidePropsType> = () => {
         }
     }, []);
 
-    useEffect(() => {
-        if (currentCart.cart !== undefined) {
-            if (!currentCart.cart?.items.length) {
-                router.replace(cartUrl);
-            } else if (!(currentCart.transport && currentCart.payment)) {
-                router.replace(transportAndPaymentUrl);
-            }
-        }
-    }, [currentCart.cart, currentCart.cart?.items, currentCart.transport, currentCart.payment, isStoreHydrated()]);
-
     const onCreateOrderHandler: SubmitHandler<typeof defaultValues> = async (formValues) => {
         setOrderCreating(true);
 
@@ -267,7 +256,7 @@ const ContactInformationPage: FC<ServerSidePropsType> = () => {
                         {isLoginPopupOpened && (
                             <Popup onCloseCallback={() => setIsLoginPopupOpened(false)}>
                                 <div className="h2 mb-3">{t('Login')}</div>
-                                <Login defaultEmail={emailValue} />
+                                <Login shouldOverwriteCustomerUserCart defaultEmail={emailValue} />
                             </Popup>
                         )}
                     </>