Skip to content

fix(messaging): resolve message-to-event 404 for outgoing events without incomingEventId #1859

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mnbreno wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(messaging): resolve message-to-event 404 for outgoing events without incomingEventId #1859

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 18 additions & 8 deletions packages/bp/src/core/messaging/messaging-bot-router.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,17 +27,27 @@ export class MessagingBotRouter extends CustomRouter {
return res.sendStatus(404)
}

const [incomingEvent] = await this.eventRepo.findEvents({
incomingEventId: messageEvent.incomingEventId,
direction: 'incoming',
botId: req.params.botId
})
// If the matched event is already incoming, return it directly
if (messageEvent.direction === 'incoming') {
return res.send(messageEvent.event)
}

if (!incomingEvent) {
return res.sendStatus(404)
// For outgoing events with a linked incoming event, follow the chain
if (messageEvent.incomingEventId) {
const [incomingEvent] = await this.eventRepo.findEvents({
incomingEventId: messageEvent.incomingEventId,
direction: 'incoming',
botId: req.params.botId
})

if (incomingEvent) {
return res.send(incomingEvent.event)
}
}

return res.send(incomingEvent.event)
// Fallback: return the outgoing event itself (graceful degradation
// instead of 404 when incomingEventId is not set)
return res.send(messageEvent.event)
})
)

Expand Down