@reactionary/source 0.3.16 → 0.3.18

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

@@ -79,6 +79,14 @@ export class MedusaProfileProvider extends ProfileProvider {
     return success(model);
   }
 
+  protected updatePayload(payload: ProfileMutationUpdate) {
+    const updateData: any = {};
+    if (payload.phone !== undefined) {
+      updateData.phone = payload.phone;
+    }
+    return updateData;
+  }
+
   @Reactionary({
     inputSchema: ProfileMutationUpdateSchema,
     outputSchema: ProfileSchema,
@@ -98,14 +106,16 @@ export class MedusaProfileProvider extends ProfileProvider {
 
     const customer = customerResponse.customer;
 
-    const updatedResponse = await client.store.customer.update({
-      phone: payload.phone ?? customer.phone,
-    }, { fields: this.includedFields.join(',') });
+    const updatedResponse = await client.store.customer.update(this.updatePayload(payload), { fields: this.includedFields.join(',') });
 
     const model = this.parseSingle(updatedResponse.customer);
     return success(model);
   }
 
+  protected addShippingAddressPayload(payload: ProfileMutationAddShippingAddress) {
+    return this.createMedusaAddress(payload.address);
+  }
+
   @Reactionary({
     inputSchema: ProfileMutationAddShippingAddressSchema,
     outputSchema: ProfileSchema,
@@ -115,7 +125,6 @@ export class MedusaProfileProvider extends ProfileProvider {
 
     const client = await this.medusaApi.getClient();
 
-    const medusaAddress = this.createMedusaAddress(payload.address);
 
     // check if any address with the same nickName exists
     const customer = await client.store.customer.retrieve({ fields: this.includedFields.join(',') });
@@ -133,7 +142,7 @@ export class MedusaProfileProvider extends ProfileProvider {
       });
     }
 
-    const response = await client.store.customer.createAddress(medusaAddress, { fields: this.includedFields.join(',') });
+    const response = await client.store.customer.createAddress(this.addShippingAddressPayload(payload), { fields: this.includedFields.join(',') });
     if (!response.customer) {
       return error<InvalidInputError>({
         type: 'InvalidInput',
@@ -145,6 +154,10 @@ export class MedusaProfileProvider extends ProfileProvider {
     return success(model);
   }
 
+  protected updateShippingAddressPayload(payload: ProfileMutationUpdateShippingAddress) {
+    return this.createMedusaAddress(payload.address);
+  }
+
   @Reactionary({
     inputSchema: ProfileMutationUpdateShippingAddressSchema,
     outputSchema: ProfileSchema,
@@ -162,8 +175,6 @@ export class MedusaProfileProvider extends ProfileProvider {
       });
     }
 
-    const medusaAddress = this.createMedusaAddress(payload.address);
-
     const existingAddress = customer.customer.addresses.find(addr => addr.address_name === payload.address.identifier.nickName);
     if (!existingAddress) {
       return error<NotFoundError>({
@@ -172,7 +183,7 @@ export class MedusaProfileProvider extends ProfileProvider {
       });
     }
 
-    const response = await client.store.customer.updateAddress(existingAddress.id, medusaAddress , { fields: this.includedFields.join(',') });
+    const response = await client.store.customer.updateAddress(existingAddress.id, this.updateShippingAddressPayload(payload), { fields: this.includedFields.join(',') });
     if (!response.customer) {
       return error<InvalidInputError>({
         type: 'InvalidInput',
@@ -226,6 +237,12 @@ export class MedusaProfileProvider extends ProfileProvider {
   }
 
 
+  protected makeShippingAddressDefaultPayload(payload: ProfileMutationMakeShippingAddressDefault) {
+   return  {
+      is_default_shipping: true
+    }
+  }
+
   @Reactionary({
     inputSchema: ProfileMutationMakeShippingAddressDefaultSchema,
     outputSchema: ProfileSchema,
@@ -251,15 +268,23 @@ export class MedusaProfileProvider extends ProfileProvider {
       });
     }
 
-    const response = await client.store.customer.updateAddress(existingAddress.id, {
-      is_default_shipping: true
-    }, { fields: this.includedFields.join(',') }
+    const response = await client.store.customer.updateAddress(
+      existingAddress.id,
+      this.makeShippingAddressDefaultPayload(payload),
+      { fields: this.includedFields.join(',') }
     );
 
     const model = this.parseSingle(response.customer!);
     return success(model);
   }
 
+
+  protected setBillingAddressPayload(payload: ProfileMutationSetBillingAddress) {
+    const newAddr = this.createMedusaAddress(payload.address);
+    newAddr.is_default_billing = true;
+    return newAddr;
+  }
+
   @Reactionary({
     inputSchema: ProfileMutationSetBillingAddressSchema,
     outputSchema: ProfileSchema,
@@ -289,9 +314,9 @@ export class MedusaProfileProvider extends ProfileProvider {
     }
 
 
-    const newAddr = this.createMedusaAddress(payload.address);
-    newAddr.is_default_billing = true;
 
+
+    const newAddr = this.setBillingAddressPayload(payload);
     // two scenarios: Either we already have a billing addres, in which case we update it, or we dont and we need to create it.
     const existingBillingAddress = customer.addresses.find(addr => addr.is_default_billing);
     if (existingBillingAddress) {

package/providers/meilisearch/src/providers/order-search.provider.ts

@@ -52,17 +52,7 @@ export class MeilisearchOrderSearchProvider extends OrderSearchProvider {
     this.config = config;
   }
 
-  @Reactionary({
-    inputSchema: OrderSearchQueryByTermSchema,
-    outputSchema: OrderSearchResultSchema,
-  })
-  public async queryByTerm(payload: OrderSearchQueryByTerm): Promise<Result<OrderSearchResult>> {
-    const client = new MeiliSearch({
-      host: this.config.apiUrl,
-      apiKey: this.config.apiKey,
-    });
-
-    const index = client.index(this.config.orderIndexName);
+  protected queryByTermPayload(payload: OrderSearchQueryByTerm): SearchParams {
 
     const filters: string[] = [];
 
@@ -103,10 +93,25 @@ export class MeilisearchOrderSearchProvider extends OrderSearchProvider {
       filter: filters.length > 0 ? filters.join(' AND ') : undefined,
       sort: ['orderDateTimestamp:desc'],
     };
+    return searchOptions
+  }
+
+  @Reactionary({
+    inputSchema: OrderSearchQueryByTermSchema,
+    outputSchema: OrderSearchResultSchema,
+  })
+  public async queryByTerm(payload: OrderSearchQueryByTerm): Promise<Result<OrderSearchResult>> {
+    const client = new MeiliSearch({
+      host: this.config.apiUrl,
+      apiKey: this.config.apiKey,
+    });
+
+    const index = client.index(this.config.orderIndexName);
+
 
     const remote = await index.search<MeilisearchNativeOrderRecord>(
       payload.search.term || '',
-      searchOptions
+      this.queryByTermPayload(payload)
     );
 
     const result = this.parsePaginatedResult(remote, payload) as OrderSearchResult;

package/providers/meilisearch/src/providers/product-recommendations.provider.ts

@@ -9,7 +9,7 @@ import {
   type ProductSearchResultItemVariant,
   ProductSearchResultItemVariantSchema,
 } from '@reactionary/core';
-import { MeiliSearch, type Hits, type RecordAny, type SearchParams, type SearchResponse } from 'meilisearch';
+import { MeiliSearch, type Hits, type RecordAny, type SearchParams, type SearchResponse, type SearchSimilarDocumentsParams } from 'meilisearch';
 import type { MeilisearchConfiguration } from '../schema/configuration.schema.js';
 import type { MeilisearchNativeRecord, MeilisearchNativeVariant } from '../schema/index.js';
 
@@ -32,6 +32,14 @@ export class MeilisearchProductRecommendationsProvider extends ProductRecommenda
     this.config = config;
   }
 
+  protected getSimilarProductsRecommendationsPayload(query: ProductRecommendationAlgorithmSimilarProductsQuery): SearchSimilarDocumentsParams {
+    return {
+        id: query.sourceProduct.key,
+        limit: query.numberOfRecommendations,
+        embedder: this.config.useAIEmbedding,
+      }
+  }
+
   /**
    * Get similar product recommendations
    * Uses semantic search to find visually or data-wise similar products
@@ -52,16 +60,7 @@ export class MeilisearchProductRecommendationsProvider extends ProductRecommenda
     }
 
     try {
-      const searchOptions: SearchParams = {
-        limit: query.numberOfRecommendations,
-      };
-
-      const response = await index.searchSimilarDocuments<MeilisearchNativeRecord>({
-        id: query.sourceProduct.key,
-        limit: query.numberOfRecommendations,
-        embedder: this.config.useAIEmbedding,
-      });
-
+      const response = await index.searchSimilarDocuments<MeilisearchNativeRecord>(this.getSimilarProductsRecommendationsPayload(query));
 
       return this.parseRecommendations(response, 'similar');
     } catch (error) {

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

@@ -36,23 +36,7 @@ export class MeilisearchSearchProvider extends ProductSearchProvider {
     this.config = config;
   }
 
-  @Reactionary({
-    inputSchema: ProductSearchQueryByTermSchema,
-    outputSchema: ProductSearchResultSchema,
-    cache: true,
-    cacheTimeToLiveInSeconds: 300,
-    currencyDependentCaching: false,
-    localeDependentCaching: true
-  })
-  public override async queryByTerm(
-    payload: ProductSearchQueryByTerm
-  ): Promise<Result<ProductSearchResult>> {
-    const client = new MeiliSearch({
-      host: this.config.apiUrl,
-      apiKey: this.config.apiKey,
-    });
-
-    const index = client.index(this.config.indexName);
+  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;
@@ -88,8 +72,29 @@ export class MeilisearchSearchProvider extends ProductSearchProvider {
         embedder: this.config.useAIEmbedding
       };
     }
+    return searchOptions;
+  }
+
+  @Reactionary({
+    inputSchema: ProductSearchQueryByTermSchema,
+    outputSchema: ProductSearchResultSchema,
+    cache: true,
+    cacheTimeToLiveInSeconds: 300,
+    currencyDependentCaching: false,
+    localeDependentCaching: true
+  })
+  public override async queryByTerm(
+    payload: ProductSearchQueryByTerm
+  ): Promise<Result<ProductSearchResult>> {
+    const client = new MeiliSearch({
+      host: this.config.apiUrl,
+      apiKey: this.config.apiKey,
+    });
+
+    const index = client.index(this.config.indexName);
+
 
-    const remote = await index.search<MeilisearchNativeRecord>(payload.search.term, searchOptions);
+    const remote = await index.search<MeilisearchNativeRecord>(payload.search.term, this.queryByTermPayload(payload) as SearchParams);
 
     const result = this.parsePaginatedResult(remote, payload) as MeilisearchProductSearchResult;