@reactionary/source 0.3.17 → 0.6.1

package/providers/algolia/src/providers/product-search.provider.ts

@@ -37,14 +37,7 @@ export class AlgoliaProductSearchProvider extends ProductSearchProvider {
     this.config = config;
   }
 
-  @Reactionary({
-    inputSchema: ProductSearchQueryByTermSchema,
-    outputSchema: ProductSearchResultSchema
-  })
-  public override async queryByTerm(
-    payload: ProductSearchQueryByTerm
-  ): Promise<Result<ProductSearchResult>> {
-    const client = algoliasearch(this.config.appId, this.config.apiKey);
+  protected queryByTermPayload(payload: ProductSearchQueryByTerm) {
 
     const facetsThatAreNotCategory = payload.search.facets.filter(x => x.facet.key !== 'categories');
     const categoryFacet = payload.search.facets.find(x => x.facet.key === 'categories') || payload.search.categoryFilter;
@@ -60,11 +53,7 @@ export class AlgoliaProductSearchProvider extends ProductSearchProvider {
     if (categoryFacet) {
       finalFilters.push(`categories:"${categoryFacet.key}"`);
     }
-
-
-    const remote = await client.search<AlgoliaNativeRecord>({
-      requests: [
-        {
+    return {
           indexName: this.config.indexName,
           query: payload.search.term,
           page: payload.search.paginationOptions.pageNumber - 1,
@@ -75,7 +64,23 @@ export class AlgoliaProductSearchProvider extends ProductSearchProvider {
           facetFilters: finalFacetFilters,
           filters: (finalFilters || [])
             .join(' AND '),
-        },
+        };
+  }
+
+  @Reactionary({
+    inputSchema: ProductSearchQueryByTermSchema,
+    outputSchema: ProductSearchResultSchema
+  })
+  public override async queryByTerm(
+    payload: ProductSearchQueryByTerm
+  ): Promise<Result<ProductSearchResult>> {
+    const client = algoliasearch(this.config.appId, this.config.apiKey);
+
+
+
+    const remote = await client.search<AlgoliaNativeRecord>({
+      requests: [
+        this.queryByTermPayload(payload)
       ],
     });
 

package/providers/commercetools/src/providers/cart.provider.ts

@@ -35,6 +35,7 @@ import type {
   CostBreakDown,
   Result,
   NotFoundError,
+  Promotion,
 } from '@reactionary/core';
 import type { CommercetoolsConfiguration } from '../schema/configuration.schema.js';
 import type {
@@ -49,7 +50,7 @@ import type { CommercetoolsAPI } from '../core/client.js';
 export class CommercetoolsCartProvider extends CartProvider {
   protected config: CommercetoolsConfiguration;
   protected commercetools: CommercetoolsAPI;
-
+  protected expandedCartFields = ['discountCodes[*].discountCode'];
   constructor(
     config: CommercetoolsConfiguration,
     cache: Cache,
@@ -71,7 +72,12 @@ export class CommercetoolsCartProvider extends CartProvider {
     const ctId = payload.cart as CommercetoolsCartIdentifier;
 
     try {
-      const remote = await client.carts.withId({ ID: ctId.key }).get().execute();
+      const remote = await client.carts.withId({ ID: ctId.key }).get(
+        {
+          queryArgs: {
+             expand: this.expandedCartFields
+          }
+        }).execute();
 
       return success(this.parseSingle(remote.body));
     } catch(err) {
@@ -92,6 +98,8 @@ export class CommercetoolsCartProvider extends CartProvider {
       cartIdentifier = await this.createCart();
     }
 
+    const channelId = await this.commercetools.resolveChannelIdByRole('Primary');
+
     const result = await this.applyActions(cartIdentifier, [
       {
         action: 'addLineItem',
@@ -100,7 +108,7 @@ export class CommercetoolsCartProvider extends CartProvider {
         // FIXME: This should be dynamic, probably as part of the context...
         distributionChannel: {
           typeId: 'channel',
-          key: 'OnlineFfmChannel',
+          id: channelId,
         },
       },
       {
@@ -184,7 +192,6 @@ export class CommercetoolsCartProvider extends CartProvider {
 
   @Reactionary({
     inputSchema: CartMutationDeleteCartSchema,
-    outputSchema: CartSchema,
   })
   public override async deleteCart(
     payload: CartMutationDeleteCart
@@ -234,11 +241,28 @@ export class CommercetoolsCartProvider extends CartProvider {
   public override async removeCouponCode(
     payload: CartMutationRemoveCoupon
   ): Promise<Result<Cart>> {
+
+    const client = await this.getClient();
+    const currentCart = await client.carts
+      .withId({ ID: payload.cart.key })
+      .get({
+        queryArgs: {
+          expand: this.expandedCartFields
+        }
+      })
+      .execute();
+
+    const discountCodeReference = currentCart.body.discountCodes?.find(dc => dc.discountCode.obj?.code === payload.couponCode)?.discountCode;
+
+    if (!discountCodeReference) {
+      // Coupon code is not applied to the cart, so we can just return the cart as is.
+      return success(this.parseSingle(currentCart.body));
+    }
     const result = await this.applyActions(payload.cart, [
       {
         action: 'removeDiscountCode',
         discountCode: {
-          id: payload.couponCode,
+          id: discountCodeReference.id,
           typeId: 'discount-code',
         },
       },
@@ -319,6 +343,9 @@ export class CommercetoolsCartProvider extends CartProvider {
           country: this.context.taxJurisdiction.countryCode || 'US',
           locale: this.context.languageContext.locale,
         },
+        queryArgs: {
+            expand: this.expandedCartFields
+        }
       })
       .execute();
 
@@ -343,6 +370,9 @@ export class CommercetoolsCartProvider extends CartProvider {
             version: ctId.version,
             actions,
           },
+          queryArgs: {
+              expand: this.expandedCartFields
+          }
         })
         .execute();
 
@@ -378,7 +408,19 @@ export class CommercetoolsCartProvider extends CartProvider {
   protected parseCartItem(remoteItem: LineItem): CartItem {
     const unitPrice = remoteItem.price.value.centAmount;
     const totalPrice = remoteItem.totalPrice.centAmount || 0;
-    const totalDiscount = remoteItem.price.discounted?.value.centAmount || 0;
+    let itemDiscount = 0;
+
+    // look, discounts are weird in commercetools.... i think the .price.discount only applies for embedded prices maybe?
+
+    if (remoteItem.discountedPricePerQuantity && remoteItem.discountedPricePerQuantity.length > 0) {
+        itemDiscount = remoteItem.discountedPricePerQuantity.reduce((sum, discPrQty) => {
+          return sum + discPrQty.quantity * discPrQty.discountedPrice?.includedDiscounts?.
+              reduce((sum, discount) => sum + discount.discountedAmount.centAmount, 0) || 0
+        }, 0);
+    }
+
+    const totalDiscount = (remoteItem.price.discounted?.value.centAmount || 0) + itemDiscount;
+
     const unitDiscount = totalDiscount / remoteItem.quantity;
     const currency =
       remoteItem.price.value.currencyCode.toUpperCase() as Currency;
@@ -423,12 +465,23 @@ export class CommercetoolsCartProvider extends CartProvider {
       version: remote.version || 0,
     } satisfies CommercetoolsCartIdentifier;
 
+
+    const items = new Array<CartItem>();
+    for (const remoteItem of remote.lineItems) {
+      const item = this.parseCartItem(remoteItem);
+
+      items.push(item);
+    }
+
+
     const grandTotal = remote.totalPrice.centAmount || 0;
     const shippingTotal = remote.shippingInfo?.price.centAmount || 0;
     const productTotal = grandTotal - shippingTotal;
     const taxTotal = remote.taxedPrice?.totalTax?.centAmount || 0;
+
+    // i think this is missing some elements still?
     const discountTotal =
-      remote.discountOnTotalPrice?.discountedAmount.centAmount || 0;
+      (remote.discountOnTotalPrice?.discountedAmount.centAmount || 0) + items.reduce((sum, item) => sum + (item.price.totalDiscount.value * 100 || 0), 0);
     const surchargeTotal = 0;
     const currency = remote.totalPrice.currencyCode as Currency;
 
@@ -459,13 +512,24 @@ export class CommercetoolsCartProvider extends CartProvider {
       },
     } satisfies CostBreakDown;
 
-    const items = new Array<CartItem>();
-    for (const remoteItem of remote.lineItems) {
-      const item = this.parseCartItem(remoteItem);
 
-      items.push(item);
+    const localeString = this.context.languageContext.locale || 'en'
+    const appliedPromotions = [];
+    if (remote.discountCodes) {
+      for (const promo of remote.discountCodes) {
+        appliedPromotions.push({
+          code: promo.discountCode.obj?.code || '',
+          isCouponCode: true,
+          name: promo.discountCode.obj?.name?.[localeString] || '',
+          description: promo.discountCode.obj?.description?.[localeString] || '',
+        } satisfies Promotion);
+      }
     }
 
+    // if we want to include the nice name and description of the non-coupon promotions, we have to do some extra work to fetch the referenced promotions and include them here,
+    // as the max expand level is 3, and the information is at level 5.
+    // For now, we will just include the coupon codes, as that is the most common use case.
+
     const cart = {
       identifier,
       userId: {
@@ -474,6 +538,7 @@ export class CommercetoolsCartProvider extends CartProvider {
       name: remote.custom?.fields['name'] || '',
       description: remote.custom?.fields['description'] || '',
       price,
+      appliedPromotions,
       items,
     } satisfies Cart;
 

package/providers/fake/src/providers/cart.provider.ts

@@ -274,6 +274,7 @@ export class FakeCartProvider extends CartProvider {
           currency: 'XXX',
         },
       },
+      appliedPromotions: [],
       userId: {
         userId: '',
       },

package/providers/medusa/src/providers/cart.provider.ts

@@ -16,6 +16,7 @@ import type {
   ItemCostBreakdown,
   NotFoundError,
   ProductVariantIdentifier,
+  Promotion,
   RequestContext,
   Result,
 } from '@reactionary/core';
@@ -31,10 +32,10 @@ import {
   CartProvider,
   CartQueryByIdSchema,
   CartSchema,
+  error,
   ProductVariantIdentifierSchema,
   Reactionary,
   success,
-  error,
 } from '@reactionary/core';
 
 import createDebug from 'debug';
@@ -47,8 +48,7 @@ import {
   parseMedusaCostBreakdown,
   parseMedusaItemPrice,
 } from '../utils/medusa-helpers.js';
-import type MedusaTypes = require('@medusajs/types');
-import type StoreCartPromotion = require('@medusajs/types');
+import type { StoreAddCartLineItem, StoreCart, StoreCartAddPromotion, StoreCartLineItem, StoreCartRemovePromotion, StoreCartResponse, StoreCreateCart, StoreProduct, StoreUpdateCart, StoreUpdateCartLineItem } from '@medusajs/types';
 
 const debug = createDebug('reactionary:medusa:cart');
 
@@ -87,7 +87,7 @@ export class MedusaCartProvider extends CartProvider {
         debug('Fetching cart by ID:', medusaId.key);
       }
 
-      const cartResponse = await client.store.cart.retrieve(medusaId.key);
+      const cartResponse = await client.store.cart.retrieve(medusaId.key, { fields: this.includedFields });
 
       if (debug.enabled) {
         debug('Received cart response:', cartResponse);
@@ -111,6 +111,21 @@ export class MedusaCartProvider extends CartProvider {
     }
   }
 
+
+  /**
+   * Extension point for the `add` operation to control the payload sent to Medusa when adding an item to the cart. By default, it only includes the variant ID and quantity, but you can override it to include more fields as needed.
+   *
+   * @param payload
+   * @param variantId
+   * @returns
+   */
+  protected addPayload(payload: CartMutationItemAdd, variantId: string): StoreAddCartLineItem {
+    return  {
+      variant_id: variantId,
+      quantity: payload.quantity,
+    };
+  }
+
   @Reactionary({
     inputSchema: CartMutationItemAddSchema,
     outputSchema: CartSchema,
@@ -148,13 +163,11 @@ export class MedusaCartProvider extends CartProvider {
 
       const response = await client.store.cart.createLineItem(
         medusaId.key,
-        {
-          variant_id: variantId,
-          quantity: payload.quantity,
-        },
+        this.addPayload(payload, variantId),
         {
           fields: this.includedFields,
         }
+
       );
 
       if (debug.enabled) {
@@ -200,6 +213,18 @@ export class MedusaCartProvider extends CartProvider {
     }
   }
 
+  /**
+   * Extension point for the `changeQuantity` operation to control the payload sent to Medusa when changing the quantity of an item in the cart. By default, it only includes the new quantity, but you can override it to include more fields as needed.
+   * @param payload
+   * @returns
+   */
+  protected changeQuantityPayload(payload: CartMutationItemQuantityChange): StoreUpdateCartLineItem {
+    return {
+      quantity: payload.quantity,
+    };
+  }
+
+
   @Reactionary({
     inputSchema: CartMutationItemQuantityChangeSchema,
     outputSchema: CartSchema,
@@ -222,9 +247,7 @@ export class MedusaCartProvider extends CartProvider {
       const response = await client.store.cart.updateLineItem(
         medusaId.key,
         payload.item.key,
-        {
-          quantity: payload.quantity,
-        },
+        this.changeQuantityPayload(payload),
         {
           fields: this.includedFields,
         }
@@ -272,7 +295,7 @@ export class MedusaCartProvider extends CartProvider {
         identifier: undefined,
       });
     } catch (err) {
-      debug('Failed to get active cart ID:', error);
+      debug('Failed to get active cart ID:', err);
 
       return error<NotFoundError>({
         type: 'NotFound',
@@ -282,8 +305,8 @@ export class MedusaCartProvider extends CartProvider {
   }
 
   @Reactionary({
+    cache: false,
     inputSchema: CartMutationDeleteCartSchema,
-    outputSchema: CartSchema,
   })
   public override async deleteCart(
     payload: CartMutationDeleteCart
@@ -319,6 +342,18 @@ export class MedusaCartProvider extends CartProvider {
     }
   }
 
+
+  /**
+   * Extension point to apply a coupon code to the cart. By default, it only includes the coupon code, but you can override it to include more fields as needed.
+   * @param payload
+   * @returns
+   */
+  protected applyCouponCodePayload(payload: CartMutationApplyCoupon): StoreCartAddPromotion {
+    return {
+      promo_codes: [payload.couponCode],
+    };
+  }
+
   @Reactionary({
     inputSchema: CartMutationApplyCouponSchema,
     outputSchema: CartSchema,
@@ -330,16 +365,27 @@ export class MedusaCartProvider extends CartProvider {
       const client = await this.getClient();
       const medusaId = payload.cart as MedusaCartIdentifier;
 
-      const response = await client.store.cart.update(
-        medusaId.key,
+
+      const response = await client.client.fetch<StoreCartResponse>(
+        `/store/carts/${medusaId.key}/promotions`,
         {
-          promo_codes: [payload.couponCode],
-        },
+          method: "POST",
+          body: this.applyCouponCodePayload(payload),
+          query: {
+            fields: this.includedFields,
+          }
+        }
+      );
+
+/** When PR: https://github.com/medusajs/medusa/pull/14850 gets merged, revert to the below
+      const response = await client.store.cart.addPromotionCodes(
+        medusaId.key,
+        this.applyCouponCodePayload(payload),
         {
           fields: this.includedFields,
         }
       );
-
+ */
       if (response.cart) {
         return success(this.parseSingle(response.cart));
       }
@@ -350,6 +396,18 @@ export class MedusaCartProvider extends CartProvider {
     }
   }
 
+  /**
+   * Extension point to remove a coupon code from the cart. By default, it only includes the coupon code to be removed, but you can override it to include more fields as needed.
+   * @param payload
+   * @returns
+   */
+  protected removeCouponCodePayload(payload: CartMutationRemoveCoupon): StoreCartRemovePromotion {
+    return {
+      promo_codes: [payload.couponCode],
+
+    };
+  }
+
   @Reactionary({
     inputSchema: CartMutationRemoveCouponSchema,
     outputSchema: CartSchema,
@@ -361,39 +419,49 @@ export class MedusaCartProvider extends CartProvider {
       const client = await this.getClient();
       const medusaId = payload.cart as MedusaCartIdentifier;
 
-      // Get current cart to find the discount to remove
-      const cartResponse = await client.store.cart.retrieve(medusaId.key);
-
-      if (cartResponse.cart?.promotions) {
-        const manualDiscounts = cartResponse.cart.promotions.filter(
-          (x) => !x.is_automatic && x.code
-        );
-
-        const remainingCodes = (manualDiscounts
-          .filter((x) => x.code !== payload.couponCode)
-          .map((promotion: MedusaTypes.StoreCartPromotion) => promotion.code) ||
-          []) as string[];
-        const response = await client.store.cart.update(
-          medusaId.key,
-          {
-            promo_codes: remainingCodes || [],
-          },
-          {
+      const response = await client.client.fetch<StoreCartResponse>(
+        `/store/carts/${medusaId.key}/promotions`,
+        {
+          method: "DELETE",
+          body: this.removeCouponCodePayload(payload),
+          query: {
             fields: this.includedFields,
           }
-        );
+        }
+      );
+
+      /*
 
-        if (response.cart) {
-          return success(this.parseSingle(response.cart));
+      const response = await client.store.cart.removePromotionCodes(
+        medusaId.key,
+        this.removeCouponCodePayload(payload),
+        {
+          fields: this.includedFields,
         }
-      }
+      );
+      */
 
+      if (response.cart) {
+        return success(this.parseSingle(response.cart));
+      }
       throw new Error('Failed to remove coupon code');
     } catch (error) {
       handleProviderError('remove coupon code', error);
     }
   }
 
+  /**
+   * Extension point to control the payload sent to Medusa when changing the currency of the cart. By default, it only includes the new region ID, but you can override it to include more fields as needed.
+   * @param payload
+   * @param newRegionId
+   * @returns
+   */
+  protected changeCurrencyPayload(payload: CartMutationChangeCurrency, newRegionId: string): StoreUpdateCart {
+    return {
+      region_id: newRegionId,
+    };
+  }
+
   @Reactionary({
     inputSchema: CartMutationChangeCurrencySchema,
     outputSchema: CartSchema,
@@ -404,35 +472,22 @@ export class MedusaCartProvider extends CartProvider {
     try {
       const client = await this.getClient();
 
-      // Get current cart
-      const currentCartResponse = await client.store.cart.retrieve(
-        payload.cart.key
-      );
-      client.store.cart.update(
+      const newRegionId = (await this.medusaApi.getActiveRegion()).id;
+      const updatedCartResponse = await client.store.cart.update(
         payload.cart.key,
-        {
-          region_id: (await this.medusaApi.getActiveRegion()).id,
-        },
+        this.changeCurrencyPayload(payload, newRegionId),
         {
           fields: this.includedFields,
         }
       );
-      if (!currentCartResponse.cart) {
-        throw new Error('Cart not found');
-      }
-
-      // Get the new cart
-      const newCartResponse = await client.store.cart.retrieve(
-        payload.cart.key
-      );
 
-      if (newCartResponse.cart) {
+      if (updatedCartResponse.cart) {
         // Update session to use new cart
         this.medusaApi.setSessionData({
-          activeCartId: newCartResponse.cart.id,
+          activeCartId: updatedCartResponse.cart.id,
         });
 
-        return success(this.parseSingle(newCartResponse.cart));
+        return success(this.parseSingle(updatedCartResponse.cart));
       }
 
       throw new Error('Failed to change currency');
@@ -441,18 +496,28 @@ export class MedusaCartProvider extends CartProvider {
     }
   }
 
+  /**
+   * Extension point to control the payload sent to Medusa when creating a cart. By default, it only includes the currency code, but you can override it to include more fields as needed.
+   * @param currency
+   * @returns
+   */
+  protected createCartPayload(currency?: string): StoreCreateCart {
+    return {
+        currency_code: (
+            currency ||
+            this.context.languageContext.currencyCode ||
+            ''
+        ).toLowerCase(),
+    };
+  }
+
+
   protected async createCart(currency?: string): Promise<CartIdentifier> {
     try {
       const client = await this.getClient();
 
       const response = await client.store.cart.create(
-        {
-          currency_code: (
-            currency ||
-            this.context.languageContext.currencyCode ||
-            ''
-          ).toLowerCase(),
-        },
+        this.createCartPayload(currency),
         {
           fields: this.includedFields,
         }
@@ -489,7 +554,7 @@ export class MedusaCartProvider extends CartProvider {
    * @returns
    */
   protected parseItemPrice(
-    remoteItem: MedusaTypes.StoreCartLineItem,
+    remoteItem: StoreCartLineItem,
     currency: Currency
   ): ItemCostBreakdown {
     return parseMedusaItemPrice(remoteItem, currency);
@@ -500,7 +565,7 @@ export class MedusaCartProvider extends CartProvider {
    * @param remote
    * @returns
    */
-  protected parseCostBreakdown(remote: MedusaTypes.StoreCart): CostBreakDown {
+  protected parseCostBreakdown(remote: StoreCart): CostBreakDown {
     return parseMedusaCostBreakdown(remote);
   }
 
@@ -511,9 +576,10 @@ export class MedusaCartProvider extends CartProvider {
    * @returns
    */
   protected parseCartItem(
-    remoteItem: MedusaTypes.StoreCartLineItem,
+    remoteItem: StoreCartLineItem,
     currency: Currency
   ): CartItem {
+
     const item: CartItem = {
       identifier: {
         key: remoteItem.id,
@@ -535,7 +601,7 @@ export class MedusaCartProvider extends CartProvider {
    * @param remote
    * @returns
    */
-  protected parseSingle(remote: MedusaTypes.StoreCart): Cart {
+  protected parseSingle(remote: StoreCart): Cart {
     const identifier = MedusaCartIdentifierSchema.parse({
       key: remote.id,
       region_id: remote.region_id,
@@ -559,12 +625,35 @@ export class MedusaCartProvider extends CartProvider {
       items.push(this.parseCartItem(remoteItem, price.grandTotal.currency));
     }
 
+
+    const appliedPromotions = [];
+    if (remote.promotions) {
+      for (const promo of remote.promotions) {
+
+        const promotionName = promo.code;
+        let promoDescription = '';
+        if (promo.application_method?.type === 'percentage') {
+          promoDescription = `-${promo.application_method.value}%`;
+        }
+        if (promo.application_method?.type === 'fixed') {
+          promoDescription = `-${promo.application_method.value} ${price.grandTotal.currency}`;
+        }
+        appliedPromotions.push({
+          code: promo.code || '',
+          isCouponCode: promo.is_automatic ? false : true,
+          name: promotionName || promoDescription,
+          description: promoDescription
+        } satisfies Promotion);
+      }
+    }
+
     const result = {
       identifier,
       name,
       description,
       price,
       items,
+      appliedPromotions,
       userId: {
         userId: '???',
       },