@open-mercato/core 0.9.1-develop.7474.1.51db10479d → 0.9.1-develop.7475.1.28ca93ed97

package/src/modules/catalog/commands/prices.ts

@@ -32,6 +32,12 @@ import { findOneWithDecryption } from '@open-mercato/shared/lib/encryption/find'
 import { makeCreateRedo } from '@open-mercato/shared/lib/commands/redo'
 import type { CrudEventsConfig } from '@open-mercato/shared/lib/crud/types'
 import type { DataEngine } from '@open-mercato/shared/lib/data/engine'
+import {
+  capturePriceHistoryEntry,
+  hasPriceHistoryRelevantChange,
+  priceHistoryInputFromRecord,
+} from '../lib/omnibus'
+import { resolveOmnibusCache } from '../lib/omnibusCache'
 
 const priceCrudEvents: CrudEventsConfig = {
   module: 'catalog',
@@ -417,6 +423,9 @@ const createPriceCommand: CommandHandler<PriceCreateInput, { priceId: string }>
       },
       events: priceCrudEvents,
     })
+    await capturePriceHistoryEntry(em, priceHistoryInputFromRecord(record), 'create', {
+      cache: resolveOmnibusCache(ctx.container),
+    })
     return { priceId: record.id }
   },
   captureAfter: async (_input, result, ctx) => {
@@ -452,6 +461,10 @@ const createPriceCommand: CommandHandler<PriceCreateInput, { priceId: string }>
     ensureOrganizationScope(ctx, record.organizationId)
     em.remove(record)
     await em.flush()
+    await capturePriceHistoryEntry(em, after, 'undo', {
+      metadata: { undoneCommand: 'catalog.prices.create' },
+      cache: resolveOmnibusCache(ctx.container),
+    })
     const resetValues = buildCustomFieldResetMap(undefined, after.custom ?? undefined)
     if (Object.keys(resetValues).length) {
       await setCustomFieldsIfAny({
@@ -470,7 +483,7 @@ const createPriceCommand: CommandHandler<PriceCreateInput, { priceId: string }>
     seedFromSnapshot: priceSeedFromSnapshot,
     buildResult: (entity) => ({ priceId: entity.id }),
     events: priceCrudEvents,
-    afterRestore: async ({ ctx, entity, snapshot }) => {
+    afterRestore: async ({ em, ctx, entity, snapshot }) => {
       if (snapshot.custom && Object.keys(snapshot.custom).length) {
         await setCustomFieldsIfAny({
           dataEngine: ctx.container.resolve('dataEngine'),
@@ -481,6 +494,10 @@ const createPriceCommand: CommandHandler<PriceCreateInput, { priceId: string }>
           values: snapshot.custom,
         })
       }
+      await capturePriceHistoryEntry(em, snapshot, 'create', {
+        metadata: { redoneCommand: 'catalog.prices.create' },
+        cache: resolveOmnibusCache(ctx.container),
+      })
     },
   }),
 }
@@ -523,6 +540,11 @@ const updatePriceCommand: CommandHandler<PriceUpdateInput, { priceId: string }>
     } else if (currentProductRef) {
       targetProduct = currentProductRef
     }
+    const recordHistoryInput = priceHistoryInputFromRecord(record)
+    const historyBefore = {
+      ...recordHistoryInput,
+      productId: recordHistoryInput.productId ?? targetProduct?.id ?? null,
+    }
 
     if (parsed.variantId !== undefined) {
       if (!parsed.variantId) {
@@ -718,6 +740,14 @@ const updatePriceCommand: CommandHandler<PriceUpdateInput, { priceId: string }>
       },
       events: priceCrudEvents,
     })
+    const historyAfter = priceHistoryInputFromRecord(record)
+    if (hasPriceHistoryRelevantChange(historyBefore, historyAfter)) {
+      await capturePriceHistoryEntry(em, historyAfter, 'update', {
+        cache: resolveOmnibusCache(ctx.container),
+        invalidatePrices: [historyBefore],
+        previous: historyBefore,
+      })
+    }
     return { priceId: record.id }
   },
   captureAfter: async (_input, result, ctx) => {
@@ -792,6 +822,12 @@ const updatePriceCommand: CommandHandler<PriceUpdateInput, { priceId: string }>
     ensureOrganizationScope(ctx, before.organizationId)
     applyPriceSnapshot(em, record, before)
     await em.flush()
+    await capturePriceHistoryEntry(em, before, 'undo', {
+      metadata: { undoneCommand: 'catalog.prices.update' },
+      cache: resolveOmnibusCache(ctx.container),
+      invalidatePrices: [after],
+      previous: after,
+    })
     const resetValues = buildCustomFieldResetMap(
       before.custom ?? undefined,
       after?.custom ?? undefined
@@ -836,8 +872,10 @@ const deletePriceCommand: CommandHandler<
     const baseEm = (ctx.container.resolve('em') as EntityManager)
     const snapshot = await loadPriceSnapshot(baseEm, id)
 
+    const deletedPrice = snapshot ?? priceHistoryInputFromRecord(record)
     em.remove(record)
     await em.flush()
+    await capturePriceHistoryEntry(em, deletedPrice, 'delete', { cache: resolveOmnibusCache(ctx.container) })
     if (snapshot?.custom && Object.keys(snapshot.custom).length) {
       const resetValues = buildCustomFieldResetMap(snapshot.custom, undefined)
       if (Object.keys(resetValues).length) {
@@ -924,6 +962,10 @@ const deletePriceCommand: CommandHandler<
     ensureOrganizationScope(ctx, before.organizationId)
     applyPriceSnapshot(em, record, before)
     await em.flush()
+    await capturePriceHistoryEntry(em, before, 'undo', {
+      metadata: { undoneCommand: 'catalog.prices.delete' },
+      cache: resolveOmnibusCache(ctx.container),
+    })
     if (before.custom && Object.keys(before.custom).length) {
       await setCustomFieldsIfAny({
         dataEngine: ctx.container.resolve('dataEngine'),

package/src/modules/catalog/commands/products.ts

@@ -1,5 +1,7 @@
 import { randomUUID } from "node:crypto";
 import { z } from "zod";
+import { createLogger } from "@open-mercato/shared/lib/logger";
+import { getTelemetryRuntime } from "@open-mercato/shared/lib/telemetry/runtime";
 import { registerCommand } from "@open-mercato/shared/lib/commands";
 import type {
   CommandHandler,
@@ -13,7 +15,7 @@ import {
   emitCrudSideEffects,
   emitCrudUndoSideEffects,
 } from "@open-mercato/shared/lib/commands/helpers";
-import type { EntityManager } from "@mikro-orm/postgresql";
+import type { EntityManager, FilterQuery } from "@mikro-orm/postgresql";
 import { UniqueConstraintViolationException } from "@mikro-orm/core";
 import { resolveTranslations } from "@open-mercato/shared/lib/i18n/server";
 import { CrudHttpError } from "@open-mercato/shared/lib/crud/errors";
@@ -87,10 +89,18 @@ import {
   type ProductDeleteOwner,
 } from "./productDeleteChildren";
 import { canonicalizeUnitCode } from "../lib/unitCodes";
+import {
+  capturePriceHistoryEntries,
+  priceHistoryInputFromRecord,
+  type PriceHistoryPriceInput,
+} from "../lib/omnibus";
+import { resolveOmnibusCache } from "../lib/omnibusCache";
 import {
   resolveCanonicalUnitCode,
 } from "../lib/unitResolution";
 
+const logger = createLogger("catalog");
+
 type ProductSnapshot = {
   id: string;
   organizationId: string;
@@ -1049,6 +1059,62 @@ async function removeProductVariants(
   }
 }
 
+async function loadProductPricesForHistory(
+  em: EntityManager,
+  product: CatalogProduct,
+  variants: CatalogProductVariant[],
+): Promise<PriceHistoryPriceInput[]> {
+  const scope = {
+    tenantId: product.tenantId,
+    organizationId: product.organizationId,
+  };
+  const variantIds = variants.map((variant) => variant.id);
+  const ownership: FilterQuery<CatalogProductPrice>[] = [{ product: product.id }];
+  if (variantIds.length) ownership.push({ variant: { $in: variantIds } });
+  const prices = await findWithDecryption(
+    em.fork(),
+    CatalogProductPrice,
+    { ...scope, $or: ownership },
+    { populate: ["priceKind", "variant"] },
+    scope,
+  );
+  return prices.map((price) => priceHistoryInputFromRecord(price));
+}
+
+async function loadRestoredPricesForHistory(
+  em: EntityManager,
+  owner: ProductDeleteOwner,
+  priceIds: string[],
+): Promise<PriceHistoryPriceInput[]> {
+  if (!priceIds.length) return [];
+  const scope = {
+    tenantId: owner.tenantId,
+    organizationId: owner.organizationId,
+  };
+  try {
+    const prices = await findWithDecryption(
+      em.fork(),
+      CatalogProductPrice,
+      { ...scope, id: { $in: priceIds } },
+      { populate: ["priceKind", "variant"] },
+      scope,
+    );
+    return prices.map((price) => priceHistoryInputFromRecord(price));
+  } catch (err) {
+    logger.error("[internal] catalog restored price lookup for history failed", {
+      priceIds,
+      ...scope,
+      err,
+    });
+    getTelemetryRuntime()?.reportError(err, {
+      module: "catalog",
+      code: "catalog.price_history_restore_lookup_failed",
+      attributes: { priceCount: priceIds.length },
+    });
+    return [];
+  }
+}
+
 async function emitProductVariantCleanupSideEffects(opts: {
   dataEngine: DataEngine;
   ctx: CommandRuntimeContext;
@@ -2250,6 +2316,11 @@ const deleteProductCommand: CommandHandler<
       em,
       record,
     );
+    const deletedPrices = await loadProductPricesForHistory(
+      em,
+      record,
+      variants,
+    );
     await withAtomicFlush(
       em,
       [
@@ -2273,6 +2344,9 @@ const deleteProductCommand: CommandHandler<
       ],
       { transaction: true },
     );
+    await capturePriceHistoryEntries(em, deletedPrices, "delete", {
+      cache: resolveOmnibusCache(ctx.container),
+    });
     await emitProductVariantCleanupSideEffects({
       dataEngine,
       ctx,
@@ -2393,6 +2467,15 @@ const deleteProductCommand: CommandHandler<
       ],
       { transaction: true },
     );
+    const restoredPrices = await loadRestoredPricesForHistory(
+      em,
+      owner,
+      (childrenPlan?.prices ?? []).map((price) => price.id),
+    );
+    await capturePriceHistoryEntries(em, restoredPrices, "undo", {
+      metadata: { undoneCommand: "catalog.products.delete" },
+      cache: resolveOmnibusCache(ctx.container),
+    });
     const dataEngine = ctx.container.resolve("dataEngine") as DataEngine;
     if (before.custom && Object.keys(before.custom).length) {
       await setCustomFieldsIfAny({

package/src/modules/catalog/commands/variants.ts

@@ -27,6 +27,8 @@ import {
   type VariantUpdateInput,
 } from '../data/validators'
 import { isValidGtin, normalizeGtinValue } from '../lib/gtin'
+import { capturePriceHistoryEntries } from '../lib/omnibus'
+import { resolveOmnibusCache } from '../lib/omnibusCache'
 import type { CatalogGtinType } from '../data/types'
 import {
   cloneJson,
@@ -1080,6 +1082,7 @@ const deleteVariantCommand: CommandHandler<
     }
     em.remove(record)
     await em.flush()
+    await capturePriceHistoryEntries(em, priceSnapshots, 'delete', { cache: resolveOmnibusCache(ctx.container) })
     for (const priceSnapshot of priceSnapshots) {
       const resetValues = buildCustomFieldResetMap(priceSnapshot.custom ?? undefined, undefined)
       if (!Object.keys(resetValues).length) continue
@@ -1185,6 +1188,10 @@ const deleteVariantCommand: CommandHandler<
       await restoreVariantPricesFromSnapshots(em, record, before.prices, dataEngine)
     }
     await em.flush()
+    await capturePriceHistoryEntries(em, before.prices, 'undo', {
+      metadata: { undoneCommand: 'catalog.variants.delete' },
+      cache: resolveOmnibusCache(ctx.container),
+    })
     if (before.custom && Object.keys(before.custom).length) {
       await setCustomFieldsIfAny({
         dataEngine: ctx.container.resolve('dataEngine'),