fixup! API now allows for cart overwrite during login

shopsys · Jan 10, 2024 · 91c6766 · 91c6766
1 parent 407aff1
commit 91c6766
Show file tree

Hide file tree

Showing 10 changed files with 49 additions and 37 deletions.
diff --git a/packages/frontend-api/src/Resources/config/graphql-types/LoginInputDecorator.types.yaml b/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
diff --git a/project-base/app/config/graphql/types/ModelType/Security/SecurityInput/LoginInput.types.yaml b/project-base/app/config/graphql/types/ModelType/Security/SecurityInput/LoginInput.types.yaml
@@ -8,7 +8,3 @@ LoginInput:
                 type: "Uuid"
                 description: "Uuid of the cart that should be merged to the cart of the user"
                 defaultValue: null
-            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
diff --git a/project-base/app/schema.graphql b/project-base/app/schema.graphql
@@ -777,7 +777,7 @@ input LoginInput {
   "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
+  shouldOverwriteCustomerUserCart: Boolean! = false
 }
 
 type LoginResult {

diff --git a/project-base/app/src/FrontendApi/Model/Cart/MergeCartFacade.php b/project-base/app/src/FrontendApi/Model/Cart/MergeCartFacade.php
@@ -52,7 +52,6 @@ public function overwriteCustomerCartWithCartByUuid(string $cartUuid, CustomerUs
         $customerCart = $this->cartFacade->getCartCreateIfNotExists($customerUser, null);
 
         $oldCart->assignCartToCustomerUser($customerUser);
-        $oldCart->setModifiedNow();
 
         $this->entityManager->flush();
 

diff --git a/project-base/app/src/Model/Cart/Cart.php b/project-base/app/src/Model/Cart/Cart.php
@@ -325,5 +325,6 @@ public function assignCartToCustomerUser(?CustomerUser $customerUser): void
     {
         $this->customerUser = $customerUser;
         $this->cartIdentifier = '';
+        $this->setModifiedNow();
     }
 }
diff --git a/project-base/app/tests/FrontendApiBundle/Functional/Cart/MergeCartsTest.php b/project-base/app/tests/FrontendApiBundle/Functional/Cart/MergeCartsTest.php
@@ -98,44 +98,35 @@ public function testCartIsMergedAfterLogin(): void
 
     public function testCartIsOverwrittenAfterLogin(): void
     {
-        /** @var \App\Model\Product\Product $anonymouslyAddedProduct */
-        $anonymouslyAddedProduct = $this->getReference(ProductDataFixture::PRODUCT_PREFIX . '5');
-        $anonymouslyAddedProductQuantity = 6;
-        $this->addProductToCustomerCart($anonymouslyAddedProduct, $anonymouslyAddedProductQuantity);
+        /** @var \App\Model\Product\Product $productAddedToCustomerUserCart */
+        $productAddedToCustomerUserCart = $this->getReference(ProductDataFixture::PRODUCT_PREFIX . '5');
+        $productAddedToCustomerUserCartQuantity = 6;
+        $this->addProductToCustomerCart($productAddedToCustomerUserCart, $productAddedToCustomerUserCartQuantity);
 
-        /** @var \App\Model\Product\Product $anonymouslyAddedProduct2 */
-        $anonymouslyAddedProduct2 = $this->getReference(ProductDataFixture::PRODUCT_PREFIX . '1');
-        $anonymouslyAddedProductQuantity2 = 1;
-        $this->addProductToCustomerCart($anonymouslyAddedProduct2, $anonymouslyAddedProductQuantity2);
+        /** @var \App\Model\Product\Product $productAddedToCustomerUserCart */
+        $productAddedToCustomerUserCart2 = $this->getReference(ProductDataFixture::PRODUCT_PREFIX . '1');
+        $productAddedToCustomerUserCart2Quantity = 1;
+        $this->addProductToCustomerCart($productAddedToCustomerUserCart2, $productAddedToCustomerUserCart2Quantity);
 
         $testCartUuid = CartDataFixture::CART_UUID;
 
-        $loginMutationWithCartUuid = 'mutation {
-                Login(input: {
-                    email: "no-reply@shopsys.com"
-                    password: "user123"
-                    cartUuid: "' . $testCartUuid . '"
-                    shouldOverwriteCustomerUserCart: true
-                }) {
-                    tokens {
-                        accessToken
-                        refreshToken
-                    }
-                    showCartMergeInfo
-                }
-            }
-        ';
-
-        $response = $this->getResponseDataForGraphQlType(
-            $this->getResponseContentForQuery($loginMutationWithCartUuid),
-            'Login',
+        $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($response['showCartMergeInfo']);
+        self::assertFalse($data['showCartMergeInfo']);
 
         $cartItems = $cart->getItems();
         self::assertCount(2, $cartItems);

diff --git a/...-base/app/tests/FrontendApiBundle/Functional/Cart/graphql/OverwriteCartAfterLogin.graphql b/...-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
+    }
+}
diff --git a/project-base/storefront/graphql/docs/schema.md b/project-base/storefront/graphql/docs/schema.md
@@ -8621,7 +8621,7 @@ Uuids of product lists that should be merged to the product lists of the user
 </tr>
 <tr>
 <td colspan="2" valign="top"><strong>shouldOverwriteCustomerUserCart</strong></td>
-<td valign="top"><a href="#boolean">Boolean</a></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

diff --git a/project-base/storefront/graphql/generated/index.tsx b/project-base/storefront/graphql/generated/index.tsx
@@ -945,7 +945,7 @@ export type LoginInputApi = {
   /** 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: InputMaybe<Scalars['Boolean']['input']>;
+  shouldOverwriteCustomerUserCart: Scalars['Boolean']['input'];
 };
 
 export type LoginResultApi = {

diff --git a/project-base/storefront/schema.graphql.json b/project-base/storefront/schema.graphql.json