Move and cleanup getting collections into MongoDatabaseAdapter.

src/Adapters/Database/Mongo/MongoDatabaseAdapter.js

@@ -23,6 +23,25 @@ export class MongoDatabaseAdapter {
  });
  return this.connectionPromise;
  }
+
+ collection(name: string) {
+ return this.connect().then(() => {
+ return this.database.collection(name);
+ });
+ }
+
+ collectionsContaining(match: string) {
+ return this.connect().then(() => {
+ return this.database.collections();
+ }).then(collections => {
+ return collections.filter(collection => {
+ if (collection.namespace.match(/\.system\./)) {
+ return false;
+ }
+ return (collection.collectionName.indexOf(match) == 0);
+ });
+ });
+ }
 }
 
 export default MongoDatabaseAdapter;

src/Controllers/DatabaseController.js

@@ -39,9 +39,7 @@ DatabaseController.prototype.collection = function(className) {
 };
 
 DatabaseController.prototype.rawCollection = function(className) {
- return this.connect().then(() => {
- return this.adapter.database.collection(this.collectionPrefix + className);
- });
+ return this.adapter.collection(this.collectionPrefix + className);
 };
 
 function returnsTrue() {
@@ -345,16 +343,10 @@ DatabaseController.prototype.mongoFind = function(className, query, options = {}
 DatabaseController.prototype.deleteEverything = function() {
  this.schemaPromise = null;
 
- return this.connect().then(() => {
- return this.adapter.database.collections();
- }).then((colls) => {
- var promises = [];
- for (var coll of colls) {
- if (!coll.namespace.match(/\.system\./) &&
- coll.collectionName.indexOf(this.collectionPrefix) === 0) {
- promises.push(coll.drop());
- }
- }
+ return this.adapter.collectionsContaining(this.collectionPrefix).then(collections => {
+ let promises = collections.map(collection => {
+ return collection.drop();
+ });
  return Promise.all(promises);
  });
 };

src/DatabaseAdapter.js

@@ -52,8 +52,6 @@ function getDatabaseConnection(appId: string, collectionPrefix: string) {
  dbConnections[appId] = new DatabaseController(dbAdapter, {
  collectionPrefix: collectionPrefix
  });
-
- dbConnections[appId].connect();
  return dbConnections[appId];
 }