Merge pull request #5 from locator-kn/refactoring

Refactoring
locator-kn · Feb 19, 2016 · c215d11 · c215d11
2 parents 1585a3a + e0d59d9
commit c215d11
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 31 deletions.
diff --git a/lib/conversations.js b/lib/conversations.js
@@ -46,10 +46,10 @@ fns.getConversationById = (message, next) => {
 
         db.findById(data.conversation_id, 'conversations')
             .then(queryResult => {
-                if (!queryResult.length) {
+                if (!queryResult) {
                     throw new Error('not found');
                 }
-                next(null, queryResult[0]);
+                next(null, queryResult);
             })
             .catch(next);
     });

diff --git a/lib/database.js b/lib/database.js
@@ -39,7 +39,7 @@ fns.findById = (id, collectionId) => {
             return collection
                 .find({'_id': oId})
                 .limit(-1)
-                .toArray();
+                .next();
         });
 };
 
@@ -71,33 +71,31 @@ fns.findMessagesByConversationId = (conversationId, query) => {
 };
 
 fns.findLatestMessagesByDistinctConversation = (userId, query) => {
-    return new Promise((resolve, reject) => {
-
-        let collectionMessages = database.collection(c.MESSAGES);
-        let collectionConversations = database.collection(c.CONVERSATIONS);
-        collectionConversations
-            .find({'participants.user_id': userId})
-            .toArray((err, conversations) => {
-                if (err) {
-                    return reject(err);
-                }
-                let promises = conversations.map(con => {
-                    return collectionMessages.find({
-                            'conversation_id': con._id.toString()
-                        })
-                        .limit(-1)
-                        .sort({timestamp: -1})
-                        .toArray();
-                });
-                Promise.all(promises).then(results => {
-                    let merged = [].concat.apply([], results);
-                    merged.sort((a, b) => {
-                        return b.timestamp - a.timestamp;
-                    });
-                    resolve(merged.slice(0, query.count || 3));
-                }).catch(reject);
+
+    let collectionMessages = database.collection(c.MESSAGES);
+    let collectionConversations = database.collection(c.CONVERSATIONS);
+    return collectionConversations
+        .find({'participants.user_id': userId})
+        .toArray()
+        .then(conversations => {
+            return conversations.map(con => {
+                return collectionMessages.find({
+                        'conversation_id': con._id.toString()
+                    })
+                    .limit(-1)
+                    .sort({timestamp: -1})
+                    .toArray();
             });
-    });
+        })
+        .then(promises => Promise.all(promises))
+        .then(messages => messages.filter(message => message.length))
+        .then(results => {
+            let merged = [].concat.apply([], results);
+            merged.sort((a, b) => {
+                return b.timestamp - a.timestamp;
+            });
+            return merged.slice(0, query.count || 3);
+        });
 };
 
 fns.acknowledgeConversation = (conversationId, userId, lastRead) => {

diff --git a/test/stubs/database.stub.js b/test/stubs/database.stub.js
@@ -26,9 +26,9 @@ fns.findConversationsByUser = (query) => {
 fns.findById = (id) => {
     if(conversationFixtures.getConversationByIdResponse._id === id) {
 
-        return Promise.resolve([conversationFixtures.getConversationByIdResponse]);
+        return Promise.resolve(conversationFixtures.getConversationByIdResponse);
     } else {
-        return Promise.resolve([]);
+        return Promise.resolve(null);
     }
 };