Before add pagination

This commit is contained in:
Cassio Santos
2020-06-03 07:34:08 -03:00
parent 5f4cf5e5b7
commit 876d8daa51
11 changed files with 283 additions and 76 deletions

View File

@@ -35,6 +35,10 @@ exports.getContactMessages = async (req, res, next) => {
const io = getIO();
const { contactId } = req.params;
const { search, page = 1 } = req.query;
let limit = 5;
let offset = limit * (page - 1);
try {
const contact = await Contact.findByPk(contactId);
@@ -45,9 +49,14 @@ exports.getContactMessages = async (req, res, next) => {
}
setMessagesAsRead(contactId);
const contactMessages = await contact.getMessages();
return res.json(contactMessages);
const contactMessages = await contact.getMessages({
limit,
offset,
order: [["createdAt", "DESC"]],
});
return res.json(contactMessages.reverse());
} catch (err) {
next(err);
}

View File

@@ -1 +1 @@
{"WABrowserId":"\"W5pw0Llb60mSeV7WOHnk8A==\"","WASecretBundle":"{\"key\":\"alDLbPjonDFzCh5PEPql9cy59LNh1HFG/AZJVoucuYI=\",\"encKey\":\"FQ1MZ2eIH9hKV4dqFoBYTv1/89aopcMAa4CXgh/9csM=\",\"macKey\":\"alDLbPjonDFzCh5PEPql9cy59LNh1HFG/AZJVoucuYI=\"}","WAToken1":"\"cCkFiHM1JR5ck9OMV+WCiBG6QLCjsCjifdel3jRQ56k=\"","WAToken2":"\"1@0Y7HKBGDZWNuaYV7LiEwm0Y8xzlGoUGoyI8OD/KWjEH7UqVxJWfeT+pMNF4XBO7LeyEjpXVljC6rvQ==\""}
{"WABrowserId":"\"W5pw0Llb60mSeV7WOHnk8A==\"","WASecretBundle":"{\"key\":\"alDLbPjonDFzCh5PEPql9cy59LNh1HFG/AZJVoucuYI=\",\"encKey\":\"FQ1MZ2eIH9hKV4dqFoBYTv1/89aopcMAa4CXgh/9csM=\",\"macKey\":\"alDLbPjonDFzCh5PEPql9cy59LNh1HFG/AZJVoucuYI=\"}","WAToken1":"\"GvHbBS6HkZD8f5nYpOxt5qsna4XaDx3JPsjoxwKiM6g=\"","WAToken2":"\"1@P1h9eDyW0m0ILzNfgs6sEF35E66OndfdlOjm3oYzeV13cg82FjBbRvhsma9+p5+/R7zjMUv6L+l/gg==\""}

View File

@@ -84,23 +84,27 @@ const wbotMessageListener = () => {
}
});
wbot.on("message_ack", (msg, ack) => {
// console.log("alteração do ack da msg", msg);
wbot.on("message_ack", async (msg, ack) => {
try {
const result = Message.update({ ack: ack }, { where: { id: msg.id.id } });
if (!result) {
const messageToUpdate = await Message.findOne({
where: { id: msg.id.id },
});
if (!messageToUpdate) {
const error = new Error(
"Erro ao definir as mensagens como lidas no banco de dados"
"Erro ao alterar o ack da mensagem no banco de dados"
);
error.satusCode = 501;
throw error;
}
await messageToUpdate.update({ ack: ack });
io.to(messageToUpdate.contactId).emit("appMessage", {
action: "update",
message: messageToUpdate,
});
} catch (err) {
console.log(err);
}
console.log("ack da msg", ack);
});
};

View File

@@ -7,6 +7,7 @@ module.exports = (req, res, next) => {
decodedToken = jwt.verify(token, "mysecret");
} catch (err) {
err.statusCode = 401;
err.message = "invalidToken";
next(err);
}

View File

@@ -6,6 +6,7 @@ const sequelize = new Sequelize("econo_whatsbot", "root", "nodecomplete", {
collate: "utf8mb4_bin",
},
dialect: "mysql",
timezone: "-03:00",
host: "localhost",
logging: false,
});