@reactionary/provider-commercetools 0.0.55 → 0.0.58

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@reactionary/provider-commercetools",
-  "version": "0.0.55",
+  "version": "0.0.58",
   "main": "index.js",
   "types": "src/index.d.ts",
   "dependencies": {
-    "@reactionary/core": "0.0.55",
+    "@reactionary/core": "0.0.58",
     "debug": "^4.4.3",
     "zod": "4.1.9",
     "@commercetools/ts-client": "^4.2.1",

package/providers/checkout.provider.js

@@ -1,9 +1,24 @@
-import { AddressSchema, CheckoutItemSchema, CheckoutProvider, PaymentInstructionIdentifierSchema, PaymentInstructionSchema, PaymentMethodIdentifierSchema, ShippingInstructionSchema, ShippingMethodSchema } from "@reactionary/core";
+import {
+  AddressSchema,
+  CheckoutItemSchema,
+  CheckoutProvider,
+  PaymentInstructionIdentifierSchema,
+  PaymentInstructionSchema,
+  PaymentMethodIdentifierSchema,
+  ShippingInstructionSchema,
+  ShippingMethodSchema
+} from "@reactionary/core";
 import { CommercetoolsClient } from "../core/client.js";
-import { CommercetoolsCartIdentifierSchema, CommercetoolsCheckoutIdentifierSchema, CommercetoolsOrderIdentifierSchema } from "../schema/commercetools.schema.js";
+import {
+  CommercetoolsCartIdentifierSchema,
+  CommercetoolsCheckoutIdentifierSchema,
+  CommercetoolsOrderIdentifierSchema
+} from "../schema/commercetools.schema.js";
 class CheckoutNotReadyForFinalizationError extends Error {
   constructor(checkoutIdentifier) {
-    super("Checkout is not ready for finalization. Ensure all required fields are set and valid. " + (checkoutIdentifier ? `Checkout ID: ${JSON.stringify(checkoutIdentifier)}` : ""));
+    super(
+      "Checkout is not ready for finalization. Ensure all required fields are set and valid. " + (checkoutIdentifier ? `Checkout ID: ${JSON.stringify(checkoutIdentifier)}` : "")
+    );
     this.checkoutIdentifier = checkoutIdentifier;
     this.name = "CheckoutNotReadyForFinalizationError";
   }
@@ -76,9 +91,7 @@ class CommercetoolsCheckoutProvider extends CheckoutProvider {
     const checkoutResponse = await client.carts.withId({ ID: replicationResponse.body.id }).post({
       body: {
         version: replicationResponse.body.version || 0,
-        actions: [
-          ...actions
-        ]
+        actions: [...actions]
       }
     }).execute();
     return this.parseSingle(checkoutResponse.body, reqCtx);
@@ -90,7 +103,18 @@ class CommercetoolsCheckoutProvider extends CheckoutProvider {
         expand: ["paymentInfo.payments[*]", "shippingInfo.shippingMethod"]
       }
     }).execute();
-    return this.parseSingle(checkoutResponse.body, reqCtx);
+    const checkout = this.parseSingle(checkoutResponse.body, reqCtx);
+    if (checkoutResponse.body.cartState === "Ordered") {
+      const order = await client.orders.get({
+        queryArgs: {
+          where: `cart(id="${checkout.identifier.key}")`
+        }
+      }).execute();
+      checkout.resultingOrder = {
+        key: order.body.results[0].id
+      };
+    }
+    return checkout;
   }
   async setShippingAddress(payload, reqCtx) {
     const client = await this.getClient(reqCtx);
@@ -142,7 +166,10 @@ class CommercetoolsCheckoutProvider extends CheckoutProvider {
     return result;
   }
   async getAvailablePaymentMethods(payload, reqCtx) {
-    const staticMethods = this.getStaticPaymentMethods(payload.checkout, reqCtx);
+    const staticMethods = this.getStaticPaymentMethods(
+      payload.checkout,
+      reqCtx
+    );
     const dynamicMethods = [];
     return [...staticMethods, ...dynamicMethods];
   }
@@ -151,7 +178,9 @@ class CommercetoolsCheckoutProvider extends CheckoutProvider {
     const response = await client.payments.post({
       body: {
         amountPlanned: {
-          centAmount: Math.round(payload.paymentInstruction.amount.value * 100),
+          centAmount: Math.round(
+            payload.paymentInstruction.amount.value * 100
+          ),
           currencyCode: payload.paymentInstruction.amount.currency
         },
         paymentMethodInfo: {
@@ -167,7 +196,7 @@ class CommercetoolsCheckoutProvider extends CheckoutProvider {
             key: "reactionaryPaymentCustomFields"
           },
           fields: {
-            "commerceToolsCartId": payload.checkout.key
+            commerceToolsCartId: payload.checkout.key
           }
         }
       }
@@ -182,11 +211,18 @@ class CommercetoolsCheckoutProvider extends CheckoutProvider {
         }
       }
     ];
-    return this.applyActions(payload.checkout, actions, reqCtx);
+    return this.applyActions(
+      payload.checkout,
+      actions,
+      reqCtx
+    );
   }
   async removePaymentInstruction(payload, reqCtx) {
     const client = await this.getClient(reqCtx);
-    const checkout = await this.getById({ identifier: payload.checkout }, reqCtx);
+    const checkout = await this.getById(
+      { identifier: payload.checkout },
+      reqCtx
+    );
     return checkout;
   }
   async setShippingInstruction(payload, reqCtx) {
@@ -215,10 +251,17 @@ class CommercetoolsCheckoutProvider extends CheckoutProvider {
       name: "pickupPointId",
       value: payload.shippingInstruction.pickupPoint
     });
-    return this.applyActions(payload.checkout, actions, reqCtx);
+    return this.applyActions(
+      payload.checkout,
+      actions,
+      reqCtx
+    );
   }
   async finalizeCheckout(payload, reqCtx) {
-    const checkout = await this.getById({ identifier: payload.checkout }, reqCtx);
+    const checkout = await this.getById(
+      { identifier: payload.checkout },
+      reqCtx
+    );
     if (!checkout || !checkout.readyForFinalization) {
       throw new CheckoutNotReadyForFinalizationError(payload.checkout);
     }
@@ -230,13 +273,10 @@ class CommercetoolsCheckoutProvider extends CheckoutProvider {
         version: ctId.version
       }
     }).execute();
-    const actions = [];
-    actions.push({
-      action: "setCustomField",
-      name: "commerceToolsOrderId",
-      value: orderResponse.body.id
-    });
-    return this.applyActions(payload.checkout, actions, reqCtx);
+    return this.getById(
+      { identifier: payload.checkout },
+      reqCtx
+    );
   }
   async applyActions(checkout, actions, reqCtx) {
     const client = await this.getClient(reqCtx);
@@ -285,15 +325,11 @@ class CommercetoolsCheckoutProvider extends CheckoutProvider {
       key: remote.custom?.fields["commerceToolsCartId"] || "",
       version: 0
     });
-    const orderId = remote.custom?.fields["commerceToolsOrderId"];
-    if (orderId) {
-      result.resultingOrder = CommercetoolsOrderIdentifierSchema.parse({
-        key: orderId,
-        version: 0
-      });
-    }
     if (remote.shippingAddress) {
-      result.shippingAddress = this.parseAddress(remote.shippingAddress, reqCtx);
+      result.shippingAddress = this.parseAddress(
+        remote.shippingAddress,
+        reqCtx
+      );
     }
     if (remote.billingAddress) {
       result.billingAddress = this.parseAddress(remote.billingAddress, reqCtx);
@@ -301,7 +337,9 @@ class CommercetoolsCheckoutProvider extends CheckoutProvider {
     result.shippingInstruction = this.parseShippingInstruction(remote);
     for (const p of remote.paymentInfo?.payments || []) {
       if (p.obj) {
-        result.paymentInstructions.push(this.parsePaymentInstruction(p.obj, reqCtx));
+        result.paymentInstructions.push(
+          this.parsePaymentInstruction(p.obj, reqCtx)
+        );
       }
     }
     const grandTotal = remote.totalPrice.centAmount || 0;
@@ -392,7 +430,9 @@ class CommercetoolsCheckoutProvider extends CheckoutProvider {
   }
   parsePaymentInstruction(remote, reqCtx) {
     const newModel = PaymentInstructionSchema.parse({});
-    newModel.identifier = PaymentInstructionIdentifierSchema.parse({ key: remote.id || "" });
+    newModel.identifier = PaymentInstructionIdentifierSchema.parse({
+      key: remote.id || ""
+    });
     newModel.amount = {
       value: remote.amountPlanned.centAmount / 100,
       currency: remote.amountPlanned.currencyCode

package/src/providers/checkout.provider.d.ts

@@ -1,9 +1,9 @@
-import type { Cache, Checkout, RequestContext, PaymentMethod, ShippingMethod, CheckoutMutationInitiateCheckout, CheckoutMutationSetShippingAddress, CheckoutMutationFinalizeCheckout, CheckoutMutationAddPaymentInstruction, CheckoutMutationRemovePaymentInstruction, CheckoutMutationSetShippingInstruction, CheckoutQueryById, CheckoutQueryForAvailablePaymentMethods, CheckoutQueryForAvailableShippingMethods, CheckoutIdentifier, ShippingInstruction, PaymentInstruction } from "@reactionary/core";
-import { CheckoutProvider } from "@reactionary/core";
-import type z from "zod";
-import type { CommercetoolsConfiguration } from "../schema/configuration.schema.js";
-import type { MyCartUpdateAction } from "@commercetools/platform-sdk";
-import type { Address as CTAddress, Payment as CTPayment, Cart as CTCart } from "@commercetools/platform-sdk";
+import type { Cache, Checkout, RequestContext, PaymentMethod, ShippingMethod, CheckoutMutationInitiateCheckout, CheckoutMutationSetShippingAddress, CheckoutMutationFinalizeCheckout, CheckoutMutationAddPaymentInstruction, CheckoutMutationRemovePaymentInstruction, CheckoutMutationSetShippingInstruction, CheckoutQueryById, CheckoutQueryForAvailablePaymentMethods, CheckoutQueryForAvailableShippingMethods, CheckoutIdentifier, ShippingInstruction, PaymentInstruction } from '@reactionary/core';
+import { CheckoutProvider } from '@reactionary/core';
+import type z from 'zod';
+import type { CommercetoolsConfiguration } from '../schema/configuration.schema.js';
+import type { MyCartUpdateAction } from '@commercetools/platform-sdk';
+import type { Address as CTAddress, Payment as CTPayment, Cart as CTCart } from '@commercetools/platform-sdk';
 export declare class CheckoutNotReadyForFinalizationError extends Error {
     checkoutIdentifier: CheckoutIdentifier;
     constructor(checkoutIdentifier: CheckoutIdentifier);