@open-mercato/core 0.6.6-develop.6094.1.28b081ea16 → 0.6.6-develop.6121.1.5797a901b3

package/dist/modules/catalog/commands/products.js

@@ -790,6 +790,32 @@ async function loadProductSnapshot(em, id) {
     weightValue,
     weightUnit,
     dimensions,
+    countryOfOriginCode: record.countryOfOriginCode ?? null,
+    pkwiuCode: record.pkwiuCode ?? null,
+    cnCode: record.cnCode ?? null,
+    hsCode: record.hsCode ?? null,
+    taxClassificationCode: record.taxClassificationCode ?? null,
+    gtuCodes: record.gtuCodes?.length ? [...record.gtuCodes] : null,
+    ageMin: record.ageMin ?? null,
+    isExciseGood: record.isExciseGood ?? false,
+    exciseCategory: record.exciseCategory ?? null,
+    requiresPrescription: record.requiresPrescription ?? false,
+    hazmatClass: record.hazmatClass ?? null,
+    unNumber: record.unNumber ?? null,
+    hazmatPackingGroup: record.hazmatPackingGroup ?? null,
+    containsLithiumBattery: record.containsLithiumBattery ?? false,
+    launchAt: record.launchAt ? record.launchAt.toISOString() : null,
+    endOfLifeAt: record.endOfLifeAt ? record.endOfLifeAt.toISOString() : null,
+    availableFrom: record.availableFrom ? record.availableFrom.toISOString() : null,
+    availableUntil: record.availableUntil ? record.availableUntil.toISOString() : null,
+    minOrderQty: record.minOrderQty ?? null,
+    maxOrderQty: record.maxOrderQty ?? null,
+    orderQtyIncrement: record.orderQtyIncrement ?? null,
+    requiresShipping: record.requiresShipping ?? true,
+    isQuoteOnly: record.isQuoteOnly ?? false,
+    seoTitle: record.seoTitle ?? null,
+    seoDescription: record.seoDescription ?? null,
+    canonicalUrl: record.canonicalUrl ?? null,
     customFieldsetCode: record.customFieldsetCode ?? null,
     metadata,
     isConfigurable: record.isConfigurable,
@@ -831,6 +857,32 @@ function productSeedFromSnapshot(snapshot) {
     weightValue: snapshot.weightValue ?? null,
     weightUnit: snapshot.weightUnit ?? null,
     dimensions: snapshot.dimensions ? cloneJson(snapshot.dimensions) : null,
+    countryOfOriginCode: snapshot.countryOfOriginCode ?? null,
+    pkwiuCode: snapshot.pkwiuCode ?? null,
+    cnCode: snapshot.cnCode ?? null,
+    hsCode: snapshot.hsCode ?? null,
+    taxClassificationCode: snapshot.taxClassificationCode ?? null,
+    gtuCodes: snapshot.gtuCodes ? [...snapshot.gtuCodes] : null,
+    ageMin: snapshot.ageMin ?? null,
+    isExciseGood: snapshot.isExciseGood ?? false,
+    exciseCategory: snapshot.exciseCategory ?? null,
+    requiresPrescription: snapshot.requiresPrescription ?? false,
+    hazmatClass: snapshot.hazmatClass ?? null,
+    unNumber: snapshot.unNumber ?? null,
+    hazmatPackingGroup: snapshot.hazmatPackingGroup ?? null,
+    containsLithiumBattery: snapshot.containsLithiumBattery ?? false,
+    launchAt: snapshot.launchAt ? new Date(snapshot.launchAt) : null,
+    endOfLifeAt: snapshot.endOfLifeAt ? new Date(snapshot.endOfLifeAt) : null,
+    availableFrom: snapshot.availableFrom ? new Date(snapshot.availableFrom) : null,
+    availableUntil: snapshot.availableUntil ? new Date(snapshot.availableUntil) : null,
+    minOrderQty: snapshot.minOrderQty ?? null,
+    maxOrderQty: snapshot.maxOrderQty ?? null,
+    orderQtyIncrement: snapshot.orderQtyIncrement ?? null,
+    requiresShipping: snapshot.requiresShipping ?? true,
+    isQuoteOnly: snapshot.isQuoteOnly ?? false,
+    seoTitle: snapshot.seoTitle ?? null,
+    seoDescription: snapshot.seoDescription ?? null,
+    canonicalUrl: snapshot.canonicalUrl ?? null,
     metadata: snapshot.metadata ? cloneJson(snapshot.metadata) : null,
     customFieldsetCode: snapshot.customFieldsetCode ?? null,
     isConfigurable: snapshot.isConfigurable,
@@ -865,6 +917,32 @@ function applyProductSnapshot(em, record, snapshot) {
   record.weightValue = snapshot.weightValue ?? null;
   record.weightUnit = snapshot.weightUnit ?? null;
   record.dimensions = snapshot.dimensions ? cloneJson(snapshot.dimensions) : null;
+  record.countryOfOriginCode = snapshot.countryOfOriginCode ?? null;
+  record.pkwiuCode = snapshot.pkwiuCode ?? null;
+  record.cnCode = snapshot.cnCode ?? null;
+  record.hsCode = snapshot.hsCode ?? null;
+  record.taxClassificationCode = snapshot.taxClassificationCode ?? null;
+  record.gtuCodes = snapshot.gtuCodes ? [...snapshot.gtuCodes] : null;
+  record.ageMin = snapshot.ageMin ?? null;
+  record.isExciseGood = snapshot.isExciseGood ?? false;
+  record.exciseCategory = snapshot.exciseCategory ?? null;
+  record.requiresPrescription = snapshot.requiresPrescription ?? false;
+  record.hazmatClass = snapshot.hazmatClass ?? null;
+  record.unNumber = snapshot.unNumber ?? null;
+  record.hazmatPackingGroup = snapshot.hazmatPackingGroup ?? null;
+  record.containsLithiumBattery = snapshot.containsLithiumBattery ?? false;
+  record.launchAt = snapshot.launchAt ? new Date(snapshot.launchAt) : null;
+  record.endOfLifeAt = snapshot.endOfLifeAt ? new Date(snapshot.endOfLifeAt) : null;
+  record.availableFrom = snapshot.availableFrom ? new Date(snapshot.availableFrom) : null;
+  record.availableUntil = snapshot.availableUntil ? new Date(snapshot.availableUntil) : null;
+  record.minOrderQty = snapshot.minOrderQty ?? null;
+  record.maxOrderQty = snapshot.maxOrderQty ?? null;
+  record.orderQtyIncrement = snapshot.orderQtyIncrement ?? null;
+  record.requiresShipping = snapshot.requiresShipping ?? true;
+  record.isQuoteOnly = snapshot.isQuoteOnly ?? false;
+  record.seoTitle = snapshot.seoTitle ?? null;
+  record.seoDescription = snapshot.seoDescription ?? null;
+  record.canonicalUrl = snapshot.canonicalUrl ?? null;
   record.metadata = snapshot.metadata ? cloneJson(snapshot.metadata) : null;
   record.customFieldsetCode = snapshot.customFieldsetCode ?? null;
   record.optionSchemaTemplate = snapshot.optionSchemaId ? em.getReference(CatalogOptionSchemaTemplate, snapshot.optionSchemaId) : null;
@@ -934,6 +1012,32 @@ const createProductCommand = {
       weightValue,
       weightUnit,
       dimensions,
+      countryOfOriginCode: parsed.countryOfOriginCode ?? null,
+      pkwiuCode: parsed.pkwiuCode ?? null,
+      cnCode: parsed.cnCode ?? null,
+      hsCode: parsed.hsCode ?? null,
+      taxClassificationCode: parsed.taxClassificationCode ?? null,
+      gtuCodes: parsed.gtuCodes ?? null,
+      ageMin: parsed.ageMin ?? null,
+      isExciseGood: parsed.isExciseGood ?? false,
+      exciseCategory: parsed.exciseCategory ?? null,
+      requiresPrescription: parsed.requiresPrescription ?? false,
+      hazmatClass: parsed.hazmatClass ?? null,
+      unNumber: parsed.unNumber ?? null,
+      hazmatPackingGroup: parsed.hazmatPackingGroup ?? null,
+      containsLithiumBattery: parsed.containsLithiumBattery ?? false,
+      launchAt: parsed.launchAt ?? null,
+      endOfLifeAt: parsed.endOfLifeAt ?? null,
+      availableFrom: parsed.availableFrom ?? null,
+      availableUntil: parsed.availableUntil ?? null,
+      minOrderQty: parsed.minOrderQty ?? null,
+      maxOrderQty: parsed.maxOrderQty ?? null,
+      orderQtyIncrement: parsed.orderQtyIncrement ?? null,
+      requiresShipping: parsed.requiresShipping ?? true,
+      isQuoteOnly: parsed.isQuoteOnly ?? false,
+      seoTitle: parsed.seoTitle ?? null,
+      seoDescription: parsed.seoDescription ?? null,
+      canonicalUrl: parsed.canonicalUrl ?? null,
       metadata,
       customFieldsetCode: parsed.customFieldsetCode ?? null,
       isConfigurable: parsed.isConfigurable ?? false,
@@ -1140,6 +1244,54 @@ const updateProductCommand = {
     ensureTenantScope(ctx, tenantId);
     ensureOrganizationScope(ctx, organizationId);
     ensureSameScope(record, organizationId, tenantId);
+    const mergedRangeViolation = (() => {
+      const minOrderQty = parsed.minOrderQty !== void 0 ? parsed.minOrderQty ?? null : record.minOrderQty ?? null;
+      const maxOrderQty = parsed.maxOrderQty !== void 0 ? parsed.maxOrderQty ?? null : record.maxOrderQty ?? null;
+      if (minOrderQty != null && maxOrderQty != null && maxOrderQty < minOrderQty) {
+        return {
+          field: "maxOrderQty",
+          key: "catalog.products.validation.orderQtyRange",
+          fallback: "Maximum order quantity cannot be lower than the minimum."
+        };
+      }
+      const launchAt = parsed.launchAt !== void 0 ? parsed.launchAt ?? null : record.launchAt ?? null;
+      const endOfLifeAt = parsed.endOfLifeAt !== void 0 ? parsed.endOfLifeAt ?? null : record.endOfLifeAt ?? null;
+      if (launchAt && endOfLifeAt && endOfLifeAt < launchAt) {
+        return {
+          field: "endOfLifeAt",
+          key: "catalog.products.validation.lifecycleDateRange",
+          fallback: "End of life cannot be before the launch date."
+        };
+      }
+      const availableFrom = parsed.availableFrom !== void 0 ? parsed.availableFrom ?? null : record.availableFrom ?? null;
+      const availableUntil = parsed.availableUntil !== void 0 ? parsed.availableUntil ?? null : record.availableUntil ?? null;
+      if (availableFrom && availableUntil && availableUntil < availableFrom) {
+        return {
+          field: "availableUntil",
+          key: "catalog.products.validation.availabilityDateRange",
+          fallback: "Available until cannot be before available from."
+        };
+      }
+      return null;
+    })();
+    if (mergedRangeViolation) {
+      const message = translate(
+        mergedRangeViolation.key,
+        mergedRangeViolation.fallback
+      );
+      throw new CrudHttpError(400, {
+        error: message,
+        fieldErrors: { [mergedRangeViolation.field]: message },
+        details: [
+          {
+            path: [mergedRangeViolation.field],
+            message,
+            code: "invalid",
+            origin: "validation"
+          }
+        ]
+      });
+    }
     const dataEngine = ctx.container.resolve("dataEngine");
     const lookupEm = em.fork();
     const taxRateProvided = parsed.taxRateId !== void 0 || parsed.taxRate !== void 0;
@@ -1262,6 +1414,55 @@ const updateProductCommand = {
     if (parsed.isConfigurable !== void 0)
       record.isConfigurable = parsed.isConfigurable;
     if (parsed.isActive !== void 0) record.isActive = parsed.isActive;
+    if (parsed.countryOfOriginCode !== void 0)
+      record.countryOfOriginCode = parsed.countryOfOriginCode ?? null;
+    if (parsed.pkwiuCode !== void 0)
+      record.pkwiuCode = parsed.pkwiuCode ?? null;
+    if (parsed.cnCode !== void 0) record.cnCode = parsed.cnCode ?? null;
+    if (parsed.hsCode !== void 0) record.hsCode = parsed.hsCode ?? null;
+    if (parsed.taxClassificationCode !== void 0)
+      record.taxClassificationCode = parsed.taxClassificationCode ?? null;
+    if (parsed.gtuCodes !== void 0)
+      record.gtuCodes = parsed.gtuCodes ?? null;
+    if (parsed.ageMin !== void 0) record.ageMin = parsed.ageMin ?? null;
+    if (parsed.isExciseGood !== void 0)
+      record.isExciseGood = parsed.isExciseGood;
+    if (parsed.exciseCategory !== void 0)
+      record.exciseCategory = parsed.exciseCategory ?? null;
+    if (parsed.requiresPrescription !== void 0)
+      record.requiresPrescription = parsed.requiresPrescription;
+    if (parsed.hazmatClass !== void 0)
+      record.hazmatClass = parsed.hazmatClass ?? null;
+    if (parsed.unNumber !== void 0)
+      record.unNumber = parsed.unNumber ?? null;
+    if (parsed.hazmatPackingGroup !== void 0)
+      record.hazmatPackingGroup = parsed.hazmatPackingGroup ?? null;
+    if (parsed.containsLithiumBattery !== void 0)
+      record.containsLithiumBattery = parsed.containsLithiumBattery;
+    if (parsed.launchAt !== void 0)
+      record.launchAt = parsed.launchAt ?? null;
+    if (parsed.endOfLifeAt !== void 0)
+      record.endOfLifeAt = parsed.endOfLifeAt ?? null;
+    if (parsed.availableFrom !== void 0)
+      record.availableFrom = parsed.availableFrom ?? null;
+    if (parsed.availableUntil !== void 0)
+      record.availableUntil = parsed.availableUntil ?? null;
+    if (parsed.minOrderQty !== void 0)
+      record.minOrderQty = parsed.minOrderQty ?? null;
+    if (parsed.maxOrderQty !== void 0)
+      record.maxOrderQty = parsed.maxOrderQty ?? null;
+    if (parsed.orderQtyIncrement !== void 0)
+      record.orderQtyIncrement = parsed.orderQtyIncrement ?? null;
+    if (parsed.requiresShipping !== void 0)
+      record.requiresShipping = parsed.requiresShipping;
+    if (parsed.isQuoteOnly !== void 0)
+      record.isQuoteOnly = parsed.isQuoteOnly;
+    if (parsed.seoTitle !== void 0)
+      record.seoTitle = parsed.seoTitle ?? null;
+    if (parsed.seoDescription !== void 0)
+      record.seoDescription = parsed.seoDescription ?? null;
+    if (parsed.canonicalUrl !== void 0)
+      record.canonicalUrl = parsed.canonicalUrl ?? null;
     try {
       await withAtomicFlush(
         em,
@@ -1302,6 +1503,14 @@ const updateProductCommand = {
     const after = snapshots.after;
     if (!before || !after) return null;
     const { translate } = await resolveTranslations();
+    const beforeGtuCodes = (before.gtuCodes ?? []).join(",");
+    const afterGtuCodes = (after.gtuCodes ?? []).join(",");
+    const gtuCodesChange = beforeGtuCodes !== afterGtuCodes ? {
+      gtuCodes: {
+        from: before.gtuCodes ?? null,
+        to: after.gtuCodes ?? null
+      }
+    } : null;
     return {
       actionLabel: translate(
         "catalog.audit.products.update",
@@ -1311,20 +1520,48 @@ const updateProductCommand = {
       resourceId: before.id,
       tenantId: before.tenantId,
       organizationId: before.organizationId,
-      changes: buildChanges(before, after, [
-        "title",
-        "sku",
-        "productType",
-        "defaultUnit",
-        "defaultSalesUnit",
-        "defaultSalesUnitQuantity",
-        "uomRoundingScale",
-        "uomRoundingMode",
-        "unitPriceEnabled",
-        "unitPriceReferenceUnit",
-        "unitPriceBaseQuantity",
-        "isActive"
-      ]),
+      changes: {
+        ...buildChanges(before, after, [
+          "title",
+          "sku",
+          "productType",
+          "defaultUnit",
+          "defaultSalesUnit",
+          "defaultSalesUnitQuantity",
+          "uomRoundingScale",
+          "uomRoundingMode",
+          "unitPriceEnabled",
+          "unitPriceReferenceUnit",
+          "unitPriceBaseQuantity",
+          "isActive",
+          "countryOfOriginCode",
+          "pkwiuCode",
+          "cnCode",
+          "hsCode",
+          "taxClassificationCode",
+          "ageMin",
+          "isExciseGood",
+          "exciseCategory",
+          "requiresPrescription",
+          "hazmatClass",
+          "unNumber",
+          "hazmatPackingGroup",
+          "containsLithiumBattery",
+          "launchAt",
+          "endOfLifeAt",
+          "availableFrom",
+          "availableUntil",
+          "minOrderQty",
+          "maxOrderQty",
+          "orderQtyIncrement",
+          "requiresShipping",
+          "isQuoteOnly",
+          "seoTitle",
+          "seoDescription",
+          "canonicalUrl"
+        ]),
+        ...gtuCodesChange
+      },
       snapshotBefore: before,
       snapshotAfter: after,
       payload: {