Merge branch 'master' into ideas-highly

ditup · Mar 31, 2018 · d29d488 · d29d488
2 parents 06df79b + 3273c00
commit d29d488
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 31 deletions.
diff --git a/controllers/ideas.js b/controllers/ideas.js
@@ -256,3 +256,4 @@ async function getIdeasHighlyRated(req, res, next) {
 
 
 module.exports = { get, getIdeasCommentedBy, getIdeasHighlyRated, getIdeasWithCreators, getIdeasWithMyTags, getIdeasWithTags, getNewIdeas, getRandomIdeas, patch, post };
+
diff --git a/controllers/validators/schema/ideas.js b/controllers/validators/schema/ideas.js
@@ -196,4 +196,3 @@ const getIdeasHighlyRated = {
 };
 
 module.exports = { getIdea, getIdeasCommentedBy, getIdeasHighlyRated, getIdeasWithCreators, getIdeasWithMyTags, getIdeasWithTags, getNewIdeas, getRandomIdeas, patchIdea, postIdeas };
-
diff --git a/models/idea/index.js b/models/idea/index.js
@@ -266,7 +266,7 @@ class Idea extends Model {
           FILTER idea._id == comment.primary
           COLLECT i = idea
           // sort from newest
-          SORT i._id DESC, i.created ASC
+          SORT i.created DESC
           LIMIT @offset, @limit
       RETURN i`;
 

diff --git a/test/ideas.list.js b/test/ideas.list.js
@@ -552,22 +552,8 @@ describe('read lists of ideas', () => {
     beforeEach(async () => {
       const data = {
         users: 6,
-        tags: 6,
         verifiedUsers: [0, 1, 2, 3, 4],
         ideas: [[{}, 0], [{}, 0],[{}, 1],[{}, 2],[{}, 2],[{}, 2],[{}, 3]],
-        userTag: [
-          [0,0,'',5],[0,1,'',4],[0,2,'',3],[0,4,'',1],
-          [1,1,'',4],[1,3,'',2],
-          [2,5,'',2]
-        ],
-        ideaTags: [
-          [0,0],[0,1],[0,2],
-          [1,1],[1,2],
-          [2,1],[2,2],[2,4],
-          [4,0],[4,1],[4,2],[4,3],[4,4],
-          [5,2],[5,3],
-          [6,3]
-        ],
         ideaComments: [[0, 0],[0, 1], [0,2],[0,2], [0,4], [1,1], [1,2], [2,1], [2,2], [3,4] ]
       };
 
@@ -692,23 +678,9 @@ describe('read lists of ideas', () => {
       const primarys = 'ideas';
       const data = {
         users: 6,
-        tags: 6,
         verifiedUsers: [0, 1, 2, 3, 4],
         ideas: [[{}, 0], [{}, 0],[{}, 1],[{}, 2],[{}, 2],[{}, 2],[{}, 3]],
-        userTag: [
-          [0,0,'',5],[0,1,'',4],[0,2,'',3],[0,4,'',1],
-          [1,1,'',4],[1,3,'',2],
-          [2,5,'',2]
-        ],
-        ideaTags: [
-          [0,0],[0,1],[0,2],
-          [1,1],[1,2],
-          [2,1],[2,2],[2,4],
-          [4,0],[4,1],[4,2],[4,3],[4,4],
-          [5,2],[5,3],
-          [6,3]
-        ],
-        // odeas with votes: 3:3, 1:3, 5:1, 2:1, 0:0, 6: -1, 4:-2
+        // ideas with votes: 3:3, 1:3, 5:1, 2:1, 0:0, 6: -1, 4:-2
         votes: [
           [0, [primarys, 0], -1],
           [1, [primarys, 0],  1],
Original file line number	Diff line number	Diff line change
Expand Up		@@ -256,3 +256,4 @@ async function getIdeasHighlyRated(req, res, next) {


		module.exports = { get, getIdeasCommentedBy, getIdeasHighlyRated, getIdeasWithCreators, getIdeasWithMyTags, getIdeasWithTags, getNewIdeas, getRandomIdeas, patch, post };
Original file line number	Diff line number	Diff line change
Expand Up		@@ -196,4 +196,3 @@ const getIdeasHighlyRated = {
		};

		module.exports = { getIdea, getIdeasCommentedBy, getIdeasHighlyRated, getIdeasWithCreators, getIdeasWithMyTags, getIdeasWithTags, getNewIdeas, getRandomIdeas, patchIdea, postIdeas };