musora-content-services 1.0.163 → 1.0.165

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

package/jest.config.js

@@ -92,7 +92,7 @@ const config = {
   // moduleNameMapper: {},
 
   // An array of regexp pattern strings, matched against all module paths before considered 'visible' to the module loader
-  // modulePathIgnorePatterns: [],
+   modulePathIgnorePatterns: ["<rootDir>/test/live"],
 
   // Activates notifications for test results
   // notify: false,

package/package.json

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

package/src/services/config.js

@@ -32,7 +32,8 @@ const excludeFromGeneratedIndex = [];
  * @param {Object} config.railcontentConfig - Configuration for user services.
  * @param {string} config.railcontentConfig.token - The token for authenticating user-specific requests.
  * @param {string} config.railcontentConfig.userId - The user ID for fetching user-specific data.
- * @param {string} config.railcontentConfig.baseUrl - The url for the enviroment.
+ * @param {string} config.railcontentConfig.baseUrl - The url for the environment.
+ * @param {string} config.railcontentConfig.authToken - The bearer authorization token.
  * @param {Object} config.localStorage - Cache to use for localStorage
  * @param {boolean} config.isMA - Variable that tells if the library is used by MA or FEW
 

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,23 +43,41 @@ export async function getProgressStateByIds(contentIds) {
     return progress;
 }
 
-export async function getAllStarted() {
+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() {
+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;
 }
 
@@ -70,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 () {
@@ -80,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] ?? [];
@@ -95,7 +114,7 @@ function completeStatusInLocalContext(contentId, localContext, hierarchy) {
 export async function contentStatusReset(contentId) {
     await dataContext.update(
         function (localContext) {
-            const index = Object.keys(localContext.data).indexOf(contentId);
+            const index = Object.keys(localContext.data).indexOf(contentId.toString());
             if (index > -1) { // only splice array when item is found
                 delete localContext.data[contentId];
             }
@@ -125,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;
 
@@ -137,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);
@@ -175,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/src/services/railcontent.js

@@ -256,6 +256,9 @@ export async function fetchHandler(url, method = "get", dataVersion = null, body
         'Content-Type': 'application/json',
         'X-CSRF-TOKEN': globalConfig.railcontentConfig.token,
     };
+    if (globalConfig.railcontentConfig.authToken) {
+        headers['Authorization'] = `Bearer ${globalConfig.railcontentConfig.authToken}`;
+    }
     if (dataVersion) headers['Data-Version'] = dataVersion;
     const options = {
         method,
@@ -269,7 +272,7 @@ export async function fetchHandler(url, method = "get", dataVersion = null, body
         if (response.ok) {
             return await response.json();
         } else {
-            console.log('fetch error:', response.status);
+            console.error(`Fetch error: ${method} ${url} ${response.status} ${response.statusText}`);
             console.log(response);
         }
     } catch (error) {
@@ -826,13 +829,13 @@ export async function fetchPlaylistItem(payload) {
 }
 
 export async function postContentCompleted(contentId) {
-    let url = `/content/${contentId}/completed`;
-    return postDataHandler(url);
+    let url = `/content/user/progress/complete`;
+    return postDataHandler(url, {"contentId": contentId});
 }
 
 export async function postContentReset(contentId) {
-    let url = `/content/${contentId}/reset`;
-    return postDataHandler(url);
+    let url = `/content/user/progress/reset`;
+    return postDataHandler(url, {"contentId": contentId});
 }
 
 /**
@@ -918,4 +921,4 @@ function fetchAbsolute(url, params) {
         }
     }
     return fetch(url, params);
-}
+}

package/test/contentProgress.test.js

@@ -2,9 +2,15 @@ import {
     getProgressPercentage,
     dataContext,
     recordWatchSession,
-    getProgressPercentageByIds, getProgressState, getProgressStateByIds, getAllStarted, getAllCompleted
+    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,9 +21,8 @@ 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},"259426":{"s":"completed","p":100}}}`);
+        var json = JSON.parse(`{"version":${testVersion},"config":{"key":1,"enabled":1,"checkInterval":1,"refreshInterval":2},"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);
-
     });
 
     test('getProgressPercentage', async () => {
@@ -49,15 +54,41 @@ describe('contentProgressDataContext', function () {
 
     test('getAllStarted', async () => {
         let result = await getAllStarted();
-        expect(result).toContain(234191);
-        expect(result).toContain(233955);
+        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).toContain(259426);
+        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;

package/test/initializeTests.js

@@ -1,8 +1,16 @@
-import {initializeService} from '../src';
+import {globalConfig, initializeService} from '../src';
 import {LocalStorageMock} from "./localStorageMock";
+
 const railContentModule = require('../src/services/railcontent.js')
+let token = null;
+let userId = null;
 
-export function initializeTestService() {
+export async function initializeTestService(useLive = false) {
+    if (useLive && !token && process.env.RAILCONTENT_BASE_URL) {
+        let data = await fetchLoginToken(process.env.RAILCONTENT_EMAIL, process.env.RAILCONTENT_PASSWORD);
+        token = data['token'];
+        userId = data['userId'];
+    }
     const config = {
         sanityConfig: {
             token: process.env.SANITY_API_TOKEN,
@@ -13,6 +21,11 @@ export function initializeTestService() {
             debug: process.env.DEBUG === 'true' || false,
             useDummyRailContentMethods: true,
         },
+        railcontentConfig: {
+            baseUrl: process.env.RAILCONTENT_BASE_URL,
+            userId: userId,
+            authToken: token,
+        },
         localStorage: new LocalStorageMock()
     };
     initializeService(config);
@@ -20,4 +33,28 @@ export function initializeTestService() {
     let mock = jest.spyOn(railContentModule, 'fetchUserPermissionsData');
     let testData = {"permissions": [78, 91, 92], "isAdmin": false};
     mock.mockImplementation(() => testData);
+}
+
+async function fetchLoginToken(email, password) {
+    try {
+        const url = `${process.env.RAILCONTENT_BASE_URL}/user-management-system/login/token`;
+        const response = await fetch(url, {
+            method: 'POST',
+            headers: {
+                'Accept': 'application/json',
+                'Content-Type': 'application/json'
+            },
+            body: JSON.stringify({"email": email, "password": password, "device_name": "test"})
+        });
+        if (response.ok) {
+            let data = await response.json();
+            return {token: data.token, userId: data.user.id};
+        } else {
+            console.log('fetch error:', response.status);
+            console.log(response);
+        }
+    } catch (error) {
+        console.error('Fetch error:', error);
+    }
+    return null;
 }

package/test/live/contentProgressLive.test.js

@@ -0,0 +1,112 @@
+import {
+    recordWatchSession,
+    getProgressPercentage,
+    dataContext,
+    getProgressState, contentStatusCompleted, contentStatusReset
+} from "../../src/services/contentProgress";
+import {initializeTestService} from "../initializeTests";
+
+
+describe('contentProgressDataContextLocal', function () {
+    beforeEach(async () => {
+        await initializeTestService(true);
+    }, 1000000);
+
+    test('verifyProgressPercentage', async () => {
+        let contentId = 241250;
+        await contentStatusReset(contentId);
+
+        await recordWatchSession(contentId, "video", "vimeo", 100, 50, 50);
+
+        let result = await getProgressPercentage(contentId);
+        expect(result).toBe(50);
+        dataContext.clearCache();
+
+        result = await getProgressPercentage(contentId);
+        expect(result).toBe(50);
+    }, 100000);
+
+    test('verifyState', async () => {
+        let contentId = 241251;
+        await contentStatusReset(contentId);
+
+        let result = await getProgressState(contentId);
+        expect(result).toBe("");
+
+        await recordWatchSession(contentId, "video", "vimeo", 100, 50, 50);
+
+        result = await getProgressState(contentId);
+        expect(result).toBe("started");
+        dataContext.clearCache();
+
+        result = await getProgressState(contentId);
+        expect(result).toBe("started");
+    }, 100000);
+
+    test('verifyStateCompleted', async () => {
+        let contentId = 241252;
+        await contentStatusReset(contentId);
+
+        await contentStatusCompleted(241252);
+        let result = await getProgressState(241252);
+        expect(result).toBe("completed");
+
+        result = await getProgressState(contentId);
+        expect(result).toBe("completed");
+        dataContext.clearCache();
+
+        result = await getProgressState(contentId);
+        expect(result).toBe("completed");
+
+
+    }, 100000);
+
+    test('verifyStateReset', async () => {
+        let contentId = 241253;
+        await contentStatusReset(contentId);
+
+        await contentStatusCompleted(contentId);
+
+        let result = await getProgressState(contentId);
+        expect(result).toBe("completed");
+        await contentStatusReset(contentId);
+
+        result = await getProgressState(contentId);
+        expect(result).toBe("");
+        dataContext.clearCache();
+
+        result = await getProgressState(contentId);
+        expect(result).toBe("");
+    }, 100000);
+
+
+    //
+    // test('progressBubbling', async () => {
+    //     let serverVersion = 2;
+    //     let mock2 = jest.spyOn(railContentModule, 'postRecordWatchSession');
+    //     mock2.mockImplementation(() => JSON.parse(`{"version": ${serverVersion}}`));
+    //     let progress = await getProgressPercentage(241250); //force load context
+    //
+    //     await recordWatchSession(241250, "video", "vimeo", 100, 50, 50);
+    //     serverVersion++;
+    //     await recordWatchSession(241251, "video", "vimeo", 100, 50, 50);
+    //     serverVersion++;
+    //     await recordWatchSession(241252, "video", "vimeo", 100, 50, 50);
+    //     serverVersion++;
+    //     await recordWatchSession(241260, "video", "vimeo", 100, 100, 100);
+    //     serverVersion++;
+    //     await recordWatchSession(241261, "video", "vimeo", 100, 100, 100);
+    //     serverVersion++;
+    //     progress = await getProgressPercentage(241250);
+    //
+    //     expect(progress).toBe(50);
+    //     let progress241249 = await getProgressPercentage(241249);
+    //     expect(progress241249).toBe(15);
+    //     let progress241248 = await getProgressPercentage(241248);
+    //     expect(progress241248).toBe(7);
+    //     let progress241247 = await getProgressPercentage(241247);
+    //     expect(progress241247).toBe(1);
+    //
+    // }, 100000);
+
+});