adapt-authoring-courseassets 1.4.2 → 1.4.4

package/.github/workflows/releases.yml

@@ -1,30 +1,16 @@
 name: Release
+
 on:
   push:
     branches:
       - master
 
+permissions:
+  contents: write
+  issues: write
+  pull-requests: write
+  id-token: write
+
 jobs:
   release:
-    name: Release
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write # to be able to publish a GitHub release
-      issues: write # to be able to comment on released issues
-      pull-requests: write # to be able to comment on released pull requests
-      id-token: write # to enable use of OIDC for trusted publishing and npm provenance
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-      - name: Setup Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: 'lts/*'
-      - name: Install dependencies
-        run: npm install
-      - name: Release
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: npx semantic-release
+    uses: adaptlearning/semantic-release-config/.github/workflows/release.yml@master

package/lib/courseassetsModule.js

@@ -20,7 +20,7 @@ class CourseAssetsModule extends AbstractApiModule {
   async init () {
     await super.init()
 
-    const [assets, content] = await this.app.waitForModule('assets', 'content')
+    const [assets, content, mongodb] = await this.app.waitForModule('assets', 'content', 'mongodb')
     /**
      * Cached module instance for easy access
      * @type {AssetsModule}
@@ -31,6 +31,10 @@ class CourseAssetsModule extends AbstractApiModule {
      * @type {ContentModule}
      */
     this.content = content
+    /** @ignore */
+    this.collection = mongodb.getCollection(this.collectionName)
+    /** @ignore */
+    this.pendingDeletes = { courseIds: new Set(), contentIds: new Set(), promise: null }
 
     this.assets.preDeleteHook.tap(this.handleDeletedAsset.bind(this));
 
@@ -54,11 +58,16 @@ class CourseAssetsModule extends AbstractApiModule {
    */
   async handleContentEvent (action, arg1, arg2) {
     if (action === 'delete') {
-      return Promise.all((Array.isArray(arg1) ? arg1 : [arg1]).map(async c => {
-        const key = c._type === 'course' ? 'courseId' : 'contentId'
-        await this.deleteMany({ [key]: c._id })
-        this.log('debug', 'DELETE', c._courseId.toString(), c._id.toString())
-      }))
+      const items = Array.isArray(arg1) ? arg1 : [arg1]
+      for (const c of items) {
+        if (c._type === 'course') this.pendingDeletes.courseIds.add(c._id.toString())
+        else this.pendingDeletes.contentIds.add(c._id.toString())
+      }
+      if (!this.pendingDeletes.promise) {
+        this.pendingDeletes.promise = new Promise(resolve => setImmediate(resolve))
+          .then(() => this.flushDeletes())
+      }
+      return this.pendingDeletes.promise
     }
     const type = arg1._type
     const contentId = arg1._id.toString()
@@ -68,23 +77,45 @@ class CourseAssetsModule extends AbstractApiModule {
     if (!contentId || !courseId) {
       return
     }
-    // delete any existing course assets for content
-    await this.deleteMany({ courseId, contentId })
-
     const data = isModify ? arg2 : arg1
     const schema = await this.content.getSchema(this.content.schemaName, data)
     const ids = extractAssetIds(schema.built.properties, data)
 
+    if (isModify) {
+      const existing = await this.find({ courseId, contentId })
+      const existingIds = existing.map(r => r.assetId.toString()).sort()
+      if (ids.length === existingIds.length && ids.slice().sort().every((id, i) => id === existingIds[i])) {
+        return
+      }
+    }
+    // delete any existing course assets for content
+    await this.collection.deleteMany({ courseId, contentId })
+
     if (!ids.length) {
       return
     }
-    await Promise.all(ids.map(async _id => {
-      await this.assets.findOne({ _id })
-      await this.insert({ courseId, contentId, assetId: _id })
-    }))
+    const found = await this.assets.find({ _id: { $in: ids } })
+    const foundIds = new Set(found.map(a => a._id.toString()))
+    const validIds = ids.filter(id => foundIds.has(id))
+
+    if (validIds.length) {
+      const docs = validIds.map(assetId => ({ courseId, contentId, assetId }))
+      await this.collection.insertMany(docs)
+    }
     this.log('debug', 'UPDATE', courseId, contentId)
   }
 
+  async flushDeletes () {
+    const { courseIds, contentIds } = this.pendingDeletes
+    this.pendingDeletes = { courseIds: new Set(), contentIds: new Set(), promise: null }
+
+    const ops = []
+    if (courseIds.size) ops.push(this.collection.deleteMany({ courseId: { $in: [...courseIds] } }))
+    if (contentIds.size) ops.push(this.collection.deleteMany({ contentId: { $in: [...contentIds] } }))
+    await Promise.all(ops)
+    this.log('debug', 'DELETE', `${courseIds.size} courses, ${contentIds.size} content items`)
+  }
+
   async handleDeletedAsset (asset) {
     const results = await this.find({ assetId: asset._id })
     if (!results.length) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adapt-authoring-courseassets",
-  "version": "1.4.2",
+  "version": "1.4.4",
   "description": "Module for managing course asset usage",
   "homepage": "https://github.com/adapt-security/adapt-authoring-courseassets",
   "license": "GPL-3.0",
@@ -16,37 +16,11 @@
     "adapt-authoring-core": "^2.0.0"
   },
   "devDependencies": {
-    "@semantic-release/git": "^10.0.1",
-    "conventional-changelog-eslint": "^6.0.0",
-    "semantic-release": "^25.0.2",
+    "@adaptlearning/semantic-release-config": "^1.0.0",
     "standard": "^17.1.0"
   },
   "release": {
-    "plugins": [
-      [
-        "@semantic-release/commit-analyzer",
-        {
-          "preset": "eslint"
-        }
-      ],
-      [
-        "@semantic-release/release-notes-generator",
-        {
-          "preset": "eslint"
-        }
-      ],
-      "@semantic-release/npm",
-      "@semantic-release/github",
-      [
-        "@semantic-release/git",
-        {
-          "assets": [
-            "package.json"
-          ],
-          "message": "Chore(release): ${nextRelease.version} [skip ci]\n\n${nextRelease.notes}"
-        }
-      ]
-    ]
+    "extends": "@adaptlearning/semantic-release-config"
   },
   "scripts": {
     "test": "node --test 'tests/**/*.spec.js'"