wait for promises to finish,

closes #120
officert · Mar 2, 2016 · 23b6276 · 23b6276
1 parent 7df3f17
commit 23b6276
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/src/lib/entities/database.js b/src/lib/entities/database.js
@@ -82,13 +82,19 @@ class Database {
       this._dbConnection.collections((err, collections) => {
         if (err) return reject(new errors.DatabaseError(err.message));
 
+        let promises = [];
+
         _.each(collections, (collection) => {
-          this.addCollection({
+          promises.push(this.addCollection({
             name: collection.collectionName
-          });
+          }));
         });
 
-        return resolve(this.collections);
+        Promise
+          .all(promises)
+          .then(() => {
+            return resolve(this.collections);
+          });
       });
     });
   }