NeoAnd/evolution-api
1
0
Fork 0
mirror of https://github.com/EvolutionAPI/evolution-api.git synced 2025-12-09 09:59:40 -06:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #2120 from FaelN1/develop
Some checks failed
Check Code Quality / check-lint-and-build (push) Has been cancelled
Details
Build Docker image / Build and Deploy (push) Has been cancelled
Details
Security Scan / CodeQL Analysis (javascript) (push) Has been cancelled
Details
Security Scan / Dependency Review (push) Has been cancelled
Details

Browse Source 
fix(chat): apply where filters correctly in findContacts endpoint
This commit is contained in:
Davidson Gomes 2025-10-23 06:55:28 -03:00 committed by GitHub
commit d5f5b8325e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/api/services/channel.service.ts
View File

@ -490,20 +490,23 @@ export class ChannelStartupService {
} }
public async fetchContacts(query: Query<Contact>) { public async fetchContacts(query: Query<Contact>) {
const remoteJid = query?.where?.remoteJid const where: any = {
? query?.where?.remoteJid.includes('@')
? query.where?.remoteJid
: createJid(query.where?.remoteJid)
: null;
const where = {
instanceId: this.instanceId, instanceId: this.instanceId,
}; };
if (remoteJid) { if (query?.where?.remoteJid) {
const remoteJid = query.where.remoteJid.includes('@') ? query.where.remoteJid : createJid(query.where.remoteJid);
where['remoteJid'] = remoteJid; where['remoteJid'] = remoteJid;
} }
if (query?.where?.id) {
where['id'] = query.where.id;
}
if (query?.where?.pushName) {
where['pushName'] = query.where.pushName;
}
const contactFindManyArgs: Prisma.ContactFindManyArgs = { const contactFindManyArgs: Prisma.ContactFindManyArgs = {
where, where,
}; };

3
src/validate/chat.schema.ts
View File

@ -195,8 +195,9 @@ export const contactValidateSchema: JSONSchema7 = {
_id: { type: 'string', minLength: 1 }, _id: { type: 'string', minLength: 1 },
pushName: { type: 'string', minLength: 1 }, pushName: { type: 'string', minLength: 1 },
id: { type: 'string', minLength: 1 }, id: { type: 'string', minLength: 1 },
remoteJid: { type: 'string', minLength: 1 },
}, },
...isNotEmpty('_id', 'id', 'pushName'), ...isNotEmpty('_id', 'id', 'pushName', 'remoteJid'),
}, },
}, },
}; };