@open-mercato/core 0.6.4-develop.4217.1.c9aa050183 → 0.6.4-develop.4239.1.4a264a5828

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

@@ -15,6 +15,7 @@ import {
   loadCustomFieldSnapshot,
   buildCustomFieldResetMap
 } from "@open-mercato/shared/lib/commands/customFieldSnapshots";
+import { withAtomicFlush } from "@open-mercato/shared/lib/commands/flush";
 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";
@@ -634,10 +635,9 @@ async function syncProductTags(em, product, tags) {
     }
   }
 }
-async function deleteProductVariantsAndRelatedData(opts) {
-  const { em, product, dataEngine, ctx } = opts;
+async function collectProductVariantCleanup(em, product) {
   const variants = await em.find(CatalogProductVariant, { product });
-  if (!variants.length) return;
+  if (!variants.length) return { variants: [], cleanupEntries: [] };
   const cleanupEntries = await Promise.all(
     variants.map(async (variant) => {
       const custom = await loadCustomFieldSnapshot(em, {
@@ -654,6 +654,10 @@ async function deleteProductVariantsAndRelatedData(opts) {
       };
     })
   );
+  return { variants, cleanupEntries };
+}
+async function removeProductVariants(em, variants) {
+  if (!variants.length) return;
   const variantIds = variants.map((variant) => variant.id);
   if (variantIds.length) {
     await em.nativeDelete(CatalogProductPrice, {
@@ -663,7 +667,9 @@ async function deleteProductVariantsAndRelatedData(opts) {
   for (const variant of variants) {
     em.remove(variant);
   }
-  await em.flush();
+}
+async function emitProductVariantCleanupSideEffects(opts) {
+  const { dataEngine, ctx, cleanupEntries } = opts;
   for (const cleanup of cleanupEntries) {
     if (!cleanup.custom) continue;
     const resetValues = buildCustomFieldResetMap(cleanup.custom, void 0);
@@ -922,15 +928,16 @@ const createProductCommand = {
     }
     em.persist(record);
     try {
-      await em.flush();
-    } catch (error) {
-      await rethrowProductUniqueConstraint(error);
-    }
-    await syncOffers(em, record, parsed.offers);
-    await syncCategoryAssignments(em, record, parsed.categoryIds);
-    await syncProductTags(em, record, parsed.tags);
-    try {
-      await em.flush();
+      await withAtomicFlush(
+        em,
+        [
+          () => em.flush(),
+          () => syncOffers(em, record, parsed.offers),
+          () => syncCategoryAssignments(em, record, parsed.categoryIds),
+          () => syncProductTags(em, record, parsed.tags)
+        ],
+        { transaction: true }
+      );
     } catch (error) {
       await rethrowProductUniqueConstraint(error);
     }
@@ -1172,15 +1179,16 @@ const updateProductCommand = {
       record.isConfigurable = parsed.isConfigurable;
     if (parsed.isActive !== void 0) record.isActive = parsed.isActive;
     try {
-      await em.flush();
-    } catch (error) {
-      await rethrowProductUniqueConstraint(error);
-    }
-    await syncOffers(em, record, parsed.offers);
-    await syncCategoryAssignments(em, record, parsed.categoryIds);
-    await syncProductTags(em, record, parsed.tags);
-    try {
-      await em.flush();
+      await withAtomicFlush(
+        em,
+        [
+          () => em.flush(),
+          () => syncOffers(em, record, parsed.offers),
+          () => syncCategoryAssignments(em, record, parsed.categoryIds),
+          () => syncProductTags(em, record, parsed.tags)
+        ],
+        { transaction: true }
+      );
     } catch (error) {
       await rethrowProductUniqueConstraint(error);
     }
@@ -1288,15 +1296,16 @@ const updateProductCommand = {
     ensureTenantScope(ctx, before.tenantId);
     ensureOrganizationScope(ctx, before.organizationId);
     applyProductSnapshot(em, record, before);
-    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();
-    }
+    await withAtomicFlush(
+      em,
+      [
+        () => em.flush(),
+        () => restoreOffersFromSnapshot(em, record, before.offers),
+        () => syncCategoryAssignments(em, record, before.categoryIds),
+        () => syncProductTags(em, record, before.tags)
+      ],
+      { transaction: true }
+    );
     const dataEngine = ctx.container.resolve("dataEngine");
     const resetValues = buildCustomFieldResetMap(
       before.custom ?? void 0,
@@ -1354,23 +1363,38 @@ const deleteProductCommand = {
     ensureTenantScope(ctx, record.tenantId);
     ensureOrganizationScope(ctx, record.organizationId);
     const dataEngine = ctx.container.resolve("dataEngine");
-    await deleteProductVariantsAndRelatedData({
-      em,
-      product: record,
-      dataEngine,
-      ctx
-    });
-    await em.nativeDelete(CatalogProductPrice, { product: record.id });
-    const templateToRemove = await resolveOptionSchemaTemplateForRemoval(
+    const { variants, cleanupEntries } = await collectProductVariantCleanup(
       em,
       record
     );
-    if (templateToRemove) {
-      record.optionSchemaTemplate = null;
-      em.remove(templateToRemove);
-    }
-    em.remove(record);
-    await em.flush();
+    await withAtomicFlush(
+      em,
+      [
+        () => removeProductVariants(em, variants),
+        async () => {
+          await em.nativeDelete(CatalogProductPrice, { product: record.id });
+        },
+        async () => {
+          const templateToRemove = await resolveOptionSchemaTemplateForRemoval(
+            em,
+            record
+          );
+          if (templateToRemove) {
+            record.optionSchemaTemplate = null;
+            em.remove(templateToRemove);
+          }
+        },
+        () => {
+          em.remove(record);
+        }
+      ],
+      { transaction: true }
+    );
+    await emitProductVariantCleanupSideEffects({
+      dataEngine,
+      ctx,
+      cleanupEntries
+    });
     if (snapshot?.custom && Object.keys(snapshot.custom).length) {
       const resetValues = buildCustomFieldResetMap(snapshot.custom, void 0);
       if (Object.keys(resetValues).length) {
@@ -1457,15 +1481,16 @@ const deleteProductCommand = {
     ensureTenantScope(ctx, before.tenantId);
     ensureOrganizationScope(ctx, before.organizationId);
     applyProductSnapshot(em, record, before);
-    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();
-    }
+    await withAtomicFlush(
+      em,
+      [
+        () => em.flush(),
+        () => restoreOffersFromSnapshot(em, record, before.offers),
+        () => syncCategoryAssignments(em, record, before.categoryIds),
+        () => syncProductTags(em, record, before.tags)
+      ],
+      { transaction: true }
+    );
     const dataEngine = ctx.container.resolve("dataEngine");
     if (before.custom && Object.keys(before.custom).length) {
       await setCustomFieldsIfAny({