diff --git a/test/api/unit/models/user.test.js b/test/api/unit/models/user.test.js index 84a10e80e3..b637b84753 100644 --- a/test/api/unit/models/user.test.js +++ b/test/api/unit/models/user.test.js @@ -181,7 +181,7 @@ describe('User Model', () => { }); }); - context.only('notifications', () => { + context('notifications', () => { it('can add notifications without data', () => { const user = new User(); diff --git a/website/server/controllers/api-v3/notifications.js b/website/server/controllers/api-v3/notifications.js index 16a0410511..8ded24d5eb 100644 --- a/website/server/controllers/api-v3/notifications.js +++ b/website/server/controllers/api-v3/notifications.js @@ -5,9 +5,6 @@ import { import { model as User, } from '../../models/user'; -import { - model as UserNotification, -} from '../../models/userNotification'; const api = {}; @@ -49,7 +46,7 @@ api.readNotification = { $pull: { notifications: { id: req.params.notificationId } }, }).exec(); - res.respond(200, UserNotification.convertNotificationsToSafeJson(user.notifications)); + res.respond(200, user.notifications); }, }; @@ -92,7 +89,7 @@ api.readNotifications = { // See https://github.com/HabitRPG/habitica/pull/9321#issuecomment-354187666 for more info user._v += 1; - res.respond(200, UserNotification.convertNotificationsToSafeJson(user.notifications)); + res.respond(200, user.notifications); }, }; @@ -181,7 +178,7 @@ api.seeNotifications = { await user.save(); - res.respond(200, UserNotification.convertNotificationsToSafeJson(user.notifications)); + res.respond(200, user.notifications); }, }; diff --git a/website/server/middlewares/response.js b/website/server/middlewares/response.js index 945cf19dea..3190214cd2 100644 --- a/website/server/middlewares/response.js +++ b/website/server/middlewares/response.js @@ -1,7 +1,4 @@ import packageInfo from '../../../package.json'; -import { - model as UserNotification, -} from '../models/userNotification'; export default function responseHandler (req, res, next) { // Only used for successful responses @@ -16,7 +13,7 @@ export default function responseHandler (req, res, next) { if (message) response.message = message; if (user) { - response.notifications = UserNotification.convertNotificationsToSafeJson(user.notifications); + response.notifications = user.notifications; response.userV = user._v; }