@unchainedshop/core 4.0.0-rc.14 → 4.0.0-rc.16

package/src/services/addMessage.ts

@@ -0,0 +1,20 @@
+import { Work } from '@unchainedshop/core-worker';
+import { MessagingDirector } from '../core-index.js';
+import { Modules } from '../modules.js';
+
+export async function addMessageService<T = Record<string, any>>(
+  this: Modules,
+  template: string,
+  input: T,
+): Promise<Work | null> {
+  const templateResolver = MessagingDirector.getTemplate(template); // Validate template exists
+  if (!templateResolver) return null;
+  return this.worker.addWork({
+    type: 'MESSAGE',
+    input: {
+      template,
+      ...input,
+    },
+    retries: 0,
+  });
+}

package/src/services/index.ts

@@ -44,6 +44,7 @@ import { simulateProductPricingService } from './simulateProductPricing.js';
 import { simulateProductDispatchingService } from './simulateProductDispatching.js';
 import { simulateProductInventoryService } from './simulateProductInventory.js';
 import { findOrInitCartService } from './findOrInitCart.js';
+import { addMessageService } from './addMessage.js';
 
 // Auto-Inject Unchained API as last parameter
 // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Proxy
@@ -156,6 +157,9 @@ export default function initServices(modules: Modules, customServices: CustomSer
     warehousing: {
       ercMetadata: ercMetadataService as Bound<typeof ercMetadataService>,
     },
+    worker: {
+      addMessage: addMessageService as Bound<typeof addMessageService>,
+    },
   };
 
   // This Proxy Binds all services to the Modules Object

package/src/services/initCartProviders.ts

@@ -33,10 +33,9 @@ export async function initCartProvidersService(this: Modules, order: Order) {
       { modules: this },
     );
     if (defaultOrderDeliveryProvider) {
-      updatedOrder = await this.orders.setDeliveryProvider(
-        updatedOrder._id,
-        defaultOrderDeliveryProvider._id,
-      );
+      updatedOrder =
+        (await this.orders.setDeliveryProvider(updatedOrder._id, defaultOrderDeliveryProvider._id)) ||
+        updatedOrder;
     }
   }
 
@@ -76,10 +75,9 @@ export async function initCartProvidersService(this: Modules, order: Order) {
     );
 
     if (defaultOrderPaymentProvider) {
-      updatedOrder = await this.orders.setPaymentProvider(
-        updatedOrder._id,
-        defaultOrderPaymentProvider._id,
-      );
+      updatedOrder =
+        (await this.orders.setPaymentProvider(updatedOrder._id, defaultOrderPaymentProvider._id)) ||
+        updatedOrder;
     }
   }
   return updatedOrder;

package/src/services/initializeEnrollment.ts

@@ -2,6 +2,7 @@ import { Enrollment } from '@unchainedshop/core-enrollments';
 import { EnrollmentDirector } from '../core-index.js';
 import { processEnrollmentService } from './processEnrollment.js';
 import { Modules } from '../modules.js';
+import { addMessageService } from './addMessage.js';
 
 export async function initializeEnrollmentService(
   this: Modules,
@@ -23,15 +24,10 @@ export async function initializeEnrollmentService(
   const user = await this.users.findUserById(enrollment.userId);
   const locale = this.users.userLocale(user);
 
-  await this.worker.addWork({
-    type: 'MESSAGE',
-    retries: 0,
-    input: {
-      reason: params.reason || 'status_change',
-      locale: locale.baseName,
-      template: 'ENROLLMENT_STATUS',
-      enrollmentId: processedEnrollment._id,
-    },
+  await addMessageService.bind(this)('ENROLLMENT_STATUS', {
+    reason: 'status_change',
+    locale: locale.baseName,
+    enrollmentId: processedEnrollment._id,
   });
 
   return processedEnrollment;

package/src/services/processQuotation.ts

@@ -1,6 +1,7 @@
 import { Quotation, QuotationStatus } from '@unchainedshop/core-quotations';
 import { Modules } from '../modules.js';
 import { QuotationDirector } from '../core-index.js';
+import { addMessageService } from './addMessage.js';
 
 const findNextStatus = async (quotation: Quotation, modules: Modules): Promise<QuotationStatus> => {
   let status = quotation.status as QuotationStatus;
@@ -61,14 +62,9 @@ export async function processQuotationService(
   const user = await this.users.findUserById(updatedQuotation.userId);
   const locale = this.users.userLocale(user);
 
-  await this.worker.addWork({
-    type: 'MESSAGE',
-    retries: 0,
-    input: {
-      locale: locale.baseName,
-      template: 'QUOTATION_STATUS',
-      quotationId: updatedQuotation._id,
-    },
+  await addMessageService.bind(this)('QUOTATION_STATUS', {
+    locale: locale.baseName,
+    quotationId: updatedQuotation._id,
   });
 
   return updatedQuotation;

package/src/services/removeFiles.ts

@@ -13,8 +13,8 @@ export async function removeFilesService(this: Modules, { fileIds }: { fileIds:
 
   try {
     await fileUploadAdapter.removeFiles(fileObjects, { modules: this });
-  } catch (e) {
-    console.warn(e);
+  } catch {
+    /**/
   }
 
   const fileIdsToDelete = fileObjects.map((f) => f._id).filter(Boolean);

package/src/services/searchAssortments.ts

@@ -36,7 +36,8 @@ export async function searchAssortmentsService(
   const assortmentIds = await searchQuery.assortmentIds;
 
   const totalAssortmentIds =
-    (await filterActions.searchAssortments({ assortmentIds }, searchConfiguration)) || [];
+    (await filterActions.searchAssortments({ assortmentIds }, searchConfiguration)) ||
+    (await this.assortments.findAssortmentIds({ includeInactive: searchQuery.includeInactive }));
 
   return {
     searchConfiguration,

package/src/services/searchProducts.ts

@@ -47,7 +47,9 @@ export async function searchProductsService(
     };
   }
 
-  const totalProductIds = (await filterActions.searchProducts(searchQuery, searchConfiguration)) || [];
+  const totalProductIds =
+    (await filterActions.searchProducts(searchQuery, searchConfiguration)) ||
+    (await this.products.findProductIds({ includeDrafts: searchQuery.includeInactive }));
 
   const filteredProductIds = await FilterDirector.productFacetedSearch(
     totalProductIds,

package/src/services/terminateEnrollment.ts

@@ -1,5 +1,6 @@
 import { Enrollment, EnrollmentStatus } from '@unchainedshop/core-enrollments';
 import { processEnrollmentService } from './processEnrollment.js';
+import { addMessageService } from './addMessage.js';
 
 export async function terminateEnrollmentService(enrollment: Enrollment) {
   if (enrollment.status === EnrollmentStatus.TERMINATED) return enrollment;
@@ -14,15 +15,10 @@ export async function terminateEnrollmentService(enrollment: Enrollment) {
   const user = await this.users.findUserById(enrollment.userId);
   const locale = this.users.userLocale(user);
 
-  await this.worker.addWork({
-    type: 'MESSAGE',
-    retries: 0,
-    input: {
-      reason: 'status_change',
-      locale: locale.baseName,
-      template: 'ENROLLMENT_STATUS',
-      enrollmentId: updatedEnrollment._id,
-    },
+  await addMessageService.bind(this)('ENROLLMENT_STATUS', {
+    reason: 'status_change',
+    locale: locale.baseName,
+    enrollmentId: updatedEnrollment._id,
   });
 
   return updatedEnrollment;

package/src/services/updateCalculation.ts

@@ -11,7 +11,7 @@ import {
 } from '../directors/index.js';
 
 export async function updateCalculationService(this: Modules, orderId: string) {
-  const order = await this.orders.findOrder({ orderId });
+  let order = await this.orders.findOrder({ orderId });
 
   // Don't recalculate orders, only carts
   if (order.status !== null) return order;
@@ -124,7 +124,9 @@ export async function updateCalculationService(this: Modules, orderId: string) {
     { modules: this },
   );
 
-  const updatedOrder = await this.orders.updateCalculationSheet(orderId, calculation);
+  if (JSON.stringify(order.calculation) !== JSON.stringify(calculation)) {
+    order = await this.orders.updateCalculationSheet(orderId, calculation);
+  }
 
   /*
        // We have to do initCartProviders after calculation, only then filterSupportedProviders will work correctly and has access to recent pricing
@@ -138,5 +140,5 @@ export async function updateCalculationService(this: Modules, orderId: string) {
         // 6. update calculation -> order pricing updated to items 0, delivery 0, payment 0
         // 7. initCartProviders with updated order -> all providers are valid -> return order
     */
-  return initCartProvidersService.bind(this)(updatedOrder);
+  return initCartProvidersService.bind(this)(order);
 }