musora-content-services 1.0.162 → 1.0.164

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.164](https://github.com/railroadmedia/musora-content-services/compare/v1.0.163...v1.0.164) (2024-11-09)
+
+### [1.0.163](https://github.com/railroadmedia/musora-content-services/compare/v1.0.162...v1.0.163) (2024-11-08)
+
 ### [1.0.162](https://github.com/railroadmedia/musora-content-services/compare/v1.0.161...v1.0.162) (2024-11-08)
 
 ### [1.0.161](https://github.com/railroadmedia/musora-content-services/compare/v1.0.152...v1.0.161) (2024-11-08)

package/package.json

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

package/src/index.d.ts

@@ -14,6 +14,8 @@ import {
 import {
 	contentStatusCompleted,
 	contentStatusReset,
+	getAllCompleted,
+	getAllStarted,
 	getProgressPercentage,
 	getProgressPercentageByIds,
 	getProgressState,
@@ -200,6 +202,8 @@ declare module 'musora-content-services' {
 		fetchUserPermissionsData,
 		fetchUserPlaylists,
 		fetchWorkouts,
+		getAllCompleted,
+		getAllStarted,
 		getProgressPercentage,
 		getProgressPercentageByIds,
 		getProgressState,

package/src/index.js

@@ -14,6 +14,8 @@ import {
 import {
 	contentStatusCompleted,
 	contentStatusReset,
+	getAllCompleted,
+	getAllStarted,
 	getProgressPercentage,
 	getProgressPercentageByIds,
 	getProgressState,
@@ -199,6 +201,8 @@ export {
 	fetchUserPermissionsData,
 	fetchUserPlaylists,
 	fetchWorkouts,
+	getAllCompleted,
+	getAllStarted,
 	getProgressPercentage,
 	getProgressPercentageByIds,
 	getProgressState,

package/src/services/contentProgress.js

@@ -2,17 +2,17 @@ import {
     fetchContentProgress,
     postContentCompleted,
     postContentReset,
-    postContentStarted,
     postRecordWatchSession
 } from "./railcontent";
 import {DataContext, ContentProgressVersionKey} from "./dataContext";
-import {fetchHierarchy, fetchParentByRailContentId} from "./sanity";
+import {fetchHierarchy} from "./sanity";
 
 const STATE_STARTED = 'started';
 const STATE_COMPLETED = 'completed';
 const DATA_KEY_STATUS = 's';
 const DATA_KEY_PROGRESS = 'p';
 const DATA_KEY_RESUME_TIME = 't';
+const DATA_KEY_LAST_UPDATED_TIME = 'u';
 export let dataContext = new DataContext(ContentProgressVersionKey, fetchContentProgress);
 
 export async function getProgressPercentage(contentId) {
@@ -43,6 +43,44 @@ export async function getProgressStateByIds(contentIds) {
     return progress;
 }
 
+export async function getAllStarted(limit = null) {
+    const data = await dataContext.getData();
+    let ids = Object.keys(data).filter(function (key) {
+        return data[parseInt(key)][DATA_KEY_STATUS] === STATE_STARTED;
+    }).map(function (key) {
+        return parseInt(key);
+    }).sort(function (a, b) {
+        let v1 = data[a][DATA_KEY_LAST_UPDATED_TIME];
+        let v2 = data[b][DATA_KEY_LAST_UPDATED_TIME];
+        if (v1 > v2) return -1;
+        else if (v1 < v2) return 1;
+        return 0;
+    });
+    if (limit) {
+        ids = ids.slice(0, limit);
+    }
+    return ids;
+}
+
+export async function getAllCompleted(limit = null) {
+    const data = await dataContext.getData();
+    let ids = Object.keys(data).filter(function (key) {
+        return data[parseInt(key)][DATA_KEY_STATUS] === STATE_COMPLETED;
+    }).map(function (key) {
+        return parseInt(key);
+    }).sort(function (a, b) {
+        let v1 = data[a][DATA_KEY_LAST_UPDATED_TIME];
+        let v2 = data[b][DATA_KEY_LAST_UPDATED_TIME];
+        if (v1 > v2) return -1;
+        else if (v1 < v2) return 1;
+        return 0;
+    });
+    if (limit) {
+        ids = ids.slice(0, limit);
+    }
+    return ids;
+}
+
 export async function getResumeTimeSeconds(contentId) {
     let data = await dataContext.getData();
     return data[contentId]?.[DATA_KEY_RESUME_TIME] ?? 0;
@@ -50,8 +88,8 @@ export async function getResumeTimeSeconds(contentId) {
 
 export async function contentStatusCompleted(contentId) {
     await dataContext.update(
-        function (localContext) {
-            let hierarchy = fetchHierarchy(contentId);
+        async function (localContext) {
+            let hierarchy = await fetchHierarchy(contentId);
             completeStatusInLocalContext(contentId, localContext, hierarchy);
         },
         async function () {
@@ -60,9 +98,10 @@ export async function contentStatusCompleted(contentId) {
 }
 
 function completeStatusInLocalContext(contentId, localContext, hierarchy) {
-    let data = localContext.data[contentId] ?? [];
+    let data = localContext.data[contentId] ?? {};
     data[DATA_KEY_STATUS] = STATE_COMPLETED;
     data[DATA_KEY_PROGRESS] = 100;
+    data[DATA_KEY_LAST_UPDATED_TIME] = Math.round(new Date().getTime() / 1000);
     localContext.data[contentId] = data;
 
     let children = hierarchy.children[contentId] ?? [];
@@ -105,7 +144,7 @@ export async function recordWatchSession(contentId, mediaType, mediaCategory, me
     await dataContext.update(
         async function (localContext) {
             if (contentId && updateLocalProgress) {
-                let data = localContext.data[contentId] ?? [];
+                let data = localContext.data[contentId] ?? {};
                 let progress = data?.[DATA_KEY_PROGRESS] ?? 0;
                 let status = data?.[DATA_KEY_STATUS] ?? 0;
 
@@ -117,6 +156,7 @@ export async function recordWatchSession(contentId, mediaType, mediaCategory, me
                 data[DATA_KEY_PROGRESS] = progress;
                 data[DATA_KEY_STATUS] = status;
                 data[DATA_KEY_RESUME_TIME] = currentSeconds;
+                data[DATA_KEY_LAST_UPDATED_TIME] = Math.round(new Date().getTime() / 1000);
                 localContext.data[contentId] = data;
 
                 let hierarchy = await fetchHierarchy(contentId);
@@ -146,7 +186,7 @@ function getMediaTypeId(mediaType, mediaCategory) {
 }
 
 function uuidv4() {
-    return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function(c) {
+    return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
         var r = Math.random() * 16 | 0, v = c === 'x' ? r : (r & 0x3 | 0x8);
         return v.toString(16);
     });
@@ -155,7 +195,7 @@ function uuidv4() {
 function bubbleProgress(hierarchy, contentId, localContext) {
     let parentId = hierarchy.parents[contentId];
     if (!parentId) return;
-    let data = localContext.data[parentId] ?? [];
+    let data = localContext.data[parentId] ?? {};
     let progress = data[DATA_KEY_PROGRESS];
     let status = data[DATA_KEY_STATUS];
     if (status !== STATE_COMPLETED && progress !== 100) {

package/test/contentProgress.test.js

@@ -2,9 +2,15 @@ import {
     getProgressPercentage,
     dataContext,
     recordWatchSession,
-    getProgressPercentageByIds, getProgressState, getProgressStateByIds
+    getProgressPercentageByIds,
+    getProgressState,
+    getProgressStateByIds,
+    getAllStarted,
+    getAllCompleted,
+    contentStatusCompleted
 } from "../src/services/contentProgress";
 import {initializeTestService} from "./initializeTests";
+import {postContentCompleted} from "../src";
 
 const railContentModule = require('../src/services/railcontent.js')
 
@@ -15,7 +21,7 @@ describe('contentProgressDataContext', function () {
     beforeEach(() => {
         initializeTestService();
         mock = jest.spyOn(dataContext, 'fetchData');
-        var json = JSON.parse(`{"version":${testVersion},"data":{"234191":{"s":"started","p":6,"t":20},"233955":{"s":"started","p":1}}}`);
+        var json = JSON.parse(`{"version":${testVersion},"data":{"234191":{"s":"started","p":6,"t":20,"u":1731108082},"233955":{"s":"started","p":1,"u":1731108083},"259426":{"s":"completed","p":100,"u":1731108085}}}`);
         mock.mockImplementation(() => json);
 
     });
@@ -47,6 +53,43 @@ describe('contentProgressDataContext', function () {
         expect(result[120402]).toBe("");
     });
 
+    test('getAllStarted', async () => {
+        let result = await getAllStarted();
+        expect(result).toStrictEqual([233955, 234191]);
+
+        result = await getAllStarted(1);
+        expect(result).toStrictEqual([233955]);
+    });
+
+    // test('getAllStartedWithUpdate', async () => {
+    //     let mock2 = jest.spyOn(railContentModule, 'postRecordWatchSession');
+    //     let serverVersion = 2;
+    //     mock2.mockImplementation(() => JSON.parse(`{"version": ${serverVersion}}`));
+    //     let result = await getAllStarted();
+    //     expect(result).toStrictEqual([233955, 234191]);
+    //     await recordWatchSession(111111, "video", "vimeo", 100, 50, 50);
+    //
+    //     let result2 = await getAllStarted();
+    //     expect(result2).toStrictEqual([111111, 233955, 234191]);
+    // });
+
+    test('getAllCompleted', async () => {
+        let result = await getAllCompleted();
+        expect(result).toStrictEqual([259426]);
+    });
+
+    // test('getAllCompletedWithUpdate', async () => {
+    //     let mock2 = jest.spyOn(railContentModule, 'postContentCompleted');
+    //     let serverVersion = 2;
+    //     mock2.mockImplementation(() => JSON.parse(`{"version": ${serverVersion}}`));
+    //
+    //     let result = await getAllCompleted();
+    //     expect(result).toStrictEqual([259426]);
+    //     await contentStatusCompleted(111111);
+    //     let result2 = await getAllCompleted();
+    //     expect(result2).toStrictEqual([111111, 259426]);
+    // });
+
     test('progressBubbling', async () => {
         let mock2 = jest.spyOn(railContentModule, 'postRecordWatchSession');
         let serverVersion = 2;