musora-content-services 1.0.119 → 1.0.121

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.121](https://github.com/railroadmedia/musora-content-services/compare/v1.0.120...v1.0.121) (2024-10-01)
+
+### [1.0.120](https://github.com/railroadmedia/musora-content-services/compare/v1.0.119...v1.0.120) (2024-09-30)
+
 ### [1.0.119](https://github.com/railroadmedia/musora-content-services/compare/v1.0.118...v1.0.119) (2024-09-27)
 
 ### [1.0.118](https://github.com/railroadmedia/musora-content-services/compare/v1.0.117...v1.0.118) (2024-09-27)

package/package.json

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

package/src/contentTypeConfig.js

@@ -95,6 +95,11 @@ let contentTypeConfig = {
             '"instructors": instructor[]->name',
             '"header_image_url": thumbnail.asset->url',
             '"logo_image_url": logo_image_url.asset->url',
+            '"award": award.asset->url',
+            `"award_template": award_template[]{
+                streak_minimum,
+                "template" : template.asset->url,
+            }`,
         ]
     },
     'course': {

package/src/filterBuilder.js

@@ -22,7 +22,8 @@ export class FilterBuilder {
         this.getFutureContentOnly = getFutureContentOnly;
         this.getFutureScheduledContentsOnly = getFutureScheduledContentsOnly;
         this.filter = filter;
-        this.debug = process.env.DEBUG === 'true' || false;
+        // this.debug = process.env.DEBUG === 'true' || false;
+        this.debug = false;
     }
 
 

package/src/index.d.ts

@@ -5,6 +5,12 @@ import {
 	initializeService
 } from './services/config.js';
 
+import {
+	isContentLiked,
+	likeContent,
+	unlikeContent
+} from './services/contentLikes.js';
+
 import {
 	fetchAllCompletedStates,
 	fetchCompletedContent,
@@ -12,10 +18,9 @@ import {
 	fetchContentInProgress,
 	fetchContentPageUserData,
 	fetchHandler,
-	fetchLikeContent,
 	fetchSongsInProgress,
-	fetchUnlikeContent,
-	fetchUserContext,
+	fetchUserLikes,
+	fetchUserPermissions,
 	fetchVimeoData
 } from './services/railcontent.js';
 
@@ -65,19 +70,8 @@ import {
 	getSortOrder
 } from './services/sanity.js';
 
-import {
-	clearCache,
-	fetchContentData,
-	init,
-	likeContent,
-	testClearLocal,
-	unlikeContent,
-	version
-} from './services/userContext.js';
-
 declare module 'musora-content-services' {
 	export {
-		clearCache,
 		fetchAll,
 		fetchAllCompletedStates,
 		fetchAllFilterOptions,
@@ -94,7 +88,6 @@ declare module 'musora-content-services' {
 		fetchCoachLessons,
 		fetchCompletedContent,
 		fetchCompletedState,
-		fetchContentData,
 		fetchContentInProgress,
 		fetchContentPageUserData,
 		fetchCourseOverview,
@@ -102,7 +95,6 @@ declare module 'musora-content-services' {
 		fetchGenreLessons,
 		fetchHandler,
 		fetchLessonContent,
-		fetchLikeContent,
 		fetchLiveEvent,
 		fetchMetadata,
 		fetchMethod,
@@ -127,18 +119,16 @@ declare module 'musora-content-services' {
 		fetchSongCount,
 		fetchSongFilterOptions,
 		fetchSongsInProgress,
-		fetchUnlikeContent,
 		fetchUpcomingEvents,
-		fetchUserContext,
+		fetchUserLikes,
+		fetchUserPermissions,
 		fetchVimeoData,
 		fetchWorkouts,
 		getSortOrder,
 		globalConfig,
-		init,
 		initializeService,
+		isContentLiked,
 		likeContent,
-		testClearLocal,
 		unlikeContent,
-		version,
 	}
 }

package/src/index.js

@@ -5,6 +5,12 @@ import {
 	initializeService
 } from './services/config.js';
 
+import {
+	isContentLiked,
+	likeContent,
+	unlikeContent
+} from './services/contentLikes.js';
+
 import {
 	fetchAllCompletedStates,
 	fetchCompletedContent,
@@ -12,10 +18,9 @@ import {
 	fetchContentInProgress,
 	fetchContentPageUserData,
 	fetchHandler,
-	fetchLikeContent,
 	fetchSongsInProgress,
-	fetchUnlikeContent,
-	fetchUserContext,
+	fetchUserLikes,
+	fetchUserPermissions,
 	fetchVimeoData
 } from './services/railcontent.js';
 
@@ -65,18 +70,7 @@ import {
 	getSortOrder
 } from './services/sanity.js';
 
-import {
-	clearCache,
-	fetchContentData,
-	init,
-	likeContent,
-	testClearLocal,
-	unlikeContent,
-	version
-} from './services/userContext.js';
-
 export {
-	clearCache,
 	fetchAll,
 	fetchAllCompletedStates,
 	fetchAllFilterOptions,
@@ -93,7 +87,6 @@ export {
 	fetchCoachLessons,
 	fetchCompletedContent,
 	fetchCompletedState,
-	fetchContentData,
 	fetchContentInProgress,
 	fetchContentPageUserData,
 	fetchCourseOverview,
@@ -101,7 +94,6 @@ export {
 	fetchGenreLessons,
 	fetchHandler,
 	fetchLessonContent,
-	fetchLikeContent,
 	fetchLiveEvent,
 	fetchMetadata,
 	fetchMethod,
@@ -126,17 +118,15 @@ export {
 	fetchSongCount,
 	fetchSongFilterOptions,
 	fetchSongsInProgress,
-	fetchUnlikeContent,
 	fetchUpcomingEvents,
-	fetchUserContext,
+	fetchUserLikes,
+	fetchUserPermissions,
 	fetchVimeoData,
 	fetchWorkouts,
 	getSortOrder,
 	globalConfig,
-	init,
 	initializeService,
+	isContentLiked,
 	likeContent,
-	testClearLocal,
 	unlikeContent,
-	version,
 };

package/src/services/config.js

@@ -4,7 +4,8 @@
 
 let globalConfig = {
     sanityConfig: {},
-    railcontentConfig: {}
+    railcontentConfig: {},
+    localStorage: null
   };
   
 /**
@@ -24,6 +25,7 @@ let globalConfig = {
  * @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 {Object} config.localStorage - Cache to use for localStorage
 
  *
  * @example
@@ -41,12 +43,14 @@ let globalConfig = {
  *     token: 'your-user-api-token',
  *     userId: 'current-user-id',
  *     baseUrl: 'https://web-staging-one.musora.com'
- *   }
+ *   },
+ *   localStorage: localStorage
  * });
  */
 function initializeService(config) {
     globalConfig.sanityConfig = config.sanityConfig;
     globalConfig.railcontentConfig = config.railcontentConfig;
+    globalConfig.localStorage = config.localStorage;
 }
 
 // Export both the initialization function and the config object

package/src/services/contentLikes.js

@@ -0,0 +1,38 @@
+import {fetchUserLikes, postContentLiked, postContentUnliked} from "./railcontent";
+import {DataContext, ContentVersionKey} from "./dataContext";
+
+export let dataContext = new DataContext(ContentVersionKey, fetchUserLikes);
+
+export async function isContentLiked(contentId) {
+    let data = await dataContext.getData();
+    return data.includes(contentId);
+}
+
+export async function likeContent(contentId) {
+   await dataContext.update(
+        function (context) {
+            if (!context.data.includes(contentId)) {
+                context.data.push(contentId);
+            }
+        },
+        async function(){
+            return postContentLiked(contentId);
+        }
+    );
+}
+
+export async function unlikeContent(contentId) {
+    await dataContext.update(
+        function (context) {
+            if (context.data.includes(contentId)) {
+                const index = context.data.indexOf(contentId);
+                if (index > -1) { // only splice array when item is found
+                   context.data.splice(index, 1); // 2nd parameter means remove one item only
+                }
+            }
+        },
+        async function(){
+            return postContentUnliked(contentId);
+        }
+    );
+}

package/src/services/dataContext.js

@@ -0,0 +1,88 @@
+import {globalConfig} from "./config";
+
+//These constants need to match MWP UserDataVersionKeyEnum enum
+export const ContentVersionKey = 0;
+
+let cache = null;
+
+export class DataContext {
+    context = null;
+
+    constructor(dataVersionKey, fetchDataFunction) {
+        this.dataVersionKey = dataVersionKey;
+        this.fetchDataFunction = fetchDataFunction;
+        this.localStorageKey = `dataContext_${this.dataVersionKey}`;
+        this.localStorageLastUpdatedKey = `dataContext_${this.dataVersionKey}_lastUpdated`;
+    }
+
+    async getData() {
+        this.ensureLocalContextLoaded();
+        if (!this.context || this.shouldVerifyServerVerions()) {
+            let version = this.version();
+            let data = await this.fetchData(version);
+            if (data.version !== "No Change") {
+                this.context = data;
+                cache.setItem(this.localStorageKey, JSON.stringify(data));
+            }
+            cache.setItem(this.localStorageLastUpdatedKey, new Date().getTime());
+        }
+        return this.context.data;
+    }
+
+    async fetchData(version) {
+        return await this.fetchDataFunction(version);
+    }
+
+    ensureLocalContextLoaded() {
+        if (this.context) return;
+        this.verifyConfig();
+        let localData = cache.getItem(this.localStorageKey);
+        if (localData) {
+            this.context = JSON.parse(localData);
+        }
+    }
+
+    verifyConfig() {
+        if (!cache) {
+            cache = globalConfig.localStorage;
+            if (!cache) throw new Error('dataContext: LocalStorage cache not configured in musora content services initializeService.');
+        }
+    }
+
+    shouldVerifyServerVerions() {
+        let lastUpdated = cache.getItem(this.localStorageLastUpdatedKey);
+        if (!lastUpdated) return false;
+        const verifyServerTime = 10000; //10 s
+        return (new Date().getTime() - lastUpdated) > verifyServerTime;
+    }
+
+    clearCache() {
+        this.clearContext();
+        cache.removeItem(this.localStorageKey);
+        cache.removeItem(this.localStorageLastUpdatedKey);
+    }
+
+    clearContext() {
+        this.context = null;
+    }
+
+    async update(localUpdateFunction, serverUpdateFunction) {
+        this.ensureLocalContextLoaded();
+        if (this.context) {
+            localUpdateFunction(this.context);
+            this.context.version++;
+            let data = JSON.stringify(this.context);
+            cache.setItem(this.localStorageKey, data);
+            cache.setItem(this.localStorageLastUpdatedKey, new Date().getTime());
+        }
+        let response = await serverUpdateFunction();
+        if (response.version !== this.version()) {
+            this.clearCache();
+        }
+    }
+
+    version() {
+        return this.context?.version ?? -1;
+    }
+
+}

package/src/services/railcontent.js

@@ -2,7 +2,7 @@
  * @module Railcontent-Services
  */
 
-const { globalConfig } = require('./config');
+const {globalConfig} = require('./config');
 
 
 /**
@@ -24,10 +24,11 @@ export async function fetchCompletedState(content_id) {
     };
 
     try {
-        const response = await fetchAbsolute(url, { headers });
+        const response = await fetchAbsolute(url, {headers});
         const result = await response.json();
 
-        if (result && result[content_id]) {            return result[content_id];  // Return the correct object
+        if (result && result[content_id]) {
+            return result[content_id];  // Return the correct object
         } else {
             return null;  // Handle unexpected structure
         }
@@ -56,7 +57,7 @@ export async function fetchVimeoData(vimeo_id) {
     };
 
     try {
-        const response = await fetchAbsolute(url, { headers });
+        const response = await fetchAbsolute(url, {headers});
         const result = await response.json();
 
         if (result) {
@@ -91,9 +92,9 @@ export async function fetchAllCompletedStates(contentIds) {
     };
 
     try {
-        const response = await fetchAbsolute(url, { headers });
+        const response = await fetchAbsolute(url, {headers});
         const result = await response.json();
-        if(result){
+        if (result) {
             return result;
         } else {
             console.log('result not json');
@@ -123,9 +124,9 @@ export async function fetchSongsInProgress(brand) {
     };
 
     try {
-        const response = await fetchAbsolute(url, { headers });
+        const response = await fetchAbsolute(url, {headers});
         const result = await response.json();
-        if(result){
+        if (result) {
             //console.log('fetchSongsInProgress', result);
             return result;
         } else {
@@ -150,12 +151,12 @@ export async function fetchSongsInProgress(brand) {
  *   .then(songs => console.log(songs))
  *   .catch(error => console.error(error));
  */
-export async function fetchContentInProgress(type="all", brand, { page, limit } = {}) {
+export async function fetchContentInProgress(type = "all", brand, {page, limit} = {}) {
     let url;
     const limitString = limit ? `&limit=${limit}` : '';
     const pageString = page ? `&page=${page}` : '';
 
-    if(type === "all") {
+    if (type === "all") {
         url = `/content/in_progress/${globalConfig.railcontentConfig.userId}?brand=${brand}${limitString}${pageString}`;
     } else {
         url = `/content/in_progress/${globalConfig.railcontentConfig.userId}?content_type=${type}&brand=${brand}${limitString}${pageString}`;
@@ -165,9 +166,9 @@ export async function fetchContentInProgress(type="all", brand, { page, limit }
         'X-CSRF-TOKEN': globalConfig.railcontentConfig.token
     };
     try {
-        const response = await fetchAbsolute(url, { headers });
+        const response = await fetchAbsolute(url, {headers});
         const result = await response.json();
-        if(result){
+        if (result) {
             //console.log('contentInProgress', result);
             return result;
         } else {
@@ -192,12 +193,12 @@ export async function fetchContentInProgress(type="all", brand, { page, limit }
  *   .then(songs => console.log(songs))
  *   .catch(error => console.error(error));
  */
-export async function fetchCompletedContent(type="all", brand, { page, limit } = {}) {
+export async function fetchCompletedContent(type = "all", brand, {page, limit} = {}) {
     let url;
     const limitString = limit ? `&limit=${limit}` : '';
     const pageString = page ? `&page=${page}` : '';
 
-    if(type === "all") {
+    if (type === "all") {
         url = `/content/completed/${globalConfig.railcontentConfig.userId}?brand=${brand}${limitString}${pageString}`;
     } else {
         url = `/content/completed/${globalConfig.railcontentConfig.userId}?content_type=${type}&brand=${brand}${limitString}${pageString}`;
@@ -207,9 +208,9 @@ export async function fetchCompletedContent(type="all", brand, { page, limit } =
         'X-CSRF-TOKEN': globalConfig.railcontentConfig.token
     };
     try {
-        const response = await fetchAbsolute(url, { headers });
+        const response = await fetchAbsolute(url, {headers});
         const result = await response.json();
-        if(result){
+        if (result) {
             //console.log('completed content', result);
             return result;
         } else {
@@ -239,32 +240,11 @@ export async function fetchContentPageUserData(contentId) {
         'X-CSRF-TOKEN': globalConfig.railcontentConfig.token
     };
 
-    try {
-        const response = await fetchAbsolute(url, { headers });
-        const result = await response.json();
-        if(result){
-            console.log('fetchContentPageUserData', result);
-            return result;
-        } else {
-            console.log('result not json');
-        }
-    } catch (error) {
-        console.error('Fetch error:', error);
-        return null;
-    }
-}
-
-export async function fetchUserContext() {
-    let url = `/content/user_data_all`;
-    const headers = {
-        'Content-Type': 'application/json',
-        'X-CSRF-TOKEN': globalConfig.railcontentConfig.token
-    };
     try {
         const response = await fetchAbsolute(url, {headers});
         const result = await response.json();
         if (result) {
-            console.log('fetchUserContext', result);
+            console.log('fetchContentPageUserData', result);
             return result;
         } else {
             console.log('result not json');
@@ -287,11 +267,16 @@ export async function fetchUserPermissions() {
     return fetchHandler(url, 'get') ?? [];
 }
 
-export async function fetchHandler(url, method = "get") {
-    const headers = {
+async function fetchDataHandler(url, dataVersion, method = "get") {
+    return fetchHandler(url, method, dataVersion);
+}
+
+export async function fetchHandler(url, method = "get", dataVersion = null) {
+    let headers = {
         'Content-Type': 'application/json',
-        'X-CSRF-TOKEN': globalConfig.railcontentConfig.token
+        'X-CSRF-TOKEN': globalConfig.railcontentConfig.token,
     };
+    if (dataVersion) headers['Data-Version'] = dataVersion;
     try {
         const response = await fetchAbsolute(url, {method, headers});
         const result = await response.json();
@@ -306,18 +291,23 @@ export async function fetchHandler(url, method = "get") {
     return null;
 }
 
-export async function fetchLikeContent(contentId) {
-    let url = `/content/${contentId}/like`;
+export async function fetchUserLikes(currentVersion) {
+    let url = `/content/user/likes/all`;
+    return fetchDataHandler(url, currentVersion);
+}
+
+export async function postContentLiked(contentId) {
+    let url = `/content/user/likes/like/${contentId}`;
     return await fetchHandler(url, "post");
 }
 
-export async function fetchUnlikeContent(contentId) {
-    let url = `/content/${contentId}/unlike`;
+export async function postContentUnliked(contentId) {
+    let url = `/content/user/likes/unlike/${contentId}`;
     return await fetchHandler(url, "post");
 }
 
 function fetchAbsolute(url, params) {
-    if(globalConfig.railcontentConfig.baseUrl) {
+    if (globalConfig.railcontentConfig.baseUrl) {
         if (url.startsWith('/')) {
             return fetch(globalConfig.railcontentConfig.baseUrl + url, params)
         }

package/src/services/sanity.js

@@ -873,7 +873,7 @@ export async function fetchLessonContent(railContentId) {
           "thumbnail_url":thumbnail.asset->url, 
           "url": web_url_path, 
           soundslice_slug,
-          description,
+          "description": description[0].children[0].text,
           "chapters": chapter[]{
             chapter_description,
             chapter_timecode,
@@ -889,6 +889,7 @@ export async function fetchLessonContent(railContentId) {
             "id":_id,
             name,
             short_bio,
+            "biography": short_bio[0].children[0].text, 
             web_url_path,
             "coach_card_image": coach_card_image.asset->url,
           },
@@ -1072,6 +1073,8 @@ export async function fetchChallengeOverview(id) {
       difficulty_string,
       difficulty,
       "type": _type,
+      is_always_unlocked,
+      is_bonus_content,
     }
   } [0...1]`;
   return fetchSanity(query, false);

package/test/contentLikes.test.js

@@ -0,0 +1,86 @@
+import {isContentLiked, dataContext, likeContent, unlikeContent} from "../src/services/contentLikes";
+import {LocalStorageMock} from "./localStorageMock";
+import {initializeService} from "../src";
+
+const railContentModule = require('../src/services/railcontent.js')
+
+describe('commentLikesDataContext', function () {
+    let mock = null;
+    const testVersion = 1;
+
+    beforeEach(() => {
+        initializeService({localStorage: new LocalStorageMock()});
+        mock = jest.spyOn(dataContext, 'fetchData');
+        var json = JSON.parse(`{"version":${testVersion},"data":[308516,308515,308514,308518]}`);
+        mock.mockImplementation(() => json);
+    });
+
+    test('contentLiked', async () => {
+        let result = await isContentLiked(308516);
+        expect(result).toBe(true);
+    });
+
+    test('contentNotLiked', async () => {
+        let result = await isContentLiked(121111);
+        expect(result).toBe(false);
+    });
+
+    test('ensureOnlyOneServerFetchRequest', async () => {
+        dataContext.clearCache();
+        await isContentLiked(308516);
+        await isContentLiked(308514);
+        await isContentLiked(121111);
+        expect(dataContext.fetchData).toHaveBeenCalledTimes(1);
+    });
+
+    test('ensureDataPulledFromLocalCache', async () => {
+        dataContext.clearCache();
+        await isContentLiked(308516);
+        dataContext.clearContext();
+        await isContentLiked(308514);
+        expect(dataContext.fetchData).toHaveBeenCalledTimes(1);
+    });
+
+    test('likeContent', async () => {
+        mock = jest.spyOn(railContentModule, 'postContentLiked');
+        var json = JSON.parse(`{"version":${testVersion + 1}}`);
+        mock.mockImplementation(() => json);
+
+        dataContext.clearCache();
+        let isLiked = await isContentLiked(111111);
+        expect(isLiked).toBe(false);
+
+        await likeContent(111111);
+        isLiked = await isContentLiked(111111);
+        expect(isLiked).toBe(true);
+
+        dataContext.clearContext();
+        isLiked = await isContentLiked(111111);
+        expect(isLiked).toBe(true);
+
+        expect(dataContext.version()).toBe(testVersion + 1);
+    });
+
+
+    test('unlikeContent', async () => {
+        mock = jest.spyOn(railContentModule, 'postContentUnliked');
+        var json = JSON.parse(`{"version":${testVersion + 1}}`);
+        mock.mockImplementation(() => json);
+
+        dataContext.clearCache();
+        let isLiked = await isContentLiked(308516);
+        expect(isLiked).toBe(true);
+
+        await unlikeContent(308516);
+        console.log(dataContext.context);
+        isLiked = await isContentLiked(308516);
+        expect(isLiked).toBe(false);
+
+        dataContext.clearContext();
+        isLiked = await isContentLiked(308516);
+        expect(isLiked).toBe(false);
+
+        expect(dataContext.version()).toBe(testVersion + 1);
+    });
+
+});

package/test/sanityQueryService.test.js

@@ -433,6 +433,16 @@ describe('Sanity Queries', function () {
         expect(response.tabs.length).toBeGreaterThan(0);
     });
 
+    test('fetchChallengesV2Fields', async () => {
+        const id = 402197;
+        const response = await fetchChallengeOverview(id);
+        log(response);
+        expect(response.award).toBeDefined();
+        expect(response.award_template).toBeDefined();
+        expect(response.lessons[0].is_always_unlocked).toBeDefined();
+        expect(response.lessons[0].is_bonus_content).toBeDefined();
+    });
+
 });
 
 describe('Filter Builder', function () {
@@ -618,6 +628,7 @@ describe('Filter Builder', function () {
     });
 });
 
+
 describe('MetaData', function () {
 
     test('customBrandTypeExists', async () => {

package/src/services/userContext.js

@@ -1,105 +0,0 @@
-import {fetchUserContext, fetchLikeContent, fetchUnlikeContent} from "./railcontent";
-
-const StorageKey = "userContext";
-let userContext = null;
-let cache = null;
-
-export function init(localCache) {
-    cache = localCache;
-}
-
-export function version() {
-    ensureLocalContextLoaded();
-    return userContext.version;
-}
-
-async function getUserContext() {
-    ensureLocalContextLoaded();
-    if (userContext) {
-        verifyContextIsValid();
-    }
-    if (!userContext) {
-        await fetchFromServer();
-    }
-    return userContext;
-}
-
-function verifyContextIsValid() {
-
-}
-
-function ensureLocalContextLoaded() {
-    if (userContext) return;
-    let localData = cache.getItem(StorageKey);
-    if (localData) {
-        userContext = JSON.parse(localData);
-    }
-}
-
-function updateLocalContext(contentId, updateFunction) {
-    ensureLocalContextLoaded();
-    if (userContext) {
-        let contentData = userContext.data[contentId] ?? [];
-        updateFunction(contentData);
-        userContext.data[contentId] = contentData;
-        userContext.version++;
-        let data = JSON.stringify(userContext);
-        cache.setItem(StorageKey, data);
-    }
-}
-
-async function fetchFromServer() {
-    let data = await fetchUserContext();
-    userContext = JSON.parse(data);
-    cache.setItem(StorageKey, data);
-}
-
-
-function transformData(data, contentId) {
-    let transformed = [];
-    transformed["contentId"] = contentId;
-    transformed["liked"] = (data && data.l) ?? 0;
-    return transformed;
-}
-
-export async function fetchContentData(contentId) {
-    let userContext = await getUserContext();
-    let data = userContext.data[contentId];
-    data = transformData(data, contentId);
-    return data;
-}
-
-export function clearCache() {
-    userContext = null;
-    cache.setItem(StorageKey, null);
-}
-
-export function testClearLocal() {
-    userContext = null;
-}
-
-export async function likeContent(contentId) {
-    updateLocalContext(contentId,
-        function (contentData) {
-            contentData.l = 1;
-        }
-    );
-
-    let result = await fetchLikeContent(contentId);
-    if (result.version !== userContext.version) {
-        clearCache();
-    }
-}
-
-export async function unlikeContent(contentId) {
-    updateLocalContext(contentId,
-        function (contentData) {
-            contentData.l = 0;
-        }
-    );
-
-    let result = await fetchUnlikeContent(contentId);
-    if (result.version !== userContext.version) {
-        clearCache();
-    }
-}

package/test/userContext.test.js

@@ -1,86 +0,0 @@
-const railContentModule = require('../src/services/railcontent.js')
-const userContextModule = require('../src/services/userContext.js');
-import {LocalStorageMock} from "./localStorageMock";
-
-describe('userContext', function () {
-    let mock = null;
-    const testVersion = 1;
-    beforeEach(() => {
-        userContextModule.init(new LocalStorageMock());
-        mock = jest.spyOn(railContentModule, 'fetchUserContext');
-        var json = `{"version":${testVersion},"data":{"308516":{"l":1},"308515":{"p":100},"308514":{"p":13},"308518":{"p":100}}}`;
-        mock.mockImplementation(() => json);
-    });
-
-    test('contentLiked', async () => {
-        let contentData = await userContextModule.fetchContentData(308516);
-        expect(contentData.liked).toBe(1);
-    });
-
-    test('contentDoesNotExist', async () => {
-        //fetch content that does not exist
-        let contentData = await userContextModule.fetchContentData(121111);
-        expect(contentData.liked).toBe(0);
-    });
-
-    test('ensureOnlyOneServerFetchRequest', async () => {
-        userContextModule.clearCache();
-        await userContextModule.fetchContentData(308516);
-        await userContextModule.fetchContentData(308514);
-        expect(railContentModule.fetchUserContext).toHaveBeenCalledTimes(1);
-    });
-
-    test('ensureDataPulledFromLocalCache', async () => {
-        userContextModule.clearCache();
-        await userContextModule.fetchContentData(308516);
-        userContextModule.testClearLocal();
-        await userContextModule.fetchContentData(308514);
-        expect(railContentModule.fetchUserContext).toHaveBeenCalledTimes(1);
-    });
-
-    // test('hashExpiration', async () => {
-    //     userContextModule.clearCache();
-    //     await userContextModule.fetchContentData(testHash308516);
-    //     let newHash = "8g9qg5wn3e5s5oi69q6g22et9w6g34t5";
-    //     await userContextModule.fetchContentData(newHash, 308516);
-    //     expect(railContentModule.fetchUserContext).toHaveBeenCalledTimes(2);
-    // });
-
-    test('likeContent', async () => {
-        mock = jest.spyOn(railContentModule, 'fetchLikeContent');
-        var json = JSON.parse(`{"version":${testVersion + 1}}`);
-        mock.mockImplementation(() => json);
-
-        userContextModule.clearCache();
-        await userContextModule.fetchContentData(308515);
-        await userContextModule.likeContent(308515);
-        let contentData = await userContextModule.fetchContentData(308515);
-        expect(contentData.liked).toBe(1);
-
-        userContextModule.testClearLocal();
-        contentData = await userContextModule.fetchContentData(308515);
-        expect(contentData.liked).toBe(1);
-
-        expect(userContextModule.version()).toBe(testVersion + 1);
-    });
-
-
-    test('unlikeContent', async () => {
-        mock = jest.spyOn(railContentModule, 'fetchUnlikeContent');
-        var json = JSON.parse(`{"version":${testVersion + 1}}`);
-        mock.mockImplementation(() => json);
-
-        userContextModule.clearCache();
-        await userContextModule.fetchContentData(308516);
-        await userContextModule.unlikeContent(308516);
-        let contentData = await userContextModule.fetchContentData(308516);
-        expect(contentData.liked).toBe(0);
-
-        userContextModule.testClearLocal();
-        contentData = await userContextModule.fetchContentData(308516);
-        expect(contentData.liked).toBe(0);
-
-        expect(userContextModule.version()).toBe(testVersion + 1);
-    });
-
-});