@dhyasama/totem-models 11.6.0 → 11.8.0

package/lib/Folder.js

@@ -12,7 +12,8 @@ module.exports = function(mongoose, config) {
       id: { type: Schema.ObjectId, required: true },
       model: { type: String, required: true, enum: ['Organization', 'Person', 'LimitedPartner'] }
     },
-    parent: { type: Schema.ObjectId, ref: 'Folder' }
+    parent: { type: Schema.ObjectId, ref: 'Folder' },
+    documents: [{ type: Schema.ObjectId, ref: 'Document' }]
   });
 
   Folder.statics.modifyById = function(id, update, cb) {
@@ -48,13 +49,30 @@ module.exports = function(mongoose, config) {
     if (!mongoose.Types.ObjectId.isValid(options.CUSTOMER_ID)) { return cb(new Error('options.CUSTOMER_ID is not a valid ObjectId'), null); }
 
     const self = this;
-    let query = self.find({
+
+    const populateFolders = async (folders) => {
+
+      _.each(folders, functon(folder) {
+
+        await folder.populate('documents').execPopulate();
+        const childFolders = await self.find({ parent: folder._id });
+        folder.children = await populateFolders(childFolders);
+
+      });
+
+      return folders;
+
+    };
+
+    self.find({
       'entity.id': entity.id,
       'entity.model': entity.model,
-      customer: options.CUSTOMER_ID
-    });
-
-    query.exec(cb);
+      customer: options.CUSTOMER_ID,
+      parent: null
+    })
+    .then(populateFolders)
+    .then(folders => cb(null, folders))
+    .catch(err => cb(err));
 
   };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dhyasama/totem-models",
-  "version": "11.6.0",
+  "version": "11.8.0",
   "author": "Jason Reynolds",
   "license": "UNLICENSED",
   "description": "Models for Totem platform",