@open-mercato/sync-akeneo 0.10.1-develop.8075.1.f2d38008c0 → 0.10.1-develop.8099.1.debd225eaa

package/dist/modules/sync_akeneo/lib/catalog-importer.js

@@ -1,6 +1,7 @@
 import { randomUUID } from "crypto";
 import { createRequestContainer } from "@open-mercato/shared/lib/di/container";
 import { emitCrudSideEffects, setCustomFieldsIfAny } from "@open-mercato/shared/lib/commands/helpers";
+import { loadCustomFieldSnapshot } from "@open-mercato/shared/lib/commands/customFieldSnapshots";
 import { withAtomicFlush } from "@open-mercato/shared/lib/commands/flush";
 import { findOneWithDecryption, findWithDecryption } from "@open-mercato/shared/lib/encryption/find";
 import { isCrudHttpError } from "@open-mercato/shared/lib/crud/errors";
@@ -319,6 +320,9 @@ function resolveAkeneoMediaTarget(params) {
   }
   return params.mappingTarget;
 }
+function isEmptyCustomFieldValue(value) {
+  return value === null || value === void 0 || Array.isArray(value) && value.length === 0;
+}
 function resolveCustomFieldValue(value, attribute, kind) {
   if (kind === "boolean") return coerceBoolean(value);
   if (kind === "integer") return coerceNumber(value) === null ? null : Math.trunc(Number(value));
@@ -1513,6 +1517,18 @@ async function createAkeneoImporter(client, scope) {
       axisCodes: []
     };
   }
+  async function omitClearsOfEmptyFields(entityId, recordId, values) {
+    if (!Object.values(values).some((value) => value === null)) return values;
+    const current = await loadCustomFieldSnapshot(em, {
+      entityId,
+      recordId,
+      tenantId: scope.tenantId,
+      organizationId: scope.organizationId
+    });
+    return Object.fromEntries(
+      Object.entries(values).filter(([key, value]) => value !== null || !isEmptyCustomFieldValue(current[key]))
+    );
+  }
   async function applyCustomFieldMappings(params) {
     const settings = params.mapping.settings?.products;
     if (!settings || settings.customFieldMappings.length === 0) return;
@@ -1527,32 +1543,32 @@ async function createAkeneoImporter(client, scope) {
       if (!kind) continue;
       const sourceLayers = fieldMapping.target === "product" ? [params.hierarchy.rootValues, params.hierarchy.mergedValues] : [params.product.values ?? {}, params.hierarchy.mergedValues];
       const rawValue = readLayeredAkeneoValue(sourceLayers, fieldMapping.attributeCode, settings.locale, settings.channel ?? null);
-      const value = resolveCustomFieldValue(rawValue, attribute, kind);
-      if (value === null || value === void 0 || Array.isArray(value) && value.length === 0) continue;
+      const resolved = resolveCustomFieldValue(rawValue, attribute, kind);
+      const value = isEmptyCustomFieldValue(resolved) ? null : resolved;
       if (fieldMapping.target === "product") {
         productCustomFields[normalizeFieldKey(fieldMapping.fieldKey)] = value;
       } else {
         variantCustomFields[normalizeFieldKey(fieldMapping.fieldKey)] = value;
       }
     }
-    await Promise.all([
-      setCustomFieldsIfAny({
-        dataEngine,
-        entityId: PRODUCT_ENTITY_ID,
-        recordId: params.localProductId,
-        organizationId: scope.organizationId,
-        tenantId: scope.tenantId,
-        values: productCustomFields
-      }),
-      setCustomFieldsIfAny({
-        dataEngine,
-        entityId: VARIANT_ENTITY_ID,
-        recordId: params.localVariantId,
-        organizationId: scope.organizationId,
-        tenantId: scope.tenantId,
-        values: variantCustomFields
-      })
-    ]);
+    const productValues = await omitClearsOfEmptyFields(PRODUCT_ENTITY_ID, params.localProductId, productCustomFields);
+    await setCustomFieldsIfAny({
+      dataEngine,
+      entityId: PRODUCT_ENTITY_ID,
+      recordId: params.localProductId,
+      organizationId: scope.organizationId,
+      tenantId: scope.tenantId,
+      values: productValues
+    });
+    const variantValues = await omitClearsOfEmptyFields(VARIANT_ENTITY_ID, params.localVariantId, variantCustomFields);
+    await setCustomFieldsIfAny({
+      dataEngine,
+      entityId: VARIANT_ENTITY_ID,
+      recordId: params.localVariantId,
+      organizationId: scope.organizationId,
+      tenantId: scope.tenantId,
+      values: variantValues
+    });
     await Promise.all([
       params.fieldsetPlan?.product?.code ? executeCommand("catalog.products.update", {
         id: params.localProductId,
@@ -1563,7 +1579,7 @@ async function createAkeneoImporter(client, scope) {
         customFieldsetCode: params.fieldsetPlan.variant.code
       }) : Promise.resolve()
     ]);
-    if (Object.keys(productCustomFields).length > 0) {
+    if (Object.keys(productValues).length > 0) {
       await emitCatalogQueryIndexEvent(buildCommandContext(), {
         entityType: PRODUCT_ENTITY_ID,
         recordId: params.localProductId,
@@ -1572,7 +1588,7 @@ async function createAkeneoImporter(client, scope) {
         action: "updated"
       });
     }
-    if (Object.keys(variantCustomFields).length > 0) {
+    if (Object.keys(variantValues).length > 0) {
       await emitCatalogQueryIndexEvent(buildCommandContext(), {
         entityType: VARIANT_ENTITY_ID,
         recordId: params.localVariantId,