@open-mercato/core 0.9.1-develop.7477.1.64ba865101 → 0.9.1-develop.7497.1.543ea44c40

package/src/modules/messages/commands/messages.ts

@@ -18,7 +18,7 @@ import {
   resolveActorFeatures,
   resolveMessageChannelThreadAccess,
 } from '../lib/channelThreadAccess'
-import { MESSAGE_ATTACHMENT_ENTITY_ID, MESSAGE_ENTITY_ID } from '../lib/constants'
+import { MESSAGE_ATTACHMENT_ENTITY_ID, MESSAGE_ENTITY_ID, SYSTEM_SENDER_USER_ID } from '../lib/constants'
 import { canUseChannelThreadFallback } from '../lib/routeHelpers'
 import { getMessageTypeOrDefault } from '../lib/message-types-registry'
 import { validateMessageObjectsForType } from '../lib/object-validation'
@@ -779,24 +779,25 @@ const replyMessageCommand: CommandHandler<unknown, { id: string; externalEmail:
     const messageType = getMessageTypeOrDefault(original.type)
     if (messageType.allowReply === false) throw new Error('Reply is not allowed for this message type')
 
+    const isReplyRecipient = (userId: string) => userId !== input.userId && userId !== SYSTEM_SENDER_USER_ID
     const recipientIds = new Set(
       (input.recipients ?? [])
         .map((recipient) => recipient.userId)
-        .filter((recipientUserId) => recipientUserId !== input.userId),
+        .filter(isReplyRecipient),
     )
 
     if (recipientIds.size === 0) {
       const originalRecipients = await em.find(MessageRecipient, { messageId: original.id, deletedAt: null })
       if (input.replyAll) {
-        if (original.senderUserId !== input.userId) recipientIds.add(original.senderUserId)
+        if (isReplyRecipient(original.senderUserId)) recipientIds.add(original.senderUserId)
         for (const recipient of originalRecipients) {
-          if (recipient.recipientUserId !== input.userId) recipientIds.add(recipient.recipientUserId)
+          if (isReplyRecipient(recipient.recipientUserId)) recipientIds.add(recipient.recipientUserId)
         }
       } else if (original.senderUserId !== input.userId) {
-        recipientIds.add(original.senderUserId)
+        if (isReplyRecipient(original.senderUserId)) recipientIds.add(original.senderUserId)
       } else {
         for (const recipient of originalRecipients) {
-          if (recipient.recipientUserId !== input.userId) {
+          if (isReplyRecipient(recipient.recipientUserId)) {
             recipientIds.add(recipient.recipientUserId)
             break
           }
@@ -807,7 +808,9 @@ const replyMessageCommand: CommandHandler<unknown, { id: string; externalEmail:
         recipientIds.add(input.userId)
       }
     }
-    if (recipientIds.size === 0) throw new Error('No recipients available for reply')
+    if (recipientIds.size === 0 && original.senderUserId !== SYSTEM_SENDER_USER_ID) {
+      throw new Error('No recipients available for reply')
+    }
 
     let messageId = ''
     let responseExternalEmail: string | null = null

package/src/modules/messages/lib/constants.ts

@@ -5,3 +5,9 @@ export const MESSAGE_ATTACHMENT_PARTITION = 'messages'
 // Resource kind used by the command-level OSS optimistic-lock guard so stale
 // draft edits and message actions fail with the structured 409 conflict.
 export const MESSAGE_OPTIMISTIC_LOCK_RESOURCE_KIND = 'messages.message'
+
+// Sender of messages composed on behalf of the platform rather than a person —
+// a communication channel's inbound ingest, inbox_ops, warranty_claims. No
+// `users` row exists for it, so it can never be a reply or notification
+// recipient (#6391).
+export const SYSTEM_SENDER_USER_ID = '00000000-0000-0000-0000-000000000000'

package/src/modules/messages/subscribers/message-notification.ts

@@ -10,6 +10,7 @@ import {
 import { User } from '../../auth/data/entities'
 import { Message } from '../data/entities'
 import { notificationTypes } from '../notifications'
+import { SYSTEM_SENDER_USER_ID } from '../lib/constants'
 import { resolveMessageChannelThreadAccess } from '../lib/channelThreadAccess'
 import {
   EXTERNAL_CONVERSATION_SOURCE_ENTITY_TYPE,
@@ -156,6 +157,7 @@ async function isChannelRoutedMessage(payload: MessageSentPayload, ctx: Resolver
 
 export default async function handle(payload: MessageSentPayload, ctx: ResolverContext): Promise<void> {
   const uniqueRecipientUserIds = Array.from(new Set(payload.recipientUserIds))
+    .filter((recipientUserId) => recipientUserId !== SYSTEM_SENDER_USER_ID)
 
   const typeDef = notificationTypes.find((type) => type.type === 'messages.new')
   if (typeDef && uniqueRecipientUserIds.length > 0) {

package/src/modules/sales/api/documents/factory.ts

@@ -24,7 +24,7 @@ import { parseScopedCommandInput, resolveCrudRecordId } from '../utils'
 import { documentUpdateSchema } from '../../commands/documents'
 import { buildIlikeTerm } from '@open-mercato/shared/lib/db/buildIlikeTerm'
 import { parseBooleanToken } from '@open-mercato/shared/lib/boolean'
-import { parseIdsParam } from '@open-mercato/shared/lib/crud/ids'
+import { isUuidListParam, parseIdsParam, splitIdListParam } from '@open-mercato/shared/lib/crud/ids'
 import type { RbacService } from '@open-mercato/core/modules/auth/services/rbacService'
 import { parseDecryptedFieldValue } from '@open-mercato/shared/lib/encryption/tenantDataEncryptionService'
 
@@ -111,7 +111,10 @@ const listSchema = z
     totalGrossMax: z.coerce.number().optional(),
     dateFrom: z.string().optional(),
     dateTo: z.string().optional(),
-    tagIds: z.string().optional(),
+    tagIds: z
+      .string()
+      .optional()
+      .refine(isUuidListParam, { message: 'tagIds must be a comma-separated list of UUIDs' }),
     tagIdsEmpty: z.string().optional(),
     sortField: z.string().optional(),
     sortDir: z.enum(['asc', 'desc']).optional(),
@@ -180,11 +183,7 @@ function buildFilters(query: ListQuery, numberColumn: string, kind: DocumentKind
   if (Object.keys(dateRange).length) {
     filters.created_at = dateRange
   }
-  const tagIdsRaw = typeof query.tagIds === 'string' ? query.tagIds : ''
-  const tagIds = tagIdsRaw
-    .split(',')
-    .map((value) => value.trim())
-    .filter((value) => value.length > 0)
+  const tagIds = splitIdListParam(query.tagIds)
   if (parseBooleanToken(query.tagIdsEmpty) === true) {
     filters.id = { $eq: '00000000-0000-0000-0000-000000000000' }
   } else if (tagIds.length) {

package/src/modules/sales/commands/payments.ts

@@ -250,7 +250,14 @@ export async function restorePaymentSnapshot(em: EntityManager, snapshot: Paymen
   em.persist(entity)
 }
 
-async function recomputeOrderPaymentTotals(
+const NON_SETTLING_PAYMENT_STATUSES = new Set(['failed', 'canceled', 'cancelled'])
+
+export function paymentCountsTowardOrderBalance(payment: Pick<SalesPayment, 'status'>): boolean {
+  const status = typeof payment.status === 'string' ? payment.status.trim().toLowerCase() : ''
+  return !NON_SETTLING_PAYMENT_STATUSES.has(status)
+}
+
+export async function recomputeOrderPaymentTotals(
   em: EntityManager,
   order: SalesOrder,
   options?: { lock?: boolean }
@@ -282,10 +289,11 @@ async function recomputeOrderPaymentTotals(
     if (paymentId) paymentIds.add(paymentId)
   })
 
-  const payments =
+  const loadedPayments =
     paymentIds.size > 0
       ? await findWithDecryption(em, SalesPayment, { id: { $in: Array.from(paymentIds) }, deletedAt: null, ...scope }, {}, scope)
       : await findWithDecryption(em, SalesPayment, { order: orderId, deletedAt: null, ...scope }, {}, scope)
+  const payments = loadedPayments.filter(paymentCountsTowardOrderBalance)
 
   const resolvePaidAmount = (payment: SalesPayment) => {
     const captured = toNumber(payment.capturedAmount)