diff --git a/backend/src/controllers/ApiController.ts b/backend/src/controllers/ApiController.ts index 33fb7df..2c553b8 100644 --- a/backend/src/controllers/ApiController.ts +++ b/backend/src/controllers/ApiController.ts @@ -24,7 +24,10 @@ interface ContactData { number: string; } -const createContact = async (newContact: string) => { +const createContact = async ( + userId: number, + newContact: string +) => { await CheckIsValidContact(newContact); const validNumber: any = await CheckContactNumber(newContact); @@ -42,7 +45,7 @@ const createContact = async (newContact: string) => { const contact = await CreateOrUpdateContactService(contactData); - const defaultWhatsapp = await GetDefaultWhatsApp(); + const defaultWhatsapp = await GetDefaultWhatsApp(userId); const createTicket = await FindOrCreateTicketService( contact, @@ -76,7 +79,8 @@ export const index = async (req: Request, res: Response): Promise => { throw new AppError(err.message); } - const contactAndTicket = await createContact(newContact.number); + const userId:number = parseInt(req.user.id); + const contactAndTicket = await createContact(userId, newContact.number); if (medias) { await Promise.all( diff --git a/backend/src/controllers/ImportPhoneContactsController.ts b/backend/src/controllers/ImportPhoneContactsController.ts index 01f1cfc..2b19890 100644 --- a/backend/src/controllers/ImportPhoneContactsController.ts +++ b/backend/src/controllers/ImportPhoneContactsController.ts @@ -2,7 +2,8 @@ import { Request, Response } from "express"; import ImportContactsService from "../services/WbotServices/ImportContactsService"; export const store = async (req: Request, res: Response): Promise => { - await ImportContactsService(); + const userId:number = parseInt(req.user.id); + await ImportContactsService(userId); return res.status(200).json({ message: "contacts imported" }); }; diff --git a/backend/src/helpers/GetTicketWbot.ts b/backend/src/helpers/GetTicketWbot.ts index 0caa6b0..802e8e9 100644 --- a/backend/src/helpers/GetTicketWbot.ts +++ b/backend/src/helpers/GetTicketWbot.ts @@ -5,7 +5,7 @@ import Ticket from "../models/Ticket"; const GetTicketWbot = async (ticket: Ticket): Promise => { if (!ticket.whatsappId) { - const defaultWhatsapp = await GetDefaultWhatsApp(); + const defaultWhatsapp = await GetDefaultWhatsApp(ticket.user.id); await ticket.$set("whatsapp", defaultWhatsapp); } diff --git a/backend/src/services/TicketServices/CreateTicketService.ts b/backend/src/services/TicketServices/CreateTicketService.ts index 4ea16cf..276d5e5 100644 --- a/backend/src/services/TicketServices/CreateTicketService.ts +++ b/backend/src/services/TicketServices/CreateTicketService.ts @@ -15,7 +15,7 @@ const CreateTicketService = async ({ status, userId }: Request): Promise => { - const defaultWhatsapp = await GetDefaultWhatsApp(); + const defaultWhatsapp = await GetDefaultWhatsApp(userId); await CheckContactOpenTickets(contactId); diff --git a/backend/src/services/WbotServices/ImportContactsService.ts b/backend/src/services/WbotServices/ImportContactsService.ts index ee6fd1f..531fff5 100644 --- a/backend/src/services/WbotServices/ImportContactsService.ts +++ b/backend/src/services/WbotServices/ImportContactsService.ts @@ -3,8 +3,8 @@ import { getWbot } from "../../libs/wbot"; import Contact from "../../models/Contact"; import { logger } from "../../utils/logger"; -const ImportContactsService = async (): Promise => { - const defaultWhatsapp = await GetDefaultWhatsApp(); +const ImportContactsService = async (userId:number): Promise => { + const defaultWhatsapp = await GetDefaultWhatsApp(userId); const wbot = getWbot(defaultWhatsapp.id);