musora-content-services 1.0.152 → 1.0.154

package/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 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.154](https://github.com/railroadmedia/musora-content-services/compare/v1.0.153...v1.0.154) (2024-11-05)
+
+### [1.0.153](https://github.com/railroadmedia/musora-content-services/compare/v1.0.152...v1.0.153) (2024-11-05)
+
 ### [1.0.152](https://github.com/railroadmedia/musora-content-services/compare/v1.0.142...v1.0.152) (2024-11-05)
 
 ### [1.0.151](https://github.com/railroadmedia/musora-content-services/compare/v1.0.142...v1.0.151) (2024-11-05)

package/package.json

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

package/src/index.d.ts

@@ -16,7 +16,9 @@ import {
 	contentStatusReset,
 	contentStatusStarted,
 	getProgressPercentage,
+	getProgressPercentageByIds,
 	getProgressState,
+	getProgressStateByIds,
 	getResumeTimeSeconds,
 	recordWatchSession
 } from './services/contentProgress.js';
@@ -48,12 +50,12 @@ import {
 	fetchUserPlaylists,
 	likePlaylist,
 	postChallengesCommunityNotification,
+	postChallengesCompleteLesson,
 	postChallengesEnroll,
 	postChallengesEnrollmentNotification,
 	postChallengesLeave,
 	postChallengesSetStartDate,
 	postChallengesUnlock,
-	postCompleteLesson,
 	postContentCompleted,
 	postContentLiked,
 	postContentReset,
@@ -190,7 +192,9 @@ declare module 'musora-content-services' {
 		fetchUserPlaylists,
 		fetchWorkouts,
 		getProgressPercentage,
+		getProgressPercentageByIds,
 		getProgressState,
+		getProgressStateByIds,
 		getResumeTimeSeconds,
 		getSortOrder,
 		globalConfig,
@@ -199,12 +203,12 @@ declare module 'musora-content-services' {
 		likeContent,
 		likePlaylist,
 		postChallengesCommunityNotification,
+		postChallengesCompleteLesson,
 		postChallengesEnroll,
 		postChallengesEnrollmentNotification,
 		postChallengesLeave,
 		postChallengesSetStartDate,
 		postChallengesUnlock,
-		postCompleteLesson,
 		postContentCompleted,
 		postContentLiked,
 		postContentReset,

package/src/index.js

@@ -16,7 +16,9 @@ import {
 	contentStatusReset,
 	contentStatusStarted,
 	getProgressPercentage,
+	getProgressPercentageByIds,
 	getProgressState,
+	getProgressStateByIds,
 	getResumeTimeSeconds,
 	recordWatchSession
 } from './services/contentProgress.js';
@@ -48,12 +50,12 @@ import {
 	fetchUserPlaylists,
 	likePlaylist,
 	postChallengesCommunityNotification,
+	postChallengesCompleteLesson,
 	postChallengesEnroll,
 	postChallengesEnrollmentNotification,
 	postChallengesLeave,
 	postChallengesSetStartDate,
 	postChallengesUnlock,
-	postCompleteLesson,
 	postContentCompleted,
 	postContentLiked,
 	postContentReset,
@@ -189,7 +191,9 @@ export {
 	fetchUserPlaylists,
 	fetchWorkouts,
 	getProgressPercentage,
+	getProgressPercentageByIds,
 	getProgressState,
+	getProgressStateByIds,
 	getResumeTimeSeconds,
 	getSortOrder,
 	globalConfig,
@@ -198,12 +202,12 @@ export {
 	likeContent,
 	likePlaylist,
 	postChallengesCommunityNotification,
+	postChallengesCompleteLesson,
 	postChallengesEnroll,
 	postChallengesEnrollmentNotification,
 	postChallengesLeave,
 	postChallengesSetStartDate,
 	postChallengesUnlock,
-	postCompleteLesson,
 	postContentCompleted,
 	postContentLiked,
 	postContentReset,

package/src/services/contentProgress.js

@@ -13,16 +13,34 @@ const STATE_COMPLETED = 'completed';
 const DATA_KEY_STATUS = 's';
 const DATA_KEY_PROGRESS = 'p';
 const DATA_KEY_RESUME_TIME = 't';
-export let dataContext = new DataContext(ContentProgressVersionKey, fetchContentProgress());
+export let dataContext = new DataContext(ContentProgressVersionKey, fetchContentProgress);
 
 export async function getProgressPercentage(contentId) {
     let data = await dataContext.getData();
     return data[contentId]?.[DATA_KEY_PROGRESS] ?? 0;
 }
 
+export async function getProgressPercentageByIds(contentIds) {
+    const data = await dataContext.getData();
+    let progress = {};
+
+    contentIds?.forEach(id => progress[id] = data[id]?.[DATA_KEY_PROGRESS] ?? 0);
+
+    return progress;
+}
+
 export async function getProgressState(contentId) {
     let data = await dataContext.getData();
-    return data[contentId]?.[DATA_KEY_STATUS] ?? 0;
+    return data[contentId]?.[DATA_KEY_STATUS] ?? "";
+}
+
+export async function getProgressStateByIds(contentIds) {
+    const data = await dataContext.getData();
+    let progress = {};
+
+    contentIds?.forEach(id => progress[id] = data[id]?.[DATA_KEY_STATUS] ?? "");
+
+    return progress;
 }
 
 export async function getResumeTimeSeconds(contentId) {
@@ -68,8 +86,8 @@ function completeStatusInLocalContext(contentId, localContext, hierarchy) {
     localContext.data[contentId] = data;
 
     let children = hierarchy.children[contentId] ?? [];
-    for(let i = 0; i < children.length; i++) {
-        let childId  = children[i];
+    for (let i = 0; i < children.length; i++) {
+        let childId = children[i];
         completeStatusInLocalContext(childId, localContext, hierarchy);
     }
 }

package/src/services/dataContext.js

@@ -19,8 +19,8 @@ export class DataContext {
     constructor(dataVersionKey, fetchDataFunction) {
         this.dataVersionKey = dataVersionKey;
         this.fetchDataFunction = fetchDataFunction;
-        this.localStorageKey = `dataContext_${this.dataVersionKey}`;
-        this.localStorageLastUpdatedKey = `dataContext_${this.dataVersionKey}_lastUpdated`;
+        this.localStorageKey = `dataContext_${this.dataVersionKey.toString()}`;
+        this.localStorageLastUpdatedKey = `dataContext_${this.dataVersionKey.toString()}_lastUpdated`;
     }
 
     async getData() {

package/src/services/railcontent.js

@@ -454,7 +454,7 @@ export async function postChallengesCommunityNotification(contentId) {
  * @param {int|string} contentId - railcontent id of the challenge
  * @returns {Promise<any|null>} - Modal data to display
  */
-export async function postCompleteLesson(contentId) {
+export async function postChallengesCompleteLesson(contentId) {
     let url = `/challenges/complete_lesson/${contentId}`;
     return await fetchHandler(url, 'post');
 }

package/test/contentProgress.test.js

@@ -1,4 +1,9 @@
-import {getProgressPercentage, dataContext, recordWatchSession} from "../src/services/contentProgress";
+import {
+    getProgressPercentage,
+    dataContext,
+    recordWatchSession,
+    getProgressPercentageByIds, getProgressState, getProgressStateByIds
+} from "../src/services/contentProgress";
 import {initializeTestService} from "./sanityQueryService.test";
 
 const railContentModule = require('../src/services/railcontent.js')
@@ -20,11 +25,28 @@ describe('contentProgressDataContext', function () {
         expect(result).toBe(6);
     });
 
+    test('getProgressPercentageByIds', async () => {
+        let result = await getProgressPercentageByIds([234191, 111111]);
+        expect(result[234191]).toBe(6);
+        expect(result[111111]).toBe(0);
+    });
+
     test('getProgressPercentage_notExists', async () => {
         let result = await getProgressPercentage(111111);
         expect(result).toBe(0);
     });
 
+    test('getProgressState', async () => {
+        let result = await getProgressState(234191);
+        expect(result).toBe("started");
+    });
+
+    test('getProgressStateByIds', async () => {
+        let result = await getProgressStateByIds([234191, 120402]);
+        expect(result[234191]).toBe("started");
+        expect(result[120402]).toBe("");
+    });
+
     test('progressBubbling', async () => {
         let mock2 = jest.spyOn(railContentModule, 'postRecordWatchSession');
         let serverVersion = 2;