Skip to content
Closed
Changes from all commits
Commits
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
30 changes: 15 additions & 15 deletions src/api/services/channel.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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;
Expand Down
Loading