musora-content-services 1.0.155 → 1.0.157

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.157](https://github.com/railroadmedia/musora-content-services/compare/v1.0.156...v1.0.157) (2024-11-08)
+
+### [1.0.156](https://github.com/railroadmedia/musora-content-services/compare/v1.0.155...v1.0.156) (2024-11-06)
+
 ### [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)

package/package.json

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

package/src/filterBuilder.js

@@ -1,3 +1,4 @@
+import {fetchUserPermissions} from "./services/userPermissions";
 
 
 export class FilterBuilder {
@@ -5,17 +6,15 @@ export class FilterBuilder {
     STATUS_SCHEDULED = 'scheduled';
 
     constructor(
-                filter = '',
-                {
-                    user = undefined,
-                    availableContentStatuses = [],
-                    bypassPermissions = false,
-                    pullFutureContent = false,
-                    getFutureContentOnly = false,
-                    getFutureScheduledContentsOnly = false,
-
-                }={}) {
-        this.user = user;
+        filter = '',
+        {
+            availableContentStatuses = [],
+            bypassPermissions = false,
+            pullFutureContent = false,
+            getFutureContentOnly = false,
+            getFutureScheduledContentsOnly = false,
+
+        } = {}) {
         this.availableContentStatuses = availableContentStatuses;
         this.bypassPermissions = bypassPermissions;
         this.pullFutureContent = pullFutureContent;
@@ -27,13 +26,15 @@ export class FilterBuilder {
     }
 
 
-    static withOnlyFilterAvailableStatuses(filter, availableContentStatuses) {
-        return new FilterBuilder(filter,{
-                                availableContentStatuses,
-                                });
+    static withOnlyFilterAvailableStatuses(filter, availableContentStatuses, bypassPermissions) {
+        return new FilterBuilder(filter, {
+            availableContentStatuses,
+            bypassPermissions,
+        });
     }
 
-    buildFilter() {
+    async buildFilter() {
+        this.userData = await fetchUserPermissions();
         if (this.debug) console.log('baseFilter', this.filter);
         const filter = this
             ._applyContentStatuses()
@@ -64,20 +65,15 @@ export class FilterBuilder {
     }
 
     _applyPermissions() {
-        if (this.bypassPermissions) return this;
-        // TODO these need to be pulled from the user and reference either ID, or railcontent_id
+        if (this.bypassPermissions || this.userData.isAdmin) return this;
         const requiredPermissions = this._getUserPermissions();
         if (requiredPermissions.length === 0) return this;
-        // handle pullSongsContent, I think the flagging on this needs to be backwards compared to BE
-        // if using id, switch railcontent_id to _id in the below query
         this._andWhere(`references(*[_type == 'permission' && railcontent_id in ${arrayToRawRepresentation(requiredPermissions)}]._id)`);
         return this;
-
     }
 
     _getUserPermissions() {
-        // TODO need user store up and running to complete this, until then just null check
-        return this?.user?.permissions ?? [];
+        return this.userData.permissions;
     }
 
     _applyPublishingDateRestrictions() {
@@ -88,7 +84,7 @@ export class FilterBuilder {
             this._andWhere(`published_on <= '${now}'`);
         } else {
             const date = new Date();
-            const theFuture =  new Date(date.setMonth(date.getMonth() + 18));
+            const theFuture = new Date(date.setMonth(date.getMonth() + 18));
             this._andWhere(`published_on <= '${theFuture}'`);
         }
         return this;
@@ -106,8 +102,8 @@ export class FilterBuilder {
 
     _trimAmpersands() {
         this.filter = this.filter.trim();
-        while( this.filter.charAt(0) === '&'  || this.filter.charAt(0) === ' ' ) this.filter = this.filter.substring(1);
-        while( this.filter.charAt(this.filter.length) === '&' || this.filter.charAt(this.filter.length) === ' ' ) this.filter = this.filter.slice(-1);
+        while (this.filter.charAt(0) === '&' || this.filter.charAt(0) === ' ') this.filter = this.filter.substring(1);
+        while (this.filter.charAt(this.filter.length) === '&' || this.filter.charAt(this.filter.length) === ' ') this.filter = this.filter.slice(-1);
         return this;
     }
 

package/src/index.d.ts

@@ -43,9 +43,10 @@ import {
 	fetchPlaylistItems,
 	fetchSongsInProgress,
 	fetchUserAward,
+	fetchUserBadges,
 	fetchUserChallengeProgress,
 	fetchUserLikes,
-	fetchUserPermissions,
+	fetchUserPermissionsData,
 	fetchUserPlaylists,
 	likePlaylist,
 	postChallengesCommunityNotification,
@@ -114,6 +115,11 @@ import {
 	getSortOrder
 } from './services/sanity.js';
 
+import {
+	fetchUserPermissions,
+	reset
+} from './services/userPermissions.js';
+
 declare module 'musora-content-services' {
 	export {
 		contentStatusCompleted,
@@ -183,9 +189,11 @@ declare module 'musora-content-services' {
 		fetchTopLevelParentId,
 		fetchUpcomingEvents,
 		fetchUserAward,
+		fetchUserBadges,
 		fetchUserChallengeProgress,
 		fetchUserLikes,
 		fetchUserPermissions,
+		fetchUserPermissionsData,
 		fetchUserPlaylists,
 		fetchWorkouts,
 		getProgressPercentage,
@@ -212,6 +220,7 @@ declare module 'musora-content-services' {
 		postContentUnliked,
 		postRecordWatchSession,
 		recordWatchSession,
+		reset,
 		unlikeContent,
 		updatePlaylist,
 		updatePlaylistItem,

package/src/index.js

@@ -43,9 +43,10 @@ import {
 	fetchPlaylistItems,
 	fetchSongsInProgress,
 	fetchUserAward,
+	fetchUserBadges,
 	fetchUserChallengeProgress,
 	fetchUserLikes,
-	fetchUserPermissions,
+	fetchUserPermissionsData,
 	fetchUserPlaylists,
 	likePlaylist,
 	postChallengesCommunityNotification,
@@ -114,6 +115,11 @@ import {
 	getSortOrder
 } from './services/sanity.js';
 
+import {
+	fetchUserPermissions,
+	reset
+} from './services/userPermissions.js';
+
 export {
 	contentStatusCompleted,
 	contentStatusReset,
@@ -182,9 +188,11 @@ export {
 	fetchTopLevelParentId,
 	fetchUpcomingEvents,
 	fetchUserAward,
+	fetchUserBadges,
 	fetchUserChallengeProgress,
 	fetchUserLikes,
 	fetchUserPermissions,
+	fetchUserPermissionsData,
 	fetchUserPlaylists,
 	fetchWorkouts,
 	getProgressPercentage,
@@ -211,6 +219,7 @@ export {
 	postContentUnliked,
 	postRecordWatchSession,
 	recordWatchSession,
+	reset,
 	unlikeContent,
 	updatePlaylist,
 	updatePlaylistItem,

package/src/services/contentProgress.js

@@ -75,9 +75,9 @@ function completeStatusInLocalContext(contentId, localContext, hierarchy) {
 export async function contentStatusReset(contentId) {
     await dataContext.update(
         function (localContext) {
-            const index = localContext.data.indexOf(contentId);
+            const index = Object.keys(localContext.data).indexOf(contentId);
             if (index > -1) { // only splice array when item is found
-                localContext.data.splice(index, 1); // 2nd parameter means remove one item only
+                delete localContext.data[contentId];
             }
         },
         async function () {
@@ -86,31 +86,24 @@ export async function contentStatusReset(contentId) {
 }
 
 
-export async function recordWatchSession({
-                                             mediaId,
-                                             mediaType,
-                                             mediaCategory,
-                                             watchPositionSeconds,
-                                             totalDurationSeconds,
-                                             sessionToken,
-                                             brand,
-                                             contentId = null
-                                         }) {
+export async function recordWatchSession(contentId, mediaType, mediaCategory, mediaLengthSeconds, currentSeconds, secondsPlayed, sessionId = null) {
+    let mediaTypeId = getMediaTypeId(mediaType, mediaCategory);
+    let updateLocalProgress = mediaTypeId === 1 || mediaTypeId === 2; //only update for video playback
     await dataContext.update(
         async function (localContext) {
-            if (contentId) {
+            if (contentId && updateLocalProgress ) {
                 let data = localContext.data[contentId] ?? [];
                 let progress = data?.[DATA_KEY_PROGRESS] ?? 0;
                 let status = data?.[DATA_KEY_STATUS] ?? 0;
 
                 if (status !== STATE_COMPLETED && progress !== 100) {
                     status = STATE_STARTED;
-                    progress = Math.min(99, Math.round(watchPositionSeconds ?? 0 / Math.max(1, totalDurationSeconds ?? 0) * 100));
+                    progress = Math.min(99, Math.round(currentSeconds ?? 0 / Math.max(1, mediaLengthSeconds ?? 0) * 100));
                 }
 
                 data[DATA_KEY_PROGRESS] = progress;
                 data[DATA_KEY_STATUS] = status;
-                data[DATA_KEY_RESUME_TIME] = watchPositionSeconds;
+                data[DATA_KEY_RESUME_TIME] = currentSeconds;
                 localContext.data[contentId] = data;
 
                 let hierarchy = await fetchHierarchy(contentId);
@@ -118,18 +111,31 @@ export async function recordWatchSession({
             }
         },
         async function () {
-            return postRecordWatchSession({
-                mediaId,
-                mediaType,
-                mediaCategory,
-                watchPositionSeconds,
-                totalDurationSeconds,
-                sessionToken,
-                brand,
-                contentId
-            });
+            return postRecordWatchSession(contentId, mediaTypeId, mediaLengthSeconds, currentSeconds, secondsPlayed, sessionId);
         }
     );
+    return sessionId;
+}
+
+function getMediaTypeId(mediaType, mediaCategory) {
+    switch (`${mediaType}_${mediaCategory}`) {
+        case "video_youtube":
+            return 1;
+        case "video_vimeo":
+            return 2;
+        case "assignment_soundslice":
+            return 3;
+        case "practice_play-alongs":
+            return 4;
+        default:
+            throw Error(`Unsupported media type: ${mediaType}_${mediaCategory}`);
+    }
+}
+
+function uuidv4() {
+    return "10000000-1000-4000-8000-100000000000".replace(/[018]/g, c =>
+        (+c ^ crypto.getRandomValues(new Uint8Array(1))[0] & 15 >> +c / 4).toString(16)
+    );
 }
 
 function bubbleProgress(hierarchy, contentId, localContext) {

package/src/services/dataContext.js

@@ -34,7 +34,7 @@ export class DataContext {
                 this.context = data;
                 cache.setItem(this.localStorageKey, JSON.stringify(data));
             }
-            cache.setItem(this.localStorageLastUpdatedKey, new Date().getTime());
+            cache.setItem(this.localStorageLastUpdatedKey, new Date().getTime()?.toString());
         }
         return this.context.data;
     }
@@ -83,10 +83,10 @@ export class DataContext {
             this.context.version++;
             let data = JSON.stringify(this.context);
             cache.setItem(this.localStorageKey, data);
-            cache.setItem(this.localStorageLastUpdatedKey, new Date().getTime());
+            cache.setItem(this.localStorageLastUpdatedKey, new Date().getTime().toString());
         }
         let response = await serverUpdateFunction();
-        if (response.version !== this.version()) {
+        if (response?.version !== this.version()) {
             this.clearCache();
         }
     }

package/src/services/lastUpdated.js

@@ -0,0 +1,18 @@
+import {globalConfig} from "./config";
+
+/**
+ * Exported functions that are excluded from index generation.
+ *
+ * @type {string[]}
+ */
+const excludeFromGeneratedIndex = ['wasLastUpdateOlderThanXSeconds', 'setLastUpdatedTime'];
+export function wasLastUpdateOlderThanXSeconds(seconds, key) {
+    let lastUpdated = globalConfig.localStorage.getItem(key);
+    if (!lastUpdated) return false;
+    const verifyServerTime = seconds * 1000;
+    return (new Date().getTime() - lastUpdated) > verifyServerTime;
+}
+
+export function setLastUpdatedTime(key) {
+    globalConfig.localStorage.setItem(key, new Date().getTime()?.toString());
+}

package/src/services/railcontent.js

@@ -16,7 +16,8 @@ const excludeFromGeneratedIndex = [
     'postRecordWatchSession',
     'postContentStarted',
     'postContentCompleted',
-    'postContentReset'
+    'postContentReset',
+    'fetchUserPermissionsData'
 ];
 
 
@@ -236,10 +237,10 @@ export async function fetchContentPageUserData(contentId) {
     }
 }
 
-export async function fetchUserPermissions() {
-    let url = `/content/user_data_permissions`;
+export async function fetchUserPermissionsData() {
+    let url = `/content/user/permissions`;
     // in the case of an unauthorized user, we return empty permissions
-    return fetchHandler(url, 'get') ?? [];
+    return await fetchHandler(url, 'get') ?? [];
 }
 
 async function fetchDataHandler(url, dataVersion, method = "get") {
@@ -265,11 +266,11 @@ export async function fetchHandler(url, method = "get", dataVersion = null, body
     }
     try {
         const response = await fetchAbsolute(url, options);
-        const result = await response.json();
-        if (result) {
-            return result;
+        if (response.ok) {
+            return await response.json();
         } else {
-            console.log('result not json');
+            console.log('fetch error:', response.status);
+            console.log(response);
         }
     } catch (error) {
         console.error('Fetch error:', error);
@@ -297,26 +298,15 @@ export async function fetchContentProgress(currentVersion) {
     return fetchDataHandler(url, currentVersion);
 }
 
-export async function postRecordWatchSession({
-                                                mediaId,
-                                                mediaType,
-                                                mediaCategory,
-                                                watchPosition,
-                                                totalDuration,
-                                                sessionToken,
-                                                brand,
-                                                contentId = null
-                                            }) {
-    let url = `/railtracker/media-playback-session`;
+export async function postRecordWatchSession(contentId, mediaTypeId, mediaLengthSeconds, currentSeconds, secondsPlayed, sessionId) {
+    let url = `/v2/railtracker/media-playback-session`;
     return postDataHandler(url, {
-        mediaId,
-        mediaType,
-        mediaCategory,
-        watchPosition,
-        totalDuration,
-        sessionToken,
-        brand,
-        contentId
+        "content_id": contentId,
+        "media_type_id": mediaTypeId,
+        "media_length_seconds": mediaLengthSeconds,
+        "current_second": currentSeconds,
+        "seconds_played": secondsPlayed,
+        "session_id": sessionId
     });
 }
 
@@ -365,7 +355,7 @@ export async function fetchUserAward(contentId) {
 }
 
 /**
- * Get challange duration, user progress, and status for the list of challenges
+ * Get challenge duration, user progress, and status for the list of challenges
  * Intended to be used on the index page for challenges
  *
  * @param {array} contentIds - arary of railcontent ids of the challenges
@@ -377,6 +367,18 @@ export async function fetchChallengeIndexMetadata(contentIds) {
     return await fetchHandler(url, 'get');
 }
 
+/**
+ * Fetch all completed badges for the user ordered by completion date descending
+ *
+ * @param {string|null} brand -
+ * @returns {Promise<any|null>}
+ */
+export async function fetchUserBadges(brand = null) {
+    let brandParam = brand ? `?brand=${brand}` : '';
+    let url = `/challenges/user_badges/get${brandParam}`;
+    return await fetchHandler(url, 'get');
+}
+
 /**
  * Enroll a user in a challenge and set the start date of the challenge to the provided day.
  * Clears any existing progress data for this challenge
@@ -481,8 +483,8 @@ export async function fetchUserPlaylists(brand, {page, limit, sort, searchTerm}
     let url;
     const limitString = limit ? `&limit=${limit}` : '';
     const pageString = page ? `&page=${page}` : '';
-    const sortString = sort ? `&sort=${sort}`:'';
-    const searchFilter = searchTerm ? `&term=${searchTerm}`: '';
+    const sortString = sort ? `&sort=${sort}` : '';
+    const searchFilter = searchTerm ? `&term=${searchTerm}` : '';
     url = `/playlists/all?brand=${brand}${limitString}${pageString}${sortString}${searchFilter}`;
     return await fetchHandler(url);
 }
@@ -517,7 +519,7 @@ export async function fetchUserPlaylists(brand, {page, limit, sort, searchTerm}
  */
 export async function duplicatePlaylist(playlistId, playlistData) {
     let url = `/playlists/duplicate/${playlistId}`;
-    return await fetchHandler(url, "post",null, playlistData);
+    return await fetchHandler(url, "post", null, playlistData);
 }
 
 /**
@@ -643,7 +645,7 @@ export async function createPlaylist(playlistData) {
  */
 export async function likePlaylist(playlistId) {
     const url = `/playlists/like`;
-    const payload = { playlist_id: playlistId };
+    const payload = {playlist_id: playlistId};
     return await fetchHandler(url, "PUT", null, payload);
 }
 
@@ -670,7 +672,7 @@ export async function likePlaylist(playlistId) {
  */
 export async function deletePlaylistLike(playlistId) {
     const url = `/playlists/like`;
-    const payload = { playlist_id: playlistId };
+    const payload = {playlist_id: playlistId};
     return await fetchHandler(url, "DELETE", null, payload);
 }