|
@@ -10,13 +10,11 @@ require('dotenv').config();
|
|
|
const listMessages = async (req, res, next) => {
|
|
|
try {
|
|
|
const userId = req.user.id;
|
|
|
- const messages = await MessageModel.getList(userId, req.query);
|
|
|
+ const messages = await MessageModel.getList({ owner: userId }, req.query);
|
|
|
return res.json({
|
|
|
status: 'success',
|
|
|
code: 200,
|
|
|
- data: {
|
|
|
- ...messages,
|
|
|
- },
|
|
|
+ data: messages,
|
|
|
});
|
|
|
} catch (e) {
|
|
|
next(e);
|
|
@@ -27,11 +25,14 @@ const listMessagesById = async (req, res, next) => {
|
|
|
try {
|
|
|
const userId = req.user.id;
|
|
|
const companionId = req.params.companionId;
|
|
|
- const messages = await MessageModel.getListById(companionId, userId);
|
|
|
+ const messages = await MessageModel.getList(
|
|
|
+ { owner: userId, companionId },
|
|
|
+ {}
|
|
|
+ );
|
|
|
return res.json({
|
|
|
status: 'success',
|
|
|
code: 200,
|
|
|
- data: [...messages],
|
|
|
+ data: messages,
|
|
|
});
|
|
|
} catch (e) {
|
|
|
next(e);
|