@open-mercato/core 0.9.0 → 0.9.1-develop.7459.1.99e3accd30

package/src/modules/customers/commands/dictionaries.ts

@@ -1,3 +1,4 @@
+import { isDeepStrictEqual } from 'node:util'
 import { registerCommand, type CommandHandler } from '@open-mercato/shared/lib/commands'
 import type { CommandRuntimeContext } from '@open-mercato/shared/lib/commands'
 import { buildChanges } from '@open-mercato/shared/lib/commands/helpers'
@@ -26,6 +27,8 @@ import {
 } from './shared'
 import { resolveRedoSnapshot } from '@open-mercato/shared/lib/commands/redo'
 import { createLogger } from '@open-mercato/shared/lib/logger'
+import { enforceCommandOptimisticLockWithGuards } from '@open-mercato/shared/lib/crud/optimistic-lock-command'
+import { calendarEventTypeBehaviorSchema, type CalendarEventTypeBehavior } from '../calendar-event-types'
 
 const logger = createLogger('customers')
 
@@ -39,6 +42,7 @@ type CustomerDictionaryEntrySnapshot = {
   label: string
   color: string | null
   icon: string | null
+  behavior: CalendarEventTypeBehavior | null
 }
 
 type CustomerDictionaryEntryUndoPayload = {
@@ -46,6 +50,18 @@ type CustomerDictionaryEntryUndoPayload = {
   after?: CustomerDictionaryEntrySnapshot | null
 }
 
+const nullableCalendarEventTypeBehaviorSchema = calendarEventTypeBehaviorSchema.nullable()
+
+function calendarEventTypeBehaviorsEqual(
+  left: CalendarEventTypeBehavior | null,
+  right: CalendarEventTypeBehavior | null,
+): boolean {
+  const parsedLeft = nullableCalendarEventTypeBehaviorSchema.safeParse(left)
+  const parsedRight = nullableCalendarEventTypeBehaviorSchema.safeParse(right)
+  if (parsedLeft.success && parsedRight.success) return isDeepStrictEqual(parsedLeft.data, parsedRight.data)
+  return isDeepStrictEqual(left, right)
+}
+
 function buildRoleTypeInUseError(usageCount: number, ownerAssignments: number, relationshipAssignments: number) {
   return new CrudHttpError(409, {
     code: 'role_type_in_use',
@@ -87,9 +103,27 @@ function toSnapshot(entry: CustomerDictionaryEntry): CustomerDictionaryEntrySnap
     label: entry.label,
     color: entry.color ?? null,
     icon: entry.icon ?? null,
+    behavior: entry.activityTypeBehavior ?? null,
   }
 }
 
+function buildDictionaryChanges(
+  before: CustomerDictionaryEntrySnapshot,
+  after: CustomerDictionaryEntrySnapshot,
+  keys: readonly (keyof CustomerDictionaryEntrySnapshot)[],
+): Record<string, { from: unknown; to: unknown }> {
+  const scalarKeys = keys.filter((key) => key !== 'behavior')
+  const changes = buildChanges(
+    before as unknown as Record<string, unknown>,
+    after as unknown as Record<string, unknown>,
+    scalarKeys,
+  )
+  if (keys.includes('behavior') && !calendarEventTypeBehaviorsEqual(before.behavior, after.behavior)) {
+    changes.behavior = { from: before.behavior, to: after.behavior }
+  }
+  return changes
+}
+
 async function loadSnapshot(
   em: EntityManager,
   id: string,
@@ -108,6 +142,7 @@ function applySnapshot(entry: CustomerDictionaryEntry, snapshot: CustomerDiction
   entry.label = snapshot.label
   entry.color = snapshot.color
   entry.icon = snapshot.icon
+  entry.activityTypeBehavior = snapshot.behavior
 }
 
 async function invalidateCache(
@@ -150,6 +185,7 @@ const createDictionaryEntryCommand: CommandHandler<CustomerDictionaryEntryCreate
     const label = parsed.label?.trim() || value.value
     const color = sanitizeColor(parsed.color)
     const icon = sanitizeIcon(parsed.icon)
+    const behavior = parsed.behavior
 
     const existing = await findOneWithDecryption(
       em,
@@ -168,6 +204,12 @@ const createDictionaryEntryCommand: CommandHandler<CustomerDictionaryEntryCreate
     )
 
     if (existing) {
+      await enforceCommandOptimisticLockWithGuards(ctx.container, {
+        resourceKind: 'customers.dictionary_entry',
+        resourceId: existing.id,
+        current: existing.updatedAt,
+        request: ctx.request ?? null,
+      })
       const before = toSnapshot(existing)
       let changed = false
 
@@ -183,10 +225,15 @@ const createDictionaryEntryCommand: CommandHandler<CustomerDictionaryEntryCreate
         existing.icon = icon ?? null
         changed = true
       }
+      if (behavior !== undefined && !isDeepStrictEqual(existing.activityTypeBehavior ?? null, behavior)) {
+        existing.activityTypeBehavior = behavior
+        changed = true
+      }
 
       if (changed) {
         existing.updatedAt = new Date()
         await em.flush()
+        await invalidateCache(ctx, toSnapshot(existing))
         return {
           entryId: existing.id,
           tenantId: parsed.tenantId,
@@ -214,9 +261,11 @@ const createDictionaryEntryCommand: CommandHandler<CustomerDictionaryEntryCreate
       label,
       color: color ?? null,
       icon: icon ?? null,
+      activityTypeBehavior: behavior ?? null,
     })
     em.persist(entry)
     await em.flush()
+    await invalidateCache(ctx, toSnapshot(entry))
 
     return {
       entryId: entry.id,
@@ -254,10 +303,10 @@ const createDictionaryEntryCommand: CommandHandler<CustomerDictionaryEntryCreate
     if (result.mode === 'updated') {
       const before = result.before ?? null
       if (!before) return null
-      const changes = buildChanges(
-        before as unknown as Record<string, unknown>,
-        after as unknown as Record<string, unknown>,
-        ['label', 'color', 'icon']
+      const changes = buildDictionaryChanges(
+        before,
+        after,
+        ['label', 'color', 'icon', 'behavior']
       )
       if (!changes || Object.keys(changes).length === 0) return null
       return {
@@ -333,6 +382,7 @@ const createDictionaryEntryCommand: CommandHandler<CustomerDictionaryEntryCreate
           label: before.label,
           color: before.color,
           icon: before.icon,
+          activityTypeBehavior: before.behavior,
         })
         em.persist(entry)
       } else {
@@ -369,6 +419,7 @@ const createDictionaryEntryCommand: CommandHandler<CustomerDictionaryEntryCreate
         label: after.label,
         color: after.color,
         icon: after.icon,
+        activityTypeBehavior: after.behavior,
       })
       em.persist(entry)
     } else {
@@ -428,6 +479,13 @@ const updateDictionaryEntryCommand: CommandHandler<CustomerDictionaryEntryUpdate
       throw notFound('Dictionary entry not found')
     }
 
+    await enforceCommandOptimisticLockWithGuards(ctx.container, {
+      resourceKind: 'customers.dictionary_entry',
+      resourceId: entry.id,
+      current: entry.updatedAt,
+      request: ctx.request ?? null,
+    })
+
     let changed = false
 
     if (parsed.value !== undefined) {
@@ -499,9 +557,18 @@ const updateDictionaryEntryCommand: CommandHandler<CustomerDictionaryEntryUpdate
       }
     }
 
+    if (
+      parsed.behavior !== undefined &&
+      !isDeepStrictEqual(entry.activityTypeBehavior ?? null, parsed.behavior)
+    ) {
+      entry.activityTypeBehavior = parsed.behavior
+      changed = true
+    }
+
     if (changed) {
       entry.updatedAt = new Date()
       await em.flush()
+      await invalidateCache(ctx, toSnapshot(entry))
     }
 
     return {
@@ -522,10 +589,10 @@ const updateDictionaryEntryCommand: CommandHandler<CustomerDictionaryEntryUpdate
     const before = snapshots.before as CustomerDictionaryEntrySnapshot | undefined
     const after = snapshots.after as CustomerDictionaryEntrySnapshot | undefined
     if (!before || !after || !result.changed) return null
-    const changes = buildChanges(
-      before as unknown as Record<string, unknown>,
-      after as unknown as Record<string, unknown>,
-      ['value', 'label', 'color', 'icon']
+    const changes = buildDictionaryChanges(
+      before,
+      after,
+      ['value', 'label', 'color', 'icon', 'behavior']
     )
     if (!changes || Object.keys(changes).length === 0) return null
     const { translate } = await resolveTranslations()
@@ -571,6 +638,7 @@ const updateDictionaryEntryCommand: CommandHandler<CustomerDictionaryEntryUpdate
         label: before.label,
         color: before.color,
         icon: before.icon,
+        activityTypeBehavior: before.behavior,
       })
       em.persist(entry)
     } else {
@@ -613,6 +681,12 @@ const deleteDictionaryEntryCommand: CommandHandler<CustomerDictionaryEntryDelete
     if (!entry || entry.organizationId !== parsed.organizationId || entry.tenantId !== parsed.tenantId || entry.kind !== parsed.kind) {
       throw notFound('Dictionary entry not found')
     }
+    await enforceCommandOptimisticLockWithGuards(ctx.container, {
+      resourceKind: 'customers.dictionary_entry',
+      resourceId: entry.id,
+      current: entry.updatedAt,
+      request: ctx.request ?? null,
+    })
     if (entry.kind === 'person_company_role') {
       const usage = await loadRoleTypeUsage(em, {
         tenantId: entry.tenantId,
@@ -629,6 +703,7 @@ const deleteDictionaryEntryCommand: CommandHandler<CustomerDictionaryEntryDelete
     }
     em.remove(entry)
     await em.flush()
+    await invalidateCache(ctx, toSnapshot(entry))
     return { entryId: entry.id }
   },
   buildLog: async ({ snapshots }) => {
@@ -675,6 +750,7 @@ const deleteDictionaryEntryCommand: CommandHandler<CustomerDictionaryEntryDelete
         label: before.label,
         color: before.color,
         icon: before.icon,
+        activityTypeBehavior: before.behavior,
       })
       em.persist(entry)
     } else {