Merge pull request #202 from Shopify/cart-transform/fix-merge-bug

Fix CartTransform extension sample app

Author: Ryan Workman

checkout/rust/cart-transform/bundles/schema.graphql

@@ -24,7 +24,7 @@ type Attribute {
 }
 
 """
-Represents information about the buyer that is interacting with the cart.
+Represents information about the buyer that is interacting with the cart. Only set when the buyer is logged in.
 """
 type BuyerIdentity {
   """
@@ -72,6 +72,11 @@ type Cart {
   """
   cost: CartCost!
 
+  """
+  A list of lines containing information about the items that can be delivered.
+  """
+  deliverableLines: [DeliverableCartLine!]!
+
   """
   The delivery groups available for the cart based on the buyer's shipping address.
   """
@@ -255,6 +260,26 @@ input CartOperation @oneOf {
   merge: MergeOperation
 }
 
+"""
+A customization which applies cart transformations to the merchandise lines.
+"""
+type CartTransform implements HasMetafields {
+  """
+  Returns a metafield by namespace and key that belongs to the resource.
+  """
+  metafield(
+    """
+    The key for the metafield.
+    """
+    key: String!
+
+    """
+    The namespace for the metafield.
+    """
+    namespace: String!
+  ): Metafield
+}
+
 """
 Represents information about a company which is also a customer of the shop.
 """
@@ -2533,6 +2558,38 @@ Example values: `"29.99"`, `"29.999"`.
 """
 scalar Decimal
 
+"""
+Represents information about the merchandise in the cart.
+"""
+type DeliverableCartLine {
+  """
+  Retrieve a cart line attribute by key.
+
+  Cart line attributes are also known as line item properties in Liquid.
+  """
+  attribute(
+    """
+    The key of the attribute to retrieve.
+    """
+    key: String
+  ): Attribute
+
+  """
+  The ID of the cart line.
+  """
+  id: ID!
+
+  """
+  The merchandise that the buyer intends to purchase.
+  """
+  merchandise: Merchandise!
+
+  """
+  The quantity of the merchandise that the customer intends to purchase.
+  """
+  quantity: Int!
+}
+
 """
 List of different delivery method types.
 """
@@ -2710,6 +2767,11 @@ type Input {
   The cart.
   """
   cart: Cart!
+
+  """
+  The CartTransform containing the function.
+  """
+  cartTransform: CartTransform!
 }
 
 """

checkout/rust/cart-transform/bundles/src/main.rs

@@ -65,14 +65,13 @@ fn get_merge_cart_operations(cart: &Cart) -> Vec<CartOperation> {
     let mut result: Vec<CartOperation> = Vec::new();
 
     for definition in merge_parent_defintions.iter() {
-        let (components_in_cart, parent_variant_quantity) =
-            get_components_in_cart(cart, definition);
+        let components_in_cart = get_components_in_cart(cart, definition);
         if components_in_cart.len() == definition.component_reference.len() {
             let cart_lines: Vec<CartLineInput> = components_in_cart
                 .iter()
                 .map(|component| CartLineInput {
                     cart_line_id: component.cart_line_id.clone(),
-                    quantity: parent_variant_quantity * component.quantity,
+                    quantity: component.quantity.clone(),
                 })
                 .collect();
 
@@ -104,9 +103,8 @@ fn get_merge_cart_operations(cart: &Cart) -> Vec<CartOperation> {
 fn get_components_in_cart(
     cart: &Cart,
     definition: &ComponentParent,
-) -> (Vec<CartLineInput>, i64) {
+) -> Vec<CartLineInput> {
     let mut line_results: Vec<CartLineInput> = Vec::new();
-    let mut maximum_available_component: Vec<i64> = Vec::new();
     for (reference, quantity) in definition
         .component_reference
         .iter()
@@ -127,23 +125,13 @@ fn get_components_in_cart(
                       cart_line_id: line.id.clone(),
                       quantity: quantity.clone(),
                   });
-                  let maximum_available = if quantity > &0 {
-                      line.quantity / quantity
-                  } else {
-                      0
-                  };
-                  maximum_available_component.push(maximum_available);
                   break;
               }
             }
         }
     }
-    let parent_variant_quantity: i64 = match maximum_available_component.iter().min() {
-        Some(available) => available.clone(),
-        None => 0,
-    };
 
-    return (line_results, parent_variant_quantity);
+    return line_results;
 }
 
 fn get_merge_parent_definitions(cart: &Cart) -> Vec<ComponentParent> {

checkout/rust/cart-transform/default/schema.graphql

@@ -24,7 +24,7 @@ type Attribute {
 }
 
 """
-Represents information about the buyer that is interacting with the cart.
+Represents information about the buyer that is interacting with the cart. Only set when the buyer is logged in.
 """
 type BuyerIdentity {
   """
@@ -72,6 +72,11 @@ type Cart {
   """
   cost: CartCost!
 
+  """
+  A list of lines containing information about the items that can be delivered.
+  """
+  deliverableLines: [DeliverableCartLine!]!
+
   """
   The delivery groups available for the cart based on the buyer's shipping address.
   """
@@ -255,6 +260,26 @@ input CartOperation @oneOf {
   merge: MergeOperation
 }
 
+"""
+A customization which applies cart transformations to the merchandise lines.
+"""
+type CartTransform implements HasMetafields {
+  """
+  Returns a metafield by namespace and key that belongs to the resource.
+  """
+  metafield(
+    """
+    The key for the metafield.
+    """
+    key: String!
+
+    """
+    The namespace for the metafield.
+    """
+    namespace: String!
+  ): Metafield
+}
+
 """
 Represents information about a company which is also a customer of the shop.
 """
@@ -2533,6 +2558,38 @@ Example values: `"29.99"`, `"29.999"`.
 """
 scalar Decimal
 
+"""
+Represents information about the merchandise in the cart.
+"""
+type DeliverableCartLine {
+  """
+  Retrieve a cart line attribute by key.
+
+  Cart line attributes are also known as line item properties in Liquid.
+  """
+  attribute(
+    """
+    The key of the attribute to retrieve.
+    """
+    key: String
+  ): Attribute
+
+  """
+  The ID of the cart line.
+  """
+  id: ID!
+
+  """
+  The merchandise that the buyer intends to purchase.
+  """
+  merchandise: Merchandise!
+
+  """
+  The quantity of the merchandise that the customer intends to purchase.
+  """
+  quantity: Int!
+}
+
 """
 List of different delivery method types.
 """
@@ -2710,6 +2767,11 @@ type Input {
   The cart.
   """
   cart: Cart!
+
+  """
+  The CartTransform containing the function.
+  """
+  cartTransform: CartTransform!
 }
 
 """

sample-apps/bundles-cart-transform/extensions/cart-merge-expand/schema.graphql

@@ -24,7 +24,7 @@ type Attribute {
 }
 
 """
-Represents information about the buyer that is interacting with the cart.
+Represents information about the buyer that is interacting with the cart. Only set when the buyer is logged in.
 """
 type BuyerIdentity {
   """
@@ -72,6 +72,11 @@ type Cart {
   """
   cost: CartCost!
 
+  """
+  A list of lines containing information about the items that can be delivered.
+  """
+  deliverableLines: [DeliverableCartLine!]!
+
   """
   The delivery groups available for the cart based on the buyer's shipping address.
   """
@@ -255,6 +260,26 @@ input CartOperation @oneOf {
   merge: MergeOperation
 }
 
+"""
+A customization which applies cart transformations to the merchandise lines.
+"""
+type CartTransform implements HasMetafields {
+  """
+  Returns a metafield by namespace and key that belongs to the resource.
+  """
+  metafield(
+    """
+    The key for the metafield.
+    """
+    key: String!
+
+    """
+    The namespace for the metafield.
+    """
+    namespace: String!
+  ): Metafield
+}
+
 """
 Represents information about a company which is also a customer of the shop.
 """
@@ -2533,6 +2558,38 @@ Example values: `"29.99"`, `"29.999"`.
 """
 scalar Decimal
 
+"""
+Represents information about the merchandise in the cart.
+"""
+type DeliverableCartLine {
+  """
+  Retrieve a cart line attribute by key.
+
+  Cart line attributes are also known as line item properties in Liquid.
+  """
+  attribute(
+    """
+    The key of the attribute to retrieve.
+    """
+    key: String
+  ): Attribute
+
+  """
+  The ID of the cart line.
+  """
+  id: ID!
+
+  """
+  The merchandise that the buyer intends to purchase.
+  """
+  merchandise: Merchandise!
+
+  """
+  The quantity of the merchandise that the customer intends to purchase.
+  """
+  quantity: Int!
+}
+
 """
 List of different delivery method types.
 """
@@ -2710,6 +2767,11 @@ type Input {
   The cart.
   """
   cart: Cart!
+
+  """
+  The CartTransform containing the function.
+  """
+  cartTransform: CartTransform!
 }
 
 """