@open-mercato/core 0.4.5-develop-3ce83a8b24 → 0.4.5-develop-539cff4960

package/dist/modules/catalog/api/products/route.js

@@ -1,7 +1,10 @@
 import { z } from "zod";
 import { makeCrudRoute } from "@open-mercato/shared/lib/crud/factory";
 import { CrudHttpError } from "@open-mercato/shared/lib/crud/errors";
-import { buildCustomFieldFiltersFromQuery, extractAllCustomFieldEntries } from "@open-mercato/shared/lib/crud/custom-fields";
+import {
+  buildCustomFieldFiltersFromQuery,
+  extractAllCustomFieldEntries
+} from "@open-mercato/shared/lib/crud/custom-fields";
 import { resolveTranslations } from "@open-mercato/shared/lib/i18n/server";
 import {
   CatalogOffer,
@@ -9,11 +12,15 @@ import {
   CatalogProductCategory,
   CatalogProductCategoryAssignment,
   CatalogProductPrice,
+  CatalogProductUnitConversion,
   CatalogProductVariant,
   CatalogProductTagAssignment
 } from "../../data/entities.js";
 import { CATALOG_PRODUCT_TYPES } from "../../data/types.js";
-import { productCreateSchema, productUpdateSchema } from "../../data/validators.js";
+import {
+  productCreateSchema,
+  productUpdateSchema
+} from "../../data/validators.js";
 import { parseScopedCommandInput, resolveCrudRecordId } from "../utils.js";
 import { splitCustomFieldPayload } from "@open-mercato/shared/lib/crud/custom-fields";
 import { E } from "../../../../generated/entities.ids.generated.js";
@@ -35,6 +42,7 @@ import {
   defaultOkResponseSchema
 } from "../openapi.js";
 import { findWithDecryption } from "@open-mercato/shared/lib/encryption/find";
+import { canonicalizeUnitCode, toUnitLookupKey } from "../../lib/unitCodes.js";
 const rawBodySchema = z.object({}).passthrough();
 const UUID_REGEX = /^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[1-5][0-9a-fA-F]{3}-[89abAB][0-9a-fA-F]{3}-[0-9a-fA-F]{12}$/;
 const listSchema = z.object({
@@ -56,6 +64,7 @@ const listSchema = z.object({
   customerId: z.string().uuid().optional(),
   customerGroupId: z.string().uuid().optional(),
   quantity: z.coerce.number().min(1).max(1e5).optional(),
+  quantityUnit: z.string().trim().max(50).optional(),
   priceDate: z.string().optional(),
   sortField: z.string().optional(),
   sortDir: z.enum(["asc", "desc"]).optional(),
@@ -148,25 +157,36 @@ async function buildProductFilters(query, ctx) {
   if (query.productType) {
     filters.product_type = { $eq: query.productType };
   }
+  const scope = {
+    organizationId: ctx.selectedOrganizationId ?? ctx.auth?.orgId ?? null,
+    tenantId: ctx.auth?.tenantId ?? null
+  };
   const channelFilterIds = parseIdList(query.channelIds);
   if (channelFilterIds.length) {
-    const offerRows = await em.find(
+    const offerRows = await findWithDecryption(
+      em,
       CatalogOffer,
       {
         channelId: { $in: channelFilterIds },
-        deletedAt: null
+        deletedAt: null,
+        ...scope
       },
-      { fields: ["id", "product"] }
+      { fields: ["id", "product"] },
+      scope
     );
-    const productIds = offerRows.map((offer) => typeof offer.product === "string" ? offer.product : offer.product?.id ?? null).filter((id) => !!id);
+    const productIds = offerRows.map(
+      (offer) => typeof offer.product === "string" ? offer.product : offer.product?.id ?? null
+    ).filter((id) => !!id);
     intersectProductIds(productIds);
   }
   const categoryFilterIds = parseIdList(query.categoryIds);
   if (categoryFilterIds.length) {
-    const assignments = await em.find(
+    const assignments = await findWithDecryption(
+      em,
       CatalogProductCategoryAssignment,
-      { category: { $in: categoryFilterIds } },
-      { fields: ["id", "product"] }
+      { category: { $in: categoryFilterIds }, ...scope },
+      { fields: ["id", "product"] },
+      scope
     );
     const productIds = assignments.map(
       (assignment) => typeof assignment.product === "string" ? assignment.product : assignment.product?.id ?? null
@@ -175,10 +195,12 @@ async function buildProductFilters(query, ctx) {
   }
   const tagFilterIds = parseIdList(query.tagIds);
   if (tagFilterIds.length) {
-    const assignments = await em.find(
+    const assignments = await findWithDecryption(
+      em,
       CatalogProductTagAssignment,
-      { tag: { $in: tagFilterIds } },
-      { fields: ["id", "product"] }
+      { tag: { $in: tagFilterIds }, ...scope },
+      { fields: ["id", "product"] },
+      scope
     );
     const productIds = assignments.map(
       (assignment) => typeof assignment.product === "string" ? assignment.product : assignment.product?.id ?? null
@@ -197,7 +219,8 @@ async function buildProductFilters(query, ctx) {
       fieldset: customFieldset ?? void 0
     });
     Object.assign(filters, cfFilters);
-  } catch {
+  } catch (err) {
+    if (process.env.NODE_ENV === "development") console.warn("[catalog:products] custom field filter error", err);
   }
   applyRestrictedProducts();
   return filters;
@@ -222,198 +245,274 @@ async function decorateProductsAfterList(payload, ctx) {
   if (!items.length) return;
   const productIds = items.map((item) => typeof item.id === "string" ? item.id : null).filter((id) => !!id);
   if (!productIds.length) return;
-  const em = ctx.container.resolve("em").fork();
-  const offers = await em.find(
-    CatalogOffer,
-    { product: { $in: productIds }, deletedAt: null },
-    { orderBy: { createdAt: "asc" } }
-  );
-  const channelIds = Array.from(
-    new Set(
-      offers.map((offer) => offer.channelId).filter((id) => typeof id === "string" && id.length > 0)
-    )
-  );
-  const channelLookup = /* @__PURE__ */ new Map();
-  if (channelIds.length) {
-    const scopedChannelsWhere = buildScopedWhere(
-      { id: { $in: channelIds } },
+  try {
+    const em = ctx.container.resolve("em").fork();
+    const scope = {
+      organizationId: ctx.selectedOrganizationId ?? ctx.auth?.orgId ?? null,
+      tenantId: ctx.auth?.tenantId ?? null
+    };
+    const offers = await findWithDecryption(
+      em,
+      CatalogOffer,
+      { product: { $in: productIds }, deletedAt: null, ...scope },
+      { orderBy: { createdAt: "asc" } },
+      scope
+    );
+    const channelIds = Array.from(
+      new Set(
+        offers.map((offer) => offer.channelId).filter(
+          (id) => typeof id === "string" && id.length > 0
+        )
+      )
+    );
+    const channelLookup = /* @__PURE__ */ new Map();
+    if (channelIds.length) {
+      const scopedChannelsWhere = buildScopedWhere(
+        { id: { $in: channelIds } },
+        {
+          organizationId: ctx.selectedOrganizationId ?? ctx.auth?.orgId ?? null,
+          organizationIds: Array.isArray(ctx.organizationIds) ? ctx.organizationIds : void 0,
+          tenantId: ctx.auth?.tenantId ?? null
+        }
+      );
+      const channels = await findWithDecryption(em, SalesChannel, scopedChannelsWhere, {
+        fields: ["id", "name", "code"]
+      });
+      for (const channel of channels) {
+        channelLookup.set(channel.id, {
+          name: channel.name,
+          code: channel.code ?? null
+        });
+      }
+    }
+    const offersByProduct = /* @__PURE__ */ new Map();
+    for (const offer of offers) {
+      const productId = typeof offer.product === "string" ? offer.product : offer.product?.id ?? null;
+      if (!productId) continue;
+      const channelInfo = channelLookup.get(offer.channelId);
+      const entry = offersByProduct.get(productId) ?? [];
+      entry.push({
+        id: offer.id,
+        channelId: offer.channelId,
+        channelName: channelInfo?.name ?? null,
+        channelCode: channelInfo?.code ?? null,
+        title: offer.title,
+        description: offer.description ?? null,
+        isActive: offer.isActive,
+        defaultMediaId: offer.defaultMediaId ?? null,
+        defaultMediaUrl: offer.defaultMediaUrl ?? null,
+        metadata: offer.metadata ?? null
+      });
+      offersByProduct.set(productId, entry);
+    }
+    const categoryAssignments = await findWithDecryption(
+      em,
+      CatalogProductCategoryAssignment,
+      { product: { $in: productIds }, ...scope },
+      { populate: ["category"], orderBy: { position: "asc" } },
+      scope
+    );
+    const parentIds = /* @__PURE__ */ new Set();
+    for (const assignment of categoryAssignments) {
+      const category = typeof assignment.category === "string" ? null : assignment.category ?? null;
+      if (!category) continue;
+      const parentId = category.parentId ?? null;
+      if (parentId) parentIds.add(parentId);
+    }
+    const parentCategories = parentIds.size ? await findWithDecryption(
+      em,
+      CatalogProductCategory,
+      { id: { $in: Array.from(parentIds) }, ...scope },
+      { fields: ["id", "name"] },
+      scope
+    ) : [];
+    const parentNameById = /* @__PURE__ */ new Map();
+    for (const parent of parentCategories) {
+      parentNameById.set(parent.id, parent.name ?? null);
+    }
+    const categoriesByProduct = /* @__PURE__ */ new Map();
+    for (const assignment of categoryAssignments) {
+      const productId = typeof assignment.product === "string" ? assignment.product : assignment.product?.id ?? null;
+      if (!productId) continue;
+      const category = typeof assignment.category === "string" ? null : assignment.category ?? null;
+      if (!category) continue;
+      const parentId = category.parentId ?? null;
+      const parentName = parentId ? parentNameById.get(parentId) ?? null : null;
+      const bucket = categoriesByProduct.get(productId) ?? [];
+      bucket.push({
+        id: category.id,
+        name: category.name ?? null,
+        treePath: category.treePath ?? null,
+        parentId,
+        parentName
+      });
+      categoriesByProduct.set(productId, bucket);
+    }
+    const tagAssignments = await findWithDecryption(
+      em,
+      CatalogProductTagAssignment,
+      { product: { $in: productIds } },
+      { populate: ["tag"] },
       {
-        organizationId: ctx.selectedOrganizationId ?? ctx.auth?.orgId ?? null,
-        organizationIds: Array.isArray(ctx.organizationIds) ? ctx.organizationIds : void 0,
-        tenantId: ctx.auth?.tenantId ?? null
+        tenantId: ctx.auth?.tenantId ?? null,
+        organizationId: ctx.auth?.orgId ?? null
       }
     );
-    const channels = await em.find(
-      SalesChannel,
-      scopedChannelsWhere,
-      { fields: ["id", "name", "code"] }
+    const tagsByProduct = /* @__PURE__ */ new Map();
+    for (const assignment of tagAssignments) {
+      const productId = typeof assignment.product === "string" ? assignment.product : assignment.product?.id ?? null;
+      if (!productId) continue;
+      const tag = typeof assignment.tag === "string" ? null : assignment.tag ?? null;
+      if (!tag) continue;
+      const label = typeof tag.label === "string" && tag.label.trim().length ? tag.label : null;
+      if (!label) continue;
+      const bucket = tagsByProduct.get(productId) ?? [];
+      bucket.push(label);
+      tagsByProduct.set(productId, bucket);
+    }
+    const variants = await findWithDecryption(
+      em,
+      CatalogProductVariant,
+      { product: { $in: productIds }, deletedAt: null, ...scope },
+      { fields: ["id", "product"] },
+      scope
+    );
+    const variantToProduct = /* @__PURE__ */ new Map();
+    for (const variant of variants) {
+      const productId = typeof variant.product === "string" ? variant.product : variant.product?.id ?? null;
+      if (!productId) continue;
+      variantToProduct.set(variant.id, productId);
+    }
+    const variantIds = Array.from(variantToProduct.keys());
+    const priceWhere = variantIds.length > 0 ? {
+      $or: [
+        { product: { $in: productIds } },
+        { variant: { $in: variantIds } }
+      ]
+    } : { product: { $in: productIds } };
+    const priceRows = await findWithDecryption(
+      em,
+      CatalogProductPrice,
+      { ...priceWhere, ...scope },
+      { populate: ["offer", "variant", "product", "priceKind"] },
+      scope
     );
-    for (const channel of channels) {
-      channelLookup.set(channel.id, {
-        name: channel.name,
-        code: channel.code ?? null
-      });
+    const pricesByProduct = /* @__PURE__ */ new Map();
+    for (const price of priceRows) {
+      let productId = null;
+      if (price.product) {
+        productId = typeof price.product === "string" ? price.product : price.product?.id ?? null;
+      } else if (price.variant) {
+        const variantId = typeof price.variant === "string" ? price.variant : price.variant.id;
+        productId = variantToProduct.get(variantId) ?? null;
+      }
+      if (!productId) continue;
+      const entry = pricesByProduct.get(productId) ?? [];
+      entry.push(price);
+      pricesByProduct.set(productId, entry);
     }
-  }
-  const offersByProduct = /* @__PURE__ */ new Map();
-  for (const offer of offers) {
-    const productId = typeof offer.product === "string" ? offer.product : offer.product?.id ?? null;
-    if (!productId) continue;
-    const channelInfo = channelLookup.get(offer.channelId);
-    const entry = offersByProduct.get(productId) ?? [];
-    entry.push({
-      id: offer.id,
-      channelId: offer.channelId,
-      channelName: channelInfo?.name ?? null,
-      channelCode: channelInfo?.code ?? null,
-      title: offer.title,
-      description: offer.description ?? null,
-      isActive: offer.isActive,
-      defaultMediaId: offer.defaultMediaId ?? null,
-      defaultMediaUrl: offer.defaultMediaUrl ?? null,
-      metadata: offer.metadata ?? null
-    });
-    offersByProduct.set(productId, entry);
-  }
-  const categoryAssignments = await em.find(
-    CatalogProductCategoryAssignment,
-    { product: { $in: productIds } },
-    { populate: ["category"], orderBy: { position: "asc" } }
-  );
-  const parentIds = /* @__PURE__ */ new Set();
-  for (const assignment of categoryAssignments) {
-    const category = typeof assignment.category === "string" ? null : assignment.category ?? null;
-    if (!category) continue;
-    const parentId = category.parentId ?? null;
-    if (parentId) parentIds.add(parentId);
-  }
-  const parentCategories = parentIds.size ? await em.find(
-    CatalogProductCategory,
-    { id: { $in: Array.from(parentIds) } },
-    { fields: ["id", "name"] }
-  ) : [];
-  const parentNameById = /* @__PURE__ */ new Map();
-  for (const parent of parentCategories) {
-    parentNameById.set(parent.id, parent.name ?? null);
-  }
-  const categoriesByProduct = /* @__PURE__ */ new Map();
-  for (const assignment of categoryAssignments) {
-    const productId = typeof assignment.product === "string" ? assignment.product : assignment.product?.id ?? null;
-    if (!productId) continue;
-    const category = typeof assignment.category === "string" ? null : assignment.category ?? null;
-    if (!category) continue;
-    const parentId = category.parentId ?? null;
-    const parentName = parentId ? parentNameById.get(parentId) ?? null : null;
-    const bucket = categoriesByProduct.get(productId) ?? [];
-    bucket.push({
-      id: category.id,
-      name: category.name ?? null,
-      treePath: category.treePath ?? null,
-      parentId,
-      parentName
-    });
-    categoriesByProduct.set(productId, bucket);
-  }
-  const tagAssignments = await findWithDecryption(
-    em,
-    CatalogProductTagAssignment,
-    { product: { $in: productIds } },
-    { populate: ["tag"] },
-    { tenantId: ctx.auth?.tenantId ?? null, organizationId: ctx.auth?.orgId ?? null }
-  );
-  const tagsByProduct = /* @__PURE__ */ new Map();
-  for (const assignment of tagAssignments) {
-    const productId = typeof assignment.product === "string" ? assignment.product : assignment.product?.id ?? null;
-    if (!productId) continue;
-    const tag = typeof assignment.tag === "string" ? null : assignment.tag ?? null;
-    if (!tag) continue;
-    const label = typeof tag.label === "string" && tag.label.trim().length ? tag.label : null;
-    if (!label) continue;
-    const bucket = tagsByProduct.get(productId) ?? [];
-    bucket.push(label);
-    tagsByProduct.set(productId, bucket);
-  }
-  const variants = await em.find(
-    CatalogProductVariant,
-    { product: { $in: productIds }, deletedAt: null },
-    { fields: ["id", "product"] }
-  );
-  const variantToProduct = /* @__PURE__ */ new Map();
-  for (const variant of variants) {
-    const productId = typeof variant.product === "string" ? variant.product : variant.product?.id ?? null;
-    if (!productId) continue;
-    variantToProduct.set(variant.id, productId);
-  }
-  const variantIds = Array.from(variantToProduct.keys());
-  const priceWhere = variantIds.length > 0 ? {
-    $or: [{ product: { $in: productIds } }, { variant: { $in: variantIds } }]
-  } : { product: { $in: productIds } };
-  const priceRows = await em.find(
-    CatalogProductPrice,
-    priceWhere,
-    { populate: ["offer", "variant", "product", "priceKind"] }
-  );
-  const pricesByProduct = /* @__PURE__ */ new Map();
-  for (const price of priceRows) {
-    let productId = null;
-    if (price.product) {
-      productId = typeof price.product === "string" ? price.product : price.product?.id ?? null;
-    } else if (price.variant) {
-      const variantId = typeof price.variant === "string" ? price.variant : price.variant.id;
-      productId = variantToProduct.get(variantId) ?? null;
+    const requestQuantityUnitKey = toUnitLookupKey(
+      ctx.query.quantityUnit
+    );
+    const conversionsByProduct = /* @__PURE__ */ new Map();
+    const conversionOrganizationId = ctx.selectedOrganizationId ?? ctx.auth?.orgId ?? null;
+    const conversionTenantId = ctx.auth?.tenantId ?? null;
+    if (requestQuantityUnitKey && productIds.length && conversionOrganizationId && conversionTenantId) {
+      const conversionRows = await findWithDecryption(
+        em,
+        CatalogProductUnitConversion,
+        {
+          product: { $in: productIds },
+          organizationId: conversionOrganizationId,
+          tenantId: conversionTenantId,
+          deletedAt: null,
+          isActive: true
+        },
+        { fields: ["id", "product", "unitCode", "toBaseFactor"] },
+        { organizationId: conversionOrganizationId, tenantId: conversionTenantId }
+      );
+      for (const row of conversionRows) {
+        const productId = typeof row.product === "string" ? row.product : row.product?.id ?? null;
+        const unitKey = toUnitLookupKey(row.unitCode);
+        const factor = Number(row.toBaseFactor);
+        if (!productId || !unitKey || !Number.isFinite(factor) || factor <= 0)
+          continue;
+        const bucket = conversionsByProduct.get(productId) ?? /* @__PURE__ */ new Map();
+        bucket.set(unitKey, factor);
+        conversionsByProduct.set(productId, bucket);
+      }
     }
-    if (!productId) continue;
-    const entry = pricesByProduct.get(productId) ?? [];
-    entry.push(price);
-    pricesByProduct.set(productId, entry);
-  }
-  const channelFilterIds = parseIdList(ctx.query.channelIds);
-  const channelContext = ctx.query.channelId ?? (channelFilterIds.length === 1 ? channelFilterIds[0] : null);
-  const pricingContext = buildPricingContext(ctx.query, channelContext);
-  const pricingService = ctx.container.resolve("catalogPricingService");
-  for (const item of items) {
-    const id = typeof item.id === "string" ? item.id : null;
-    if (!id) continue;
-    const offerEntries = offersByProduct.get(id) ?? [];
-    item.offers = offerEntries;
-    const channelIds2 = Array.from(
-      new Set(
-        offerEntries.map((offer) => typeof offer.channelId === "string" ? offer.channelId : null).filter((channelId) => !!channelId)
-      )
+    const channelFilterIds = parseIdList(ctx.query.channelIds);
+    const channelContext = ctx.query.channelId ?? (channelFilterIds.length === 1 ? channelFilterIds[0] : null);
+    const pricingContext = buildPricingContext(ctx.query, channelContext);
+    const pricingService = ctx.container.resolve(
+      "catalogPricingService"
     );
-    item.channelIds = channelIds2;
-    const categories = categoriesByProduct.get(id) ?? [];
-    item.categories = categories;
-    item.categoryIds = categories.map((category) => category.id);
-    item.tags = tagsByProduct.get(id) ?? [];
-    const priceCandidates = pricesByProduct.get(id) ?? [];
-    const channelScopedContext = pricingContext.channelId || channelIds2.length !== 1 ? pricingContext : { ...pricingContext, channelId: channelIds2[0] };
-    const best = await pricingService.resolvePrice(priceCandidates, channelScopedContext);
-    if (best) {
-      item.pricing = {
-        kind: resolvePriceKindCode(best),
-        price_kind_id: typeof best.priceKind === "string" ? best.priceKind : best.priceKind?.id ?? null,
-        price_kind_code: resolvePriceKindCode(best),
-        currency_code: best.currencyCode,
-        unit_price_net: best.unitPriceNet,
-        unit_price_gross: best.unitPriceGross,
-        min_quantity: best.minQuantity,
-        max_quantity: best.maxQuantity ?? null,
-        tax_rate: best.taxRate ?? null,
-        tax_amount: best.taxAmount ?? null,
-        scope: {
-          variant_id: resolvePriceVariantId(best),
-          offer_id: resolvePriceOfferId(best),
-          channel_id: resolvePriceChannelId(best),
-          user_id: best.userId ?? null,
-          user_group_id: best.userGroupId ?? null,
-          customer_id: best.customerId ?? null,
-          customer_group_id: best.customerGroupId ?? null
+    for (const item of items) {
+      const id = typeof item.id === "string" ? item.id : null;
+      if (!id) continue;
+      const offerEntries = offersByProduct.get(id) ?? [];
+      item.offers = offerEntries;
+      const channelIds2 = Array.from(
+        new Set(
+          offerEntries.map(
+            (offer) => typeof offer.channelId === "string" ? offer.channelId : null
+          ).filter((channelId) => !!channelId)
+        )
+      );
+      item.channelIds = channelIds2;
+      const categories = categoriesByProduct.get(id) ?? [];
+      item.categories = categories;
+      item.categoryIds = categories.map((category) => category.id);
+      item.tags = tagsByProduct.get(id) ?? [];
+      const priceCandidates = pricesByProduct.get(id) ?? [];
+      const normalizedQuantityForPricing = (() => {
+        if (!requestQuantityUnitKey) return pricingContext.quantity;
+        const baseUnit = toUnitLookupKey(item.default_unit);
+        if (!baseUnit || requestQuantityUnitKey === baseUnit)
+          return pricingContext.quantity;
+        const productConversions = conversionsByProduct.get(id);
+        const factor = productConversions?.get(requestQuantityUnitKey) ?? null;
+        if (!factor || !Number.isFinite(factor) || factor <= 0) {
+          if (process.env.NODE_ENV === "development") console.warn(`[catalog.products] Invalid conversion factor for product=${id} unit=${requestQuantityUnitKey} factor=${factor}`);
+          return pricingContext.quantity;
         }
-      };
-    } else {
-      item.pricing = null;
+        const normalized = pricingContext.quantity * factor;
+        return Number.isFinite(normalized) && normalized > 0 ? normalized : pricingContext.quantity;
+      })();
+      const channelScopedContext = pricingContext.channelId || channelIds2.length !== 1 ? pricingContext : { ...pricingContext, channelId: channelIds2[0] };
+      const best = await pricingService.resolvePrice(priceCandidates, {
+        ...channelScopedContext,
+        quantity: normalizedQuantityForPricing
+      });
+      if (best) {
+        item.pricing = {
+          kind: resolvePriceKindCode(best),
+          price_kind_id: typeof best.priceKind === "string" ? best.priceKind : best.priceKind?.id ?? null,
+          price_kind_code: resolvePriceKindCode(best),
+          currency_code: best.currencyCode,
+          unit_price_net: best.unitPriceNet,
+          unit_price_gross: best.unitPriceGross,
+          min_quantity: best.minQuantity,
+          max_quantity: best.maxQuantity ?? null,
+          tax_rate: best.taxRate ?? null,
+          tax_amount: best.taxAmount ?? null,
+          scope: {
+            variant_id: resolvePriceVariantId(best),
+            offer_id: resolvePriceOfferId(best),
+            channel_id: resolvePriceChannelId(best),
+            user_id: best.userId ?? null,
+            user_group_id: best.userGroupId ?? null,
+            customer_id: best.customerId ?? null,
+            customer_group_id: best.customerGroupId ?? null
+          }
+        };
+      } else {
+        item.pricing = null;
+      }
     }
+  } catch (error) {
+    console.error("[decorateProductsAfterList] Failed to load unit conversions", error);
   }
 }
 const crud = makeCrudRoute({
@@ -444,6 +543,13 @@ const crud = makeCrudRoute({
       F.status_entry_id,
       F.primary_currency_code,
       F.default_unit,
+      "default_sales_unit",
+      "default_sales_unit_quantity",
+      "uom_rounding_scale",
+      "uom_rounding_mode",
+      "unit_price_enabled",
+      "unit_price_reference_unit",
+      "unit_price_base_quantity",
       F.default_media_id,
       F.default_media_url,
       F.weight_value,
@@ -474,7 +580,21 @@ const crud = makeCrudRoute({
           delete normalized[key];
         }
       }
-      return { ...normalized, ...cfEntries };
+      const defaultUnit = canonicalizeUnitCode(normalized.default_unit) ?? null;
+      const defaultSalesUnit = canonicalizeUnitCode(normalized.default_sales_unit) ?? null;
+      const unitPriceReferenceUnit = canonicalizeUnitCode(normalized.unit_price_reference_unit) ?? null;
+      return {
+        ...normalized,
+        default_unit: defaultUnit,
+        default_sales_unit: defaultSalesUnit,
+        unit_price_reference_unit: unitPriceReferenceUnit,
+        ...cfEntries,
+        unit_price: {
+          enabled: Boolean(normalized.unit_price_enabled),
+          reference_unit: unitPriceReferenceUnit,
+          base_quantity: normalized.unit_price_base_quantity ?? null
+        }
+      };
     }
   },
   hooks: {
@@ -486,11 +606,18 @@ const crud = makeCrudRoute({
       schema: rawBodySchema,
       mapInput: async ({ raw, ctx }) => {
         const { translate } = await resolveTranslations();
-        const parsed = parseScopedCommandInput(productCreateSchema, raw ?? {}, ctx, translate);
+        const parsed = parseScopedCommandInput(
+          productCreateSchema,
+          raw ?? {},
+          ctx,
+          translate
+        );
         const { base, custom } = splitCustomFieldPayload(parsed);
         return Object.keys(custom).length ? { ...base, customFields: custom } : base;
       },
-      response: ({ result }) => ({ id: result?.productId ?? result?.id ?? null }),
+      response: ({ result }) => ({
+        id: result?.productId ?? result?.id ?? null
+      }),
       status: 201
     },
     update: {
@@ -498,7 +625,12 @@ const crud = makeCrudRoute({
       schema: rawBodySchema,
       mapInput: async ({ raw, ctx }) => {
         const { translate } = await resolveTranslations();
-        const parsed = parseScopedCommandInput(productUpdateSchema, raw ?? {}, ctx, translate);
+        const parsed = parseScopedCommandInput(
+          productUpdateSchema,
+          raw ?? {},
+          ctx,
+          translate
+        );
         const { base, custom } = splitCustomFieldPayload(parsed);
         return Object.keys(custom).length ? { ...base, customFields: custom } : base;
       },
@@ -510,7 +642,13 @@ const crud = makeCrudRoute({
       mapInput: async ({ parsed, ctx }) => {
         const { translate } = await resolveTranslations();
         const id = resolveCrudRecordId(parsed, ctx, translate);
-        if (!id) throw new CrudHttpError(400, { error: translate("catalog.errors.id_required", "Product id is required.") });
+        if (!id)
+          throw new CrudHttpError(400, {
+            error: translate(
+              "catalog.errors.id_required",
+              "Product id is required."
+            )
+          });
         return { id };
       },
       response: () => ({ ok: true })
@@ -532,6 +670,18 @@ const productListItemSchema = z.object({
   status_entry_id: z.string().uuid().nullable().optional(),
   primary_currency_code: z.string().nullable().optional(),
   default_unit: z.string().nullable().optional(),
+  default_sales_unit: z.string().nullable().optional(),
+  default_sales_unit_quantity: z.number().nullable().optional(),
+  uom_rounding_scale: z.number().nullable().optional(),
+  uom_rounding_mode: z.enum(["half_up", "down", "up"]).nullable().optional(),
+  unit_price_enabled: z.boolean().nullable().optional(),
+  unit_price_reference_unit: z.enum(["kg", "l", "m2", "m3", "pc"]).nullable().optional(),
+  unit_price_base_quantity: z.number().nullable().optional(),
+  unit_price: z.object({
+    enabled: z.boolean(),
+    reference_unit: z.enum(["kg", "l", "m2", "m3", "pc"]).nullable(),
+    base_quantity: z.number().nullable()
+  }).optional(),
   default_media_id: z.string().uuid().nullable().optional(),
   default_media_url: z.string().nullable().optional(),
   weight_value: z.number().nullable().optional(),