musora-content-services 1.0.153 → 1.0.155

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.155](https://github.com/railroadmedia/musora-content-services/compare/v1.0.154...v1.0.155) (2024-11-05)
+
+### [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)

package/package.json

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

package/src/index.d.ts

@@ -14,9 +14,10 @@ import {
 import {
 	contentStatusCompleted,
 	contentStatusReset,
-	contentStatusStarted,
 	getProgressPercentage,
+	getProgressPercentageByIds,
 	getProgressState,
+	getProgressStateByIds,
 	getResumeTimeSeconds,
 	recordWatchSession
 } from './services/contentProgress.js';
@@ -57,7 +58,6 @@ import {
 	postContentCompleted,
 	postContentLiked,
 	postContentReset,
-	postContentStarted,
 	postContentUnliked,
 	postRecordWatchSession,
 	updatePlaylist,
@@ -118,7 +118,6 @@ declare module 'musora-content-services' {
 	export {
 		contentStatusCompleted,
 		contentStatusReset,
-		contentStatusStarted,
 		createPlaylist,
 		deletePlaylist,
 		deletePlaylistItem,
@@ -190,7 +189,9 @@ declare module 'musora-content-services' {
 		fetchUserPlaylists,
 		fetchWorkouts,
 		getProgressPercentage,
+		getProgressPercentageByIds,
 		getProgressState,
+		getProgressStateByIds,
 		getResumeTimeSeconds,
 		getSortOrder,
 		globalConfig,
@@ -208,7 +209,6 @@ declare module 'musora-content-services' {
 		postContentCompleted,
 		postContentLiked,
 		postContentReset,
-		postContentStarted,
 		postContentUnliked,
 		postRecordWatchSession,
 		recordWatchSession,

package/src/index.js

@@ -14,9 +14,10 @@ import {
 import {
 	contentStatusCompleted,
 	contentStatusReset,
-	contentStatusStarted,
 	getProgressPercentage,
+	getProgressPercentageByIds,
 	getProgressState,
+	getProgressStateByIds,
 	getResumeTimeSeconds,
 	recordWatchSession
 } from './services/contentProgress.js';
@@ -57,7 +58,6 @@ import {
 	postContentCompleted,
 	postContentLiked,
 	postContentReset,
-	postContentStarted,
 	postContentUnliked,
 	postRecordWatchSession,
 	updatePlaylist,
@@ -117,7 +117,6 @@ import {
 export {
 	contentStatusCompleted,
 	contentStatusReset,
-	contentStatusStarted,
 	createPlaylist,
 	deletePlaylist,
 	deletePlaylistItem,
@@ -189,7 +188,9 @@ export {
 	fetchUserPlaylists,
 	fetchWorkouts,
 	getProgressPercentage,
+	getProgressPercentageByIds,
 	getProgressState,
+	getProgressStateByIds,
 	getResumeTimeSeconds,
 	getSortOrder,
 	globalConfig,
@@ -207,7 +208,6 @@ export {
 	postContentCompleted,
 	postContentLiked,
 	postContentReset,
-	postContentStarted,
 	postContentUnliked,
 	postRecordWatchSession,
 	recordWatchSession,

package/src/services/contentProgress.js

@@ -13,42 +13,40 @@ 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 getProgressState(contentId) {
-    let data = await dataContext.getData();
-    return data[contentId]?.[DATA_KEY_STATUS] ?? 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 getResumeTimeSeconds(contentId) {
+export async function getProgressState(contentId) {
     let data = await dataContext.getData();
-    return data[contentId]?.[DATA_KEY_RESUME_TIME] ?? 0;
+    return data[contentId]?.[DATA_KEY_STATUS] ?? "";
 }
 
-export async function contentStatusStarted(contentId) {
-    await dataContext.update(
-        function (localContext) {
-            let data = localContext.data[contentId] ?? [];
-            let progress = data?.[DATA_KEY_PROGRESS] ?? 0;
-            let status = data?.[DATA_KEY_STATUS] ?? 0;
+export async function getProgressStateByIds(contentIds) {
+    const data = await dataContext.getData();
+    let progress = {};
 
-            if (status !== STATE_COMPLETED && progress !== 100) {
-                status = STATE_STARTED;
-            }
+    contentIds?.forEach(id => progress[id] = data[id]?.[DATA_KEY_STATUS] ?? "");
 
-            data[DATA_KEY_STATUS] = status;
-            localContext.data[contentId] = data;
-        },
-        async function () {
-            return postContentStarted(contentId);
-        });
+    return progress;
 }
 
+export async function getResumeTimeSeconds(contentId) {
+    let data = await dataContext.getData();
+    return data[contentId]?.[DATA_KEY_RESUME_TIME] ?? 0;
+}
 
 export async function contentStatusCompleted(contentId) {
     await dataContext.update(
@@ -68,8 +66,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

@@ -823,11 +823,6 @@ export async function fetchPlaylistItem(payload) {
     return await fetchHandler(url);
 }
 
-export async function postContentStarted(contentId) {
-    let url = `/content/${contentId}/started`;
-    return postDataHandler(url);
-}
-
 export async function postContentCompleted(contentId) {
     let url = `/content/${contentId}/completed`;
     return postDataHandler(url);

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;