musora-content-services 1.0.156 → 1.0.158

package/src/services/userPermissions.js

@@ -0,0 +1,26 @@
+import {
+    fetchUserPermissionsData
+} from "./railcontent";
+import {setLastUpdatedTime, wasLastUpdateOlderThanXSeconds} from "./lastUpdated";
+
+/**
+ * Exported functions that are excluded from index generation.
+ *
+ * @type {string[]}
+ */
+const excludeFromGeneratedIndex = [];
+let userPermissionsPromise = null;
+let lastUpdatedKey = `userPermissions_lastUpdated`;
+
+export async function fetchUserPermissions() {
+    if (!userPermissionsPromise || wasLastUpdateOlderThanXSeconds(10, lastUpdatedKey)) {
+        userPermissionsPromise = fetchUserPermissionsData();
+        setLastUpdatedTime(lastUpdatedKey);
+    }
+
+    return await userPermissionsPromise;
+}
+
+export async function reset() {
+    userPermissionsPromise = null;
+}

package/test/contentLikes.test.js

@@ -1,6 +1,5 @@
 import {isContentLiked, dataContext, likeContent, unlikeContent} from "../src/services/contentLikes";
-import {LocalStorageMock} from "./localStorageMock";
-import {initializeService} from "../src";
+import {initializeTestService} from "./initializeTests";
 
 const railContentModule = require('../src/services/railcontent.js')
 
@@ -9,7 +8,7 @@ describe('contentLikesDataContext', function () {
     const testVersion = 1;
 
     beforeEach(() => {
-        initializeService({localStorage: new LocalStorageMock()});
+        initializeTestService();
         mock = jest.spyOn(dataContext, 'fetchData');
         var json = JSON.parse(`{"version":${testVersion},"data":[308516,308515,308514,308518]}`);
         mock.mockImplementation(() => json);

package/test/contentProgress.test.js

@@ -4,7 +4,7 @@ import {
     recordWatchSession,
     getProgressPercentageByIds, getProgressState, getProgressStateByIds
 } from "../src/services/contentProgress";
-import {initializeTestService} from "./sanityQueryService.test";
+import {initializeTestService} from "./initializeTests";
 
 const railContentModule = require('../src/services/railcontent.js')
 
@@ -53,17 +53,17 @@ describe('contentProgressDataContext', function () {
         mock2.mockImplementation(() => JSON.parse(`{"version": ${serverVersion}}`));
         let progress = await getProgressPercentage(241250); //force load context
 
-        let result = await recordWatchSession({watchPositionSeconds: 50, totalDurationSeconds: 100, contentId: 241250});
+        await recordWatchSession(241250, "video", "vimeo", 100, 50, 50);
         serverVersion++;
-        await recordWatchSession({watchPositionSeconds: 50, totalDurationSeconds: 100, contentId: 241251});
+        await recordWatchSession(241251, "video", "vimeo", 100, 50, 50);
         serverVersion++;
-        await recordWatchSession({watchPositionSeconds: 50, totalDurationSeconds: 100, contentId: 241252});
+        await recordWatchSession(241252, "video", "vimeo", 100, 50, 50);
         serverVersion++;
-        await recordWatchSession({watchPositionSeconds: 100, totalDurationSeconds: 100, contentId: 241260});
+        await recordWatchSession(241260, "video", "vimeo", 100, 100, 100);
         serverVersion++;
-        await recordWatchSession({watchPositionSeconds: 100, totalDurationSeconds: 100, contentId: 241261});
+        await recordWatchSession(241261, "video", "vimeo", 100, 100, 100);
         serverVersion++;
-        progress = await getProgressPercentage(241250); //force load context
+        progress = await getProgressPercentage(241250);
 
         expect(progress).toBe(50);
         let progress241249 = await getProgressPercentage(241249);

package/test/initializeTests.js

@@ -0,0 +1,23 @@
+import {initializeService} from '../src';
+import {LocalStorageMock} from "./localStorageMock";
+const railContentModule = require('../src/services/railcontent.js')
+
+export function initializeTestService() {
+    const config = {
+        sanityConfig: {
+            token: process.env.SANITY_API_TOKEN,
+            projectId: process.env.SANITY_PROJECT_ID,
+            dataset: process.env.SANITY_DATASET,
+            useCachedAPI: process.env.SANITY_USE_CACHED_API === 'true' || true,
+            version: '2021-06-07',
+            debug: process.env.DEBUG === 'true' || false,
+            useDummyRailContentMethods: true,
+        },
+        localStorage: new LocalStorageMock()
+    };
+    initializeService(config);
+
+    let mock = jest.spyOn(railContentModule, 'fetchUserPermissionsData');
+    let testData = {"permissions": [78, 91, 92], "isAdmin": false};
+    mock.mockImplementation(() => testData);
+}

package/test/lastUpdated.test.js

@@ -0,0 +1,22 @@
+const {setLastUpdatedTime, wasLastUpdateOlderThanXSeconds} = require("../src/services/lastUpdated");
+const {initializeTestService} = require("./initializeTests");
+
+describe('lastUpdated', function () {
+
+    beforeEach(() => {
+        initializeTestService();
+    });
+
+    test('lastUpdated', async () => {
+        setLastUpdatedTime("testKey");
+        let test1 = wasLastUpdateOlderThanXSeconds(1, "testKey");
+        await new Promise((r) => setTimeout(r, 800));
+        let test2 = wasLastUpdateOlderThanXSeconds(1, "testKey");
+        await new Promise((r) => setTimeout(r, 500));
+        let test3 = wasLastUpdateOlderThanXSeconds(1, "testKey");
+
+        expect(test1).toEqual(false);
+        expect(test2).toEqual(false);
+        expect(test3).toEqual(true);
+    });
+});

package/test/sanityQueryService.test.js

@@ -1,8 +1,7 @@
-import {initializeService} from '../src/services/config.js';
 import {getFieldsForContentType} from "../src/contentTypeConfig";
 import {fetchSanity} from "../src/services/sanity";
 import {log} from './log.js';
-import {LocalStorageMock} from "./localStorageMock";
+import {initializeTestService} from "./initializeTests";
 
 const {
     fetchSongById,
@@ -50,22 +49,6 @@ const {
     processMetadata,
 } = require('../src/contentMetaData.js');
 
-export function initializeTestService(){
-    const config = {
-        sanityConfig: {
-            token: process.env.SANITY_API_TOKEN,
-            projectId: process.env.SANITY_PROJECT_ID,
-            dataset: process.env.SANITY_DATASET,
-            useCachedAPI: process.env.SANITY_USE_CACHED_API === 'true' || true,
-            version: '2021-06-07',
-            debug: process.env.DEBUG === 'true' || false,
-            useDummyRailContentMethods: true,
-        },
-        localStorage:  new LocalStorageMock()
-    };
-    initializeService(config);
-}
-
 describe('Sanity Queries', function () {
     beforeEach(() => {
         initializeTestService();
@@ -295,7 +278,7 @@ describe('Sanity Queries', function () {
         expect(relatedLessons.some(
             lesson => lessonIds.includes(lesson.id)
         )).toBe(true);
-    },10000);
+    }, 10000);
 
     test('fetchChildren', async () => {
         // complement test to fetchParentByRailContentId
@@ -404,7 +387,7 @@ describe('Sanity Queries', function () {
         expect(response.entity.length).toBeGreaterThan(0);
     });
     test('fetchCoachLessons-WithTypeFilters', async () => {
-        const response = await fetchAllFilterOptions('drumeo',['type,course','type,live'], '','','coach-lessons','',[],31880);
+        const response = await fetchAllFilterOptions('drumeo', ['type,course', 'type,live'], '', '', 'coach-lessons', '', [], 31880);
         log(response);
         expect(response.meta.filterOptions.difficulty).toBeDefined();
         expect(response.meta.filterOptions.type).toBeDefined();
@@ -423,7 +406,7 @@ describe('Sanity Queries', function () {
     });
 
     test('fetchCoachLessons-IncludedFields', async () => {
-        const response = await fetchCoachLessons('drumeo',31880, {includedFields: ['genre,Pop/Rock','difficulty,Beginner']});
+        const response = await fetchCoachLessons('drumeo', 31880, {includedFields: ['genre,Pop/Rock', 'difficulty,Beginner']});
         log(response);
         expect(response.entity.length).toBeGreaterThan(0);
     });
@@ -526,7 +509,7 @@ describe('Sanity Queries', function () {
     });
 
     test('fetchMetadata-Coach-Lessons', async () => {
-        const response = await fetchMetadata('drumeo','coach-lessons');
+        const response = await fetchMetadata('drumeo', 'coach-lessons');
         log(response);
         expect(response).toBeDefined();
     });
@@ -586,23 +569,27 @@ describe('Sanity Queries', function () {
         expect(hierarchy.parents[241249]).toBe(241248);
         expect(hierarchy.parents[241248]).toBe(241247);
         expect(hierarchy.children[241250]).toStrictEqual([]);
-        expect(hierarchy.children[243085]).toStrictEqual([ 243170, 243171, 243172, 243174, 243176 ]);
+        expect(hierarchy.children[243085]).toStrictEqual([243170, 243171, 243172, 243174, 243176]);
     });
 
 });
 
 describe('Filter Builder', function () {
 
+    beforeEach(() => {
+        initializeTestService();
+    });
+
     test('baseConstructor', async () => {
         const filter = 'railcontent_id = 111'
-        let builder = new FilterBuilder(filter);
-        let finalFilter = builder.buildFilter(filter);
+        let builder = new FilterBuilder(filter, {bypassPermissions: true});
+        let finalFilter = await builder.buildFilter(filter);
         let clauses = spliceFilterForAnds(finalFilter);
         expect(clauses[0].phrase).toBe(filter);
         expect(clauses[1].field).toBe('published_on');
 
-        builder = new FilterBuilder();
-        finalFilter = builder.buildFilter(filter);
+        builder = new FilterBuilder('', {bypassPermissions: true});
+        finalFilter = await builder.buildFilter(filter);
         clauses = spliceFilterForAnds(finalFilter);
         expect(clauses[0].field).toBe('published_on');
         expect(clauses[0].operator).toBe('<=');
@@ -610,8 +597,8 @@ describe('Filter Builder', function () {
 
     test('withOnlyFilterAvailableStatuses', async () => {
         const filter = 'railcontent_id = 111'
-        const builder = FilterBuilder.withOnlyFilterAvailableStatuses(filter, ['published', 'unlisted']);
-        const finalFilter = builder.buildFilter();
+        const builder = FilterBuilder.withOnlyFilterAvailableStatuses(filter, ['published', 'unlisted'], true);
+        const finalFilter = await builder.buildFilter();
         const clauses = spliceFilterForAnds(finalFilter);
         expect(clauses[0].phrase).toBe(filter);
         expect(clauses[1].field).toBe('status');
@@ -627,7 +614,7 @@ describe('Filter Builder', function () {
             availableContentStatuses: ['published', 'unlisted', 'scheduled'],
             getFutureScheduledContentsOnly: true
         });
-        const finalFilter = builder.buildFilter();
+        const finalFilter = await builder.buildFilter();
         const clauses = spliceFilterForAnds(finalFilter);
         expect(clauses[0].phrase).toBe(filter);
         expect(clauses[1].field).toBe('(status'); // extra ( because it's a multi part filter
@@ -642,27 +629,18 @@ describe('Filter Builder', function () {
 
     test('withUserPermissions', async () => {
         const filter = 'railcontent_id = 111'
-        const builder = new FilterBuilder(filter,
-            {
-                user: {
-                    user: {},
-                    permissions: [91, 92],
-                }
-            });
-        const finalFilter = builder.buildFilter();
-        const expected = "references(*[_type == 'permission' && railcontent_id in [91,92]]._id)"
+        const builder = new FilterBuilder(filter);
+        const finalFilter = await builder.buildFilter();
+        const expected = "references(*[_type == 'permission' && railcontent_id in [78,91,92]]._id)"
         const isMatch = finalFilter.includes(expected);
         expect(isMatch).toBeTruthy();
     });
 
     test('withUserPermissionsForPlusUser', async () => {
         const filter = 'railcontent_id = 111'
-        const builder = new FilterBuilder(filter,
-            {
-                user: getPlusUser()
-            });
-        const finalFilter = builder.buildFilter();
-        const expected = "references(*[_type == 'permission' && railcontent_id in [91,92]]._id)"
+        const builder = new FilterBuilder(filter);
+        const finalFilter = await builder.buildFilter();
+        const expected = "references(*[_type == 'permission' && railcontent_id in [78,91,92]]._id)"
         const isMatch = finalFilter.includes(expected);
         expect(isMatch).toBeTruthy();
     });
@@ -671,11 +649,10 @@ describe('Filter Builder', function () {
         const filter = 'railcontent_id = 111'
         const builder = new FilterBuilder(filter,
             {
-                user: getPlusUser(),
                 bypassPermissions: true
             });
-        const finalFilter = builder.buildFilter();
-        const expected = "references(*[_type == 'permission' && railcontent_id in [91,92]]._id)"
+        const finalFilter = await builder.buildFilter();
+        const expected = "references(*[_type == 'permission' && railcontent_id in [78,91,92]]._id)"
         const isMatch = finalFilter.includes(expected);
         expect(isMatch).toBeFalsy();
         const clauses = spliceFilterForAnds(finalFilter);
@@ -689,11 +666,11 @@ describe('Filter Builder', function () {
 
         const filter = 'railcontent_id = 111'
         let builder = new FilterBuilder(filter, {
-            user: {},
             pullFutureContent: true,
+            bypassPermissions: true
         });
 
-        let finalFilter = builder.buildFilter();
+        let finalFilter = await builder.buildFilter();
         let clauses = spliceFilterForAnds(finalFilter);
         expect(clauses[0].phrase).toBe(filter);
 
@@ -705,22 +682,16 @@ describe('Filter Builder', function () {
 
         builder = new FilterBuilder(filter,
             {
-                user: {},
                 getFutureContentOnly: true,
+                bypassPermissions: true
             });
-        finalFilter = builder.buildFilter();
+        finalFilter = await builder.buildFilter();
         clauses = spliceFilterForAnds(finalFilter);
         expect(clauses[0].phrase).toBe(filter);
         expect(clauses[1].field).toBe('published_on');
         expect(clauses[1].operator).toBe('>=');
     });
 
-    function getPlusUser() {
-        return {
-            permissions: [91, 92],
-        }
-    }
-
     function spliceFilterForAnds(filter) {
         // this will not correctly split complex filters with && and || conditions.
         let phrases = filter.split(' && ');

package/test/userPermissions.test.js

@@ -0,0 +1,19 @@
+const {fetchUserPermissions} = require("../src/services/userPermissions");
+const {initializeTestService} = require("./initializeTests");
+
+describe('userPermissions', function () {
+    beforeEach(() => {
+       initializeTestService();
+    });
+
+    test('fetchUserPermissions', async () => {
+        let result = await fetchUserPermissions(); //fetch from server
+        let result2 = await fetchUserPermissions(); //fetch locally
+
+        //This breaks when running tests in parallel
+        //expect(railContentModule.fetchUserPermissionsData).toHaveBeenCalledTimes(1);
+        expect(result.permissions).toStrictEqual([78,91,92]);
+        expect(result.isAdmin).toStrictEqual(false);
+        expect(result).toBe(result2);
+    });
+});