rewrite for more logs

webresto · Nov 10, 2023 · 354b03b · 354b03b
1 parent 7b7e806
commit 354b03b
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 19 deletions.
diff --git a/adapters/otp/default/defaultOTP.js b/adapters/otp/default/defaultOTP.js
@@ -18,10 +18,10 @@ class DefaultOTP extends OneTimePasswordAdapter_1.default {
             await NotificationManager.sendMessageToDeliveryManager("error", `Failed OPT password generate for ${login}, please contact with him`);
             throw `otp generation error`;
         }
-        let mainLoginField = await Settings.get("LOGIN_FIELD");
+        let mainLoginField = await Settings.get("LOGIN_FIELD") ?? 'phone';
         if (NotificationManager.isChannelExist(mainLoginField === "phone" ? "sms" : mainLoginField)) {
             try {
-                await NotificationManager.sendMessageToUser("info", `Your code is ${otp.password}`, login);
+                await NotificationManager.sendMessageToUser("info", `Your code is ${otp.password}`, { phone: { code: "", number: login } });
             }
             catch (error) {
                 sails.log.error(`SEND OTP ERROR: ${error}`);

diff --git a/adapters/otp/default/defaultOTP.ts b/adapters/otp/default/defaultOTP.ts
@@ -15,10 +15,10 @@ export class DefaultOTP extends OneTimePasswordAdapter {
       throw `otp generation error`
     }
 
-    let mainLoginField = await Settings.get("LOGIN_FIELD") as string;
+    let mainLoginField = await Settings.get("LOGIN_FIELD") as string ?? 'phone';
     if (NotificationManager.isChannelExist(mainLoginField === "phone" ? "sms" : mainLoginField)){
       try {
-        await NotificationManager.sendMessageToUser("info", `Your code is ${otp.password}`,login);
+        await NotificationManager.sendMessageToUser("info", `Your code is ${otp.password}`,{ phone: { code: "", number:login}});
       } catch (error) {
         sails.log.error(`SEND OTP ERROR: ${error}`)
       }

diff --git a/libs/NotificationManager.js b/libs/NotificationManager.js
@@ -22,7 +22,7 @@ class NotificationManager {
             await NotificationManager.send(badge, "manager", text, null);
         }
         catch (error) {
-            sails.log.info(`✉️ Notification manager > console: ${badge}, ${text}`);
+            sails.log.warn(`✉️ Notification manager > console: ${badge}, ${text}`);
         }
     }
     /**
@@ -62,10 +62,7 @@ NotificationManager.send = async (badge, groupTo, message, user, type, subject,
         }
         sent = await channel.trySendMessage(badge, message, user, subject, data);
     }
-    if (groupTo === "user" && user !== undefined && !sent) {
-        throw new Error(`Failed to send message to user ${user.login} with message: ${message}`);
-    }
-    else {
+    if (!sent) {
         throw new Error(`Failed to send message to group ${groupTo}, ${type ? type : ""}, message: ${message}`);
     }
 };

diff --git a/libs/NotificationManager.ts b/libs/NotificationManager.ts
@@ -61,7 +61,7 @@ export class NotificationManager {
     try {
       await NotificationManager.send(badge, "manager", text, null);
     } catch (error) {
-      sails.log.info(`✉️ Notification manager > console: ${badge}, ${text}`)
+      sails.log.warn(`✉️ Notification manager > console: ${badge}, ${text}`)
     }
   }
 
@@ -111,14 +111,10 @@ export class NotificationManager {
         continue;
       }
 
-
-
       sent = await channel.trySendMessage(badge, message, user, subject, data);
     }
 
-    if (groupTo === "user" && user !== undefined && !sent) {
-      throw new Error(`Failed to send message to user ${user.login} with message: ${message}`);
-    } else {
+    if(!sent){
       throw new Error(`Failed to send message to group ${groupTo}, ${type ? type: ""}, message: ${message}`);
     }
   };

diff --git a/test/integration/notification_manager.test.js b/test/integration/notification_manager.test.js
@@ -16,14 +16,19 @@ class TestChannel extends NotificationManager_1.Channel {
 }
 const testChannel = new TestChannel;
 describe("NotificationManager", function () {
-    it("NotificationManager add new channel", () => {
+    it("add new channel", () => {
         NotificationManager_1.NotificationManager.registerChannel(testChannel);
         if (NotificationManager_1.NotificationManager.channels.length !== 1)
             throw `should 1`;
     });
-    it("NotificationManager send message", () => {
+    it("send message", () => {
         NotificationManager_1.NotificationManager.send("info", "user", "test123", null);
         if (testChannel.lastMessage !== "test123")
             throw `Problem in send Ntification`;
     });
+    it("is exist", () => {
+        let result = NotificationManager_1.NotificationManager.isChannelExist('sms');
+        if (!result)
+            throw `Not exist??`;
+    });
 });
diff --git a/test/integration/notification_manager.test.ts b/test/integration/notification_manager.test.ts
@@ -14,15 +14,20 @@ class TestChannel extends Channel {
 const testChannel = new TestChannel;
 
 describe("NotificationManager", function () {
-  it("NotificationManager add new channel", () => {
+  it("add new channel", () => {
 
     NotificationManager.registerChannel(testChannel);
     if (NotificationManager.channels.length !== 1) throw `should 1`
   });
 
 
-  it("NotificationManager send message", () => {
+  it("send message", () => {
     NotificationManager.send("info", "user", "test123", null);
     if(testChannel.lastMessage !=="test123") throw `Problem in send Ntification`
   });
+
+  it("is exist", () => {
+    let result = NotificationManager.isChannelExist('sms');
+    if(!result) throw `Not exist??`
+  });
 });