musora-content-services 1.0.172 → 1.0.173

package/CHANGELOG.md

@@ -2,6 +2,8 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [1.0.173](https://github.com/railroadmedia/musora-content-services/compare/v1.0.172...v1.0.173) (2024-11-14)
+
 ### [1.0.172](https://github.com/railroadmedia/musora-content-services/compare/v1.0.171...v1.0.172) (2024-11-13)
 
 ### [1.0.171](https://github.com/railroadmedia/musora-content-services/compare/v1.0.170...v1.0.171) (2024-11-12)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "musora-content-services",
-  "version": "1.0.172",
+  "version": "1.0.173",
   "description": "A package for Musoras content services ",
   "main": "src/index.js",
   "scripts": {

package/src/index.d.ts

@@ -13,6 +13,7 @@ import {
 
 import {
 	assignmentStatusCompleted,
+	assignmentStatusReset,
 	contentStatusCompleted,
 	contentStatusReset,
 	getAllCompleted,
@@ -132,6 +133,7 @@ declare module 'musora-content-services' {
 	export {
 		addItemToPlaylist,
 		assignmentStatusCompleted,
+		assignmentStatusReset,
 		contentStatusCompleted,
 		contentStatusReset,
 		countAssignmentsAndLessons,

package/src/index.js

@@ -13,6 +13,7 @@ import {
 
 import {
 	assignmentStatusCompleted,
+	assignmentStatusReset,
 	contentStatusCompleted,
 	contentStatusReset,
 	getAllCompleted,
@@ -131,6 +132,7 @@ import {
 export {
 	addItemToPlaylist,
 	assignmentStatusCompleted,
+	assignmentStatusReset,
 	contentStatusCompleted,
 	contentStatusReset,
 	countAssignmentsAndLessons,

package/src/services/contentProgress.js

@@ -151,24 +151,40 @@ function getChildrenToDepth(parentId, hierarchy, depth = 1) {
 }
 
 
+export async function assignmentStatusReset(assignmentId, contentId) {
+    await dataContext.update(
+        async function (localContext) {
+            let hierarchy = await fetchHierarchy(contentId);
+            resetStatusInLocalContext(localContext, assignmentId, hierarchy);
+        },
+        async function () {
+            return postContentReset(contentId);
+        });
+}
+
 export async function contentStatusReset(contentId) {
     await dataContext.update(
         async function (localContext) {
             let hierarchy = await fetchHierarchy(contentId);
-            let allChildIds = getChildrenToDepth(contentId, hierarchy, 5);
-            allChildIds.push(contentId);
-            allChildIds.forEach(id => {
-                const index = Object.keys(localContext.data).indexOf(id.toString());
-                if (index > -1) { // only splice array when item is found
-                    delete localContext.data[id];
-                }
-            });
+            resetStatusInLocalContext(localContext, contentId, hierarchy);
         },
         async function () {
             return postContentReset(contentId);
         });
 }
 
+function resetStatusInLocalContext(localContext, contentId, hierarchy) {
+    let allChildIds = getChildrenToDepth(contentId, hierarchy, 5);
+    allChildIds.push(contentId);
+    allChildIds.forEach(id => {
+        const index = Object.keys(localContext.data).indexOf(id.toString());
+        if (index > -1) { // only splice array when item is found
+            delete localContext.data[id];
+        }
+    });
+    bubbleProgress(hierarchy, contentId, localContext);
+}
+
 /**
  * Record watch session
  * @return {string} sessionId - provide in future calls to update progress
@@ -230,17 +246,13 @@ function bubbleProgress(hierarchy, contentId, localContext) {
     let parentId = hierarchy.parents[contentId];
     if (!parentId) return;
     let data = localContext.data[parentId] ?? {};
-    let progress = data[DATA_KEY_PROGRESS];
-    let status = data[DATA_KEY_STATUS];
-    if (status !== STATE_COMPLETED && progress !== 100) {
-        let childProgress = hierarchy.children[parentId].map(function (childId) {
-            return localContext.data[childId]?.[DATA_KEY_PROGRESS] ?? 0;
-        });
-        progress = Math.round(childProgress.reduce((a, b) => a + b, 0) / childProgress.length);
-        data[DATA_KEY_PROGRESS] = progress;
-        data[DATA_KEY_STATUS] = progress === 100 ? STATE_COMPLETED : STATE_STARTED;
-        localContext.data[parentId] = data;
-    }
+    let childProgress = hierarchy.children[parentId].map(function (childId) {
+        return localContext.data[childId]?.[DATA_KEY_PROGRESS] ?? 0;
+    });
+    let progress = Math.round(childProgress.reduce((a, b) => a + b, 0) / childProgress.length);
+    data[DATA_KEY_PROGRESS] = progress;
+    data[DATA_KEY_STATUS] = progress === 100 ? STATE_COMPLETED : STATE_STARTED;
+    localContext.data[parentId] = data;
     bubbleProgress(hierarchy, parentId, localContext);
 }
 

package/test/contentProgress.test.js

@@ -7,7 +7,7 @@ import {
     getProgressStateByIds,
     getAllStarted,
     getAllCompleted,
-    contentStatusCompleted, assignmentStatusCompleted, contentStatusReset
+    contentStatusCompleted, assignmentStatusCompleted, contentStatusReset, assignmentStatusReset
 } from "../src/services/contentProgress";
 import {initializeTestService} from "./initializeTests";
 import {postContentCompleted} from "../src";
@@ -148,6 +148,33 @@ describe('contentProgressDataContext', function () {
     //     state = await getProgressState(contentId); //assignment
     //     expect(state).toBe("completed");
     // });
+    //
+    // test('assignmentCompleteResetBubblingMultiple', async () => {
+    //     let contentId = 281709;
+    //
+    //     let state = await getProgressState(contentId);
+    //     expect(state).toBe("");
+    //
+    //     let assignmentIds = [281710, 281711, 281712, 281713, 281714, 281715];
+    //     for (const assignmentId of assignmentIds) {
+    //         await assignmentStatusCompleted(assignmentId, contentId);
+    //         state = await getProgressState(assignmentId);
+    //         expect(state).toBe("completed");
+    //     }
+    //
+    //     state = await getProgressState(contentId);
+    //     expect(state).toBe("completed");
+    //
+    //     await assignmentStatusReset(assignmentIds[0], contentId);
+    //     state = await getProgressState(assignmentIds[0]);
+    //     expect(state).toBe("");
+    //     state = await getProgressState(contentId);
+    //     expect(state).toBe("started");
+    //     let percentage = await getProgressPercentage(contentId);
+    //     expect(percentage).toBe(83);
+    // });
+
+
     //
     // test('completeBubbling', async () => {
     //     let state = await getProgressState(276698);
@@ -181,5 +208,4 @@ describe('contentProgressDataContext', function () {
     // });
 
 
-
 });

package/test/live/contentProgressLive.test.js

@@ -2,7 +2,7 @@ import {
     recordWatchSession,
     getProgressPercentage,
     dataContext,
-    getProgressState, contentStatusCompleted, contentStatusReset
+    getProgressState, contentStatusCompleted, contentStatusReset, assignmentStatusCompleted
 } from "../../src/services/contentProgress";
 import {initializeTestService} from "../initializeTests";
 
@@ -80,6 +80,35 @@ describe('contentProgressDataContextLocal', function () {
         expect(result).toBe("");
     }, 100000);
 
+    test('assignmentCompleteBubblingToCompletedMultiple', async () => {
+        let contentId = 281709;
+        await contentStatusReset(contentId);
+
+        let state = await getProgressState(contentId);
+        expect(state).toBe("");
+
+        let assignmentIds = [281710, 281711, 281712, 281713, 281714, 281715];
+        for (const assignmentId of assignmentIds) {
+            await assignmentStatusCompleted(assignmentId, contentId);
+            state = await getProgressState(assignmentId);
+            expect(state).toBe("completed");
+        }
+
+        state = await getProgressState(contentId); //assignment
+        expect(state).toBe("completed");
+
+        dataContext.clearCache();
+
+        state = await getProgressState(contentId); //assignment
+        expect(state).toBe("completed");
+
+        for (const assignmentId of assignmentIds) {
+            state = await getProgressState(assignmentId);
+            expect(state).toBe("completed");
+        }
+
+    }, 100000);
+
 
     //
     // test('progressBubbling', async () => {