adapt-authoring-content 2.1.6 → 2.1.8

package/lib/ContentModule.js

@@ -115,8 +115,8 @@ class ContentModule extends AbstractApiModule {
       return this.update({ _id: doc._id }, { _courseId: doc._id.toString() })
     }
     await Promise.all([
-      options.updateSortOrder !== false && this.updateSortOrder(doc, data),
-      options.updateEnabledPlugins !== false && this.updateEnabledPlugins(doc)
+      options.updateSortOrder !== false && this.updateSortOrder(doc, data, options, mongoOptions),
+      options.updateEnabledPlugins !== false && this.updateEnabledPlugins(doc, {}, options, mongoOptions)
     ])
     return doc
   }
@@ -133,8 +133,8 @@ class ContentModule extends AbstractApiModule {
       throw e
     }
     await Promise.all([
-      this.updateSortOrder(doc, data),
-      this.updateEnabledPlugins(doc, data._enabledPlugins ? { forceUpdate: true } : {})
+      this.updateSortOrder(doc, data, options, mongoOptions),
+      this.updateEnabledPlugins(doc, data._enabledPlugins ? { forceUpdate: true } : {}, options, mongoOptions)
     ])
     return doc
   }
@@ -150,12 +150,19 @@ class ContentModule extends AbstractApiModule {
     }
     const descendants = await getDescendants(q => this.find(q), targetDoc)
 
-    await Promise.all([...descendants, targetDoc].map(d => {
-      return super.delete({ _id: d._id }, options, mongoOptions)
-    }))
+    // bulk-delete descendants directly to avoid per-item memory overhead and hook storms
+    if (descendants.length > 0) {
+      const mongodb = await this.app.waitForModule('mongodb')
+      await mongodb.deleteMany(this.collectionName, { _id: { $in: descendants.map(d => d._id) } }, mongoOptions)
+    }
+    // delete target via super.delete to trigger deleteHook middleware (e.g. multilang)
+    await super.delete({ _id: targetDoc._id }, options, mongoOptions)
+    if (descendants.length > 0 && options.invokePostHook !== false) {
+      await this.postDeleteHook.invoke(descendants)
+    }
     await Promise.all([
-      this.updateEnabledPlugins(targetDoc),
-      this.updateSortOrder(targetDoc)
+      this.updateEnabledPlugins(targetDoc, {}, options, mongoOptions),
+      this.updateSortOrder(targetDoc, undefined, options, mongoOptions)
     ])
     return [targetDoc, ...descendants]
   }
@@ -272,7 +279,7 @@ class ContentModule extends AbstractApiModule {
    * @param {Object} updateData The update data
    * @return {Promise}
    */
-  async updateSortOrder (item, updateData) {
+  async updateSortOrder (item, updateData, parentOptions, parentMongoOptions) {
     // some exceptions which don't need a _sortOrder
     if (item._type === 'config' || item._type === 'course' || !item._parentId) {
       return
@@ -284,7 +291,7 @@ class ContentModule extends AbstractApiModule {
     }
     return Promise.all(siblings.map(async (s, i) => {
       const _sortOrder = i + 1
-      if (s._sortOrder !== _sortOrder) return super.update({ _id: s._id }, { _sortOrder })
+      if (s._sortOrder !== _sortOrder) return super.update({ _id: s._id }, { _sortOrder }, parentOptions, parentMongoOptions)
     }))
   }
 
@@ -295,7 +302,7 @@ class ContentModule extends AbstractApiModule {
    * @param {Boolean} options.forceUpdate Forces an update of defaults regardless of whether the _enabledPlugins list has changed
    * @return {Promise}
    */
-  async updateEnabledPlugins ({ _courseId }, options = {}) {
+  async updateEnabledPlugins ({ _courseId }, options = {}, parentOptions, parentMongoOptions) {
     const [contentplugin, jsonschema] = await this.app.waitForModule('contentplugin', 'jsonschema')
     const contentItems = await this.find({ _courseId })
     const config = contentItems.find(c => c._type === 'config')
@@ -330,12 +337,12 @@ class ContentModule extends AbstractApiModule {
         }, types)
       }, [])
     // update config._enabledPlugins
-    await super.update({ _courseId, _type: 'config' }, { _enabledPlugins })
+    await super.update({ _courseId, _type: 'config' }, { _enabledPlugins }, parentOptions, parentMongoOptions)
     // update other affected content objects to ensure new defaults are applied
     // note: due to the complex data, each must be updated separately rather than using updateMany
     if (types.length > 0) {
       const toUpdate = await super.find({ _courseId, _type: { $in: types } }, {})
-      return Promise.all(toUpdate.map(c => super.update({ _id: c._id }, {})))
+      return Promise.all(toUpdate.map(c => super.update({ _id: c._id }, {}, parentOptions, parentMongoOptions)))
     }
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adapt-authoring-content",
-  "version": "2.1.6",
+  "version": "2.1.8",
   "description": "Module for managing Adapt content",
   "homepage": "https://github.com/adapt-security/adapt-authoring-content",
   "license": "GPL-3.0",