Merge pull request #248 from SoftwareEngineeringDaily/hot-fixes

Hot fixes
SoftwareEngineeringDaily · May 23, 2018 · dd4ccfe · dd4ccfe
2 parents ba8cc7b + 0d33001
commit dd4ccfe
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 9 deletions.
diff --git a/server/controllers/feed.controller.js b/server/controllers/feed.controller.js
@@ -28,7 +28,7 @@ async function getLinks(req) {
   if (req.user) query.user = req.user;
 
   const {
-    limit = 15,
+    limit = 10,
   } = req.query;
 
   query.limit = limit;

diff --git a/server/controllers/post.controller.js b/server/controllers/post.controller.js
@@ -1,5 +1,4 @@
-import raccoon from 'raccoon';
-import mongoose from 'mongoose';
+// import mongoose from 'mongoose';
 
 import Post from '../models/post.model';
 import {
@@ -176,8 +175,10 @@ function list(req, res, next) {
  *       $ref: '#/responses/NotFound'
  */
 
-function recommendations(req, res, next) {
-  const numberOfRecommendations = 10;
+function recommendations(req, res) {
+  // const numberOfRecommendations = 10;
+  res.json([]);
+  /*
   raccoon
     .recommendFor(req.user._id.toString(), numberOfRecommendations)
     .then((recommendationsFound) => {
@@ -193,25 +194,30 @@ function recommendations(req, res, next) {
     .catch((e) => {
       next(e);
     });
+    */
 }
 
 function upvote(req, res, next) {
+  /*
   const userIdString = req.user._id.toString();
   const postIdString = req.post._id.toString();
   if (req.liked) {
-    raccoon.liked(userIdString, postIdString);
+    // raccoon.liked(userIdString, postIdString);
   } else if (req.unliked) {
-    raccoon.unliked(userIdString, postIdString);
+    // raccoon.unliked(userIdString, postIdString);
   }
+  */
   next();
 }
 
 function downvote(req, res, next) {
+  /*
   if (req.undisliked) {
-    raccoon.undisliked(req.user._id.toString(), req.post._id.toString());
+    // raccoon.undisliked(req.user._id.toString(), req.post._id.toString());
   } else if (req.disliked) {
-    raccoon.disliked(req.user._id.toString(), req.post._id.toString());
+    // raccoon.disliked(req.user._id.toString(), req.post._id.toString());
   }
+  */
   next();
 }
 

diff --git a/server/models/feedItem.model.js b/server/models/feedItem.model.js
@@ -19,16 +19,20 @@ const FeedItemSchema = new Schema({
 FeedItemSchema.statics = {
   // This doesn't paginate currently:
   list({
+    limit = 10,
     user = null
   } = {}) {
     const query = { user };
+    const limitOption = parseInt(limit, 10);
+
     return this.find(query)
       .populate('user', '-password')
       // Deep populate: https://github.com/Automattic/mongoose/issues/5696
       .populate({ path: 'relatedLink', populate: { path: 'author' } })
       .populate({ path: 'relatedLink', populate: { path: 'post' } })
     // .populate({ path: 'relatedLink', populate: { path: 'post', populate: { path: 'thread' } } })
       .sort({ randomOrder: -1 })
+      .limit(limitOption)
       .exec()
       .then((itemsFound) => {
         const foundProcessed = itemsFound.map((item) => {