Skip to content
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

Corrigindo um bug no endpoint de findChats e permitindo paginação nos endpoints de findChats e findContacts #1334

Merged
merged 2 commits into from
Mar 26, 2025
Merged

Corrigindo um bug no endpoint de findChats e permitindo paginação nos endpoints de findChats e findContacts #1334

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c5c354f
fix_and_add_name_to_find_chats_and_paginate_get_contacts_and_get_chats
pedro-php Mar 25, 2025
d196590
Update src/api/services/channel.service.ts
pedro-php Mar 25, 2025
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
3 changes: 2 additions & 1 deletion src/api/integrations/channel/whatsapp/whatsapp.baileys.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1186,7 +1186,8 @@ export class BaileysStartupService extends ChannelStartupService {
existingChat &&
received.pushName &&
existingChat.name !== received.pushName &&
received.pushName.trim().length > 0
received.pushName.trim().length > 0 &&
!received.key.remoteJid.includes('@g.us')
) {
this.sendDataWebhook(Events.CHATS_UPSERT, [{ ...existingChat, name: received.pushName }]);
if (this.configService.get<Database>('DATABASE').SAVE_DATA.CHATS) {
Expand Down
22 changes: 20 additions & 2 deletions src/api/services/channel.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -503,9 +503,17 @@ export class ChannelStartupService {
where['remoteJid'] = remoteJid;
}

return await this.prismaRepository.contact.findMany({
const contactFindManyArgs: Prisma.ContactFindManyArgs = {
where,
});
};

if (query.offset) contactFindManyArgs.take = query.offset;
if (query.page) {
const validPage = Math.max(query.page as number, 1);
contactFindManyArgs.skip = query.offset * (validPage - 1);
}

return await this.prismaRepository.contact.findMany(contactFindManyArgs);
}

public cleanMessageData(message: any) {
Expand Down Expand Up @@ -674,6 +682,13 @@ export class ChannelStartupService {
: createJid(query.where?.remoteJid)
: null;

const limit =
query.offset && !query.page
? Prisma.sql` LIMIT ${query.offset}`
: query.offset && query.page
? Prisma.sql` LIMIT ${query.offset} OFFSET ${((query.page as number) - 1) * query.offset}`
: Prisma.sql``;

const where = {
instanceId: this.instanceId,
};
Expand All @@ -700,6 +715,7 @@ export class ChannelStartupService {
to_timestamp("Message"."messageTimestamp"::double precision),
"Contact"."updatedAt"
) as "updatedAt",
"Chat"."name" as "chatName",
"Chat"."createdAt" as "windowStart",
"Chat"."createdAt" + INTERVAL '24 hours' as "windowExpires",
CASE
Expand Down Expand Up @@ -730,6 +746,7 @@ export class ChannelStartupService {
ORDER BY
"Contact"."remoteJid",
"Message"."messageTimestamp" DESC
${limit}
)
SELECT * FROM rankedMessages
ORDER BY "updatedAt" DESC NULLS LAST;
Expand Down Expand Up @@ -758,6 +775,7 @@ export class ChannelStartupService {
id: contact.id,
remoteJid: contact.remoteJid,
pushName: contact.pushName,
chatName: contact.chatName,
profilePicUrl: contact.profilePicUrl,
updatedAt: contact.updatedAt,
windowStart: contact.windowStart,
Expand Down