todo: service

src/views/Conversations/Online/Input/InputComposer.jsx

@@ -112,8 +112,8 @@ const InputComposer = ({ channel, currentActive }) => {
     // console.log('content to send-------------------------------------', contentToSend);
 
     if (channel === 'whatsapp') {
-      const waObj = { from: fromIM.replace('+', ''), to: toIM.replace('+', ''), content: msgObj.text, };
+      // const waObj = { from: fromIM.replace('+', ''), to: toIM.replace('+', ''), content: msgObj.text,  };
-      await postSendMsg(waObj);
+      await postSendMsg({...contentToSend, externalId: currentConversation.sn || ''});
     } else if (channel === 'waba') {
       websocket.sendMessage({ ...contentToSend, opi_sn: userId, coli_sn: currentConversation.coli_sn || '', conversationid: currentConversation.sn, });
     }

wai-server/api/messages/message.controller.js

@@ -2,13 +2,15 @@
 
 const generateId = require('../../utils/generateId.util');
 const { sessionService } = require('../../core');
+// const { upsertOutboundMessage } = require('../../services/outbound_messages.service');
 
 function sleep(ms) {
   return new Promise(resolve => setTimeout(resolve, ms));
 }
 
 exports.sendText = async ctx => {
-  const { from, to, content } = ctx.request.body;
+  const { from, to, msgcontent, content: _content } = ctx.request.body;
+  const content = _content || msgcontent.text || '';
   if (!from || !content) {
     ctx.assert(from, 400, 'From and message are required');
     return;
@@ -22,6 +24,7 @@ exports.sendText = async ctx => {
   // return wsToSend;
   try {
     wsToSend.sendTextMessage(to, content);
+    // await upsertOutboundMessage();
     return 'Message sent successfully'; // { wsToSend, ret: 'Message sent successfully' };
   } catch (error) {
     console.error('Error sending message:', error);

wai-server/middleware/components/request_log.middleware.js

@@ -1,4 +1,4 @@
-const { createRequestLog } = require('../../services/requestLogs.service');
+const { createRequestLog } = require('../../services/request_logs.service');
 
 module.exports = async (ctx, next) => {
   try {

wai-server/services/connections.service.js

@@ -43,4 +43,16 @@ const getConnection = async data => {
   return r;
 };
 
-module.exports = { addConnection, addCurrentConnection, updateConnection, getConnection };
+const resetConnection = async () => {
+  const r = await ConnectionsModel.update(
+    {
+      status: 'close',
+      closetime: Sequelize.fn('NOW'),
+      updatetime: Sequelize.fn('NOW'),
+    },
+    { where: { connect_domain: domain, connect_name: name } },
+  );
+  return r;
+};
+
+module.exports = { addConnection, addCurrentConnection, updateConnection, getConnection, resetConnection };

wai-server/services/outbound_messages.service.js

@@ -0,0 +1,18 @@
+'use strict';
+
+const db = require('../config').database;
+const { domain, name } = require('../config').server;
+const initModels = require('../models/init-models');
+
+const Sequelize = db.sequelize;
+const models = initModels(Sequelize);
+
+const OutboundModelModel = models.outbound_messages;
+
+const upsertOutboundMessage = async data => {
+  // const r = await OutboundModelModel.create({ ...data });
+  const [instance, created] = await OutboundModelModel.upsert({ ...data }, { returning: true });
+  return created;
+};
+
+module.exports = { upsertOutboundMessage };

wai-server/services/request_logs.service.js

@@ -1,7 +1,7 @@
 'use strict';
 
-const db = require('./../config').database;
+const db = require('../config').database;
-const initModels = require('./../models/init-models');
+const initModels = require('../models/init-models');
 
 const Sequelize = db.sequelize;
 const models = initModels(Sequelize);

wai-server/services/webhook_logs.service.js

@@ -0,0 +1,17 @@
+'use strict';
+
+const db = require('../config').database;
+const { domain, name } = require('../config').server;
+const initModels = require('../models/init-models');
+
+const Sequelize = db.sequelize;
+const models = initModels(Sequelize);
+
+const WebhookModelModel = models.webhook_logs;
+
+const addWebhookLog = async data => {
+  const r = await WebhookModelModel.create({ ...data });
+  return r;
+};
+
+module.exports = { addWebhookLog };