feat(#3): for new cronjob, search candidates active within the last 2 days

Author: peterpeterparker

config/constants.js

@@ -16,6 +16,7 @@ define("DEFAULT_DISTANCE", 99);
 
 // Discover roommates
 define("LIMIT_CANDIDATES", 40); // Find only roommates active in the last x days
+define("LIMIT_RECENT_CANDIDATES", 2);
 define("LIMIT_TARGETED_USERS", 60);
 
 // Item

controllers/candidates/candidatesHelper.js

@@ -7,18 +7,16 @@ const utils = require('../utils/utils');
 
 const queryUtils = require('../utils/query-utils');
 
-const constants = require('../../config/constants');
-
 const Q = require('q');
 
 function CandidatesHelper() {
     this.findCandidates = findCandidates;
 }
 
-function findCandidates(userIds, page, limit, params) {
+function findCandidates(userIds, page, limit, params, lastLoginInDays) {
     let deferred = Q.defer();
 
-    const startLastLogin = moment(new Date()).startOf('day').add(-1 * constants.LIMIT_CANDIDATES, 'd').toDate();
+    const startLastLogin = moment(new Date()).startOf('day').add(-1 * lastLoginInDays, 'd').toDate();
 
     // Prepare the query
     let query = {

controllers/candidates/get-candidates.js

@@ -1,32 +1,32 @@
-var mongoose = require('mongoose');
+const mongoose = require('mongoose');
 
-var CandidatesHelper = require('./candidatesHelper');
+const CandidatesHelper = require('./candidatesHelper');
 
-var utils = require('../utils/utils');
+const utils = require('../utils/utils');
 
-var constants = require('../../config/constants');
+const constants = require('../../config/constants');
 
-module.exports.getCandidates = function (req, res, next) {
-    var userId = req.params.userId || req.body.userId || req.query.userId || null;
+module.exports.getCandidates = (req, res, next) => {
+    const userId = req.params.userId || req.body.userId || req.query.userId || null;
 
-    var userIds = new Array();
+    const userIds = new Array();
     userIds.push(new mongoose.Types.ObjectId(userId));
 
-    var limit = constants.LIMIT_QUERY;
-    var page = null;
+    const limit = constants.LIMIT_QUERY;
+    let page = null;
     if (!utils.isStringEmpty(req.query.pageIndex)) {
         page = parseInt(req.query.pageIndex) * limit;
     }
 
-    var candidatesHelper = new CandidatesHelper();
+    const candidatesHelper = new CandidatesHelper();
 
-    candidatesHelper.findCandidates(userIds, page, limit, req.query).then(function (users) {
+    candidatesHelper.findCandidates(userIds, page, limit, req.query, constants.LIMIT_CANDIDATES).then((users) => {
         res.format({
-            json: function () {
+            json: () => {
                 res.json(users);
             }
         });
-    }, function (err) {
+    }, (err) => {
         res.status(500).json({
             error: "Get users error:" + err
         });

cronjobs/helpers/push-candidates-helper.js

@@ -19,7 +19,7 @@ module.exports = {
     sendPushNotification: sendPushNotification
 };
 
-function findCandidates(item, ageMin, ageMax) {
+function findCandidates(item, ageMin, ageMax, lastLoginInDays) {
     const deferred = Q.defer();
 
     const candidatesHelper = new CandidatesHelper();
@@ -77,9 +77,9 @@ function findCandidates(item, ageMin, ageMax) {
         userIds = userIds.concat(dislikes);
     }
 
-    candidatesHelper.findCandidates(userIds, 0, constants.MAX_ITEM_USERS, query).then(function (users) {
+    candidatesHelper.findCandidates(userIds, 0, constants.MAX_ITEM_USERS, query, lastLoginInDays).then((users) => {
         deferred.resolve(users);
-    }, function (err) {
+    }, (err) => {
         deferred.reject(new Error(err));
     });
 

cronjobs/push-new-candidates.js

@@ -74,7 +74,7 @@ function hasItemCandidates(item) {
     const ageMin = item.userLimitations.age.min === 18 ? 18 : getFilterAgeMin(item.userLimitations.age.min);
     const ageMax = item.userLimitations.age.max === 99 ? 99 : getFilterAgeMax(item.userLimitations.age.max);
 
-    pushCandidatesHelper.findCandidates(item, ageMin, ageMax).then((users) => {
+    pushCandidatesHelper.findCandidates(item, ageMin, ageMax, constants.LIMIT_RECENT_CANDIDATES).then((users) => {
         deferred.resolve({
             item: item,
             hasCandidates: utils.isNotEmpty(users)

cronjobs/push-new-items.js

@@ -46,7 +46,7 @@ function pushNewItems() {
                     const ageMin = item.userLimitations.age.min;
                     const ageMax = item.userLimitations.age.max;
 
-                    promises.push(pushCandidatesHelper.findCandidates(item, ageMin, ageMax));
+                    promises.push(pushCandidatesHelper.findCandidates(item, ageMin, ageMax, constants.LIMIT_CANDIDATES));
                 }
 
                 Promise.all(promises).then((values) => {