Merge pull request 'wisdom' (#39) from wisdom into main

Reviewed-on: #39

.env.example

@@ -45,4 +45,18 @@ IMAGEKIT_PRIVATE_KEY=private_vhO/jXHnEoaVYptOHIuZDPMbxIA=
 # CLIENT_SECRET=xxxxxxxxxxxxxxxxxxxxxxxx
 # REFRESH_TOKEN=1//XXXXXXXX
 
+ENDPOINT_WHATSAPP=https://117.102.231.130:9531/send
+# ENDPOINT_WHATSAPP=http://localhost:9529/send
+
+# ENDPOINT_FE=http://localhost:8592
+# ENDPOINT_FE=http://203.153.114.226:8466
+ENDPOINT_FE=https://117.102.231.130:9529
+
+
+# MQTT Connection
+MQTT_HOST=ws://117.102.231.130:7001
+MQTT_USERNAME=morekmorekmorek
+MQTT_PASSWORD=morek888
+TOPIC_COD=PIU_COD/ERROR_CODE
+
 VITE_KEY_SESSION=PetekRombonganPetekMorekMorakMarek

config/index.js

@@ -292,11 +292,11 @@ const mqttOptions = {
   clientId: 'express_mqtt_client_' + Math.random().toString(16).substr(2, 8),
   clean: true,
   connectTimeout: 4000,
-  username: 'morekmorekmorek', // jika ada
-  password: 'morek888', // jika ada
+  username: process.env.MQTT_USERNAME ?? 'morekmorekmorek', // jika ada
+  password: process.env.MQTT_PASSWORD ?? 'morek888', // jika ada
 };
 
-const mqttUrl = 'ws://117.102.231.130:7001'; // Ganti dengan broker kamu
+const mqttUrl = process.env.MQTT_HOST; // Ganti dengan broker kamu
 const topic = process.env.TOPIC_COD ?? 'morek';
 
 const mqttClient = mqtt.connect(mqttUrl, mqttOptions);

controllers/auth.controller.js

@@ -104,6 +104,8 @@ class AuthController {
     const bytes = CryptoJS.AES.decrypt(tokenRedirect, process.env.VITE_KEY_SESSION);
     const decrypted = JSON.parse(bytes.toString(CryptoJS.enc.Utf8));
 
+    console.log("decrypted: ", decrypted);
+
     const userPhone = decrypted?.user_phone
     const userName = decrypted?.user_name
     const idData = decrypted?.id

db/notification_error.db.js

@@ -95,7 +95,8 @@ const getAllNotificationDb = async (searchParams = {}) => {
     ],
     queryParams
   );
-  if (whereParamAnd) queryParams = whereParamAnd;
+  
+   queryParams = whereParamAnd ? whereParamAnd : queryParams;
 
   const queryText = `
     SELECT
@@ -108,12 +109,12 @@ const getAllNotificationDb = async (searchParams = {}) => {
       a.is_delivered,
       a.is_read,
       a.is_active,
+      a.created_at,
 
       b.error_code,
       b.error_code_name,
       b.error_code_color,
       b.path_icon,
-      b.created_at,
 
       c.solution_name,
       c.type_solution,

services/notifikasi-wa.service.js

@@ -67,8 +67,8 @@ class NotifikasiWaService {
           for (const dataUser of dataUsers) {
             if (dataUser.is_active) {
               const tokenRedirect = await generateTokenRedirect(
-                dataUser.userPhone,
-                dataUser.userName,
+                dataUser.contact_phone,
+                dataUser.contact_name,
                 resultNotificationError.notification_error_id
               );
 
@@ -105,6 +105,8 @@ class NotifikasiWaService {
                 param.bodyMessage
               );
 
+              console.log("resultSend: ", resultSend);
+
               await updateNotificationErrorUserDb(
                 resultNotificationErrorUser[0].notification_error_user_id,
                 {