From 228dcf8aa5412acd1cacd7f03043f28b21fae216 Mon Sep 17 00:00:00 2001
From: Davidson Gomes <contato@agenciadgcode.com>
Date: Thu, 27 Jun 2024 09:01:02 -0300
Subject: [PATCH] chore: Improve code consistency and readability

Refactored the initialization of `LocalSettings` in `channel.service.ts` to only set the properties that have been explicitly provided. This refactoring improves code consistency and readability. Also, removed the unused `initStoreFolders` method from `repository.service.ts` and its related imports. In addition, updated the import style for `PrismaClient` in `repository.service.ts`.

The modified files are:
- src/api/controllers/instance.controller.ts
- src/api/repository/repository.service.ts
- src/api/services/channel.service.ts
- src/api/services/channels/whatsapp.baileys.service.ts
---
 src/api/controllers/instance.controller.ts    | 12 ++++-----
 src/api/repository/repository.service.ts      | 26 -------------------
 src/api/services/channel.service.ts           |  8 +++++-
 .../channels/whatsapp.baileys.service.ts      |  7 ++---
 4 files changed, 17 insertions(+), 36 deletions(-)

diff --git a/src/api/controllers/instance.controller.ts b/src/api/controllers/instance.controller.ts
index 292ad9e4..556caed9 100644
--- a/src/api/controllers/instance.controller.ts
+++ b/src/api/controllers/instance.controller.ts
@@ -373,13 +373,13 @@ export class InstanceController {
       }
 
       const settings: wa.LocalSettings = {
-        rejectCall: rejectCall || false,
+        rejectCall: rejectCall === true,
         msgCall: msgCall || '',
-        groupsIgnore: groupsIgnore || true,
-        alwaysOnline: alwaysOnline || false,
-        readMessages: readMessages || false,
-        readStatus: readStatus || false,
-        syncFullHistory: syncFullHistory ?? false,
+        groupsIgnore: groupsIgnore === true,
+        alwaysOnline: alwaysOnline === true,
+        readMessages: readMessages === true,
+        readStatus: readStatus === true,
+        syncFullHistory: syncFullHistory === true,
       };
 
       await this.settingsService.create(instance, settings);
diff --git a/src/api/repository/repository.service.ts b/src/api/repository/repository.service.ts
index 7dfc5d3b..9c9bbf0e 100644
--- a/src/api/repository/repository.service.ts
+++ b/src/api/repository/repository.service.ts
@@ -1,6 +1,4 @@
 import { PrismaClient } from '@prisma/client';
-import fs from 'fs';
-import { join } from 'path';
 
 import { ConfigService } from '../../config/env.config';
 import { Logger } from '../../config/logger.config';
@@ -15,30 +13,6 @@ export class Query<T> {
 export class PrismaRepository extends PrismaClient {
   constructor(private readonly configService: ConfigService) {
     super();
-
-    this.initStoreFolders();
-  }
-
-  private async initStoreFolders() {
-    try {
-      const storePath = join(process.cwd(), 'store');
-
-      this.logger.verbose('creating store path: ' + storePath);
-
-      const tempDir = join(storePath, 'temp');
-      const chatwootDir = join(storePath, 'chatwoot');
-
-      if (!fs.existsSync(chatwootDir)) {
-        this.logger.verbose('creating chatwoot dir: ' + chatwootDir);
-        fs.mkdirSync(chatwootDir, { recursive: true });
-      }
-      if (!fs.existsSync(tempDir)) {
-        this.logger.verbose('creating temp dir: ' + tempDir);
-        fs.mkdirSync(tempDir, { recursive: true });
-      }
-    } catch (error) {
-      this.logger.error(error);
-    }
   }
 
   private readonly logger = new Logger(PrismaRepository.name);
diff --git a/src/api/services/channel.service.ts b/src/api/services/channel.service.ts
index ca995cf2..1212ea84 100644
--- a/src/api/services/channel.service.ts
+++ b/src/api/services/channel.service.ts
@@ -189,7 +189,13 @@ export class ChannelStartupService {
       },
     });
 
-    Object.assign(this.localSettings, data);
+    this.localSettings.rejectCall = data?.rejectCall;
+    this.localSettings.msgCall = data?.msgCall;
+    this.localSettings.groupsIgnore = data?.groupsIgnore;
+    this.localSettings.alwaysOnline = data?.alwaysOnline;
+    this.localSettings.readMessages = data?.readMessages;
+    this.localSettings.readStatus = data?.readStatus;
+    this.localSettings.syncFullHistory = data?.syncFullHistory;
   }
 
   public async findSettings() {
diff --git a/src/api/services/channels/whatsapp.baileys.service.ts b/src/api/services/channels/whatsapp.baileys.service.ts
index 468a5eeb..c0b123eb 100644
--- a/src/api/services/channels/whatsapp.baileys.service.ts
+++ b/src/api/services/channels/whatsapp.baileys.service.ts
@@ -256,7 +256,7 @@ export class BaileysStartupService extends ChannelStartupService {
   public async getProfileStatus() {
     const status = await this.client.fetchStatus(this.instance.wuid);
 
-    return status[0]?.status;
+    return status?.status;
   }
 
   public get profilePictureUrl() {
@@ -551,6 +551,8 @@ export class BaileysStartupService extends ChannelStartupService {
 
       this.logger.info(log);
 
+      this.logger.info(`Group Ignore: ${this.localSettings.groupsIgnore}`);
+
       let options;
 
       if (this.localProxy.enabled) {
@@ -625,7 +627,6 @@ export class BaileysStartupService extends ChannelStartupService {
         },
         userDevicesCache: this.userDevicesCache,
         transactionOpts: { maxCommitRetries: 5, delayBetweenTriesMs: 2500 },
-        // forceGroupsPrekey: false,
         patchMessageBeforeSending(message) {
           if (
             message.deviceSentMessage?.message?.listMessage?.listType ===
@@ -1667,7 +1668,7 @@ export class BaileysStartupService extends ChannelStartupService {
     try {
       return {
         wuid: jid,
-        status: (await this.client.fetchStatus(jid))[0]?.status,
+        status: (await this.client.fetchStatus(jid))?.status,
       };
     } catch (error) {
       return {