Merge pull request #1428 from adaptlearning/issue/1427

Make sure courseassets are cleaned up on object delete

Author: taylortom

plugins/content/courseasset/index.js

@@ -42,38 +42,81 @@ CourseAssetContent.prototype.getModelName = function () {
 function initialize() {
   // Content Hook for updatedAt and updatedBy:
   ['course', 'contentobject', 'article', 'block', 'component'].forEach(function (contentType) {
-    app.contentmanager.addContentHook('destroy', contentType, { when: 'pre' }, function (contentType, data, next) { 
-
+    app.contentmanager.addContentHook('destroy', contentType, { when: 'pre' }, function (contentType, data, next) {
       database.getDatabase(function (err, db) {
         db.retrieve(contentType, data[0], function(err, items) {
           if (err) {
             logger.log('err', err);
             return next(err);
           }
-
           if (items && items.length == 1) {
             var itemForDeletion = items[0].toObject();
             var criteria = {};
-            
+
             async.series([
+              function(callback){
+                if (contentType !== 'contentobject') {
+                  return callback(null, 'Not processing a content object');
+                }
+                db.retrieve('article', { _courseId: itemForDeletion._courseId, _parentId: itemForDeletion._id }, function(err, articles) {
+                  if (err) {
+                    return callback(err, 'Unable to retrieve child articles of contentobject ' + itemForDeletion._id);
+                  }
+                  var parentIds = [];
+                  if (articles && articles.length !== 0) {
+                    criteria._courseId = itemForDeletion._courseId;
+                    parentIds = _.pluck(articles, '_id');
+                    // add the contentObject id as parent for assets on articles
+                    parentIds.push(itemForDeletion._id);
+                  }
+                  async.each(articles, function(article, cb) {
+                    db.retrieve('block', {_courseId: article._courseId, _parentId: article._id}, function(err, blocks) {
+                      if (err) {
+                        return callback(err, 'Unable to retrieve child blocks of article ' + article._id);
+                      }
+                      if (blocks && blocks.length !== 0) {
+                        parentIds = parentIds.concat(_.pluck(blocks, '_id'));
+                      }
+                      if(parentIds.length > 0) {
+                        criteria.$or = [
+                          { _contentTypeParentId: { $in: parentIds } },
+                          { _contentTypeId: itemForDeletion._id }
+                        ];
+                      } else {
+                        criteria._contentTypeId = itemForDeletion._id;
+                      }
+                      cb();
+                    });
+                  }, function(error) {
+                    if (error) {
+                      callback(error);
+                    } else {
+                      callback(null, 'Child content objects added to criteria object');
+                    }
+                  });
+                });
+              },
               function(callback){
                 if (contentType !== 'article') {
                   return callback(null, 'Not processing an article');
                 }
-                
                 // When processing an article we need to retrieve the blocks in order to remove the associated assets.
                 db.retrieve('block', {_courseId: itemForDeletion._courseId, _parentId: itemForDeletion._id}, function(err, blocks) {
                   if (err) {
                     return callback(err, 'Unable to retrieve child blocks of article ' + itemForDeletion._id);
                   }
-                  
                   // Formulate the block search criteria.
                   if (blocks && blocks.length !== 0) {
-                    // We have enough information to start removing course assets.
-                    criteria._contentTypeParentId  = { $in: [_.pluck(blocks, '_id')] };
                     criteria._courseId = itemForDeletion._courseId;
-                  } 
-                  
+                    // find any assets associated with the blocks as parent
+                    var parentArray = _.pluck(blocks, '_id');
+
+                    parentArray.push(itemForDeletion._id);
+                    criteria.$or = [
+                      { _contentTypeParentId: { $in: parentArray } },
+                      { _contentTypeId: itemForDeletion._id }
+                    ];
+                  }
                   callback(null, 'Blocks added to criteria object');
                 });
               },
@@ -84,23 +127,20 @@ function initialize() {
                   case 'course':
                     criteria._courseId = itemForDeletion._id;
                     break;
-                  case 'contentobject':
+                  case 'block':
                     criteria._courseId = itemForDeletion._courseId;
-                    criteria._contentType = itemForDeletion._type;
-                    criteria._contentTypeId = itemForDeletion._id;
-                    break;
-                  case 'block':   
-                    criteria._courseId = itemForDeletion._courseId;
-                    criteria._contentTypeParentId = itemForDeletion._id;
-                    criteria._contentType = 'component';
+                    // Find assets directly associated with the block or with block as parent
+                    criteria.$or = [
+                      { _contentTypeId: itemForDeletion._id },
+                      { _contentTypeParentId: itemForDeletion._id }
+                    ]
                     break;
                   case 'component':
                     criteria._courseId = itemForDeletion._courseId;
                     criteria._contentTypeId = itemForDeletion._id;
                     criteria._contentType = 'component';
                     break;
                 }
-                
                 callback(null, 'Search criteria successfully set up');
               }
             ],
@@ -110,15 +150,13 @@ function initialize() {
                 logger.log('error', err);
                 return next(err);
               }
-              
               // Only remove the courseasset if there is enough critera to search on.
               if (Object.keys(criteria).length !== 0) {
                 db.destroy('courseasset', criteria, function (err) {
                   if (err) {
                     logger.log('error', err);
                     return next(err);
                   }
-    
                   next(null, data);
                 });
               } else {
@@ -133,9 +171,7 @@ function initialize() {
           }
         });
       });
-
     }.bind(null, contentType));
-
   });
 }