chore(cart): expose active option (product+qty) for bundle products w…

…ithin the cart items
i-love-flamingo · Oct 26, 2023 · bd23c20 · bd23c20
1 parent 69ba5b1
commit bd23c20
Show file tree

Hide file tree

Showing 9 changed files with 225 additions and 98 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,7 @@
 * **Breaking**(In case you have implemented a custom cart service): Extend the cart service interface with `UpdateItemBundleConfig` to allow updating bundles that have already been placed inside the cart.
 * GraphQL:
   * Add new mutation `Commerce_Cart_UpdateItemBundleConfig` to update bundle configs for existing cart items
+  * Expose Active Option (product+qty) for bundle products within the cart items 
 
 **checkout**
 * initialize place order metrics with 0 on application start to follow prometheus best practices

diff --git a/product/interfaces/graphql/product/dto/productdto_bundleproduct.go b/product/interfaces/graphql/product/dto/productdto_bundleproduct.go
@@ -15,7 +15,10 @@ type (
 		Required   bool
 		Label      string
 		Options    []Option
-		Active     Product
+
+		// Deprecated: ActiveOption provides the product and quantity of the active choice
+		Active       Product
+		ActiveOption Option
 	}
 
 	Option struct {
@@ -128,7 +131,12 @@ func mapWithActiveChoices(domainChoices []productDomain.Choice, activeChoices ma
 	for i, choice := range choices {
 		activeChoice, ok := activeChoices[productDomain.Identifier(choice.Identifier)]
 		if ok {
-			choices[i].Active = NewGraphqlProductDto(activeChoice.Product, nil, nil)
+			product := NewGraphqlProductDto(activeChoice.Product, nil, nil)
+			choices[i].Active = product
+			choices[i].ActiveOption = Option{
+				Product: product,
+				Qty:     activeChoice.Qty,
+			}
 		}
 	}
 

diff --git a/product/interfaces/graphql/schema.graphql b/product/interfaces/graphql/schema.graphql
@@ -319,7 +319,8 @@ type Commerce_Product_Choice {
     required: Boolean!
     label: String!
     options: [Commerce_Product_Option!]
-    active: Commerce_Product
+    active: Commerce_Product @deprecated(reason: "use activeOption instead")
+    activeOption: Commerce_Product_Option
 }
 
 type Commerce_Product_Option {

diff --git a/test/integrationtest/projecttest/graphql/generated.go b/test/integrationtest/projecttest/graphql/generated.go
diff --git a/...raphql/schema/flamingo.me_flamingo-commerce_v3_product_interfaces_graphql-Service.graphql b/...raphql/schema/flamingo.me_flamingo-commerce_v3_product_interfaces_graphql-Service.graphql
@@ -319,7 +319,8 @@ type Commerce_Product_Choice {
     required: Boolean!
     label: String!
     options: [Commerce_Product_Option!]
-    active: Commerce_Product
+    active: Commerce_Product @deprecated(reason: "use activeOption instead")
+    activeOption: Commerce_Product_Option
 }
 
 type Commerce_Product_Option {

diff --git a/test/integrationtest/projecttest/tests/graphql/cart_test.go b/test/integrationtest/projecttest/tests/graphql/cart_test.go
@@ -223,37 +223,50 @@ func TestAddBundleProductToCart(t *testing.T) {
 		body := response.Expect().Body()
 
 		expected := `{
-					  "data": {
-						"Commerce_Cart_AddToCart": {
-						  "decoratedDeliveries": [
-							{
-							  "decoratedItems": [
-								{
-								  "product": {
-									"marketPlaceCode": "fake_bundle",
-									"choices": [
-									  {
-										"identifier": "identifier1",
-										"active": {
-										  "marketPlaceCode": "simple_option1"
-										}
-									  },
-									  {
-										"identifier": "identifier2",
-										"active": {
-										  "marketPlaceCode": "configurable_option2",
-										  "variantMarketPlaceCode": "shirt-red-s"
-										}
-									  }
-									]
-								  }
-								}
-							  ]
-							}
-						  ]
-						}
-					  }
-					}`
+  "data": {
+    "Commerce_Cart_AddToCart": {
+      "decoratedDeliveries": [
+        {
+          "decoratedItems": [
+            {
+              "product": {
+                "marketPlaceCode": "fake_bundle",
+                "choices": [
+                  {
+                    "identifier": "identifier1",
+                    "active": {
+                      "marketPlaceCode": "simple_option1"
+                    },
+                    "activeOption": {
+                      "product": {
+                        "marketPlaceCode": "simple_option1"
+                      },
+                      "qty": 1
+                    }
+                  },
+                  {
+                    "identifier": "identifier2",
+                    "active": {
+                      "marketPlaceCode": "configurable_option2",
+                      "variantMarketPlaceCode": "shirt-red-s"
+                    },
+                    "activeOption": {
+                      "product": {
+                        "marketPlaceCode": "configurable_option2",
+                        "variantMarketPlaceCode": "shirt-red-s"
+                      },
+                      "qty": 1
+                    }
+                  }
+                ]
+              }
+            }
+          ]
+        }
+      ]
+    }
+  }
+}`
 
 		expected = spaceMap(expected)
 		body.IsEqual(expected)
@@ -395,37 +408,50 @@ func TestUpdateBundleConfiguration(t *testing.T) {
 		body := updateResponse.Expect().Body()
 
 		expected := `{
-					  "data": {
-						"Commerce_Cart_UpdateItemBundleConfig": {
-						  "decoratedDeliveries": [
-							{
-							  "decoratedItems": [
-								{
-								  "product": {
-									"marketPlaceCode": "fake_bundle",
-									"choices": [
-									  {
-										"identifier": "identifier1",
-										"active": {
-										  "marketPlaceCode": "simple_option2"
-										}
-									  },
-									  {
-										"identifier": "identifier2",
-										"active": {
-										  "marketPlaceCode": "configurable_option1",
-										  "variantMarketPlaceCode": "shirt-red-m"
-										}
-									  }
-									]
-								  }
-								}
-							  ]
-							}
-						  ]
-						}
-					  }
-					}`
+  "data": {
+    "Commerce_Cart_UpdateItemBundleConfig": {
+      "decoratedDeliveries": [
+        {
+          "decoratedItems": [
+            {
+              "product": {
+                "marketPlaceCode": "fake_bundle",
+                "choices": [
+                  {
+                    "identifier": "identifier1",
+                    "active": {
+                      "marketPlaceCode": "simple_option2"
+                    },
+                    "activeOption": {
+                      "product": {
+                        "marketPlaceCode": "simple_option2"
+                      },
+                      "qty": 1
+                    }
+                  },
+                  {
+                    "identifier": "identifier2",
+                    "active": {
+                      "marketPlaceCode": "configurable_option1",
+                      "variantMarketPlaceCode": "shirt-red-m"
+                    },
+                    "activeOption": {
+                      "product": {
+                        "marketPlaceCode": "configurable_option1",
+                        "variantMarketPlaceCode": "shirt-red-m"
+                      },
+                      "qty": 1
+                    }
+                  }
+                ]
+              }
+            }
+          ]
+        }
+      ]
+    }
+  }
+}`
 
 		expected = spaceMap(expected)
 		body.IsEqual(expected)

diff --git a/...ationtest/projecttest/tests/graphql/testdata/Commerce_Cart_UpdateItemBundleConfig.graphql b/...ationtest/projecttest/tests/graphql/testdata/Commerce_Cart_UpdateItemBundleConfig.graphql
@@ -26,6 +26,15 @@ mutation {
                                     variantMarketPlaceCode
                                 }
                             }
+                            activeOption {
+                                product {
+                                    marketPlaceCode
+                                    ... on Commerce_Product_ActiveVariantProduct {
+                                        variantMarketPlaceCode
+                                    }
+                                }
+                                qty
+                            }
                         }
                     }
                 }

diff --git a/...ntest/projecttest/tests/graphql/testdata/Commerce_Cart_UpdateItemBundleConfig_one.graphql b/...ntest/projecttest/tests/graphql/testdata/Commerce_Cart_UpdateItemBundleConfig_one.graphql
@@ -21,6 +21,15 @@ mutation {
                                     variantMarketPlaceCode
                                 }
                             }
+                            activeOption {
+                                product {
+                                    marketPlaceCode
+                                    ... on Commerce_Product_ActiveVariantProduct {
+                                        variantMarketPlaceCode
+                                    }
+                                }
+                                qty
+                            }
                         }
                     }
                 }