From f0d82f3bfa8a726ac887b78b4ab166a6d49eefcf Mon Sep 17 00:00:00 2001
From: an-lee <an.lee.work@gmail.com>
Date: Fri, 18 Oct 2024 22:50:31 +0800
Subject: [PATCH] refactor code

---
 enjoy/src/main/db/handlers/audios-handler.ts |  2 +-
 enjoy/src/main/db/index.ts                   |  8 ++++----
 enjoy/src/main/db/models/audio.ts            |  5 +++--
 enjoy/src/main/db/models/chat-member.ts      |  2 ++
 enjoy/src/main/db/models/video.ts            |  3 ++-
 enjoy/src/main/ffmpeg.ts                     |  2 +-
 enjoy/src/main/youtubedr.ts                  | 12 ++++++------
 7 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/enjoy/src/main/db/handlers/audios-handler.ts b/enjoy/src/main/db/handlers/audios-handler.ts
index 1f498def..4ab7020c 100644
--- a/enjoy/src/main/db/handlers/audios-handler.ts
+++ b/enjoy/src/main/db/handlers/audios-handler.ts
@@ -107,7 +107,7 @@ class AudiosHandler {
 
       return audio.toJSON();
     } catch (err) {
-      logger.error(err);
+      logger.error(err.message);
       throw err;
     }
   }
diff --git a/enjoy/src/main/db/index.ts b/enjoy/src/main/db/index.ts
index 74faa216..93dce88a 100644
--- a/enjoy/src/main/db/index.ts
+++ b/enjoy/src/main/db/index.ts
@@ -174,10 +174,6 @@ db.connect = async () => {
 
         // migrate up to the latest state
         await umzug.up();
-
-        await sequelize.query("PRAGMA foreign_keys = false;");
-        await sequelize.sync();
-        await sequelize.authenticate();
       } catch (err) {
         logger.error(err);
         await sequelize.close();
@@ -200,6 +196,10 @@ db.connect = async () => {
       await db.backup();
     }
 
+    await sequelize.query("PRAGMA foreign_keys = false;");
+    await sequelize.sync();
+    await sequelize.authenticate();
+
     // vacuum the database
     logger.info("Vacuuming the database");
     await sequelize.query("VACUUM");
diff --git a/enjoy/src/main/db/models/audio.ts b/enjoy/src/main/db/models/audio.ts
index bfb0e4ab..bcf77833 100644
--- a/enjoy/src/main/db/models/audio.ts
+++ b/enjoy/src/main/db/models/audio.ts
@@ -333,7 +333,8 @@ export class Audio extends Model<Audio> {
         md5,
       },
     });
-    if (existing) {
+    if (!!existing) {
+      logger.warn("Audio already exists:", existing.id);
       return existing;
     }
 
@@ -388,7 +389,7 @@ export class Audio extends Model<Audio> {
     });
 
     return record.save().catch((err) => {
-      logger.error(err);
+      logger.error(err.message);
       // Remove copied file
       fs.removeSync(destFile);
       throw err;
diff --git a/enjoy/src/main/db/models/chat-member.ts b/enjoy/src/main/db/models/chat-member.ts
index a184cae8..bd00dd78 100644
--- a/enjoy/src/main/db/models/chat-member.ts
+++ b/enjoy/src/main/db/models/chat-member.ts
@@ -58,11 +58,13 @@ export class ChatMember extends Model<ChatMember> {
 
   @BelongsTo(() => Chat, {
     foreignKey: "chatId",
+    constraints: false,
   })
   chat: Chat;
 
   @BelongsTo(() => ChatAgent, {
     foreignKey: "userId",
+    constraints: false,
   })
   agent: ChatAgent;
 
diff --git a/enjoy/src/main/db/models/video.ts b/enjoy/src/main/db/models/video.ts
index b9b7c45a..ed864f04 100644
--- a/enjoy/src/main/db/models/video.ts
+++ b/enjoy/src/main/db/models/video.ts
@@ -349,7 +349,8 @@ export class Video extends Model<Video> {
         md5,
       },
     });
-    if (existing) {
+    if (!!existing) {
+      logger.warn("Video already exists:", existing.id);
       return existing;
     }
 
diff --git a/enjoy/src/main/ffmpeg.ts b/enjoy/src/main/ffmpeg.ts
index 9eebbb7d..8d9526b5 100644
--- a/enjoy/src/main/ffmpeg.ts
+++ b/enjoy/src/main/ffmpeg.ts
@@ -347,7 +347,7 @@ export default class FfmpegWrapper {
           resolve(output);
         })
         .on("error", (err) => {
-          logger.error(err);
+          logger.error(err.message);
           reject(err);
         })
         .save(output);
diff --git a/enjoy/src/main/youtubedr.ts b/enjoy/src/main/youtubedr.ts
index 9d9f6160..acc8327c 100644
--- a/enjoy/src/main/youtubedr.ts
+++ b/enjoy/src/main/youtubedr.ts
@@ -133,7 +133,7 @@ class Youtubedr {
         {
           timeout: TEN_MINUTES,
           signal: this.abortController.signal,
-          env: this.proxyEnv()
+          env: this.proxyEnv(),
         }
       );
 
@@ -189,7 +189,7 @@ class Youtubedr {
         command,
         {
           timeout: ONE_MINUTE,
-          env: this.proxyEnv()
+          env: this.proxyEnv(),
         },
         (error, stdout, stderr) => {
           if (error) {
@@ -249,7 +249,7 @@ class Youtubedr {
       this.getYtVideoId(url);
       return true;
     } catch (error) {
-      logger.warn(error);
+      logger.warn(error.message);
       return false;
     }
   };
@@ -264,14 +264,14 @@ class Youtubedr {
    */
   proxyEnv = () => {
     // keep current environment variables
-    let env = {...process.env}
+    let env = { ...process.env };
     const proxyConfig = settings.getSync("proxy") as ProxyConfigType;
     if (proxyConfig.enabled && proxyConfig.url) {
       env["HTTP_PROXY"] = proxyConfig.url;
       env["HTTPS_PROXY"] = proxyConfig.url;
     }
-    return env
-  }
+    return env;
+  };
 }
 
 export default new Youtubedr();