|
|
|
@ -71,6 +71,7 @@ const uniqueMsgId = msg => (msg.id && msg.direction ? `${directionPrefix[msg.dir
|
|
|
|
|
*/
|
|
|
|
|
const webhookBodyBuilder = (messageData, messageType) => {
|
|
|
|
|
const defaultContent = { id: '', from: '', to: '', externalId: '', type: '', direction: '', status: '' };
|
|
|
|
|
const status = messageData.direction === 'inbound' ? '' : statusMapped?.[messageData.status] || messageData.status || '';
|
|
|
|
|
const message = {
|
|
|
|
|
id: `evt_${generateId().replace(/-/g, '')}`,
|
|
|
|
|
type: eventTypeMapped[messageType],
|
|
|
|
@ -83,12 +84,12 @@ const webhookBodyBuilder = (messageData, messageType) => {
|
|
|
|
|
waiMessage: {
|
|
|
|
|
...defaultContent,
|
|
|
|
|
...messageData,
|
|
|
|
|
...(messageData.updateTime ? { [timeField[messageData.status]]: messageData.updateTime } : {}),
|
|
|
|
|
...(messageData.updateTime && !isEmpty(status) ? { [timeField[messageData.status]]: messageData.updateTime } : {}),
|
|
|
|
|
type: messageData.type || messageData.msgtype || '',
|
|
|
|
|
id: uniqueMsgId(messageData) || messageData.id || generateId(),
|
|
|
|
|
wamid: messageData.id || '',
|
|
|
|
|
// direction: directionField[messageType],
|
|
|
|
|
status: messageData.direction === 'inbound' ? '' : statusMapped?.[messageData.status] || messageData.status || '',
|
|
|
|
|
status,
|
|
|
|
|
externalId: messageData?.externalId || '',
|
|
|
|
|
},
|
|
|
|
|
};
|
|
|
|
@ -226,7 +227,7 @@ const setupMessageHandler = async () => {
|
|
|
|
|
const msgRow = await upsertOutboundMessage({ ...upsertFields, ...readyUpsert, ...typeField, ...msgOrigin }, targetUpsert);
|
|
|
|
|
if (_type !== 'unresolvable') {
|
|
|
|
|
// 把内容加上, 否则前端没显示
|
|
|
|
|
await callWebhook(webhookBodyFill(webhookBody, { ...msgRow, status: msgRow.msg_status }));
|
|
|
|
|
await callWebhook(webhookBodyFill(webhookBody, { ...msgRow, status: msgRow.msg_status || '' }));
|
|
|
|
|
}
|
|
|
|
|
} catch (error) {
|
|
|
|
|
logger.error({ messageData, error }, 'error call webhook');
|
|
|
|
|