musora-content-services 1.0.155 → 1.0.156

package/CHANGELOG.md

@@ -2,6 +2,8 @@
 
 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.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.156",
   "description": "A package for Musoras content services ",
   "main": "src/index.js",
   "scripts": {

package/src/index.d.ts

@@ -43,6 +43,7 @@ import {
 	fetchPlaylistItems,
 	fetchSongsInProgress,
 	fetchUserAward,
+	fetchUserBadges,
 	fetchUserChallengeProgress,
 	fetchUserLikes,
 	fetchUserPermissions,
@@ -183,6 +184,7 @@ declare module 'musora-content-services' {
 		fetchTopLevelParentId,
 		fetchUpcomingEvents,
 		fetchUserAward,
+		fetchUserBadges,
 		fetchUserChallengeProgress,
 		fetchUserLikes,
 		fetchUserPermissions,

package/src/index.js

@@ -43,6 +43,7 @@ import {
 	fetchPlaylistItems,
 	fetchSongsInProgress,
 	fetchUserAward,
+	fetchUserBadges,
 	fetchUserChallengeProgress,
 	fetchUserLikes,
 	fetchUserPermissions,
@@ -182,6 +183,7 @@ export {
 	fetchTopLevelParentId,
 	fetchUpcomingEvents,
 	fetchUserAward,
+	fetchUserBadges,
 	fetchUserChallengeProgress,
 	fetchUserLikes,
 	fetchUserPermissions,

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 () {

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/railcontent.js

@@ -265,11 +265,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);
@@ -298,15 +298,15 @@ export async function fetchContentProgress(currentVersion) {
 }
 
 export async function postRecordWatchSession({
-                                                mediaId,
-                                                mediaType,
-                                                mediaCategory,
-                                                watchPosition,
-                                                totalDuration,
-                                                sessionToken,
-                                                brand,
-                                                contentId = null
-                                            }) {
+                                                 mediaId,
+                                                 mediaType,
+                                                 mediaCategory,
+                                                 watchPosition,
+                                                 totalDuration,
+                                                 sessionToken,
+                                                 brand,
+                                                 contentId = null
+                                             }) {
     let url = `/railtracker/media-playback-session`;
     return postDataHandler(url, {
         mediaId,
@@ -365,7 +365,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 +377,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 +493,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 +529,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 +655,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 +682,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);
 }