musora-content-services 1.0.222 → 1.0.224

package/src/index.js

@@ -48,6 +48,7 @@ import {
 	fetchContentPageUserData,
 	fetchContentProgress,
 	fetchHandler,
+	fetchNextContentDataForParent,
 	fetchOwnedChallenges,
 	fetchPinnedPlaylists,
 	fetchPlaylist,
@@ -117,13 +118,13 @@ import {
 	fetchPackData,
 	fetchParentByRailContentId,
 	fetchParentForDownload,
+	fetchPlayAlongsCount,
 	fetchRelatedLessons,
 	fetchRelatedMethodLessons,
 	fetchRelatedSongs,
 	fetchSanity,
 	fetchScheduledReleases,
 	fetchShowsData,
-	fetchPlayAlongsCount,
 	fetchSongArtistCount,
 	fetchSongById,
 	fetchSongCount,
@@ -131,7 +132,8 @@ import {
 	fetchTopLevelParentId,
 	fetchUpcomingEvents,
 	fetchWorkouts,
-	getSortOrder
+	getSortOrder,
+	jumpToContinueContent
 } from './services/sanity.js';
 
 import {
@@ -193,6 +195,7 @@ export {
 	fetchMethodPreviousNextLesson,
 	fetchMethods,
 	fetchNewReleases,
+	fetchNextContentDataForParent,
 	fetchNextPreviousLesson,
 	fetchOwnedChallenges,
 	fetchPackAll,
@@ -201,6 +204,7 @@ export {
 	fetchParentByRailContentId,
 	fetchParentForDownload,
 	fetchPinnedPlaylists,
+	fetchPlayAlongsCount,
 	fetchPlaylist,
 	fetchPlaylistItem,
 	fetchPlaylistItems,
@@ -211,7 +215,6 @@ export {
 	fetchScheduledReleases,
 	fetchShowsData,
 	fetchSongArtistCount,
-	fetchPlayAlongsCount,
 	fetchSongById,
 	fetchSongCount,
 	fetchSongFilterOptions,
@@ -238,6 +241,7 @@ export {
 	globalConfig,
 	initializeService,
 	isContentLiked,
+	jumpToContinueContent,
 	likeContent,
 	likePlaylist,
 	pinPlaylist,

package/src/services/railcontent.js

@@ -38,6 +38,7 @@ export async function fetchCompletedState(content_id) {
 
     const headers = {
         'Content-Type': 'application/json',
+        'Accept': 'application/json',
         'X-CSRF-TOKEN': globalConfig.railcontentConfig.token
     };
 
@@ -72,6 +73,7 @@ export async function fetchAllCompletedStates(contentIds) {
 
     const headers = {
         'Content-Type': 'application/json',
+        'Accept': 'application/json',
         'X-CSRF-TOKEN': globalConfig.railcontentConfig.token
     };
 
@@ -104,6 +106,7 @@ export async function fetchSongsInProgress(brand) {
 
     const headers = {
         'Content-Type': 'application/json',
+        'Accept': 'application/json',
         'X-CSRF-TOKEN': globalConfig.railcontentConfig.token
     };
 
@@ -147,6 +150,7 @@ export async function fetchContentInProgress(type = "all", brand, {page, limit}
     }
     const headers = {
         'Content-Type': 'application/json',
+        'Accept': 'application/json',
         'X-CSRF-TOKEN': globalConfig.railcontentConfig.token
     };
     try {
@@ -189,6 +193,7 @@ export async function fetchCompletedContent(type = "all", brand, {page, limit} =
     }
     const headers = {
         'Content-Type': 'application/json',
+        'Accept': 'application/json',
         'X-CSRF-TOKEN': globalConfig.railcontentConfig.token
     };
     try {
@@ -221,6 +226,7 @@ export async function fetchContentPageUserData(contentId) {
     let url = `/content/${contentId}/user_data/${globalConfig.railcontentConfig.userId}`;
     const headers = {
         'Content-Type': 'application/json',
+        'Accept': 'application/json',
         'X-CSRF-TOKEN': globalConfig.railcontentConfig.token
     };
 
@@ -239,6 +245,36 @@ export async function fetchContentPageUserData(contentId) {
     }
 }
 
+/**
+ * Fetches the ID and Type of the piece of content that would be the next one for the user
+ *
+ * @param {int} contentId - The id of the parent (method, level, or course) piece of content.
+ * @returns {Promise<Object|null>} - Returns and Object with the id and type of the next piece of content if found, otherwise null.
+ */
+export async function fetchNextContentDataForParent(contentId) {
+    let url = `/content/${contentId}/next/${globalConfig.railcontentConfig.userId}`;
+    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('fetchNextContentDataForParent', result);
+            return result.next;
+        } else {
+            console.log('fetchNextContentDataForParent result not json');
+            return null;
+        }
+    } catch (error) {
+        console.error('Fetch error:', error);
+        return null;
+    }
+}
+
+
 export async function fetchUserPermissionsData() {
     let url = `/content/user/permissions`;
     // in the case of an unauthorized user, we return empty permissions
@@ -256,6 +292,7 @@ async function postDataHandler(url, data) {
 export async function fetchHandler(url, method = "get", dataVersion = null, body = null) {
     let headers = {
         'Content-Type': 'application/json',
+        'Accept': 'application/json',
         'X-CSRF-TOKEN': globalConfig.railcontentConfig.token,
     };
 

package/src/services/sanity.js

@@ -27,7 +27,8 @@ import {
     fetchAllCompletedStates,
     fetchCompletedChallenges,
     fetchCurrentSongComplete,
-    fetchOwnedChallenges
+    fetchOwnedChallenges,
+    fetchNextContentDataForParent
 } from './railcontent.js';
 import {arrayToStringRepresentation, FilterBuilder} from "../filterBuilder";
 import {fetchUserPermissions} from "./userPermissions";
@@ -608,6 +609,7 @@ export async function fetchAll(brand, type, {
             start: start,
             end: end,
         });
+    
     return fetchSanity(query, true);
 }
 
@@ -828,17 +830,18 @@ export async function fetchAllFilterOptions(
 
     const includedFieldsFilter = filters?.length ? filtersToGroq(filters) : undefined;
     const progressFilter = progressIds ? `&& railcontent_id in [${progressIds.join(',')}]` : "";
+    const isAdmin = (await fetchUserPermissions()).isAdmin;
 
     const constructCommonFilter = (excludeFilter) => {
         const filterWithoutOption = excludeFilter ? filtersToGroq(filters, excludeFilter) : includedFieldsFilter;
         const statusFilter = ' && status == "published"';
-        const includeStatusFilter = !['instructor','artist','genre'].includes(contentType);
+        const includeStatusFilter = !isAdmin && !['instructor','artist','genre'].includes(contentType);
 
         return coachId
             ? `brand == '${brand}' && status == "published" && references(*[_type=='instructor' && railcontent_id == ${coachId}]._id) ${filterWithoutOption || ''}`
             : `_type == '${contentType}' && brand == "${brand}"${includeStatusFilter ? statusFilter : ''}${style && excludeFilter !== "style" ? ` && '${style}' in genre[]->name` : ''}${artist && excludeFilter !== "artist" ? ` && artist->name == '${artist}'` : ''} ${progressFilter} ${filterWithoutOption || ''}`;
     };
-
+    
     const metaData = processMetadata(brand, contentType, true);
     const allowableFilters = metaData?.allowableFilters || [];
     const tabs = metaData?.tabs || [];
@@ -1102,6 +1105,24 @@ export async function fetchNextPreviousLesson(railcontentId) {
     return await fetchSanity(query, true);
 }
 
+/**
+ * Fetch the next piece of content under a parent by Railcontent ID
+ * @param {int} railcontentId - The Railcontent ID of the parent content
+ * @returns {Promise<{next: (Object|null)}|null>} - object with 'next' attribute
+ * @example
+ * jumpToContinueContent(296693)
+ *  then.(data => { console.log('next', data.next);})
+ *  .catch(error => console.error(error));
+ */
+export async function jumpToContinueContent(railcontentId) {
+    const nextContent = await fetchNextContentDataForParent(railcontentId);
+    if (!nextContent) {
+        return null;
+    }
+    let next = await fetchByRailContentId(nextContent.id, nextContent.type);
+    return {next};
+}
+
 /**
  * Fetch the page data for a specific lesson by Railcontent ID.
  * @param {string} railContentId - The Railcontent ID of the current lesson.