From b9512ef3b015dd975cfe23a5a015c0e450bcab43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Y=C3=BBki=20Vachot?= Date: Wed, 15 Dec 2021 02:25:19 +0100 Subject: [PATCH] Update: User.ad --- app-backend/controllers/user.controller.js | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/app-backend/controllers/user.controller.js b/app-backend/controllers/user.controller.js index 68b0af7..eba3c5a 100644 --- a/app-backend/controllers/user.controller.js +++ b/app-backend/controllers/user.controller.js @@ -418,12 +418,23 @@ exports.ad = (req, res) => { match = {$match: {isVisible: true, isActive: true}}; pick = {$sample: {size: parseInt(quantity, 10)}}; } + console.log(match, pick, interests); Ad.aggregate([ match, pick ]) .then(data => { - return sendMessage(res, 11, data, token); + if(data.length > 0){ + return sendMessage(res, 11, data, token); + } else { + Ad.aggregate([{$match: {isVisible: true, isActive: true}}, {$sample: {size: parseInt(quantity, 10)}}]) + .then(data => { + return sendMessage(res, 11, data, token); + }) + .catch(err => { + return sendError(res,500,101,err.message || `Some error occurred while getting ${quantity} ad(s) for the User.`, token); + }); + } }) .catch(err => { return sendError(res,500,101,err.message || `Some error occurred while getting ${quantity} ad(s) for the User.`, token);