Update totalPrice mapping and add more integration tests

There was a mistake originally, as cart's total amount includes
any gift cards that have been applied, but checkout's total price
should reflect the price before gift cards have been applied.

Additionally, I've added more integration tests to ensure that all
the expected fields are being returned (not null).

Author: kdaviduik

src/cart-payload-mapper.js

@@ -219,7 +219,7 @@ function calculateTotalPrice(cart, totalAmount) {
   }
 
   return {
-    amount: (parseFloat(totalAmount.amount) - giftCardTotal).toFixed(2),
+    amount: (parseFloat(totalAmount.amount) + giftCardTotal).toFixed(2),
     currencyCode: totalAmount.currencyCode,
     type: totalAmount.type
   };

test/cart-payload-mapper-test.js

@@ -364,7 +364,7 @@ suite('cart-payload-mapper-test', () => {
       const result = mapCartPayload(cart);
 
       assert.deepStrictEqual(result.subtotalPrice, withType({
-        amount: '269.82',
+        amount: '314.18',
         currencyCode: 'USD'
       }, 'MoneyV2'));
     });
@@ -425,7 +425,7 @@ suite('cart-payload-mapper-test', () => {
       assert.deepStrictEqual(
         result.totalPrice,
         withType({
-          amount: '294.82',
+          amount: '339.18',
           currencyCode: 'USD'
         }, 'MoneyV2')
       );

test/client-checkout-discounts-integration-test.js

@@ -151,6 +151,36 @@ suite('client-checkout-discounts-integration-test', () => {
             assert.strictEqual(updatedCheckout.discountApplications.length, 1);
             assert.strictEqual(updatedCheckout.lineItems[0].discountAllocations.length, 1);
 
+            // Add assertions for previously missing price fields
+            assert.ok(updatedCheckout.lineItemsSubtotalPrice, 'lineItemsSubtotalPrice exists');
+            assert.ok(updatedCheckout.lineItemsSubtotalPrice.amount, 'lineItemsSubtotalPrice amount exists');
+            assert.ok(updatedCheckout.lineItemsSubtotalPrice.currencyCode, 'lineItemsSubtotalPrice currencyCode exists');
+
+            assert.ok(updatedCheckout.subtotalPrice, 'subtotalPrice exists');
+            assert.ok(updatedCheckout.subtotalPriceV2, 'subtotalPriceV2 exists');
+            assert.strictEqual(updatedCheckout.subtotalPrice.amount, updatedCheckout.subtotalPriceV2.amount, 'subtotalPrice amount matches V2');
+
+            assert.ok(updatedCheckout.totalPrice, 'totalPrice exists');
+            assert.ok(updatedCheckout.totalPriceV2, 'totalPriceV2 exists');
+            // Total price should be less than original due to discount
+            const totalPriceNum = parseFloat(updatedCheckout.totalPrice.amount);
+            const lineItemPrice = parseFloat(updatedCheckout.lineItems[0].variant.price.amount);
+
+            assert.ok(totalPriceNum < lineItemPrice, 'totalPrice reflects discount');
+
+            assert.ok(updatedCheckout.totalTax, 'totalTax exists');
+            assert.ok(updatedCheckout.totalTaxV2, 'totalTaxV2 exists');
+
+            // Verify UNSUPPORTED_FIELDS maintain expected values with discounts applied
+            assert.strictEqual(updatedCheckout.completedAt, null, 'completedAt is null');
+            assert.strictEqual(updatedCheckout.order, null, 'order is null');
+            assert.strictEqual(updatedCheckout.orderStatusUrl, null, 'orderStatusUrl is null');
+            assert.strictEqual(updatedCheckout.ready, false, 'ready is false');
+            assert.strictEqual(updatedCheckout.requiresShipping, true, 'requiresShipping is true');
+            assert.strictEqual(updatedCheckout.shippingLine, null, 'shippingLine is null');
+            assert.strictEqual(updatedCheckout.taxExempt, false, 'taxExempt is false');
+            assert.strictEqual(updatedCheckout.taxesIncluded, false, 'taxesIncluded is false');
+
             const expectedRootDiscountApplications = [
               {
                 __typename: 'DiscountCodeApplication',
@@ -506,6 +536,35 @@ suite('client-checkout-discounts-integration-test', () => {
 
             assert.strictEqual(updatedCheckout.discountApplications.length, 1);
             assertActualDiscountApplicationIsExpected(updatedCheckout.discountApplications[0], expectedRootDiscountApplications[0]);
+
+            assert.ok(updatedCheckout.lineItemsSubtotalPrice, 'lineItemsSubtotalPrice exists');
+            assert.ok(updatedCheckout.lineItemsSubtotalPrice.amount, 'lineItemsSubtotalPrice amount exists');
+            assert.ok(updatedCheckout.lineItemsSubtotalPrice.currencyCode, 'lineItemsSubtotalPrice currencyCode exists');
+
+            assert.ok(updatedCheckout.subtotalPrice, 'subtotalPrice exists');
+            assert.ok(updatedCheckout.subtotalPriceV2, 'subtotalPriceV2 exists');
+            assert.strictEqual(updatedCheckout.subtotalPrice.amount, updatedCheckout.subtotalPriceV2.amount, 'subtotalPrice amount matches V2');
+
+            assert.ok(updatedCheckout.totalPrice, 'totalPrice exists');
+            assert.ok(updatedCheckout.totalPriceV2, 'totalPriceV2 exists');
+            // Total price should be less than original due to discount
+            const totalPriceNum = parseFloat(updatedCheckout.totalPrice.amount);
+            const lineItemPrice = parseFloat(updatedCheckout.lineItems[0].variant.price.amount);
+
+            assert.ok(totalPriceNum < lineItemPrice, 'totalPrice reflects discount');
+
+            assert.ok(updatedCheckout.totalTax, 'totalTax exists');
+            assert.ok(updatedCheckout.totalTaxV2, 'totalTaxV2 exists');
+
+            // Verify UNSUPPORTED_FIELDS maintain expected values with discounts applied
+            assert.strictEqual(updatedCheckout.completedAt, null, 'completedAt is null');
+            assert.strictEqual(updatedCheckout.order, null, 'order is null');
+            assert.strictEqual(updatedCheckout.orderStatusUrl, null, 'orderStatusUrl is null');
+            assert.strictEqual(updatedCheckout.ready, false, 'ready is false');
+            assert.strictEqual(updatedCheckout.requiresShipping, true, 'requiresShipping is true');
+            assert.strictEqual(updatedCheckout.shippingLine, null, 'shippingLine is null');
+            assert.strictEqual(updatedCheckout.taxExempt, false, 'taxExempt is false');
+            assert.strictEqual(updatedCheckout.taxesIncluded, false, 'taxesIncluded is false');
           });
         });
       });

test/client-checkout-giftcards-integration-test.js

@@ -121,6 +121,41 @@ suite('client-checkout-giftcards-integration-test', () => {
             implementsNode: false
           }
         });
+
+        assert.ok(updatedCheckout.lineItemsSubtotalPrice, 'lineItemsSubtotalPrice exists');
+        assert.strictEqual(updatedCheckout.lineItemsSubtotalPrice.amount, '70.0', 'lineItemsSubtotalPrice amount is correct');
+        assert.strictEqual(updatedCheckout.lineItemsSubtotalPrice.currencyCode, 'CAD', 'lineItemsSubtotalPrice currencyCode is correct');
+
+        assert.ok(updatedCheckout.subtotalPrice, 'subtotalPrice exists');
+        assert.ok(updatedCheckout.subtotalPriceV2, 'subtotalPriceV2 exists');
+        assert.strictEqual(updatedCheckout.subtotalPrice, updatedCheckout.subtotalPriceV2);
+        assert.strictEqual(updatedCheckout.subtotalPrice.amount, '70.0', 'subtotalPrice does not include gift cards');
+        assert.strictEqual(updatedCheckout.subtotalPrice.currencyCode, 'CAD', 'subtotalPrice currency is correct');
+
+        assert.ok(updatedCheckout.totalPrice, 'totalPrice exists');
+        assert.ok(updatedCheckout.totalPriceV2, 'totalPriceV2 exists');
+        assert.strictEqual(updatedCheckout.totalPrice, updatedCheckout.totalPriceV2);
+        assert.strictEqual(updatedCheckout.totalPrice.amount, '70.0', 'totalPrice does not include gift cards');
+        assert.strictEqual(updatedCheckout.totalPrice.currencyCode, 'CAD', 'totalPrice currency is correct');
+
+        assert.ok(updatedCheckout.totalTax, 'totalTax exists');
+        assert.ok(updatedCheckout.totalTaxV2, 'totalTaxV2 exists');
+
+        assert.ok(updatedCheckout.paymentDue, 'paymentDue exists');
+        assert.ok(updatedCheckout.paymentDueV2, 'paymentDueV2 exists');
+        assert.strictEqual(updatedCheckout.paymentDue, updatedCheckout.paymentDueV2);
+        assert.strictEqual(updatedCheckout.paymentDue.amount, '0.0', 'paymentDue amount includes gift cards');
+        assert.strictEqual(updatedCheckout.paymentDue.currencyCode, 'CAD', 'paymentDue currencyCode is correct');
+
+        // Verify UNSUPPORTED_FIELDS maintain expected values
+        assert.strictEqual(updatedCheckout.completedAt, null, 'completedAt is null');
+        assert.strictEqual(updatedCheckout.order, null, 'order is null');
+        assert.strictEqual(updatedCheckout.orderStatusUrl, null, 'orderStatusUrl is null');
+        assert.strictEqual(updatedCheckout.ready, false, 'ready is false');
+        assert.strictEqual(updatedCheckout.requiresShipping, true, 'requiresShipping is true');
+        assert.strictEqual(updatedCheckout.shippingLine, null, 'shippingLine is null');
+        assert.strictEqual(updatedCheckout.taxExempt, false, 'taxExempt is false');
+        assert.strictEqual(updatedCheckout.taxesIncluded, false, 'taxesIncluded is false');
       });
     });
   });
@@ -165,6 +200,32 @@ suite('client-checkout-giftcards-integration-test', () => {
         assert.ok(updatedCheckout.appliedGiftCards[1].id);
         assert.strictEqual(updatedCheckout.appliedGiftCards[1].lastCharacters, 'card');
         assert.ok(updatedCheckout.appliedGiftCards[1].type);
+
+
+        assert.ok(updatedCheckout.lineItemsSubtotalPrice, 'lineItemsSubtotalPrice exists');
+        assert.strictEqual(updatedCheckout.lineItemsSubtotalPrice.amount, '270.0', 'lineItemsSubtotalPrice does not include gift cards');
+        assert.strictEqual(updatedCheckout.lineItemsSubtotalPrice.currencyCode, 'CAD', 'lineItemsSubtotalPrice currencyCode is correct');
+
+        assert.ok(updatedCheckout.subtotalPrice, 'subtotalPrice exists');
+        assert.ok(updatedCheckout.subtotalPriceV2, 'subtotalPriceV2 exists');
+        assert.strictEqual(updatedCheckout.subtotalPrice, updatedCheckout.subtotalPriceV2);
+        assert.strictEqual(updatedCheckout.subtotalPrice.amount, '270.0', 'subtotalPrice does not include gift cards');
+        assert.strictEqual(updatedCheckout.subtotalPrice.currencyCode, 'CAD', 'subtotalPrice currency is correct');
+
+        assert.ok(updatedCheckout.totalPrice, 'totalPrice exists');
+        assert.ok(updatedCheckout.totalPriceV2, 'totalPriceV2 exists');
+        assert.strictEqual(updatedCheckout.totalPrice, updatedCheckout.totalPriceV2);
+        assert.strictEqual(updatedCheckout.totalPrice.amount, '270.0', 'totalPrice does not include gift cards');
+        assert.strictEqual(updatedCheckout.totalPrice.currencyCode, 'CAD', 'totalPrice currency is correct');
+
+        assert.ok(updatedCheckout.paymentDue, 'paymentDue exists');
+        assert.ok(updatedCheckout.paymentDueV2, 'paymentDueV2 exists');
+        assert.strictEqual(updatedCheckout.paymentDue, updatedCheckout.paymentDueV2);
+        assert.strictEqual(updatedCheckout.paymentDue.amount, '120.0', 'paymentDue amount includes gift cards');
+        assert.strictEqual(updatedCheckout.paymentDue.currencyCode, 'CAD', 'paymentDue currencyCode is correct');
+
+        assert.ok(updatedCheckout.totalTax, 'totalTax exists');
+        assert.ok(updatedCheckout.totalTaxV2, 'totalTaxV2 exists');
       });
     });
   });

test/client-checkout-integration-test.js

@@ -189,6 +189,50 @@ suite('client-checkout-integration-test', () => {
     });
   });
 
+  suite('payload fields verification', () => {
+    test('it returns all expected fields including price fields in a checkout with items', () => {
+      const input = {
+        lineItems: [
+          {
+            variantId: 'gid://shopify/ProductVariant/50850334310456',
+            quantity: 1
+          }
+        ]
+      };
+
+      return client.checkout.create(input).then((checkout) => {
+        assert.ok(checkout.lineItemsSubtotalPrice, 'lineItemsSubtotalPrice exists');
+        assert.ok(checkout.lineItemsSubtotalPrice.amount, 'lineItemsSubtotalPrice.amount exists');
+        assert.ok(checkout.lineItemsSubtotalPrice.currencyCode, 'lineItemsSubtotalPrice.currencyCode exists');
+
+        assert.ok(checkout.subtotalPrice, 'subtotalPrice exists');
+        assert.ok(checkout.subtotalPriceV2, 'subtotalPriceV2 exists');
+        assert.strictEqual(checkout.subtotalPrice.amount, checkout.subtotalPriceV2.amount, 'subtotalPrice amount matches V2');
+        assert.strictEqual(checkout.subtotalPrice.currencyCode, checkout.subtotalPriceV2.currencyCode, 'subtotalPrice currency matches V2');
+
+        assert.ok(checkout.totalPrice, 'totalPrice exists');
+        assert.ok(checkout.totalPriceV2, 'totalPriceV2 exists');
+        assert.strictEqual(checkout.totalPrice.amount, checkout.totalPriceV2.amount, 'totalPrice amount matches V2');
+        assert.strictEqual(checkout.totalPrice.currencyCode, checkout.totalPriceV2.currencyCode, 'totalPrice currency matches V2');
+
+        assert.ok(checkout.totalTax, 'totalTax exists');
+        assert.ok(checkout.totalTaxV2, 'totalTaxV2 exists');
+        assert.strictEqual(checkout.totalTax.amount, checkout.totalTaxV2.amount, 'totalTax amount matches V2');
+        assert.strictEqual(checkout.totalTax.currencyCode, checkout.totalTaxV2.currencyCode, 'totalTax currency matches V2');
+
+        // Verify the UNSUPPORTED_FIELDS have expected values
+        assert.strictEqual(checkout.completedAt, null, 'completedAt is null');
+        assert.strictEqual(checkout.order, null, 'order is null');
+        assert.strictEqual(checkout.orderStatusUrl, null, 'orderStatusUrl is null');
+        assert.strictEqual(checkout.ready, false, 'ready is false');
+        assert.strictEqual(checkout.requiresShipping, true, 'requiresShipping is true');
+        assert.strictEqual(checkout.shippingLine, null, 'shippingLine is null');
+        assert.strictEqual(checkout.taxExempt, false, 'taxExempt is false');
+        assert.strictEqual(checkout.taxesIncluded, false, 'taxesIncluded is false');
+      });
+    });
+  });
+
   suite('updateAttributes', () => {
     test('it updates a checkout note via updateAttributes', () => {
       const input = {