fix: feed

Author: sgcodes7471

controllers/feedController.js

@@ -3,7 +3,7 @@ const DeactivatedUsers = require("../models/DeactivatedUsers.js");
 // const PersonalInfo = require("../models/PersonalInfo.js");
 const UserProfile = require("../models/UserProfile.js");
 const { GuestEmails } = require("../shared/constants.js");
-const { calculateMatchingScore, cumulateMatchingFactors, shuffleProfiles, paginateCombined } = require("../utils/feedAlgorithm.js");
+const { calculateMatchingScore, cumulateMatchingFactors, shuffleProfiles, pickUsers } = require("../utils/feedAlgorithm.js");
 
 async function cleanUserProfiles(userProfiles , email) {
     const blockedUsers = await BlockedUserList.findOne({ 
@@ -56,7 +56,7 @@ exports.getFeed = async(req, res) => {
     });
 
     if (!currUser 
-        ||  !currUser.personalityType
+        // ||  !currUser.personalityType
     ) {
         return res     
         .json({ 
@@ -65,7 +65,7 @@ exports.getFeed = async(req, res) => {
         });
     }
 
-    const currUserScoreFactors = cumulateMatchingFactors(currUser);
+    // const currUserScoreFactors = cumulateMatchingFactors(currUser);
 
     let userProfiles = await UserProfile.find({
         ...newFilters , 
@@ -83,11 +83,11 @@ exports.getFeed = async(req, res) => {
     const lessPreferredGenderUser = [];
 
     userProfiles.forEach(otherUser => {
-        const otherUserScoreFactors = cumulateMatchingFactors(otherUser);
-        const scoredProfile =  {
-            score : calculateMatchingScore(currUserScoreFactors , otherUserScoreFactors) , 
-            ...(otherUser.toObject())
-        };
+        // const otherUserScoreFactors = cumulateMatchingFactors(otherUser);
+        // const scoredProfile =  {
+            // score : calculateMatchingScore(currUserScoreFactors , otherUserScoreFactors) , 
+            // ...(otherUser.toObject())
+        // };
 
         if(
             (
@@ -98,25 +98,13 @@ exports.getFeed = async(req, res) => {
                 && otherUser.gender.toLowerCase() === currUser.gender.toLowerCase()
             )
         ) {
-            morePreferredGenderUser.push(scoredProfile);
+            morePreferredGenderUser.push(otherUser);
         } else {
-            lessPreferredGenderUser.push(scoredProfile);
+            morePreferredGenderUser.push(otherUser);
         }
     });
-
-    shuffleProfiles(morePreferredGenderUser);
-    shuffleProfiles(lessPreferredGenderUser);
-
-    const pageNumber = parseInt(req.params.pageNumber, 10) || 0;
-    const pageSize = 10;
-    const startIndex = pageNumber * pageSize;
-
-    const paginatedUsers = paginateCombined(
-        morePreferredGenderUser , 
-        lessPreferredGenderUser ,
-        startIndex ,
-        pageSize
-    );
+    
+    let paginatedUsers = pickUsers(morePreferredGenderUser, lessPreferredGenderUser);
 
     shuffleProfiles(paginatedUsers);
 

controllers/userController.js

@@ -387,7 +387,7 @@ exports.updateUserProfile = async (req, res, next) => {
   const _user = await UserProfile.findOne({email : req.email});
   profileChanges.gender = _user.gender; // gender resets back to initial one always
 
-  const user = await UserProfile.findOneAndUpdate(
+  let user = await UserProfile.findOneAndUpdate(
     { email: req.email },
     profileChanges,
     {

utils/feedAlgorithm.js

@@ -14,7 +14,7 @@ exports.cumulateMatchingFactors = (user) => {
         user.sexualOrientation , 
         user.hometown , 
         user.relationshipGoals ,
-        ...user.personalityType.split()
+        // ...user.personalityType.split()
     );
 
     return scoreFactors
@@ -29,56 +29,50 @@ exports.shuffleProfiles = (userProfiles) => {
 }
 
 
-exports.paginateCombined = (
-    moreArr,
-    lessArr,
-    start,
-    size
-) => {
-    const result = [];
-
-    let m = start;
-    let l = start;
-
-    const allowMoreCycle = Math.random() < 0.5;
-
-    while (result.length < size && (moreArr.length || lessArr.length)) {
-
-        const takeMore = result.length % 2 === 0;
-
-        if (takeMore) {
-
-            if (m < moreArr.length) {
-                result.push(moreArr[m++]);
-            } 
-            else if (allowMoreCycle && moreArr.length > 0) {
-                result.push(moreArr[m % moreArr.length]);
-                m++;
-            } 
-            else if (l < lessArr.length) {
-                result.push(lessArr[l++]);
-            } 
-            else {
-                break;
-            }
-
-        } else {
-
-            if (l < lessArr.length) {
-                result.push(lessArr[l++]);
-            } 
-            else if (m < moreArr.length) {
-                result.push(moreArr[m++]);
-            } 
-            else if (allowMoreCycle && moreArr.length > 0) {
-                result.push(moreArr[m % moreArr.length]);
-                m++;
-            }
-            else {
-                break;
-            }
-        }
+function getRandomConsecutiveSlice(arr, count) {
+  if (count <= 0 || arr.length === 0) return [];
+
+  if (arr.length <= count) return [...arr];
+
+  const maxStart = arr.length - count;
+  const start = Math.floor(Math.random() * (maxStart + 1));
+  return arr.slice(start, start + count);
+}
+
+
+exports.pickUsers = (morePreferredGenderUser, lessPreferredGenderUser) => {
+    const totalNeeded = 10;
+
+    let moreCount = Math.floor(Math.random() * (totalNeeded + 1));
+    let lessCount = totalNeeded - moreCount;
+
+    if (morePreferredGenderUser.length < moreCount) {
+        const deficit = moreCount - morePreferredGenderUser.length;
+        moreCount = morePreferredGenderUser.length;
+        lessCount = Math.min(
+            lessPreferredGenderUser.length,
+            lessCount + deficit
+        );
     }
 
-    return result;
-};
+    if (lessPreferredGenderUser.length < lessCount) {
+        const deficit = lessCount - lessPreferredGenderUser.length;
+        lessCount = lessPreferredGenderUser.length;
+        moreCount = Math.min(
+            morePreferredGenderUser.length,
+            moreCount + deficit
+        );
+    }
+
+    const pickedMore = getRandomConsecutiveSlice(
+            morePreferredGenderUser,
+            moreCount
+    );
+
+    const pickedLess = getRandomConsecutiveSlice(
+            lessPreferredGenderUser,
+            lessCount
+    );
+
+    return [...pickedMore, ...pickedLess];
+}