From cc24bf3da82eb8b147298e82c1ef44b50b7d0577 Mon Sep 17 00:00:00 2001
From: rlacko <rlacko@sch.bme.hu>
Date: Wed, 29 Jul 2020 16:01:59 +0200
Subject: [PATCH] get one activity
---
src/resources/activity/activityControllers.js | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
diff --git a/src/resources/activity/activityControllers.js b/src/resources/activity/activityControllers.js
index d4f938b..d92b8df 100644
--- a/src/resources/activity/activityControllers.js
+++ b/src/resources/activity/activityControllers.js
@@ -90,7 +90,7 @@ exports.default.createOne = async (req, res) => {
}
return res.status(422).json({ messages })
}
- res.status(500).json({ message: err.message }).end()
+ return res.status(500).json({ message: err.message }).end()
}
}
@@ -99,19 +99,22 @@ exports.default.getOne = async (req, res) => {
const activity = await Activity.findOne({ _id: req.params.id })
.populate({
path: 'comment',
- populate: { path: 'creator', select: '-_id fullName nickName' },
+ select: '_id creator text createdAt',
+ })
+ .populate({
+ path: 'attendance',
+ select: '_id user state',
})
.select('-_id -__v')
.lean()
.exec()
- if (!activity) {
- res.status(404).json({ message: 'No such activity.' }).end()
- }
+ if (!activity)
+ return res.status(404).json({ messages: ['No such activity.'] })
- res.status(200).json({ data: activity }).end()
+ return res.status(200).json({ data: activity }).end()
} catch (err) {
- res.status(500).json({ message: err.message }).end()
+ return res.status(500).json({ message: err.message }).end()
}
}
--
GitLab