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

fix: fetch instances

Browse Source
This commit is contained in:
Davidson Gomes 2024-10-29 07:43:48 -03:00
parent fce3e55e91
commit 23640a71b8
3 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/api/controllers/instance.controller.ts
View File

@ -382,7 +382,9 @@ export class InstanceController {
return this.waMonitor.instanceInfoById(instanceId, number); return this.waMonitor.instanceInfoById(instanceId, number);
} }
return this.waMonitor.instanceInfo([instanceName]); const instanceNames = instanceName ? [instanceName] : null;
return this.waMonitor.instanceInfo(instanceNames);
} }
public async setPresence({ instanceName }: InstanceDto, data: SetPresenceDto) { public async setPresence({ instanceName }: InstanceDto, data: SetPresenceDto) {

3
src/api/integrations/channel/whatsapp/whatsapp.baileys.service.ts
View File

@ -1762,7 +1762,8 @@ export class BaileysStartupService extends ChannelStartupService {
website: business?.website?.shift(), website: business?.website?.shift(),
}; };
} else { } else {
const info: Instance = await waMonitor.instanceInfo([instanceName]); const instanceNames = instanceName ? [instanceName] : null;
const info: Instance = await waMonitor.instanceInfo(instanceNames);
const business = await this.fetchBusinessProfile(jid); const business = await this.fetchBusinessProfile(jid);
return { return {

28
src/api/services/monitor.service.ts
View File

@ -60,23 +60,25 @@ export class WAMonitoringService {
} }
public async instanceInfo(instanceNames?: string[]): Promise<any> { public async instanceInfo(instanceNames?: string[]): Promise<any> {
const inexistentInstances = instanceNames ? instanceNames.filter((instance) => !this.waInstances[instance]) : []; if (instanceNames && instanceNames.length > 0) {
const inexistentInstances = instanceNames ? instanceNames.filter((instance) => !this.waInstances[instance]) : [];
if (inexistentInstances.length > 0) { if (inexistentInstances.length > 0) {
throw new NotFoundException( throw new NotFoundException(
`Instance${inexistentInstances.length > 1 ? 's' : ''} "${inexistentInstances.join(', ')}" not found`, `Instance${inexistentInstances.length > 1 ? 's' : ''} "${inexistentInstances.join(', ')}" not found`,
); );
}
} }
const clientName = this.configService.get<Database>('DATABASE').CONNECTION.CLIENT_NAME; const clientName = this.configService.get<Database>('DATABASE').CONNECTION.CLIENT_NAME;
const where = instanceNames const where = instanceNames && instanceNames.length > 0
? { ? {
name: { name: {
in: instanceNames, in: instanceNames,
}, },
clientName, clientName,
} }
: { clientName }; : { clientName };
const instances = await this.prismaRepository.instance.findMany({ const instances = await this.prismaRepository.instance.findMany({
@ -123,7 +125,9 @@ export class WAMonitoringService {
throw new NotFoundException(`Instance "${instanceName}" not found`); throw new NotFoundException(`Instance "${instanceName}" not found`);
} }
return this.instanceInfo([instanceName]); const instanceNames = instanceName ? [instanceName] : null;
return this.instanceInfo(instanceNames);
} }
public async cleaningUp(instanceName: string) { public async cleaningUp(instanceName: string) {