@open-mercato/core 0.6.4-develop.4217.1.c9aa050183 → 0.6.4-develop.4236.1.9fa6806b34

package/dist/modules/directory/commands/organizations.js

@@ -11,6 +11,7 @@ import {
   diffCustomFieldChanges
 } from "@open-mercato/shared/lib/commands/customFieldSnapshots";
 import { extractUndoPayload } from "@open-mercato/shared/lib/commands/undo";
+import { withAtomicFlush } from "@open-mercato/shared/lib/commands/flush";
 import {
   parseWithCustomFields,
   setCustomFieldsIfAny,
@@ -225,32 +226,38 @@ const createOrganizationCommand = {
     const baseSlug = parsed.slug ? parsed.slug : slugify(parsed.name);
     const slug = baseSlug ? await resolveUniqueSlug(em, tenantId, baseSlug) : null;
     const de = ctx.container.resolve("dataEngine");
-    const organization = await de.createOrmEntity({
-      entity: Organization,
-      data: {
-        tenant: tenantRef,
-        name: parsed.name,
-        slug,
-        isActive: parsed.isActive ?? true,
-        parentId
+    let organization;
+    await withAtomicFlush(em, [
+      async () => {
+        organization = await de.createOrmEntity({
+          entity: Organization,
+          data: {
+            tenant: tenantRef,
+            name: parsed.name,
+            slug,
+            isActive: parsed.isActive ?? true,
+            parentId
+          }
+        });
+        setInternalTenantId(organization, tenantId);
+        const recordId2 = String(organization.id);
+        if (childIds.length) {
+          await assignChildren(em, tenantId, recordId2, childIds);
+        }
+        const childParentsAfter = await loadChildParentSnapshots(em, tenantId, childIds);
+        setUndoMeta(organization, { childParentsBefore, childParentsAfter });
+        await setCustomFieldsIfAny({
+          dataEngine: de,
+          entityId: E.directory.organization,
+          recordId: recordId2,
+          tenantId,
+          organizationId: recordId2,
+          values: custom
+        });
+        await rebuildHierarchyForTenant(em, tenantId);
       }
-    });
-    setInternalTenantId(organization, tenantId);
+    ], { transaction: true });
     const recordId = String(organization.id);
-    if (childIds.length) {
-      await assignChildren(em, tenantId, recordId, childIds);
-    }
-    const childParentsAfter = await loadChildParentSnapshots(em, tenantId, childIds);
-    setUndoMeta(organization, { childParentsBefore, childParentsAfter });
-    await setCustomFieldsIfAny({
-      dataEngine: de,
-      entityId: E.directory.organization,
-      recordId,
-      tenantId,
-      organizationId: recordId,
-      values: custom
-    });
-    await rebuildHierarchyForTenant(em, tenantId);
     const identifiers = { id: recordId, organizationId: recordId, tenantId };
     await emitCrudSideEffects({
       dataEngine: de,
@@ -308,27 +315,31 @@ const createOrganizationCommand = {
     if (!tenantId) return;
     const em = ctx.container.resolve("em");
     const de = ctx.container.resolve("dataEngine");
-    await restoreChildParents(em, tenantId, childrenBefore);
-    if (after.custom && Object.keys(after.custom).length) {
-      const reset = buildCustomFieldResetMap(void 0, after.custom);
-      if (Object.keys(reset).length) {
-        const resetValues = reset;
-        await de.setCustomFields({
-          entityId: E.directory.organization,
-          recordId: after.id,
-          tenantId,
-          organizationId: after.id,
-          values: resetValues,
-          notify: false
+    await withAtomicFlush(em, [
+      async () => {
+        await restoreChildParents(em, tenantId, childrenBefore);
+        if (after.custom && Object.keys(after.custom).length) {
+          const reset = buildCustomFieldResetMap(void 0, after.custom);
+          if (Object.keys(reset).length) {
+            const resetValues = reset;
+            await de.setCustomFields({
+              entityId: E.directory.organization,
+              recordId: after.id,
+              tenantId,
+              organizationId: after.id,
+              values: resetValues,
+              notify: false
+            });
+          }
+        }
+        await de.deleteOrmEntity({
+          entity: Organization,
+          where: { id: after.id, deletedAt: null },
+          soft: false
         });
+        await rebuildHierarchyForTenant(em, tenantId);
       }
-    }
-    await de.deleteOrmEntity({
-      entity: Organization,
-      where: { id: after.id, deletedAt: null },
-      soft: false
-    });
-    await rebuildHierarchyForTenant(em, tenantId);
+    ], { transaction: true });
   }
 };
 const updateOrganizationCommand = {
@@ -395,43 +406,50 @@ const updateOrganizationCommand = {
       resolvedSlug = parsed.slug ? await resolveUniqueSlug(em, tenantId, parsed.slug, parsed.id) : parsed.slug;
     }
     const de = ctx.container.resolve("dataEngine");
-    const organization = await de.updateOrmEntity({
-      entity: Organization,
-      where: { id: parsed.id, deletedAt: null },
-      apply: (entity) => {
-        if (parsed.name !== void 0) entity.name = parsed.name;
-        if (resolvedSlug !== void 0) entity.slug = resolvedSlug;
-        if (parsed.isActive !== void 0) entity.isActive = parsed.isActive;
-        entity.parentId = parentId;
+    let resolvedOrganization;
+    await withAtomicFlush(em, [
+      async () => {
+        const organization = await de.updateOrmEntity({
+          entity: Organization,
+          where: { id: parsed.id, deletedAt: null },
+          apply: (entity) => {
+            if (parsed.name !== void 0) entity.name = parsed.name;
+            if (resolvedSlug !== void 0) entity.slug = resolvedSlug;
+            if (parsed.isActive !== void 0) entity.isActive = parsed.isActive;
+            entity.parentId = parentId;
+          }
+        });
+        if (!organization) throw new CrudHttpError(404, { error: "Not found" });
+        setInternalTenantId(organization, tenantId);
+        const recordId2 = String(organization.id);
+        const desiredChildIds = new Set(normalizedChildIds.filter((id) => id !== recordId2));
+        await clearRemovedChildren(em, tenantId, recordId2, desiredChildIds);
+        await assignChildren(em, tenantId, recordId2, desiredChildIds);
+        const childParentsAfter = await loadChildParentSnapshots(em, tenantId, combinedChildIds);
+        setUndoMeta(organization, { childParentsBefore, childParentsAfter });
+        await setCustomFieldsIfAny({
+          dataEngine: de,
+          entityId: E.directory.organization,
+          recordId: recordId2,
+          tenantId,
+          organizationId: recordId2,
+          values: custom
+        });
+        await rebuildHierarchyForTenant(em, tenantId);
+        resolvedOrganization = organization;
       }
-    });
-    if (!organization) throw new CrudHttpError(404, { error: "Not found" });
-    setInternalTenantId(organization, tenantId);
-    const recordId = String(organization.id);
-    const desiredChildIds = new Set(normalizedChildIds.filter((id) => id !== recordId));
-    await clearRemovedChildren(em, tenantId, recordId, desiredChildIds);
-    await assignChildren(em, tenantId, recordId, desiredChildIds);
-    const childParentsAfter = await loadChildParentSnapshots(em, tenantId, combinedChildIds);
-    setUndoMeta(organization, { childParentsBefore, childParentsAfter });
-    await setCustomFieldsIfAny({
-      dataEngine: de,
-      entityId: E.directory.organization,
-      recordId,
-      tenantId,
-      organizationId: recordId,
-      values: custom
-    });
-    await rebuildHierarchyForTenant(em, tenantId);
+    ], { transaction: true });
+    const recordId = String(resolvedOrganization.id);
     const identifiers = { id: recordId, organizationId: recordId, tenantId };
     await emitCrudSideEffects({
       dataEngine: de,
       action: "updated",
-      entity: organization,
+      entity: resolvedOrganization,
       identifiers,
       events: organizationCrudEvents,
       indexer: organizationCrudIndexer
     });
-    return organization;
+    return resolvedOrganization;
   },
   captureAfter: async (_input, result, ctx) => {
     const em = ctx.container.resolve("em").fork();
@@ -486,34 +504,39 @@ const updateOrganizationCommand = {
     if (!tenantId) return;
     const em = ctx.container.resolve("em");
     const de = ctx.container.resolve("dataEngine");
-    const updated = await de.updateOrmEntity({
-      entity: Organization,
-      where: { id: before.id },
-      apply: (entity) => {
-        entity.name = before.name;
-        if (before.slug !== void 0) entity.slug = before.slug;
-        entity.isActive = before.isActive;
-        entity.parentId = before.parentId;
+    let updated = null;
+    await withAtomicFlush(em, [
+      async () => {
+        updated = await de.updateOrmEntity({
+          entity: Organization,
+          where: { id: before.id },
+          apply: (entity) => {
+            entity.name = before.name;
+            if (before.slug !== void 0) entity.slug = before.slug;
+            entity.isActive = before.isActive;
+            entity.parentId = before.parentId;
+          }
+        });
+        if (updated && tenantId) {
+          setInternalTenantId(updated, tenantId);
+        }
+        const reset = buildCustomFieldResetMap(before.custom, after?.custom);
+        if (Object.keys(reset).length) {
+          const resetValues = reset;
+          await de.setCustomFields({
+            entityId: E.directory.organization,
+            recordId: before.id,
+            tenantId,
+            organizationId: before.id,
+            values: resetValues,
+            notify: false
+          });
+        }
+        const childSnapshots = before.childParents;
+        await restoreChildParents(em, tenantId, childSnapshots);
+        await rebuildHierarchyForTenant(em, tenantId);
       }
-    });
-    if (updated && tenantId) {
-      setInternalTenantId(updated, tenantId);
-    }
-    const reset = buildCustomFieldResetMap(before.custom, after?.custom);
-    if (Object.keys(reset).length) {
-      const resetValues = reset;
-      await de.setCustomFields({
-        entityId: E.directory.organization,
-        recordId: before.id,
-        tenantId,
-        organizationId: before.id,
-        values: resetValues,
-        notify: false
-      });
-    }
-    const childSnapshots = before.childParents;
-    await restoreChildParents(em, tenantId, childSnapshots);
-    await rebuildHierarchyForTenant(em, tenantId);
+    ], { transaction: true });
     await emitCrudUndoSideEffects({
       dataEngine: de,
       action: "updated",
@@ -559,37 +582,43 @@ const deleteOrganizationCommand = {
       Array.isArray(existing.childIds) ? existing.childIds : []
     );
     const de = ctx.container.resolve("dataEngine");
-    const deleted = await de.deleteOrmEntity({
-      entity: Organization,
-      where: { id, deletedAt: null },
-      soft: true,
-      softDeleteField: "deletedAt"
-    });
-    if (!deleted) throw new CrudHttpError(404, { error: "Not found" });
-    setInternalTenantId(deleted, tenantId);
-    deleted.isActive = false;
-    deleted.parentId = null;
-    const childrenFilter = { tenant: tenantId, parentId: id, deletedAt: null };
-    const children = await em.find(Organization, childrenFilter);
-    const toPersist = [];
-    for (const child of children) {
-      child.parentId = parentId;
-      toPersist.push(child);
-    }
-    toPersist.push(deleted);
-    if (toPersist.length) await em.persist(toPersist).flush();
-    setUndoMeta(deleted, { childParentsBefore: childSnapshotsBefore });
-    await rebuildHierarchyForTenant(em, tenantId);
+    let resolvedDeleted;
+    await withAtomicFlush(em, [
+      async () => {
+        const deleted = await de.deleteOrmEntity({
+          entity: Organization,
+          where: { id, deletedAt: null },
+          soft: true,
+          softDeleteField: "deletedAt"
+        });
+        if (!deleted) throw new CrudHttpError(404, { error: "Not found" });
+        setInternalTenantId(deleted, tenantId);
+        deleted.isActive = false;
+        deleted.parentId = null;
+        const childrenFilter = { tenant: tenantId, parentId: id, deletedAt: null };
+        const children = await em.find(Organization, childrenFilter);
+        const toPersist = [];
+        for (const child of children) {
+          child.parentId = parentId;
+          toPersist.push(child);
+        }
+        toPersist.push(deleted);
+        if (toPersist.length) await em.persist(toPersist).flush();
+        setUndoMeta(deleted, { childParentsBefore: childSnapshotsBefore });
+        await rebuildHierarchyForTenant(em, tenantId);
+        resolvedDeleted = deleted;
+      }
+    ], { transaction: true });
     const identifiers = { id, organizationId: id, tenantId };
     await emitCrudSideEffects({
       dataEngine: de,
       action: "deleted",
-      entity: deleted,
+      entity: resolvedDeleted,
       identifiers,
       events: organizationCrudEvents,
       indexer: organizationCrudIndexer
     });
-    return deleted;
+    return resolvedDeleted;
   },
   buildLog: async ({ snapshots, input, ctx }) => {
     const { translate } = await resolveTranslations();
@@ -620,45 +649,50 @@ const deleteOrganizationCommand = {
     if (!tenantId) return;
     const em = ctx.container.resolve("em");
     const de = ctx.container.resolve("dataEngine");
-    let organization = await em.findOne(Organization, { id: before.id });
-    if (organization) {
-      organization.deletedAt = null;
-      organization.isActive = before.isActive;
-      organization.name = before.name;
-      if (before.slug !== void 0) organization.slug = before.slug;
-      organization.parentId = before.parentId;
-      await em.flush();
-      if (tenantId) setInternalTenantId(organization, tenantId);
-    } else {
-      organization = await de.createOrmEntity({
-        entity: Organization,
-        data: {
-          id: before.id,
-          name: before.name,
-          slug: before.slug ?? null,
-          tenant: tenantId ? em.getReference(Tenant, tenantId) : void 0,
-          isActive: before.isActive,
-          parentId: before.parentId
+    let organization = null;
+    await withAtomicFlush(em, [
+      async () => {
+        organization = await em.findOne(Organization, { id: before.id });
+        if (organization) {
+          organization.deletedAt = null;
+          organization.isActive = before.isActive;
+          organization.name = before.name;
+          if (before.slug !== void 0) organization.slug = before.slug;
+          organization.parentId = before.parentId;
+          await em.flush();
+          if (tenantId) setInternalTenantId(organization, tenantId);
+        } else {
+          organization = await de.createOrmEntity({
+            entity: Organization,
+            data: {
+              id: before.id,
+              name: before.name,
+              slug: before.slug ?? null,
+              tenant: tenantId ? em.getReference(Tenant, tenantId) : void 0,
+              isActive: before.isActive,
+              parentId: before.parentId
+            }
+          });
+          if (tenantId) setInternalTenantId(organization, tenantId);
         }
-      });
-      if (tenantId) setInternalTenantId(organization, tenantId);
-    }
-    if (tenantId) {
-      const customValues = buildCustomFieldResetMap(before.custom, void 0);
-      if (Object.keys(customValues).length) {
-        const resetValues = customValues;
-        await de.setCustomFields({
-          entityId: E.directory.organization,
-          recordId: before.id,
-          tenantId,
-          organizationId: before.id,
-          values: resetValues,
-          notify: false
-        });
+        if (tenantId) {
+          const customValues = buildCustomFieldResetMap(before.custom, void 0);
+          if (Object.keys(customValues).length) {
+            const resetValues = customValues;
+            await de.setCustomFields({
+              entityId: E.directory.organization,
+              recordId: before.id,
+              tenantId,
+              organizationId: before.id,
+              values: resetValues,
+              notify: false
+            });
+          }
+        }
+        await restoreChildParents(em, tenantId, before.childParents);
+        await rebuildHierarchyForTenant(em, tenantId);
       }
-    }
-    await restoreChildParents(em, tenantId, before.childParents);
-    await rebuildHierarchyForTenant(em, tenantId);
+    ], { transaction: true });
     await emitCrudUndoSideEffects({
       dataEngine: de,
       action: "updated",