From 7b636ee7932a18d693cd0c6aa9c9a06ba34b7de6 Mon Sep 17 00:00:00 2001 From: dahyeon Date: Sun, 7 Jun 2026 05:57:44 -0700 Subject: [PATCH] fix: preserve dakao result subjects on outbox retry --- .../dakao/dakao-outbox.service.spec.ts | 116 ++++++++++++++++++ .../src/modules/dakao/dakao-outbox.service.ts | 22 +++- .../api/src/modules/global/database/schema.ts | 8 ++ 3 files changed, 145 insertions(+), 1 deletion(-) create mode 100644 apps/api/src/modules/dakao/dakao-outbox.service.spec.ts diff --git a/apps/api/src/modules/dakao/dakao-outbox.service.spec.ts b/apps/api/src/modules/dakao/dakao-outbox.service.spec.ts new file mode 100644 index 00000000..97b6c264 --- /dev/null +++ b/apps/api/src/modules/dakao/dakao-outbox.service.spec.ts @@ -0,0 +1,116 @@ +import { ConnectionService } from '../global/database/connection.service'; +import { NatsService } from '../global/nats/nats.service'; +import { DakaoOutboxService } from './dakao-outbox.service'; +import { DakaoResultSubjects } from './dakao.types'; + +function execResult(value: T) { + return { exec: jest.fn().mockResolvedValue(value) }; +} + +function makeService(outboxModel: Record) { + const connectionService = { + getModel: jest.fn().mockResolvedValue(outboxModel), + } as unknown as ConnectionService; + const natsService = { + publishJetStream: jest.fn().mockResolvedValue(undefined), + } as unknown as NatsService; + + return { + service: new DakaoOutboxService(connectionService, natsService), + connectionService, + natsService, + }; +} + +describe('DakaoOutboxService', () => { + it('persists result subjects when enqueuing send-message commands', async () => { + const outboxModel = { + findOneAndUpdate: jest.fn().mockReturnValue(execResult({})), + updateOne: jest.fn().mockReturnValue(execResult({})), + }; + const { service, natsService } = makeService(outboxModel); + const resultSubjects: DakaoResultSubjects = { + succeeded: 'staging.lolympus.dakao.chat.send-message.succeeded.v1', + failed: 'staging.lolympus.dakao.chat.send-message.failed.v1', + }; + + await service.enqueueAndPublish({ + subject: 'staging.dakao.chat.send-message.v1', + eventId: 'lolympus:chat.send-message:chat-log-1', + envelope: { + schema: 'dakao.command.v1', + eventId: 'lolympus:chat.send-message:chat-log-1', + type: 'chat.send-message', + eventSource: 'lolympus', + correlationId: 'chat-log-1', + resultSubjects, + payload: { + chatroomId: '18474390111480678', + segments: [{ kind: 'text', text: 'done' }], + }, + }, + }); + + expect(outboxModel.findOneAndUpdate).toHaveBeenCalledWith( + { eventId: 'lolympus:chat.send-message:chat-log-1' }, + expect.objectContaining({ + $setOnInsert: expect.objectContaining({ resultSubjects }), + }), + expect.any(Object), + ); + expect(natsService.publishJetStream).toHaveBeenCalledWith( + 'staging.dakao.chat.send-message.v1', + expect.objectContaining({ resultSubjects }), + { messageId: 'lolympus:chat.send-message:chat-log-1' }, + ); + }); + + it('restores send-message result subjects when sweeping legacy stale rows', async () => { + const previousNodeEnv = process.env.NODE_ENV; + process.env.NODE_ENV = 'staging'; + + try { + const exec = jest.fn().mockResolvedValue([ + { + eventId: 'lolympus:chat.send-message:chat-log-1', + type: 'chat.send-message', + eventSource: 'lolympus', + subject: 'staging.dakao.chat.send-message.v1', + correlationId: 'chat-log-1', + payload: { + chatroomId: '18474390111480678', + segments: [{ kind: 'text', text: 'done' }], + }, + }, + ]); + const lean = jest.fn().mockReturnValue({ exec }); + const limit = jest.fn().mockReturnValue({ lean }); + const sort = jest.fn().mockReturnValue({ limit }); + const outboxModel = { + find: jest.fn().mockReturnValue({ sort }), + }; + const { service } = makeService(outboxModel); + const enqueue = jest + .spyOn(service, 'enqueueAndPublish') + .mockResolvedValue(undefined); + + await expect(service.sweepStale({ staleMs: 1, limit: 1 })).resolves.toBe( + 1, + ); + + expect(enqueue).toHaveBeenCalledWith( + expect.objectContaining({ + envelope: expect.objectContaining({ + resultSubjects: { + succeeded: + 'staging.lolympus.dakao.chat.send-message.succeeded.v1', + failed: 'staging.lolympus.dakao.chat.send-message.failed.v1', + }, + }), + }), + ); + } finally { + process.env.NODE_ENV = previousNodeEnv; + } + }); +}); diff --git a/apps/api/src/modules/dakao/dakao-outbox.service.ts b/apps/api/src/modules/dakao/dakao-outbox.service.ts index ca58d2cd..21fb7cda 100644 --- a/apps/api/src/modules/dakao/dakao-outbox.service.ts +++ b/apps/api/src/modules/dakao/dakao-outbox.service.ts @@ -1,13 +1,23 @@ import { Injectable, Logger } from '@nestjs/common'; import { ConnectionService } from '../global/database/connection.service'; import { NatsService } from '../global/nats/nats.service'; -import { DakaoCommandEnvelope, DakaoResultEnvelope } from './dakao.types'; +import { resolveDakaoNatsNames } from './dakao.nats-names'; +import { + DakaoCommandEnvelope, + DakaoResultEnvelope, + DakaoResultSubjects, +} from './dakao.types'; +const CHAT_SEND_MESSAGE_TYPE = 'chat.send-message'; const TERMINAL_STATES = ['sent', 'failed'] as const; @Injectable() export class DakaoOutboxService { private readonly logger = new Logger(DakaoOutboxService.name); + private readonly chatSendMessageResultSubjects = { + succeeded: resolveDakaoNatsNames().subjects.chatSendMessageSucceeded, + failed: resolveDakaoNatsNames().subjects.chatSendMessageFailed, + }; constructor( private readonly connectionService: ConnectionService, @@ -30,6 +40,7 @@ export class DakaoOutboxService { type: params.envelope.type, subject: params.subject, correlationId: params.envelope.correlationId, + resultSubjects: params.envelope.resultSubjects, payload: params.envelope.payload as Record, state: 'pending', publishAttempts: 0, @@ -161,6 +172,8 @@ export class DakaoOutboxService { type: row.type, eventSource: row.eventSource, correlationId: row.correlationId, + resultSubjects: + row.resultSubjects ?? this.resolveDefaultResultSubjects(row.type), payload: row.payload, }, }); @@ -168,4 +181,11 @@ export class DakaoOutboxService { return rows.length; } + + private resolveDefaultResultSubjects( + type: string, + ): DakaoResultSubjects | undefined { + if (type !== CHAT_SEND_MESSAGE_TYPE) return undefined; + return this.chatSendMessageResultSubjects; + } } diff --git a/apps/api/src/modules/global/database/schema.ts b/apps/api/src/modules/global/database/schema.ts index 9aef3702..e7f41494 100644 --- a/apps/api/src/modules/global/database/schema.ts +++ b/apps/api/src/modules/global/database/schema.ts @@ -350,6 +350,10 @@ export interface DakaoOutboxMessage extends MongooseTimestamps { type: string; subject: string; correlationId?: string; + resultSubjects?: { + succeeded: string; + failed: string; + }; payload: Record; state: DakaoOutboxMessageState; publishAttempts: number; @@ -960,6 +964,10 @@ export const DakaoOutboxMessageSchema = new Schema( type: { type: String, required: true }, subject: { type: String, required: true }, correlationId: { type: String }, + resultSubjects: { + succeeded: { type: String }, + failed: { type: String }, + }, payload: { type: Schema.Types.Mixed, required: true }, state: { type: String,