diff --git a/src/api/controllers/instance.controller.ts b/src/api/controllers/instance.controller.ts index ed22a3ea..6df6d854 100644 --- a/src/api/controllers/instance.controller.ts +++ b/src/api/controllers/instance.controller.ts @@ -1,11 +1,11 @@ import { InstanceDto, SetPresenceDto } from '@api/dto/instance.dto'; +import { BaileysStartupService } from '@api/integrations/channel/whatsapp/baileys/whatsapp.baileys.service'; +import { BusinessStartupService } from '@api/integrations/channel/whatsapp/business/whatsapp.business.service'; import { ChatwootService } from '@api/integrations/chatbot/chatwoot/services/chatwoot.service'; import { ProviderFiles } from '@api/provider/sessions'; import { PrismaRepository } from '@api/repository/repository.service'; import { eventController } from '@api/server.module'; import { CacheService } from '@api/services/cache.service'; -import { BaileysStartupService } from '@api/services/channels/whatsapp.baileys.service'; -import { BusinessStartupService } from '@api/services/channels/whatsapp.business.service'; import { WAMonitoringService } from '@api/services/monitor.service'; import { SettingsService } from '@api/services/settings.service'; import { Events, Integration, wa } from '@api/types/wa.types'; diff --git a/src/api/services/channels/whatsapp.baileys.service.ts b/src/api/integrations/channel/whatsapp/baileys/whatsapp.baileys.service.ts similarity index 100% rename from src/api/services/channels/whatsapp.baileys.service.ts rename to src/api/integrations/channel/whatsapp/baileys/whatsapp.baileys.service.ts diff --git a/src/api/services/channels/whatsapp.business.service.ts b/src/api/integrations/channel/whatsapp/business/whatsapp.business.service.ts similarity index 100% rename from src/api/services/channels/whatsapp.business.service.ts rename to src/api/integrations/channel/whatsapp/business/whatsapp.business.service.ts diff --git a/src/api/services/channel.service.ts b/src/api/services/channel.service.ts index 7acc7438..345ec813 100644 --- a/src/api/services/channel.service.ts +++ b/src/api/services/channel.service.ts @@ -11,12 +11,10 @@ import { eventController, waMonitor } from '@api/server.module'; import { Events, wa } from '@api/types/wa.types'; import { Auth, Chatwoot, ConfigService, HttpServer } from '@config/env.config'; import { Logger } from '@config/logger.config'; -import { ROOT_DIR } from '@config/path.config'; import { NotFoundException } from '@exceptions'; import { Contact, Message } from '@prisma/client'; import { WASocket } from 'baileys'; import EventEmitter2 from 'eventemitter2'; -import { join } from 'path'; import { v4 } from 'uuid'; import { CacheService } from './cache.service'; @@ -36,7 +34,6 @@ export class ChannelStartupService { public readonly localChatwoot: wa.LocalChatwoot = {}; public readonly localProxy: wa.LocalProxy = {}; public readonly localSettings: wa.LocalSettings = {}; - public readonly storePath = join(ROOT_DIR, 'store'); public chatwootService = new ChatwootService( waMonitor, diff --git a/src/api/services/monitor.service.ts b/src/api/services/monitor.service.ts index be3f821d..763059b1 100644 --- a/src/api/services/monitor.service.ts +++ b/src/api/services/monitor.service.ts @@ -1,4 +1,6 @@ import { InstanceDto } from '@api/dto/instance.dto'; +import { BaileysStartupService } from '@api/integrations/channel/whatsapp/baileys/whatsapp.baileys.service'; +import { BusinessStartupService } from '@api/integrations/channel/whatsapp/business/whatsapp.business.service'; import { ProviderFiles } from '@api/provider/sessions'; import { PrismaRepository } from '@api/repository/repository.service'; import { Events, Integration } from '@api/types/wa.types'; @@ -12,8 +14,6 @@ import { rmSync } from 'fs'; import { join } from 'path'; import { CacheService } from './cache.service'; -import { BaileysStartupService } from './channels/whatsapp.baileys.service'; -import { BusinessStartupService } from './channels/whatsapp.business.service'; export class WAMonitoringService { constructor(