diff --git a/app-backend/controllers/ad.controller.js b/app-backend/controllers/ad.controller.js index 0182491..2b6dd6f 100644 --- a/app-backend/controllers/ad.controller.js +++ b/app-backend/controllers/ad.controller.js @@ -70,7 +70,7 @@ exports.findAll = (req, res) => { query.url = condition; const interests = req.query.interests; - condition = interests ? {$in: interests} : undefined; + condition = interests ? {$in: interests.split(',')} : undefined; query["interests.interest"] = condition const comment = req.query.comment; @@ -174,9 +174,9 @@ exports.update = (req, res) => { condition = url ? url : undefined; update.url = condition; - const interests = req.body.interests; - condition = interests ? interests : undefined; - update.interests = condition; + let interests = req.body.interests; + condition = interests ? {interests: [...new Map(interests.map(v => [v.id, v])).values()]} : undefined; + update.$addToSet = condition; const comment = req.body.comment; condition = comment ? comment : undefined; diff --git a/app-backend/controllers/user.controller.js b/app-backend/controllers/user.controller.js index dedab4e..125c6d3 100644 --- a/app-backend/controllers/user.controller.js +++ b/app-backend/controllers/user.controller.js @@ -457,7 +457,8 @@ exports.history = (req, res) => { watchedDate: {$arrayElemAt: ["$watchedDates", -1]}, createdAt: true, updatedAt: true - }}]) + }}, + {$sort: {watchedDate: -1}}]) .then(async data => { let yt_results = []; let dm_results = [];