diff --git a/src/api/services/channel.service.ts b/src/api/services/channel.service.ts index 0a6d5a55e..64889a2d5 100644 --- a/src/api/services/channel.service.ts +++ b/src/api/services/channel.service.ts @@ -754,21 +754,21 @@ export class ChannelStartupService { `; if (results && isArray(results) && results.length > 0) { - const mappedResults = results.map((item) => { - const lastMessage = item.lastMessageId + const mappedResults = results.map((contact) => { + const lastMessage = contact.lastmessageid ? { - id: item.lastMessageId, - key: item.lastMessage_key, - pushName: item.lastMessagePushName, - participant: item.lastMessageParticipant, - messageType: item.lastMessageMessageType, - message: item.lastMessageMessage, - contextInfo: item.lastMessageContextInfo, - source: item.lastMessageSource, - messageTimestamp: item.lastMessageMessageTimestamp, - instanceId: item.lastMessageInstanceId, - sessionId: item.lastMessageSessionId, - status: item.lastMessageStatus, + id: contact.lastmessageid, + key: contact.lastmessage_key, + pushName: contact.lastmessagepushname, + participant: contact.lastmessageparticipant, + messageType: contact.lastmessagemessagetype, + message: contact.lastmessagemessage, + contextInfo: contact.lastmessagecontextinfo, + source: contact.lastmessagesource, + messageTimestamp: contact.lastmessagemessagetimestamp, + instanceId: contact.lastmessageinstanceid, + sessionId: contact.lastmessagesessionid, + status: contact.lastmessagestatus, } : undefined; @@ -786,7 +786,7 @@ export class ChannelStartupService { isSaved: !!item.contactId, }; }); - + if (query?.take && query?.skip) { const skip = query.skip || 0; const take = query.take || 20;