g2

controllers/get/messages.js

@@ -0,0 +1,22 @@
+const Accounts = require("../../models/accounts");
+const Members = require("../../models/members");
+const Messages = require("../../models/messages");
+
+exports.messages = async function (chatId) {
+    try {
+        const resultMessages = await Messages.findAll({
+            where: {
+                chatId: chatId
+            },
+            include: {
+                model: Accounts,
+                attributes: ['id', 'name', 'surname', 'username']
+            },
+            attributes: ['id', 'text']
+        },);
+        return (resultMessages) ?? false;
+    } catch (error) {
+        console.log(error);
+        return false;
+    };
+};

controllers/post/messages.js

@@ -1,12 +1,13 @@
 const Messages = require("../../models/messages")
 
-exports.send = async function (text, chatId, accountId) {
+exports.send = async function (text, chatId, accountId, time) {
     try {
         const isComplete = await Messages.create({
             text: text,
             chatId: chatId,
-            accountId: accountId
-        }).thes(res => {
+            accountId: accountId,
+            createdAt: time
+        }).then(res => {
             if (res) {
                 return true
             } else {

models/accounts.js

@@ -2,6 +2,26 @@ const { DataTypes } = require("sequelize");
 const sequelize = require("../data/db");
 
 const Accounts = sequelize.define('accounts', {
+    name: {
+        type: DataTypes.CHAR(50),
+        unique: false,
+        allowNull: false
+    },
+    surname: {
+        type: DataTypes.CHAR(50),
+        unique: false,
+        allowNull: false
+    },
+    username: {
+        type: DataTypes.CHAR(50),
+        unique: true,
+        allowNull: false
+    },
+    email: {
+        type: DataTypes.CHAR(70),
+        unique: true,
+        allowNull: false
+    },
     elbab_id: {
         type: DataTypes.INTEGER,
         unique: true,

routers/get.js

@@ -1,5 +1,6 @@
 const express = require('express');
 const { chats } = require('../controllers/get/chats');
+const { messages } = require('../controllers/get/messages');
 const router = express();
 
 //CHATS
@@ -7,4 +8,9 @@ router.get('/chats', async (req, res) => {
     res.json(await chats());
 });
 
+//MESSAGES
+router.get('/messages', async (req, res) => {
+    res.json(await messages(req.query.chatId));
+});
+
 module.exports = router;

routers/post.js

@@ -1,4 +1,5 @@
 const express = require('express');
+const { send } = require('../controllers/post/messages');
 const router = express();
 
 // CHATS
@@ -7,8 +8,16 @@ router.post('/chats/join', (req, res) => {
 });
 
 // MESSAGE
-router.post('/message/send', (req, res) => {
+router.post('/message/send', async (req, res) => {
+    const message = req.body.msg;
+    const chatId = req.body.cid;
+    const account = req.body.aid;
+    const time = req.body.time;
 
+    console.log(message, account, chatId, time);
+
+    const result = await send(message, chatId, account, time);
+    res.send(result);
 })
 
 module.exports = router;