@open-mercato/core 0.10.1-develop.7716.1.cefe7975df → 0.10.1-develop.7721.1.b5c4a00a68

package/src/modules/staff/commands/timesheets-task-comments.ts

@@ -39,13 +39,13 @@ import { buildChanges, emitCrudSideEffects, emitCrudUndoSideEffects } from '@ope
 import { withAtomicFlush } from '@open-mercato/shared/lib/commands/flush'
 import { authorizeFeatures } from '@open-mercato/shared/security/featurePolicy'
 import type { CrudEventsConfig, CrudIndexerConfig } from '@open-mercato/shared/lib/crud/types'
-import { StaffTimeTask, StaffTimeTaskComment } from '../data/entities'
+import { StaffTimeTask, StaffTimeTaskComment, type StaffTimeTaskCommentVisibility } from '../data/entities'
 import { staffTimeTaskCommentCrudEvents } from '../lib/crud'
 import {
   staffTimeTaskCommentCreateSchema,
-  staffTimeTaskCommentUpdateSchema,
+  staffTimeTaskCommentUpdateRequestSchema,
   type StaffTimeTaskCommentCreateInput,
-  type StaffTimeTaskCommentUpdateInput,
+  type StaffTimeTaskCommentUpdateRequestInput,
 } from '../data/validators'
 import {
   applyScopeToWhere,
@@ -96,6 +96,43 @@ const commentCrudIndexer: CrudIndexerConfig<StaffTimeTaskComment> = {
  */
 const commentCrudEvents: CrudEventsConfig<StaffTimeTaskComment> = staffTimeTaskCommentCrudEvents
 
+/**
+ * The comment CRUD events carry `portalVisible`: true when the comment is visible to
+ * the customer before OR after the change, so publishing, retracting and deleting a
+ * reply all refresh the portal. Internal notes never set it.
+ */
+function commentEvents(portalVisible: boolean): CrudEventsConfig<StaffTimeTaskComment> {
+  const base = staffTimeTaskCommentCrudEvents
+  return {
+    ...base,
+    buildPayload: (context) => ({
+      ...((base.buildPayload ? base.buildPayload(context) : {}) as Record<string, unknown>),
+      portalVisible,
+    }),
+  }
+}
+
+export const TASK_COMMENT_CUSTOMER_IMMUTABLE_CODE = 'task_comment_customer_immutable'
+export const TASK_COMMENT_VISIBILITY_INVALID_CODE = 'task_comment_visibility_invalid'
+
+function customerCommentImmutableError(translate: Translate): CrudHttpError {
+  return new CrudHttpError(403, {
+    code: TASK_COMMENT_CUSTOMER_IMMUTABLE_CODE,
+    error: translate(
+      'staff.time_tracking.taskComments.errors.customerImmutable',
+      'Messages written by the customer cannot be edited or deleted.',
+    ),
+  })
+}
+
+function visibilityInvalidError(translate: Translate): CrudHttpError {
+  const message = translate(
+    'staff.time_tracking.taskComments.errors.visibilityPortalOnly',
+    'Only customer support tickets can carry replies visible to the customer.',
+  )
+  return new CrudHttpError(422, { code: TASK_COMMENT_VISIBILITY_INVALID_CODE, error: message, fieldErrors: { visibility: message } })
+}
+
 type Translate = (key: string, fallback: string) => string
 
 type CommentSnapshot = {
@@ -105,6 +142,8 @@ type CommentSnapshot = {
   taskId: string
   body: string
   authorUserId: string | null
+  visibility: StaffTimeTaskCommentVisibility
+  authorKind: string
   createdAt: string | null
   deletedAt: string | null
 }
@@ -129,6 +168,8 @@ function toCommentSnapshot(comment: StaffTimeTaskComment): CommentSnapshot {
     taskId: comment.taskId,
     body: comment.body,
     authorUserId: comment.authorUserId ?? null,
+    visibility: comment.visibility ?? 'internal',
+    authorKind: comment.authorKind ?? 'staff',
     createdAt: comment.createdAt ? comment.createdAt.toISOString() : null,
     deletedAt: comment.deletedAt ? comment.deletedAt.toISOString() : null,
   }
@@ -211,6 +252,7 @@ async function requireEditableComment(
   ctx: CommandRuntimeContext,
   translate: Translate,
 ): Promise<void> {
+  if (comment.authorKind === 'customer') throw customerCommentImmutableError(translate)
   const actorId = stampAuthorUserId(ctx)
   if (actorId && comment.authorUserId === actorId) return
   if (await callerCanManageAll(ctx)) return
@@ -257,7 +299,10 @@ const createTaskCommentCommand: CommandHandler<
     await withAtomicFlush(
       em,
       [
-        () => requireTaskInScope(em, parsed.taskId, scope, translate),
+        async () => {
+          const task = await requireTaskInScope(em, parsed.taskId, scope, translate)
+          if (parsed.visibility === 'customer' && task.source !== 'portal') throw visibilityInvalidError(translate)
+        },
         () => {
           created = em.create(StaffTimeTaskComment, {
             tenantId: parsed.tenantId,
@@ -265,6 +310,8 @@ const createTaskCommentCommand: CommandHandler<
             taskId: parsed.taskId,
             body: parsed.body,
             authorUserId,
+            visibility: parsed.visibility ?? 'internal',
+            authorKind: 'staff',
             createdAt: new Date(),
             updatedAt: new Date(),
             deletedAt: null,
@@ -283,7 +330,7 @@ const createTaskCommentCommand: CommandHandler<
       action: 'created',
       entity: record,
       identifiers: { id: record.id, organizationId: record.organizationId, tenantId: record.tenantId },
-      events: commentCrudEvents,
+      events: commentEvents(record.visibility === 'customer'),
       indexer: commentCrudIndexer,
     })
 
@@ -340,19 +387,19 @@ const createTaskCommentCommand: CommandHandler<
       action: 'deleted',
       entity: comment,
       identifiers: { id: comment.id, organizationId: comment.organizationId, tenantId: comment.tenantId },
-      events: commentCrudEvents,
+      events: commentEvents(comment.visibility === 'customer'),
       indexer: commentCrudIndexer,
     })
   },
 }
 
 const updateTaskCommentCommand: CommandHandler<
-  StaffTimeTaskCommentUpdateInput,
+  StaffTimeTaskCommentUpdateRequestInput,
   { commentId: string; taskId: string }
 > = {
   id: staffTimeTaskCommentCommandIds.update,
   async prepare(rawInput, ctx) {
-    const parsed = staffTimeTaskCommentUpdateSchema.safeParse(rawInput)
+    const parsed = staffTimeTaskCommentUpdateRequestSchema.safeParse(rawInput)
     if (!parsed.success) return {}
     const em = ctx.container.resolve('em') as EntityManager
     const before = await loadCommentSnapshot(em, parsed.data.id, staffSnapshotScopeFromContext(ctx))
@@ -360,7 +407,7 @@ const updateTaskCommentCommand: CommandHandler<
     return { before: { snapshot: before } }
   },
   async execute(rawInput, ctx) {
-    const parsed = staffTimeTaskCommentUpdateSchema.parse(rawInput)
+    const parsed = staffTimeTaskCommentUpdateRequestSchema.parse(rawInput)
     const { translate } = await resolveTranslations()
     const em = (ctx.container.resolve('em') as EntityManager).fork()
     const scope = commandActorScope(ctx)
@@ -374,12 +421,18 @@ const updateTaskCommentCommand: CommandHandler<
     ensureOrganizationScope(ctx, comment.organizationId)
     assertCommentVersion(ctx, comment)
     await requireEditableComment(comment, ctx, translate)
+    const visibilityBefore = comment.visibility ?? 'internal'
+    if (parsed.visibility === 'customer' && visibilityBefore !== 'customer') {
+      const task = await requireTaskInScope(em, comment.taskId, scope, translate)
+      if (task.source !== 'portal') throw visibilityInvalidError(translate)
+    }
 
     await withAtomicFlush(
       em,
       [
         () => {
-          comment.body = parsed.body
+          if (parsed.body !== undefined) comment.body = parsed.body
+          if (parsed.visibility !== undefined) comment.visibility = parsed.visibility
           comment.updatedAt = new Date()
         },
       ],
@@ -391,7 +444,7 @@ const updateTaskCommentCommand: CommandHandler<
       action: 'updated',
       entity: comment,
       identifiers: { id: comment.id, organizationId: comment.organizationId, tenantId: comment.tenantId },
-      events: commentCrudEvents,
+      events: commentEvents(visibilityBefore === 'customer' || comment.visibility === 'customer'),
       indexer: commentCrudIndexer,
     })
 
@@ -417,7 +470,7 @@ const updateTaskCommentCommand: CommandHandler<
       changes: buildChanges(
         before as unknown as Record<string, unknown>,
         after as unknown as Record<string, unknown>,
-        ['body'],
+        ['body', 'visibility'],
       ),
       payload: {
         undo: { before, after } satisfies CommentUndoPayload,
@@ -440,6 +493,7 @@ const updateTaskCommentCommand: CommandHandler<
       [
         () => {
           comment.body = before.body
+          comment.visibility = before.visibility ?? 'internal'
           comment.updatedAt = new Date()
         },
       ],
@@ -451,7 +505,7 @@ const updateTaskCommentCommand: CommandHandler<
       action: 'updated',
       entity: comment,
       identifiers: { id: comment.id, organizationId: comment.organizationId, tenantId: comment.tenantId },
-      events: commentCrudEvents,
+      events: commentEvents(true),
       indexer: commentCrudIndexer,
     })
   },
@@ -505,7 +559,7 @@ const deleteTaskCommentCommand: CommandHandler<{ id?: string }, { commentId: str
       action: 'deleted',
       entity: comment,
       identifiers: { id: comment.id, organizationId: comment.organizationId, tenantId: comment.tenantId },
-      events: commentCrudEvents,
+      events: commentEvents(comment.visibility === 'customer'),
       indexer: commentCrudIndexer,
     })
 
@@ -551,6 +605,7 @@ const deleteTaskCommentCommand: CommandHandler<{ id?: string }, { commentId: str
               taskId: before.taskId,
               body: before.body,
               authorUserId: before.authorUserId,
+              visibility: before.visibility ?? 'internal',
               createdAt: before.createdAt ? new Date(before.createdAt) : new Date(),
               updatedAt: new Date(),
               deletedAt: null,
@@ -572,7 +627,7 @@ const deleteTaskCommentCommand: CommandHandler<{ id?: string }, { commentId: str
       action: 'created',
       entity: comment,
       identifiers: { id: before.id, organizationId: before.organizationId, tenantId: before.tenantId },
-      events: commentCrudEvents,
+      events: commentEvents(before.visibility === 'customer'),
       indexer: commentCrudIndexer,
     })
   },

package/src/modules/staff/commands/timesheets-tasks.ts

@@ -34,13 +34,15 @@ import { registerCommand } from '@open-mercato/shared/lib/commands'
 import { CrudHttpError } from '@open-mercato/shared/lib/crud/errors'
 import { enforceCommandOptimisticLockWithGuards } from '@open-mercato/shared/lib/crud/optimistic-lock-command'
 import { createLogger } from '@open-mercato/shared/lib/logger'
+import { getTelemetryRuntime } from '@open-mercato/shared/lib/telemetry/runtime'
 import { resolveTranslations } from '@open-mercato/shared/lib/i18n/server'
 import { findOneWithDecryption } from '@open-mercato/shared/lib/encryption/find'
 import { buildChanges, emitCrudSideEffects, emitCrudUndoSideEffects } from '@open-mercato/shared/lib/commands/helpers'
+import { findWithDecryption } from '@open-mercato/shared/lib/encryption/find'
 import { withAtomicFlush } from '@open-mercato/shared/lib/commands/flush'
 import type { CrudEventsConfig, CrudIndexerConfig } from '@open-mercato/shared/lib/crud/types'
 import type { DataEngine } from '@open-mercato/shared/lib/data/engine'
-import { StaffTeamMember, StaffTimeProject, StaffTimeTask, StaffTimeTaskStatus } from '../data/entities'
+import { StaffSupportTicket, StaffTeamMember, StaffTimeProject, StaffTimeTask, StaffTimeTaskStatus } from '../data/entities'
 import {
   staffTimeTaskCreateSchema,
   staffTimeTaskStatusChangeSchema,
@@ -67,7 +69,9 @@ import {
   commandInputScope,
   ensureOrganizationScope,
   ensureTenantScope,
+  explicitStaffCommandScope,
   extractUndoPayload,
+  lockLiveProjectForWrite,
   scopeForDecryption,
   scopedStaffSnapshotWhere,
   staffSnapshotScopeFromContext,
@@ -102,7 +106,7 @@ export const TASK_REFERENCE_CONFLICT_CODE = 'task_reference_conflict'
 
 const logger = createLogger('staff').child({ component: 'commands/timesheets-tasks' })
 
-const taskCrudIndexer: CrudIndexerConfig<StaffTimeTask> = {
+export const taskCrudIndexer: CrudIndexerConfig<StaffTimeTask> = {
   entityType: 'staff:staff_time_task',
 }
 
@@ -111,7 +115,7 @@ const taskCrudIndexer: CrudIndexerConfig<StaffTimeTask> = {
  * lifecycle `…status_changed` event belongs to the dedicated status endpoint that
  * owns the drag-and-drop move, not to these generic writes.
  */
-const taskCrudEvents: CrudEventsConfig<StaffTimeTask> = {
+export const taskCrudEvents: CrudEventsConfig<StaffTimeTask> = {
   module: 'staff',
   entity: 'timesheets.time_task',
   persistent: true,
@@ -136,7 +140,7 @@ const taskCrudEvents: CrudEventsConfig<StaffTimeTask> = {
  * "changed by someone else" until the entry expired. `ENABLE_CRUD_API_CACHE` off
  * hides it; the ephemeral QA and integration environments run with it on.
  */
-const TASK_LIST_CACHE_RESOURCE = `${taskCrudEvents.module}.${taskCrudEvents.entity}`
+export const TASK_LIST_CACHE_RESOURCE = `${taskCrudEvents.module}.${taskCrudEvents.entity}`
 
 type Translate = (key: string, fallback: string) => string
 
@@ -163,6 +167,8 @@ type TaskUndoPayload = {
   after?: TaskSnapshot | null
   /** Children the delete took with it, so undo can put the whole set back. */
   cascadedChildren?: TaskSnapshot[] | null
+  /** Support tickets this delete soft-deleted; undo restores exactly these and no others. */
+  cascadedSupportTicketIds?: string[] | null
 }
 
 const DIFFED_FIELDS = [
@@ -323,10 +329,7 @@ async function requireProject(
   scope: StaffCommandScope,
   translate: Translate,
 ): Promise<StaffTimeProject> {
-  const project = await em.findOne(
-    StaffTimeProject,
-    applyScopeToWhere<StaffTimeProject>({ id: timeProjectId, deletedAt: null }, scope),
-  )
+  const project = await lockLiveProjectForWrite(em, timeProjectId, scope)
   if (!project) throw projectNotFoundError(translate)
   return project
 }
@@ -336,7 +339,7 @@ async function requireProject(
  * otherwise the project's `is_default` entry point. The board invariants guarantee one
  * exists; the positional fallback only covers a board repaired by hand.
  */
-async function resolveTaskStatus(
+export async function resolveTaskStatus(
   em: EntityManager,
   timeProjectId: string,
   requestedStatusId: string | null | undefined,
@@ -408,7 +411,7 @@ async function requireStaffMember(
  * Order within a column, on the same gap grid the columns themselves use: a drop
  * between two cards writes one row instead of renumbering the stack.
  */
-async function nextTaskPosition(
+export async function nextTaskPosition(
   em: EntityManager,
   timeProjectId: string,
   taskStatusId: string,
@@ -427,7 +430,7 @@ async function nextTaskPosition(
  * the next task reuse that reference — and a closed report quoting the old one would
  * suddenly read as the new one.
  */
-async function readHighestSequenceNumber(
+export async function readHighestSequenceNumber(
   em: EntityManager,
   timeProjectId: string,
   scope: StaffCommandScope,
@@ -457,7 +460,7 @@ function assertNoProjectMove(rawInput: unknown, task: StaffTimeTask, translate:
   })
 }
 
-function applyStatusToTask(task: StaffTimeTask, status: StaffTimeTaskStatus, now: Date): void {
+export function applyStatusToTask(task: StaffTimeTask, status: StaffTimeTaskStatus, now: Date): void {
   task.taskStatusId = status.id
   // Done-ness comes from the column, never from a boolean on the task: landing on a
   // terminal column closes it, leaving one re-opens it.
@@ -622,6 +625,33 @@ const createTaskCommand: CommandHandler<StaffTimeTaskCreateInput, { taskId: stri
   },
 }
 
+export type TaskAssigneeChangeReason = 'default' | 'claim' | 'release' | 'manual'
+
+export function emitTaskAssigneeChanged(
+  task: Pick<StaffTimeTask, 'id' | 'tenantId' | 'organizationId' | 'timeProjectId' | 'assigneeStaffMemberId'>,
+  previousAssigneeStaffMemberId: string | null,
+  changeKind: TaskAssigneeChangeReason,
+  actorUserId: string | null = null,
+): void {
+  void emitStaffEvent(
+    'staff.timesheets.time_task.assignee_changed',
+    {
+      id: task.id,
+      tenantId: task.tenantId,
+      organizationId: task.organizationId,
+      timeProjectId: task.timeProjectId,
+      previousAssigneeStaffMemberId,
+      assigneeStaffMemberId: task.assigneeStaffMemberId ?? null,
+      changeKind,
+      actorUserId,
+    },
+    { persistent: true },
+  ).catch((err) => {
+    logger.error('staff.timesheets.time_task.assignee_changed emit failed', { err, taskId: task.id })
+    getTelemetryRuntime()?.reportError(err, { module: 'staff', code: 'staff.task_assignee_changed_emit_failed' })
+  })
+}
+
 const updateTaskCommand: CommandHandler<StaffTimeTaskUpdateInput, { taskId: string }> = {
   id: staffTimeTaskCommandIds.update,
   async prepare(rawInput, ctx) {
@@ -650,6 +680,7 @@ const updateTaskCommand: CommandHandler<StaffTimeTaskUpdateInput, { taskId: stri
     let targetStatus: StaffTimeTaskStatus | null = null
     let targetParentTaskId: string | null | undefined
     let targetAssigneeStaffMemberId: string | null | undefined
+    const previousAssigneeStaffMemberId = task.assigneeStaffMemberId ?? null
 
     await withAtomicFlush(
       em,
@@ -707,6 +738,11 @@ const updateTaskCommand: CommandHandler<StaffTimeTaskUpdateInput, { taskId: stri
       indexer: taskCrudIndexer,
     })
 
+    const nextAssigneeStaffMemberId = task.assigneeStaffMemberId ?? null
+    if (targetAssigneeStaffMemberId !== undefined && nextAssigneeStaffMemberId !== previousAssigneeStaffMemberId) {
+      emitTaskAssigneeChanged(task, previousAssigneeStaffMemberId, 'manual', ctx.auth?.sub ?? null)
+    }
+
     return { taskId: task.id }
   },
   buildLog: async ({ snapshots, ctx }) => {
@@ -766,7 +802,13 @@ const updateTaskCommand: CommandHandler<StaffTimeTaskUpdateInput, { taskId: stri
   },
 }
 
-const deleteTaskCommand: CommandHandler<{ id?: string }, { taskId: string; childIds: string[] }> = {
+export type StaffTimeTaskDeleteResult = {
+  taskId: string
+  childIds: string[]
+  supportTicketIds: string[]
+}
+
+const deleteTaskCommand: CommandHandler<{ id?: string }, StaffTimeTaskDeleteResult> = {
   id: staffTimeTaskCommandIds.delete,
   async prepare(input, ctx) {
     const id = input?.id
@@ -798,6 +840,8 @@ const deleteTaskCommand: CommandHandler<{ id?: string }, { taskId: string; child
 
     let children: StaffTimeTask[] = []
     let childIds: string[] = []
+    let supportTickets: StaffSupportTicket[] = []
+    const supportTicketIds: string[] = []
 
     await withAtomicFlush(
       em,
@@ -811,6 +855,18 @@ const deleteTaskCommand: CommandHandler<{ id?: string }, { taskId: string; child
                 StaffTimeTask,
                 applyScopeToWhere<StaffTimeTask>({ parentTaskId: task.id, deletedAt: null }, scope),
               )
+          supportTickets = await findWithDecryption(
+            em,
+            StaffSupportTicket,
+            {
+              taskId: { $in: [task.id, ...children.map((child) => child.id)] },
+              tenantId: task.tenantId,
+              organizationId: task.organizationId,
+              deletedAt: null,
+            },
+            undefined,
+            { tenantId: task.tenantId, organizationId: task.organizationId },
+          )
         },
         () => {
           const plan = planTaskSoftDelete(task, children)
@@ -825,6 +881,13 @@ const deleteTaskCommand: CommandHandler<{ id?: string }, { taskId: string; child
             child.deletedAt = now
             child.updatedAt = now
           }
+          const removedTaskIds = new Set([task.id, ...childIds])
+          for (const ticket of supportTickets) {
+            if (!removedTaskIds.has(ticket.taskId)) continue
+            ticket.deletedAt = now
+            ticket.updatedAt = now
+            supportTicketIds.push(ticket.id)
+          }
           // Time entries are untouched on purpose: a closed report still has to
           // resolve this task's label months after it was removed from the board.
         },
@@ -844,9 +907,9 @@ const deleteTaskCommand: CommandHandler<{ id?: string }, { taskId: string; child
       })
     }
 
-    return { taskId: task.id, childIds }
+    return { taskId: task.id, childIds, supportTicketIds }
   },
-  buildLog: async ({ snapshots }) => {
+  buildLog: async ({ snapshots, result }) => {
     const prepared = snapshots.before as
       | { snapshot?: TaskSnapshot; cascadedChildren?: TaskSnapshot[] }
       | undefined
@@ -864,6 +927,7 @@ const deleteTaskCommand: CommandHandler<{ id?: string }, { taskId: string; child
         undo: {
           before,
           cascadedChildren: prepared?.cascadedChildren ?? null,
+          cascadedSupportTicketIds: result?.supportTicketIds ?? [],
         } satisfies TaskUndoPayload,
       },
     }
@@ -876,16 +940,39 @@ const deleteTaskCommand: CommandHandler<{ id?: string }, { taskId: string; child
     const em = (ctx.container.resolve('em') as EntityManager).fork()
     const ids = [before.id, ...(payload?.cascadedChildren ?? []).map((child) => child.id)]
     const restored: StaffTimeTask[] = []
+    const restoredTickets: StaffSupportTicket[] = []
+    const ticketIds = payload?.cascadedSupportTicketIds ?? []
+    const { translate } = await resolveTranslations()
 
     await withAtomicFlush(
       em,
       [
         async () => {
+          const project = await lockLiveProjectForWrite(
+            em,
+            before.timeProjectId,
+            explicitStaffCommandScope(before.tenantId, before.organizationId),
+          )
+          if (!project) throw projectNotFoundError(translate)
           const tasks = await em.find(StaffTimeTask, {
             id: { $in: ids },
             ...snapshotScopeWhere(snapshotScope),
           })
           restored.push(...tasks)
+          if (ticketIds.length === 0) return
+          const tickets = await findWithDecryption(
+            em,
+            StaffSupportTicket,
+            {
+              id: { $in: ticketIds },
+              taskId: { $in: ids },
+              ...snapshotScopeWhere(snapshotScope),
+              deletedAt: { $ne: null },
+            },
+            undefined,
+            { tenantId: before.tenantId, organizationId: before.organizationId },
+          )
+          restoredTickets.push(...tickets)
         },
         () => {
           // Undo restores the whole set the cascade removed, not just the parent.
@@ -893,6 +980,10 @@ const deleteTaskCommand: CommandHandler<{ id?: string }, { taskId: string; child
             task.deletedAt = null
             task.updatedAt = new Date()
           }
+          for (const ticket of restoredTickets) {
+            ticket.deletedAt = null
+            ticket.updatedAt = new Date()
+          }
         },
       ],
       { transaction: true, label: `${staffTimeTaskCommandIds.delete}.undo` },