Correção do bug ao adicionar um contato com caixa de mensagem ja existente

This commit is contained in:
Marcos Tulio 2024-08-07 14:46:11 -03:00
parent bd7b142d56
commit 919fc86bd1

View File

@ -525,58 +525,72 @@ export class ChatwootService {
public async createConversation(instance: InstanceDto, body: any) { public async createConversation(instance: InstanceDto, body: any) {
try { try {
const client = await this.clientCw(instance); this.logger.info('--- Start createConversation ---');
this.logger.info(`Instance: ${JSON.stringify(instance)}`);
this.logger.info(`Body: ${JSON.stringify(body)}`);
const client = await this.clientCw(instance);
if (!client) { if (!client) {
this.logger.warn('client not found'); this.logger.warn(`Client not found for instance: ${JSON.stringify(instance)}`);
return null; return null;
} }
const cacheKey = `${instance.instanceName}:createConversation-${body.key.remoteJid}`; const cacheKey = `${instance.instanceName}:createConversation-${body.key.remoteJid}`;
this.logger.info(`Cache key: ${cacheKey}`);
if (await this.cache.has(cacheKey)) { if (await this.cache.has(cacheKey)) {
this.logger.info(`Cache hit for key: ${cacheKey}`);
const conversationId = (await this.cache.get(cacheKey)) as number; const conversationId = (await this.cache.get(cacheKey)) as number;
this.logger.info(`Cached conversation ID: ${conversationId}`);
let conversationExists: conversation | boolean; let conversationExists: conversation | boolean;
try { try {
conversationExists = await client.conversations.get({ conversationExists = await client.conversations.get({
accountId: this.provider.accountId, accountId: this.provider.accountId,
conversationId: conversationId, conversationId: conversationId,
}); });
this.logger.info(`Conversation exists: ${JSON.stringify(conversationExists)}`);
} catch (error) { } catch (error) {
this.logger.error(`Error getting conversation: ${error}`);
conversationExists = false; conversationExists = false;
} }
if (!conversationExists) { if (!conversationExists) {
this.logger.info('Conversation does not exist, re-calling createConversation');
this.cache.delete(cacheKey); this.cache.delete(cacheKey);
return await this.createConversation(instance, body); return await this.createConversation(instance, body);
} }
return conversationId; return conversationId;
} }
const isGroup = body.key.remoteJid.includes('@g.us'); const isGroup = body.key.remoteJid.includes('@g.us');
this.logger.info(`Is group: ${isGroup}`);
const chatId = isGroup ? body.key.remoteJid : body.key.remoteJid.split('@')[0]; const chatId = isGroup ? body.key.remoteJid : body.key.remoteJid.split('@')[0];
this.logger.info(`Chat ID: ${chatId}`);
let nameContact: string; let nameContact: string;
nameContact = !body.key.fromMe ? body.pushName : chatId; nameContact = !body.key.fromMe ? body.pushName : chatId;
this.logger.info(`Name contact: ${nameContact}`);
const filterInbox = await this.getInbox(instance); const filterInbox = await this.getInbox(instance);
if (!filterInbox) { if (!filterInbox) {
this.logger.warn('inbox not found'); this.logger.warn(`Inbox not found for instance: ${JSON.stringify(instance)}`);
return null; return null;
} }
if (isGroup) { if (isGroup) {
this.logger.info('Processing group conversation');
const group = await this.waMonitor.waInstances[instance.instanceName].client.groupMetadata(chatId); const group = await this.waMonitor.waInstances[instance.instanceName].client.groupMetadata(chatId);
this.logger.info(`Group metadata: ${JSON.stringify(group)}`);
nameContact = `${group.subject} (GROUP)`;
const picture_url = await this.waMonitor.waInstances[instance.instanceName].profilePicture( const picture_url = await this.waMonitor.waInstances[instance.instanceName].profilePicture(
body.key.participant.split('@')[0], body.key.participant.split('@')[0],
); );
this.logger.info(`Participant profile picture URL: ${JSON.stringify(picture_url)}`);
const findParticipant = await this.findContact(instance, body.key.participant.split('@')[0]); const findParticipant = await this.findContact(instance, body.key.participant.split('@')[0]);
this.logger.info(`Found participant: ${JSON.stringify(findParticipant)}`);
if (findParticipant) { if (findParticipant) {
if (!findParticipant.name || findParticipant.name === chatId) { if (!findParticipant.name || findParticipant.name === chatId) {
@ -599,8 +613,10 @@ export class ChatwootService {
} }
const picture_url = await this.waMonitor.waInstances[instance.instanceName].profilePicture(chatId); const picture_url = await this.waMonitor.waInstances[instance.instanceName].profilePicture(chatId);
this.logger.info(`Contact profile picture URL: ${JSON.stringify(picture_url)}`);
let contact = await this.findContact(instance, chatId); let contact = await this.findContact(instance, chatId);
this.logger.info(`Found contact: ${JSON.stringify(contact)}`);
if (contact) { if (contact) {
if (!body.key.fromMe) { if (!body.key.fromMe) {
@ -617,8 +633,10 @@ export class ChatwootService {
) )
: false); : false);
const contactNeedsUpdate = pictureNeedsUpdate || nameNeedsUpdate; this.logger.info(`Picture needs update: ${pictureNeedsUpdate}`);
if (contactNeedsUpdate) { this.logger.info(`Name needs update: ${nameNeedsUpdate}`);
if (pictureNeedsUpdate || nameNeedsUpdate) {
contact = await this.updateContact(instance, contact.id, { contact = await this.updateContact(instance, contact.id, {
...(nameNeedsUpdate && { name: nameContact }), ...(nameNeedsUpdate && { name: nameContact }),
...(waProfilePictureFile === '' && { avatar: null }), ...(waProfilePictureFile === '' && { avatar: null }),
@ -640,38 +658,50 @@ export class ChatwootService {
} }
if (!contact) { if (!contact) {
this.logger.warn('contact not found'); this.logger.warn('Contact not created or found');
return null; return null;
} }
const contactId = contact?.payload?.id || contact?.payload?.contact?.id || contact?.id; const contactId = contact?.payload?.id || contact?.payload?.contact?.id || contact?.id;
this.logger.info(`Contact ID: ${contactId}`);
const contactConversations = (await client.contacts.listConversations({ const contactConversations = (await client.contacts.listConversations({
accountId: this.provider.accountId, accountId: this.provider.accountId,
id: contactId, id: contactId,
})) as any; })) as any;
this.logger.info(`Contact conversations: ${JSON.stringify(contactConversations)}`);
if (contactConversations?.payload?.length) { if (!contactConversations || !contactConversations.payload) {
this.logger.error('No conversations found or payload is undefined');
return null;
}
if (contactConversations.payload.length) {
let conversation: any; let conversation: any;
if (this.provider.reopenConversation) { if (this.provider.reopenConversation) {
conversation = contactConversations.payload.find((conversation) => conversation.inbox_id == filterInbox.id); conversation = contactConversations.payload.find((conversation) => conversation.inbox_id == filterInbox.id);
this.logger.info(`Found conversation in reopenConversation mode: ${JSON.stringify(conversation)}`);
if (this.provider.conversationPending) { if (this.provider.conversationPending) {
await client.conversations.toggleStatus({ if (conversation) {
accountId: this.provider.accountId, await client.conversations.toggleStatus({
conversationId: conversation.id, accountId: this.provider.accountId,
data: { conversationId: conversation.id,
status: 'pending', data: {
}, status: 'pending',
}); },
});
}
} }
} else { } else {
conversation = contactConversations.payload.find( conversation = contactConversations.payload.find(
(conversation) => conversation.status !== 'resolved' && conversation.inbox_id == filterInbox.id, (conversation) => conversation.status !== 'resolved' && conversation.inbox_id == filterInbox.id,
); );
this.logger.info(`Found conversation: ${JSON.stringify(conversation)}`);
} }
if (conversation) { if (conversation) {
this.logger.info(`Returning existing conversation ID: ${conversation.id}`);
this.cache.set(cacheKey, conversation.id); this.cache.set(cacheKey, conversation.id);
return conversation.id; return conversation.id;
} }
@ -692,14 +722,15 @@ export class ChatwootService {
}); });
if (!conversation) { if (!conversation) {
this.logger.warn('conversation not found'); this.logger.warn('Conversation not created or found');
return null; return null;
} }
this.logger.info(`New conversation created with ID: ${conversation.id}`);
this.cache.set(cacheKey, conversation.id); this.cache.set(cacheKey, conversation.id);
return conversation.id; return conversation.id;
} catch (error) { } catch (error) {
this.logger.error(error); this.logger.error(`Error in createConversation: ${error}`);
} }
} }