@open-mercato/core 0.4.5-develop-f4858e0ef3 → 0.4.5-develop-4849712ccb

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

@@ -1,6 +1,7 @@
 import { randomUUID } from "node:crypto";
 import { registerCommand } from "@open-mercato/shared/lib/commands";
 import {
+  buildChanges,
   requireId,
   parseWithCustomFields,
   setCustomFieldsIfAny,
@@ -10,7 +11,10 @@ import {
 import { UniqueConstraintViolationException } from "@mikro-orm/core";
 import { resolveTranslations } from "@open-mercato/shared/lib/i18n/server";
 import { CrudHttpError } from "@open-mercato/shared/lib/crud/errors";
-import { loadCustomFieldSnapshot, buildCustomFieldResetMap } from "@open-mercato/shared/lib/commands/customFieldSnapshots";
+import {
+  loadCustomFieldSnapshot,
+  buildCustomFieldResetMap
+} from "@open-mercato/shared/lib/commands/customFieldSnapshots";
 import { E } from "../../../generated/entities.ids.generated.js";
 import { slugifyTagLabel } from "@open-mercato/shared/lib/utils";
 import { parseObjectLike } from "@open-mercato/shared/lib/json/parseObjectLike";
@@ -19,6 +23,7 @@ import {
   CatalogProduct,
   CatalogProductVariant,
   CatalogProductPrice,
+  CatalogProductUnitConversion,
   CatalogOptionSchemaTemplate,
   CatalogProductCategory,
   CatalogProductCategoryAssignment,
@@ -40,9 +45,77 @@ import {
   resolveOptionSchemaCode,
   emitCatalogQueryIndexEvent,
   randomSuffix,
-  toNumericString
+  toNumericString,
+  getErrorConstraint,
+  getErrorMessage
 } from "./shared.js";
-import { findWithDecryption, findOneWithDecryption } from "@open-mercato/shared/lib/encryption/find";
+import {
+  findWithDecryption,
+  findOneWithDecryption
+} from "@open-mercato/shared/lib/encryption/find";
+import { canonicalizeUnitCode } from "../lib/unitCodes.js";
+import {
+  resolveCanonicalUnitCode
+} from "../lib/unitResolution.js";
+async function resolveProductUnitDefaults(em, params) {
+  const defaultUnitInput = canonicalizeUnitCode(params.defaultUnit);
+  const defaultSalesUnitInput = canonicalizeUnitCode(params.defaultSalesUnit);
+  if (!defaultUnitInput && defaultSalesUnitInput) {
+    throw new CrudHttpError(400, { error: "uom.default_unit_missing" });
+  }
+  const defaultUnit = defaultUnitInput ? await resolveCanonicalUnitCode(em, {
+    organizationId: params.organizationId,
+    tenantId: params.tenantId,
+    unitCode: defaultUnitInput
+  }) : null;
+  const defaultSalesUnit = defaultSalesUnitInput ? await resolveCanonicalUnitCode(em, {
+    organizationId: params.organizationId,
+    tenantId: params.tenantId,
+    unitCode: defaultSalesUnitInput
+  }) : null;
+  return { defaultUnit, defaultSalesUnit };
+}
+async function ensureBaseUnitCanBeRemoved(em, params) {
+  if (params.defaultUnit) return;
+  if (params.defaultSalesUnit) {
+    throw new CrudHttpError(400, { error: "uom.default_unit_missing" });
+  }
+  const activeConversionCount = await em.count(CatalogProductUnitConversion, {
+    product: params.productId,
+    organizationId: params.organizationId,
+    tenantId: params.tenantId,
+    deletedAt: null,
+    isActive: true
+  });
+  if (activeConversionCount > 0) {
+    throw new CrudHttpError(400, { error: "uom.default_unit_missing" });
+  }
+}
+function resolveUnitPriceInput(parsed) {
+  const enabledFromNested = parsed.unitPrice?.enabled;
+  const enabledFromFlat = parsed.unitPriceEnabled;
+  const referenceFromNested = parsed.unitPrice?.referenceUnit;
+  const referenceFromFlat = parsed.unitPriceReferenceUnit;
+  const baseFromNested = parsed.unitPrice?.baseQuantity;
+  const baseFromFlat = parsed.unitPriceBaseQuantity;
+  const enabledProvided = enabledFromNested !== void 0 || enabledFromFlat !== void 0;
+  const referenceProvided = referenceFromNested !== void 0 || referenceFromFlat !== void 0;
+  const baseProvided = baseFromNested !== void 0 || baseFromFlat !== void 0;
+  const enabled = enabledFromNested ?? enabledFromFlat;
+  const referenceUnit = canonicalizeUnitCode(
+    referenceFromNested ?? referenceFromFlat ?? null
+  );
+  const baseQuantitySource = baseFromNested ?? baseFromFlat;
+  const baseQuantity = baseQuantitySource === void 0 ? void 0 : toNumericString(baseQuantitySource) ?? null;
+  return {
+    enabled,
+    referenceUnit,
+    baseQuantity,
+    enabledProvided,
+    referenceProvided,
+    baseProvided
+  };
+}
 const productCrudEvents = {
   module: "catalog",
   entity: "product",
@@ -108,14 +181,20 @@ async function resolveScopedTaxRate(em, taxRateId, taxRateInput, organizationId,
   if (!taxRateId) {
     return { taxRateId: null, taxRate: normalizedRate };
   }
-  const record = await em.findOne(SalesTaxRate, {
+  const record = await findOneWithDecryption(em, SalesTaxRate, {
     id: taxRateId,
     organizationId,
     tenantId,
     deletedAt: null
   });
   if (!record) {
-    throw new CrudHttpError(400, { error: "Tax class not found" });
+    const { translate } = await resolveTranslations();
+    throw new CrudHttpError(400, {
+      error: translate(
+        "catalog.products.errors.taxClassNotFound",
+        "Tax class not found"
+      )
+    });
   }
   return { taxRateId, taxRate: record.rate ?? normalizedRate };
 }
@@ -123,7 +202,8 @@ function slugifyCode(input) {
   return input.toLowerCase().trim().replace(/[^a-z0-9\-]+/g, "-").replace(/^-+|-+$/g, "");
 }
 function normalizeCatalogOptionSchema(input) {
-  if (!input || !Array.isArray(input.options) || !input.options.length) return null;
+  if (!input || !Array.isArray(input.options) || !input.options.length)
+    return null;
   const options = input.options.map((option) => {
     if (!option) return null;
     const label = typeof option.label === "string" && option.label.trim().length ? option.label.trim() : null;
@@ -170,10 +250,13 @@ function convertLegacyOptionSchema(raw) {
     if (!title) return null;
     const values = Array.isArray(source["values"]) ? source["values"].map((value) => {
       if (!value || typeof value !== "object") return null;
-      const label = typeof value.label === "string" && value.label.trim().length ? value.label.trim() : null;
+      const choice = value;
+      const label = typeof choice.label === "string" && choice.label.trim().length ? choice.label.trim() : null;
       if (!label) return null;
       return { code: slugifyCode(label), label };
-    }).filter((choice) => !!choice) : [];
+    }).filter(
+      (choice) => !!choice
+    ) : [];
     return {
       code: slugifyCode(title),
       label: title,
@@ -239,7 +322,12 @@ function normalizeWeightInput(raw) {
 }
 function extractMeasurementsFromMetadata(metadata) {
   if (!metadata || typeof metadata !== "object") {
-    return { metadata: null, dimensions: null, weightValue: null, weightUnit: null };
+    return {
+      metadata: null,
+      dimensions: null,
+      weightValue: null,
+      weightUnit: null
+    };
   }
   const clone = { ...metadata };
   const dimensions = normalizeDimensionsInput(clone.dimensions);
@@ -260,7 +348,10 @@ function ensureSchemaName(name, fallback) {
   return "Product option schema";
 }
 async function assignOptionSchemaTemplate(em, product, schema, preferredName) {
-  const resolvedName = ensureSchemaName(schema.name, preferredName ?? product.title);
+  const resolvedName = ensureSchemaName(
+    schema.name,
+    preferredName ?? product.title
+  );
   const templateCode = resolveOptionSchemaCode({
     name: schema.name ?? resolvedName,
     fallback: `${resolvedName}-${product.id}`,
@@ -430,15 +521,14 @@ async function syncCategoryAssignments(em, product, categoryIds) {
     }
     return;
   }
-  const categories = await em.find(
-    CatalogProductCategory,
-    {
-      id: { $in: normalized },
-      organizationId: product.organizationId,
-      tenantId: product.tenantId
-    }
+  const categories = await em.find(CatalogProductCategory, {
+    id: { $in: normalized },
+    organizationId: product.organizationId,
+    tenantId: product.tenantId
+  });
+  const categoryMap = new Map(
+    categories.map((category) => [category.id, category])
   );
-  const categoryMap = new Map(categories.map((category) => [category.id, category]));
   const claimed = /* @__PURE__ */ new Set();
   normalized.forEach((categoryId, index) => {
     const category = categoryMap.get(categoryId);
@@ -495,14 +585,11 @@ async function syncProductTags(em, product, tags) {
     }
     return;
   }
-  const existingTags = await em.find(
-    CatalogProductTag,
-    {
-      organizationId: product.organizationId,
-      tenantId: product.tenantId,
-      slug: { $in: slugs }
-    }
-  );
+  const existingTags = await em.find(CatalogProductTag, {
+    organizationId: product.organizationId,
+    tenantId: product.tenantId,
+    slug: { $in: slugs }
+  });
   const tagsBySlug = new Map(existingTags.map((tag) => [tag.slug, tag]));
   for (const slug of slugs) {
     if (tagsBySlug.has(slug)) continue;
@@ -567,7 +654,9 @@ async function deleteProductVariantsAndRelatedData(opts) {
   );
   const variantIds = variants.map((variant) => variant.id);
   if (variantIds.length) {
-    await em.nativeDelete(CatalogProductPrice, { variant: { $in: variantIds } });
+    await em.nativeDelete(CatalogProductPrice, {
+      variant: { $in: variantIds }
+    });
   }
   for (const variant of variants) {
     em.remove(variant);
@@ -633,7 +722,13 @@ async function loadProductSnapshot(em, id) {
       { populate: ["tag"] },
       { tenantId: record.tenantId, organizationId: record.organizationId }
     ),
-    em.find(CatalogProductCategoryAssignment, { product: record.id }, { populate: ["category"] })
+    findWithDecryption(
+      em,
+      CatalogProductCategoryAssignment,
+      { product: record.id },
+      { populate: ["category"] },
+      { tenantId: record.tenantId, organizationId: record.organizationId }
+    )
   ]);
   const tags = tagAssignments.map((assignment) => {
     const tag = typeof assignment.tag === "string" ? null : assignment.tag ?? null;
@@ -652,7 +747,9 @@ async function loadProductSnapshot(em, id) {
   });
   const optionSchemaTemplate = record.optionSchemaTemplate;
   const optionTemplateId = typeof optionSchemaTemplate === "string" ? optionSchemaTemplate : optionSchemaTemplate?.id ?? null;
-  const measurements = extractMeasurementsFromMetadata(record.metadata ? cloneJson(record.metadata) : null);
+  const measurements = extractMeasurementsFromMetadata(
+    record.metadata ? cloneJson(record.metadata) : null
+  );
   const dimensions = record.dimensions && Object.keys(record.dimensions).length ? cloneJson(record.dimensions) : measurements.dimensions ? cloneJson(measurements.dimensions) : null;
   const weightValue = record.weightValue ?? (measurements.weightValue !== null ? toNumericString(measurements.weightValue) : null);
   const weightUnit = record.weightUnit ?? measurements.weightUnit ?? null;
@@ -672,6 +769,13 @@ async function loadProductSnapshot(em, id) {
     statusEntryId: record.statusEntryId ?? null,
     primaryCurrencyCode: record.primaryCurrencyCode ?? null,
     defaultUnit: record.defaultUnit ?? null,
+    defaultSalesUnit: record.defaultSalesUnit ?? null,
+    defaultSalesUnitQuantity: record.defaultSalesUnitQuantity ?? "1",
+    uomRoundingScale: record.uomRoundingScale ?? 4,
+    uomRoundingMode: record.uomRoundingMode ?? "half_up",
+    unitPriceEnabled: record.unitPriceEnabled ?? false,
+    unitPriceReferenceUnit: record.unitPriceReferenceUnit ?? null,
+    unitPriceBaseQuantity: record.unitPriceBaseQuantity ?? null,
     defaultMediaId: record.defaultMediaId ?? null,
     defaultMediaUrl: record.defaultMediaUrl ?? null,
     weightValue,
@@ -704,6 +808,13 @@ function applyProductSnapshot(em, record, snapshot) {
   record.statusEntryId = snapshot.statusEntryId ?? null;
   record.primaryCurrencyCode = snapshot.primaryCurrencyCode ?? null;
   record.defaultUnit = snapshot.defaultUnit ?? null;
+  record.defaultSalesUnit = snapshot.defaultSalesUnit ?? null;
+  record.defaultSalesUnitQuantity = snapshot.defaultSalesUnitQuantity ?? "1";
+  record.uomRoundingScale = snapshot.uomRoundingScale;
+  record.uomRoundingMode = snapshot.uomRoundingMode;
+  record.unitPriceEnabled = snapshot.unitPriceEnabled;
+  record.unitPriceReferenceUnit = snapshot.unitPriceReferenceUnit ?? null;
+  record.unitPriceBaseQuantity = snapshot.unitPriceBaseQuantity ?? null;
   record.defaultMediaId = snapshot.defaultMediaId ?? null;
   record.defaultMediaUrl = snapshot.defaultMediaUrl ?? null;
   record.weightValue = snapshot.weightValue ?? null;
@@ -720,10 +831,14 @@ function applyProductSnapshot(em, record, snapshot) {
 const createProductCommand = {
   id: "catalog.products.create",
   async execute(rawInput, ctx) {
-    const { parsed, custom } = parseWithCustomFields(productCreateSchema, rawInput);
+    const { parsed, custom } = parseWithCustomFields(
+      productCreateSchema,
+      rawInput
+    );
     ensureTenantScope(ctx, parsed.tenantId);
     ensureOrganizationScope(ctx, parsed.organizationId);
     const em = ctx.container.resolve("em").fork();
+    const { translate } = await resolveTranslations();
     const now = /* @__PURE__ */ new Date();
     const { taxRateId, taxRate } = await resolveScopedTaxRate(
       em,
@@ -738,6 +853,14 @@ const createProductCommand = {
     const weightValue = parsed.weightValue !== void 0 ? toNumericString(parsed.weightValue) : measurements.weightValue !== null ? toNumericString(measurements.weightValue) : null;
     const weightUnit = parsed.weightUnit !== void 0 ? parsed.weightUnit ?? null : measurements.weightUnit ?? null;
     const metadata = measurements.metadata ? cloneJson(measurements.metadata) : null;
+    const unitPriceInput = resolveUnitPriceInput(parsed);
+    const unitPriceEnabled = unitPriceInput.enabled ?? false;
+    const resolvedUnits = await resolveProductUnitDefaults(em, {
+      organizationId: parsed.organizationId,
+      tenantId: parsed.tenantId,
+      defaultUnit: parsed.defaultUnit ?? null,
+      defaultSalesUnit: parsed.defaultSalesUnit ?? parsed.defaultUnit ?? null
+    });
     const productId = randomUUID();
     const record = em.create(CatalogProduct, {
       id: productId,
@@ -753,7 +876,14 @@ const createProductCommand = {
       productType: parsed.productType ?? "simple",
       statusEntryId: parsed.statusEntryId ?? null,
       primaryCurrencyCode: parsed.primaryCurrencyCode ?? null,
-      defaultUnit: parsed.defaultUnit ?? null,
+      defaultUnit: resolvedUnits.defaultUnit,
+      defaultSalesUnit: resolvedUnits.defaultSalesUnit ?? resolvedUnits.defaultUnit,
+      defaultSalesUnitQuantity: toNumericString(parsed.defaultSalesUnitQuantity ?? 1) ?? "1",
+      uomRoundingScale: parsed.uomRoundingScale ?? 4,
+      uomRoundingMode: parsed.uomRoundingMode ?? "half_up",
+      unitPriceEnabled,
+      unitPriceReferenceUnit: unitPriceEnabled ? unitPriceInput.referenceUnit ?? null : null,
+      unitPriceBaseQuantity: unitPriceEnabled ? unitPriceInput.baseQuantity ?? null : null,
       defaultMediaId: parsed.defaultMediaId ?? null,
       defaultMediaUrl: parsed.defaultMediaUrl ?? null,
       weightValue,
@@ -771,9 +901,13 @@ const createProductCommand = {
       optionSchemaTemplate = await requireOptionSchemaTemplate(
         em,
         parsed.optionSchemaId,
-        "Option schema not found"
+        translate("catalog.errors.optionSchemaNotFound", "Option schema not found")
+      );
+      ensureSameScope(
+        optionSchemaTemplate,
+        parsed.organizationId,
+        parsed.tenantId
       );
-      ensureSameScope(optionSchemaTemplate, parsed.organizationId, parsed.tenantId);
       record.optionSchemaTemplate = optionSchemaTemplate;
     } else if (optionSchemaDefinition) {
       optionSchemaTemplate = await assignOptionSchemaTemplate(
@@ -822,7 +956,10 @@ const createProductCommand = {
     if (!after) return null;
     const { translate } = await resolveTranslations();
     return {
-      actionLabel: translate("catalog.audit.products.create", "Create catalog product"),
+      actionLabel: translate(
+        "catalog.audit.products.create",
+        "Create catalog product"
+      ),
       resourceKind: "catalog.product",
       resourceId: result.productId,
       tenantId: after.tenantId,
@@ -840,14 +977,17 @@ const createProductCommand = {
     const after = payload?.after;
     if (!after) return;
     const em = ctx.container.resolve("em").fork();
-    const record = await em.findOne(CatalogProduct, { id: after.id });
+    const record = await findOneWithDecryption(em, CatalogProduct, { id: after.id });
     if (!record) return;
     ensureTenantScope(ctx, record.tenantId);
     ensureOrganizationScope(ctx, record.organizationId);
     em.remove(record);
     await em.flush();
     const dataEngine = ctx.container.resolve("dataEngine");
-    const resetValues = buildCustomFieldResetMap(void 0, after.custom ?? void 0);
+    const resetValues = buildCustomFieldResetMap(
+      void 0,
+      after.custom ?? void 0
+    );
     if (Object.keys(resetValues).length) {
       await setCustomFieldsIfAny({
         dataEngine,
@@ -878,35 +1018,105 @@ const updateProductCommand = {
     return snapshot ? { before: snapshot } : {};
   },
   async execute(rawInput, ctx) {
-    const { parsed, custom } = parseWithCustomFields(productUpdateSchema, rawInput);
+    const { parsed, custom } = parseWithCustomFields(
+      productUpdateSchema,
+      rawInput
+    );
+    const rawPayload = rawInput && typeof rawInput === "object" ? rawInput : null;
+    const hasDefaultUnit = Boolean(
+      rawPayload && Object.prototype.hasOwnProperty.call(rawPayload, "defaultUnit")
+    );
+    const hasDefaultSalesUnit = Boolean(
+      rawPayload && Object.prototype.hasOwnProperty.call(rawPayload, "defaultSalesUnit")
+    );
+    const requestedDefaultUnit = hasDefaultUnit ? rawPayload?.defaultUnit : parsed.defaultUnit;
+    const requestedDefaultSalesUnit = hasDefaultSalesUnit ? rawPayload?.defaultSalesUnit : parsed.defaultSalesUnit;
     const em = ctx.container.resolve("em").fork();
-    const record = await em.findOne(CatalogProduct, { id: parsed.id, deletedAt: null });
-    if (!record) throw new CrudHttpError(404, { error: "Catalog product not found" });
+    const { translate } = await resolveTranslations();
+    const record = await findOneWithDecryption(em, CatalogProduct, {
+      id: parsed.id,
+      deletedAt: null
+    });
+    if (!record)
+      throw new CrudHttpError(404, {
+        error: translate("catalog.errors.productNotFound", "Catalog product not found")
+      });
     const organizationId = parsed.organizationId ?? record.organizationId;
     const tenantId = parsed.tenantId ?? record.tenantId;
     ensureTenantScope(ctx, tenantId);
     ensureOrganizationScope(ctx, organizationId);
     ensureSameScope(record, organizationId, tenantId);
     const dataEngine = ctx.container.resolve("dataEngine");
+    const lookupEm = em.fork();
+    const taxRateProvided = parsed.taxRateId !== void 0 || parsed.taxRate !== void 0;
+    const resolvedTaxRate = taxRateProvided ? await resolveScopedTaxRate(
+      lookupEm,
+      parsed.taxRateId ?? null,
+      parsed.taxRate,
+      organizationId,
+      tenantId
+    ) : null;
     record.organizationId = organizationId;
     record.tenantId = tenantId;
-    const taxRateProvided = parsed.taxRateId !== void 0 || parsed.taxRate !== void 0;
-    const resolvedTaxRate = taxRateProvided ? await resolveScopedTaxRate(em, parsed.taxRateId ?? null, parsed.taxRate, organizationId, tenantId) : null;
     if (parsed.title !== void 0) record.title = parsed.title;
-    if (parsed.subtitle !== void 0) record.subtitle = parsed.subtitle ?? null;
-    if (parsed.description !== void 0) record.description = parsed.description ?? null;
+    if (parsed.subtitle !== void 0)
+      record.subtitle = parsed.subtitle ?? null;
+    if (parsed.description !== void 0)
+      record.description = parsed.description ?? null;
     if (parsed.sku !== void 0) record.sku = parsed.sku ?? null;
     if (parsed.handle !== void 0) record.handle = parsed.handle ?? null;
     if (taxRateProvided) {
       record.taxRateId = resolvedTaxRate?.taxRateId ?? null;
       record.taxRate = resolvedTaxRate?.taxRate ?? null;
     }
-    if (parsed.productType !== void 0) record.productType = parsed.productType;
-    if (parsed.statusEntryId !== void 0) record.statusEntryId = parsed.statusEntryId ?? null;
+    if (parsed.productType !== void 0)
+      record.productType = parsed.productType;
+    if (parsed.statusEntryId !== void 0)
+      record.statusEntryId = parsed.statusEntryId ?? null;
     if (parsed.primaryCurrencyCode !== void 0) {
       record.primaryCurrencyCode = parsed.primaryCurrencyCode ?? null;
     }
-    if (parsed.defaultUnit !== void 0) record.defaultUnit = parsed.defaultUnit ?? null;
+    const uomDefaultsTouched = hasDefaultUnit || hasDefaultSalesUnit || parsed.defaultUnit !== void 0 || parsed.defaultSalesUnit !== void 0 || parsed.organizationId !== void 0 || parsed.tenantId !== void 0;
+    if (uomDefaultsTouched) {
+      const resolvedUnits = await resolveProductUnitDefaults(lookupEm, {
+        organizationId,
+        tenantId,
+        defaultUnit: hasDefaultUnit ? requestedDefaultUnit : parsed.defaultUnit !== void 0 ? parsed.defaultUnit : record.defaultUnit,
+        defaultSalesUnit: hasDefaultSalesUnit ? requestedDefaultSalesUnit : parsed.defaultSalesUnit !== void 0 ? parsed.defaultSalesUnit : record.defaultSalesUnit
+      });
+      await ensureBaseUnitCanBeRemoved(lookupEm, {
+        productId: record.id,
+        organizationId,
+        tenantId,
+        defaultUnit: resolvedUnits.defaultUnit,
+        defaultSalesUnit: resolvedUnits.defaultSalesUnit
+      });
+      record.defaultUnit = resolvedUnits.defaultUnit;
+      record.defaultSalesUnit = resolvedUnits.defaultSalesUnit;
+    }
+    if (parsed.defaultSalesUnitQuantity !== void 0) {
+      record.defaultSalesUnitQuantity = toNumericString(parsed.defaultSalesUnitQuantity) ?? "1";
+    }
+    if (parsed.uomRoundingScale !== void 0) {
+      record.uomRoundingScale = parsed.uomRoundingScale;
+    }
+    if (parsed.uomRoundingMode !== void 0) {
+      record.uomRoundingMode = parsed.uomRoundingMode;
+    }
+    const unitPriceInput = resolveUnitPriceInput(parsed);
+    if (unitPriceInput.enabledProvided) {
+      record.unitPriceEnabled = unitPriceInput.enabled ?? false;
+      if (!record.unitPriceEnabled) {
+        record.unitPriceReferenceUnit = null;
+        record.unitPriceBaseQuantity = null;
+      }
+    }
+    if (unitPriceInput.referenceProvided && record.unitPriceEnabled) {
+      record.unitPriceReferenceUnit = unitPriceInput.referenceUnit ?? null;
+    }
+    if (unitPriceInput.baseProvided && record.unitPriceEnabled) {
+      record.unitPriceBaseQuantity = unitPriceInput.baseQuantity ?? null;
+    }
     if (parsed.defaultMediaId !== void 0) {
       record.defaultMediaId = parsed.defaultMediaId ?? null;
     }
@@ -935,9 +1145,9 @@ const updateProductCommand = {
         record.optionSchemaTemplate = null;
       } else {
         const optionTemplate = await requireOptionSchemaTemplate(
-          em,
+          lookupEm,
           parsed.optionSchemaId,
-          "Option schema not found"
+          translate("catalog.errors.optionSchemaNotFound", "Option schema not found")
         );
         ensureSameScope(optionTemplate, organizationId, tenantId);
         record.optionSchemaTemplate = optionTemplate;
@@ -954,7 +1164,8 @@ const updateProductCommand = {
     if (parsed.customFieldsetCode !== void 0) {
       record.customFieldsetCode = parsed.customFieldsetCode ?? null;
     }
-    if (parsed.isConfigurable !== void 0) record.isConfigurable = parsed.isConfigurable;
+    if (parsed.isConfigurable !== void 0)
+      record.isConfigurable = parsed.isConfigurable;
     if (parsed.isActive !== void 0) record.isActive = parsed.isActive;
     try {
       await em.flush();
@@ -996,11 +1207,28 @@ const updateProductCommand = {
     if (!before || !after) return null;
     const { translate } = await resolveTranslations();
     return {
-      actionLabel: translate("catalog.audit.products.update", "Update catalog product"),
+      actionLabel: translate(
+        "catalog.audit.products.update",
+        "Update catalog product"
+      ),
       resourceKind: "catalog.product",
       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"
+      ]),
       snapshotBefore: before,
       snapshotAfter: after,
       payload: {
@@ -1016,7 +1244,7 @@ const updateProductCommand = {
     const before = payload?.before;
     if (!before) return;
     const em = ctx.container.resolve("em").fork();
-    let record = await em.findOne(CatalogProduct, { id: before.id });
+    let record = await findOneWithDecryption(em, CatalogProduct, { id: before.id });
     if (!record) {
       record = em.create(CatalogProduct, {
         id: before.id,
@@ -1032,6 +1260,13 @@ const updateProductCommand = {
         statusEntryId: before.statusEntryId ?? null,
         primaryCurrencyCode: before.primaryCurrencyCode ?? null,
         defaultUnit: before.defaultUnit ?? null,
+        defaultSalesUnit: before.defaultSalesUnit ?? null,
+        defaultSalesUnitQuantity: before.defaultSalesUnitQuantity ?? "1",
+        uomRoundingScale: before.uomRoundingScale,
+        uomRoundingMode: before.uomRoundingMode,
+        unitPriceEnabled: before.unitPriceEnabled,
+        unitPriceReferenceUnit: before.unitPriceReferenceUnit ?? null,
+        unitPriceBaseQuantity: before.unitPriceBaseQuantity ?? null,
         weightValue: before.weightValue ?? null,
         weightUnit: before.weightUnit ?? null,
         dimensions: before.dimensions ? cloneJson(before.dimensions) : null,
@@ -1050,12 +1285,19 @@ const updateProductCommand = {
     ensureOrganizationScope(ctx, before.organizationId);
     applyProductSnapshot(em, record, before);
     await em.flush();
-    await restoreOffersFromSnapshot(em, record, before.offers);
-    await syncCategoryAssignments(em, record, before.categoryIds);
-    await syncProductTags(em, record, before.tags);
-    await em.flush();
+    const relationEm = em.fork();
+    const relationRecord = await findOneWithDecryption(relationEm, CatalogProduct, { id: before.id });
+    if (relationRecord) {
+      await restoreOffersFromSnapshot(relationEm, relationRecord, before.offers);
+      await syncCategoryAssignments(relationEm, relationRecord, before.categoryIds);
+      await syncProductTags(relationEm, relationRecord, before.tags);
+      await relationEm.flush();
+    }
     const dataEngine = ctx.container.resolve("dataEngine");
-    const resetValues = buildCustomFieldResetMap(before.custom ?? void 0, payload?.after?.custom ?? void 0);
+    const resetValues = buildCustomFieldResetMap(
+      before.custom ?? void 0,
+      payload?.after?.custom ?? void 0
+    );
     if (Object.keys(resetValues).length) {
       await setCustomFieldsIfAny({
         dataEngine,
@@ -1094,15 +1336,31 @@ const deleteProductCommand = {
       { id },
       { populate: ["optionSchemaTemplate"] }
     );
-    if (!record) throw new CrudHttpError(404, { error: "Catalog product not found" });
+    if (!record) {
+      const { translate } = await resolveTranslations();
+      throw new CrudHttpError(404, {
+        error: translate(
+          "catalog.products.errors.notFound",
+          "Catalog product not found"
+        )
+      });
+    }
     const baseEm = ctx.container.resolve("em");
     const snapshot = await loadProductSnapshot(baseEm, id);
     ensureTenantScope(ctx, record.tenantId);
     ensureOrganizationScope(ctx, record.organizationId);
     const dataEngine = ctx.container.resolve("dataEngine");
-    await deleteProductVariantsAndRelatedData({ em, product: record, dataEngine, ctx });
+    await deleteProductVariantsAndRelatedData({
+      em,
+      product: record,
+      dataEngine,
+      ctx
+    });
     await em.nativeDelete(CatalogProductPrice, { product: record.id });
-    const templateToRemove = await resolveOptionSchemaTemplateForRemoval(em, record);
+    const templateToRemove = await resolveOptionSchemaTemplateForRemoval(
+      em,
+      record
+    );
     if (templateToRemove) {
       record.optionSchemaTemplate = null;
       em.remove(templateToRemove);
@@ -1134,7 +1392,10 @@ const deleteProductCommand = {
     if (!before) return null;
     const { translate } = await resolveTranslations();
     return {
-      actionLabel: translate("catalog.audit.products.delete", "Delete catalog product"),
+      actionLabel: translate(
+        "catalog.audit.products.delete",
+        "Delete catalog product"
+      ),
       resourceKind: "catalog.product",
       resourceId: before.id,
       tenantId: before.tenantId,
@@ -1152,7 +1413,7 @@ const deleteProductCommand = {
     const before = payload?.before;
     if (!before) return;
     const em = ctx.container.resolve("em").fork();
-    let record = await em.findOne(CatalogProduct, { id: before.id });
+    let record = await findOneWithDecryption(em, CatalogProduct, { id: before.id });
     if (!record) {
       record = em.create(CatalogProduct, {
         id: before.id,
@@ -1168,6 +1429,13 @@ const deleteProductCommand = {
         statusEntryId: before.statusEntryId ?? null,
         primaryCurrencyCode: before.primaryCurrencyCode ?? null,
         defaultUnit: before.defaultUnit ?? null,
+        defaultSalesUnit: before.defaultSalesUnit ?? null,
+        defaultSalesUnitQuantity: before.defaultSalesUnitQuantity ?? "1",
+        uomRoundingScale: before.uomRoundingScale,
+        uomRoundingMode: before.uomRoundingMode,
+        unitPriceEnabled: before.unitPriceEnabled,
+        unitPriceReferenceUnit: before.unitPriceReferenceUnit ?? null,
+        unitPriceBaseQuantity: before.unitPriceBaseQuantity ?? null,
         weightValue: before.weightValue ?? null,
         weightUnit: before.weightUnit ?? null,
         dimensions: before.dimensions ? cloneJson(before.dimensions) : null,
@@ -1185,10 +1453,15 @@ const deleteProductCommand = {
     ensureTenantScope(ctx, before.tenantId);
     ensureOrganizationScope(ctx, before.organizationId);
     applyProductSnapshot(em, record, before);
-    await restoreOffersFromSnapshot(em, record, before.offers);
-    await syncCategoryAssignments(em, record, before.categoryIds);
-    await syncProductTags(em, record, before.tags);
     await em.flush();
+    const relationEm = em.fork();
+    const relationRecord = await findOneWithDecryption(relationEm, CatalogProduct, { id: before.id });
+    if (relationRecord) {
+      await restoreOffersFromSnapshot(relationEm, relationRecord, before.offers);
+      await syncCategoryAssignments(relationEm, relationRecord, before.categoryIds);
+      await syncProductTags(relationEm, relationRecord, before.tags);
+      await relationEm.flush();
+    }
     const dataEngine = ctx.container.resolve("dataEngine");
     if (before.custom && Object.keys(before.custom).length) {
       await setCustomFieldsIfAny({
@@ -1212,15 +1485,14 @@ registerCommand(updateProductCommand);
 registerCommand(deleteProductCommand);
 function resolveProductUniqueConstraint(error) {
   if (!(error instanceof UniqueConstraintViolationException)) return null;
-  const constraint = typeof error.constraint === "string" ? error.constraint : null;
+  const constraint = getErrorConstraint(error);
   if (constraint === "catalog_products_handle_scope_unique") return "handle";
   if (constraint === "catalog_products_sku_scope_unique") return "sku";
-  const message = typeof error.message === "string" ? error.message : "";
-  const normalized = message ? message.toLowerCase() : "";
-  if (normalized.includes("catalog_products_handle_scope_unique") || normalized.includes(" handle")) {
+  const message = getErrorMessage(error).toLowerCase();
+  if (message.includes("catalog_products_handle_scope_unique") || message.includes(" handle")) {
     return "handle";
   }
-  if (normalized.includes("catalog_products_sku_scope_unique") || normalized.includes(" sku")) {
+  if (message.includes("catalog_products_sku_scope_unique") || message.includes(" sku")) {
     return "sku";
   }
   return null;
@@ -1233,20 +1505,30 @@ async function rethrowProductUniqueConstraint(error) {
 }
 async function throwDuplicateHandleError() {
   const { translate } = await resolveTranslations();
-  const message = translate("catalog.products.errors.handleExists", "Handle already in use.");
+  const message = translate(
+    "catalog.products.errors.handleExists",
+    "Handle already in use."
+  );
   throw new CrudHttpError(400, {
     error: message,
     fieldErrors: { handle: message },
-    details: [{ path: ["handle"], message, code: "duplicate", origin: "validation" }]
+    details: [
+      { path: ["handle"], message, code: "duplicate", origin: "validation" }
+    ]
   });
 }
 async function throwDuplicateSkuError() {
   const { translate } = await resolveTranslations();
-  const message = translate("catalog.products.errors.skuExists", "SKU already in use.");
+  const message = translate(
+    "catalog.products.errors.skuExists",
+    "SKU already in use."
+  );
   throw new CrudHttpError(400, {
     error: message,
     fieldErrors: { sku: message },
-    details: [{ path: ["sku"], message, code: "duplicate", origin: "validation" }]
+    details: [
+      { path: ["sku"], message, code: "duplicate", origin: "validation" }
+    ]
   });
 }
 //# sourceMappingURL=products.js.map