musora-content-services 1.0.205 → 1.0.207

package/docs/sanity.js.html

@@ -29,7 +29,7 @@
 <nav >
     
     
-    <h2><a href="index.html">Home</a></h2><h3>Modules</h3><ul><li><a href="module-Config.html">Config</a><ul class='methods'><li data-type='method'><a href="module-Config.html#~initializeService">initializeService</a></li></ul></li><li><a href="module-Railcontent-Services.html">Railcontent-Services</a><ul class='methods'><li data-type='method'><a href="module-Railcontent-Services.html#.addItemToPlaylist">addItemToPlaylist</a></li><li data-type='method'><a href="module-Railcontent-Services.html#.countAssignmentsAndLessons">countAssignmentsAndLessons</a></li><li data-type='method'><a href="module-Railcontent-Services.html#.createPlaylist">createPlaylist</a></li><li data-type='method'><a href="module-Railcontent-Services.html#.deletePlaylist">deletePlaylist</a></li><li data-type='method'><a href="module-Railcontent-Services.html#.deletePlaylistItem">deletePlaylistItem</a></li><li data-type='method'><a href="module-Railcontent-Services.html#.deletePlaylistLike">deletePlaylistLike</a></li><li data-type='method'><a href="module-Railcontent-Services.html#.duplicatePlaylist">duplicatePlaylist</a></li><li data-type='method'><a href="module-Railcontent-Services.html#.fetchAllCompletedStates">fetchAllCompletedStates</a></li><li data-type='method'><a href="module-Railcontent-Services.html#.fetchChallengeIndexMetadata">fetchChallengeIndexMetadata</a></li><li data-type='method'><a href="module-Railcontent-Services.html#.fetchChallengeLessonData">fetchChallengeLessonData</a></li><li data-type='method'><a href="module-Railcontent-Services.html#.fetchChallengeMetadata">fetchChallengeMetadata</a></li><li data-type='method'><a href="module-Railcontent-Services.html#.fetchChallengeUserActiveChallenges">fetchChallengeUserActiveChallenges</a></li><li data-type='method'><a href="module-Railcontent-Services.html#.fetchCompletedContent">fetchCompletedContent</a></li><li data-type='method'><a href="module-Railcontent-Services.html#.fetchCompletedState">fetchCompletedState</a></li><li data-type='method'><a href="module-Railcontent-Services.html#.fetchContentInProgress">fetchContentInProgress</a></li><li data-type='method'><a href="module-Railcontent-Services.html#.fetchContentPageUserData">fetchContentPageUserData</a></li><li data-type='method'><a href="module-Railcontent-Services.html#.fetchPinnedPlaylists">fetchPinnedPlaylists</a></li><li data-type='method'><a href="module-Railcontent-Services.html#.fetchPlaylist">fetchPlaylist</a></li><li data-type='method'><a href="module-Railcontent-Services.html#.fetchPlaylistItem">fetchPlaylistItem</a></li><li data-type='method'><a href="module-Railcontent-Services.html#.fetchPlaylistItems">fetchPlaylistItems</a></li><li data-type='method'><a href="module-Railcontent-Services.html#.fetchSongsInProgress">fetchSongsInProgress</a></li><li data-type='method'><a href="module-Railcontent-Services.html#.fetchUserAward">fetchUserAward</a></li><li data-type='method'><a href="module-Railcontent-Services.html#.fetchUserBadges">fetchUserBadges</a></li><li data-type='method'><a href="module-Railcontent-Services.html#.fetchUserChallengeProgress">fetchUserChallengeProgress</a></li><li data-type='method'><a href="module-Railcontent-Services.html#.fetchUserPlaylists">fetchUserPlaylists</a></li><li data-type='method'><a href="module-Railcontent-Services.html#.likePlaylist">likePlaylist</a></li><li data-type='method'><a href="module-Railcontent-Services.html#.pinPlaylist">pinPlaylist</a></li><li data-type='method'><a href="module-Railcontent-Services.html#.postChallengesCommunityNotification">postChallengesCommunityNotification</a></li><li data-type='method'><a href="module-Railcontent-Services.html#.postChallengesCompleteLesson">postChallengesCompleteLesson</a></li><li data-type='method'><a href="module-Railcontent-Services.html#.postChallengesEnroll">postChallengesEnroll</a></li><li data-type='method'><a href="module-Railcontent-Services.html#.postChallengesEnrollmentNotification">postChallengesEnrollmentNotification</a></li><li data-type='method'><a href="module-Railcontent-Services.html#.postChallengesLeave">postChallengesLeave</a></li><li data-type='method'><a href="module-Railcontent-Services.html#.postChallengesSetStartDate">postChallengesSetStartDate</a></li><li data-type='method'><a href="module-Railcontent-Services.html#.postChallengesUnlock">postChallengesUnlock</a></li><li data-type='method'><a href="module-Railcontent-Services.html#.unpinPlaylist">unpinPlaylist</a></li><li data-type='method'><a href="module-Railcontent-Services.html#.updatePlaylist">updatePlaylist</a></li><li data-type='method'><a href="module-Railcontent-Services.html#.updatePlaylistItem">updatePlaylistItem</a></li></ul></li><li><a href="module-Sanity-Services.html">Sanity-Services</a><ul class='methods'><li data-type='method'><a href="module-Sanity-Services.html#.fetchAll">fetchAll</a></li><li data-type='method'><a href="module-Sanity-Services.html#.fetchAllFilterOptions">fetchAllFilterOptions</a></li><li data-type='method'><a href="module-Sanity-Services.html#.fetchAllPacks">fetchAllPacks</a></li><li data-type='method'><a href="module-Sanity-Services.html#.fetchAllSongs">fetchAllSongs</a></li><li data-type='method'><a href="module-Sanity-Services.html#.fetchArtistLessons">fetchArtistLessons</a></li><li data-type='method'><a href="module-Sanity-Services.html#.fetchArtists">fetchArtists</a></li><li data-type='method'><a href="module-Sanity-Services.html#.fetchAssignments">fetchAssignments</a></li><li data-type='method'><a href="module-Sanity-Services.html#.fetchByRailContentId">fetchByRailContentId</a></li><li data-type='method'><a href="module-Sanity-Services.html#.fetchByRailContentIds">fetchByRailContentIds</a></li><li data-type='method'><a href="module-Sanity-Services.html#.fetchByReference">fetchByReference</a></li><li data-type='method'><a href="module-Sanity-Services.html#.fetchCatalogMetadata">fetchCatalogMetadata</a></li><li data-type='method'><a href="module-Sanity-Services.html#.fetchChallengeOverview">fetchChallengeOverview</a></li><li data-type='method'><a href="module-Sanity-Services.html#.fetchChildren">fetchChildren</a></li><li data-type='method'><a href="module-Sanity-Services.html#.fetchCoachLessons">fetchCoachLessons</a></li><li data-type='method'><a href="module-Sanity-Services.html#.fetchCommentModContentData">fetchCommentModContentData</a></li><li data-type='method'><a href="module-Sanity-Services.html#.fetchCourseOverview">fetchCourseOverview</a></li><li data-type='method'><a href="module-Sanity-Services.html#.fetchFoundation">fetchFoundation</a></li><li data-type='method'><a href="module-Sanity-Services.html#.fetchGenreLessons">fetchGenreLessons</a></li><li data-type='method'><a href="module-Sanity-Services.html#.fetchLessonContent">fetchLessonContent</a></li><li data-type='method'><a href="module-Sanity-Services.html#.fetchMetadata">fetchMetadata</a></li><li data-type='method'><a href="module-Sanity-Services.html#.fetchMethod">fetchMethod</a></li><li data-type='method'><a href="module-Sanity-Services.html#.fetchMethodChildren">fetchMethodChildren</a></li><li data-type='method'><a href="module-Sanity-Services.html#.fetchMethodChildrenIds">fetchMethodChildrenIds</a></li><li data-type='method'><a href="module-Sanity-Services.html#.fetchMethodNextLesson">fetchMethodNextLesson</a></li><li data-type='method'><a href="module-Sanity-Services.html#.fetchMethodPreviousNextLesson">fetchMethodPreviousNextLesson</a></li><li data-type='method'><a href="module-Sanity-Services.html#.fetchMethods">fetchMethods</a></li><li data-type='method'><a href="module-Sanity-Services.html#.fetchNewReleases">fetchNewReleases</a></li><li data-type='method'><a href="module-Sanity-Services.html#.fetchNextPreviousLesson">fetchNextPreviousLesson</a></li><li data-type='method'><a href="module-Sanity-Services.html#.fetchPackAll">fetchPackAll</a></li><li data-type='method'><a href="module-Sanity-Services.html#.fetchPackChildren">fetchPackChildren</a></li><li data-type='method'><a href="module-Sanity-Services.html#.fetchPackData">fetchPackData</a></li><li data-type='method'><a href="module-Sanity-Services.html#.fetchParentByRailContentId">fetchParentByRailContentId</a></li><li data-type='method'><a href="module-Sanity-Services.html#.fetchParentForDownload">fetchParentForDownload</a></li><li data-type='method'><a href="module-Sanity-Services.html#.fetchRelatedLessons">fetchRelatedLessons</a></li><li data-type='method'><a href="module-Sanity-Services.html#.fetchRelatedMethodLessons">fetchRelatedMethodLessons</a></li><li data-type='method'><a href="module-Sanity-Services.html#.fetchRelatedSongs">fetchRelatedSongs</a></li><li data-type='method'><a href="module-Sanity-Services.html#.fetchSanity">fetchSanity</a></li><li data-type='method'><a href="module-Sanity-Services.html#.fetchScheduledReleases">fetchScheduledReleases</a></li><li data-type='method'><a href="module-Sanity-Services.html#.fetchShowsData">fetchShowsData</a></li><li data-type='method'><a href="module-Sanity-Services.html#.fetchSongArtistCount">fetchSongArtistCount</a></li><li data-type='method'><a href="module-Sanity-Services.html#.fetchSongById">fetchSongById</a></li><li data-type='method'><a href="module-Sanity-Services.html#.fetchSongCount">fetchSongCount</a></li><li data-type='method'><a href="module-Sanity-Services.html#.fetchSongFilterOptions">fetchSongFilterOptions</a></li><li data-type='method'><a href="module-Sanity-Services.html#.fetchUpcomingEvents">fetchUpcomingEvents</a></li><li data-type='method'><a href="module-Sanity-Services.html#.fetchWorkouts">fetchWorkouts</a></li></ul></li></ul>
+    <h2><a href="index.html">Home</a></h2><h3>Modules</h3><ul><li><a href="module-Config.html">Config</a><ul class='methods'><li data-type='method'><a href="module-Config.html#~initializeService">initializeService</a></li></ul></li><li><a href="module-Railcontent-Services.html">Railcontent-Services</a><ul class='methods'><li data-type='method'><a href="module-Railcontent-Services.html#.addItemToPlaylist">addItemToPlaylist</a></li><li data-type='method'><a href="module-Railcontent-Services.html#.countAssignmentsAndLessons">countAssignmentsAndLessons</a></li><li data-type='method'><a href="module-Railcontent-Services.html#.createPlaylist">createPlaylist</a></li><li data-type='method'><a href="module-Railcontent-Services.html#.deletePlaylist">deletePlaylist</a></li><li data-type='method'><a href="module-Railcontent-Services.html#.deletePlaylistItem">deletePlaylistItem</a></li><li data-type='method'><a href="module-Railcontent-Services.html#.deletePlaylistLike">deletePlaylistLike</a></li><li data-type='method'><a href="module-Railcontent-Services.html#.duplicatePlaylist">duplicatePlaylist</a></li><li data-type='method'><a href="module-Railcontent-Services.html#.fetchAllCompletedStates">fetchAllCompletedStates</a></li><li data-type='method'><a href="module-Railcontent-Services.html#.fetchCarouselCardData">fetchCarouselCardData</a></li><li data-type='method'><a href="module-Railcontent-Services.html#.fetchChallengeIndexMetadata">fetchChallengeIndexMetadata</a></li><li data-type='method'><a href="module-Railcontent-Services.html#.fetchChallengeLessonData">fetchChallengeLessonData</a></li><li data-type='method'><a href="module-Railcontent-Services.html#.fetchChallengeMetadata">fetchChallengeMetadata</a></li><li data-type='method'><a href="module-Railcontent-Services.html#.fetchChallengeUserActiveChallenges">fetchChallengeUserActiveChallenges</a></li><li data-type='method'><a href="module-Railcontent-Services.html#.fetchCompletedChallenges">fetchCompletedChallenges</a></li><li data-type='method'><a href="module-Railcontent-Services.html#.fetchCompletedContent">fetchCompletedContent</a></li><li data-type='method'><a href="module-Railcontent-Services.html#.fetchCompletedState">fetchCompletedState</a></li><li data-type='method'><a href="module-Railcontent-Services.html#.fetchContentInProgress">fetchContentInProgress</a></li><li data-type='method'><a href="module-Railcontent-Services.html#.fetchContentPageUserData">fetchContentPageUserData</a></li><li data-type='method'><a href="module-Railcontent-Services.html#.fetchOwnedChallenges">fetchOwnedChallenges</a></li><li data-type='method'><a href="module-Railcontent-Services.html#.fetchPinnedPlaylists">fetchPinnedPlaylists</a></li><li data-type='method'><a href="module-Railcontent-Services.html#.fetchPlaylist">fetchPlaylist</a></li><li data-type='method'><a href="module-Railcontent-Services.html#.fetchPlaylistItem">fetchPlaylistItem</a></li><li data-type='method'><a href="module-Railcontent-Services.html#.fetchPlaylistItems">fetchPlaylistItems</a></li><li data-type='method'><a href="module-Railcontent-Services.html#.fetchSongsInProgress">fetchSongsInProgress</a></li><li data-type='method'><a href="module-Railcontent-Services.html#.fetchUserAward">fetchUserAward</a></li><li data-type='method'><a href="module-Railcontent-Services.html#.fetchUserBadges">fetchUserBadges</a></li><li data-type='method'><a href="module-Railcontent-Services.html#.fetchUserChallengeProgress">fetchUserChallengeProgress</a></li><li data-type='method'><a href="module-Railcontent-Services.html#.fetchUserPlaylists">fetchUserPlaylists</a></li><li data-type='method'><a href="module-Railcontent-Services.html#.likePlaylist">likePlaylist</a></li><li data-type='method'><a href="module-Railcontent-Services.html#.pinPlaylist">pinPlaylist</a></li><li data-type='method'><a href="module-Railcontent-Services.html#.postChallengesCommunityNotification">postChallengesCommunityNotification</a></li><li data-type='method'><a href="module-Railcontent-Services.html#.postChallengesCompleteLesson">postChallengesCompleteLesson</a></li><li data-type='method'><a href="module-Railcontent-Services.html#.postChallengesEnroll">postChallengesEnroll</a></li><li data-type='method'><a href="module-Railcontent-Services.html#.postChallengesEnrollmentNotification">postChallengesEnrollmentNotification</a></li><li data-type='method'><a href="module-Railcontent-Services.html#.postChallengesHideCompletedBanner">postChallengesHideCompletedBanner</a></li><li data-type='method'><a href="module-Railcontent-Services.html#.postChallengesLeave">postChallengesLeave</a></li><li data-type='method'><a href="module-Railcontent-Services.html#.postChallengesSetStartDate">postChallengesSetStartDate</a></li><li data-type='method'><a href="module-Railcontent-Services.html#.postChallengesUnlock">postChallengesUnlock</a></li><li data-type='method'><a href="module-Railcontent-Services.html#.reportPlaylist">reportPlaylist</a></li><li data-type='method'><a href="module-Railcontent-Services.html#.unpinPlaylist">unpinPlaylist</a></li><li data-type='method'><a href="module-Railcontent-Services.html#.updatePlaylist">updatePlaylist</a></li><li data-type='method'><a href="module-Railcontent-Services.html#.updatePlaylistItem">updatePlaylistItem</a></li></ul></li><li><a href="module-Sanity-Services.html">Sanity-Services</a><ul class='methods'><li data-type='method'><a href="module-Sanity-Services.html#.fetchAll">fetchAll</a></li><li data-type='method'><a href="module-Sanity-Services.html#.fetchAllFilterOptions">fetchAllFilterOptions</a></li><li data-type='method'><a href="module-Sanity-Services.html#.fetchAllPacks">fetchAllPacks</a></li><li data-type='method'><a href="module-Sanity-Services.html#.fetchAllSongs">fetchAllSongs</a></li><li data-type='method'><a href="module-Sanity-Services.html#.fetchArtistLessons">fetchArtistLessons</a></li><li data-type='method'><a href="module-Sanity-Services.html#.fetchArtists">fetchArtists</a></li><li data-type='method'><a href="module-Sanity-Services.html#.fetchAssignments">fetchAssignments</a></li><li data-type='method'><a href="module-Sanity-Services.html#.fetchByRailContentId">fetchByRailContentId</a></li><li data-type='method'><a href="module-Sanity-Services.html#.fetchByRailContentIds">fetchByRailContentIds</a></li><li data-type='method'><a href="module-Sanity-Services.html#.fetchByReference">fetchByReference</a></li><li data-type='method'><a href="module-Sanity-Services.html#.fetchCatalogMetadata">fetchCatalogMetadata</a></li><li data-type='method'><a href="module-Sanity-Services.html#.fetchChallengeOverview">fetchChallengeOverview</a></li><li data-type='method'><a href="module-Sanity-Services.html#.fetchChildren">fetchChildren</a></li><li data-type='method'><a href="module-Sanity-Services.html#.fetchCoachLessons">fetchCoachLessons</a></li><li data-type='method'><a href="module-Sanity-Services.html#.fetchCommentModContentData">fetchCommentModContentData</a></li><li data-type='method'><a href="module-Sanity-Services.html#.fetchCourseOverview">fetchCourseOverview</a></li><li data-type='method'><a href="module-Sanity-Services.html#.fetchFoundation">fetchFoundation</a></li><li data-type='method'><a href="module-Sanity-Services.html#.fetchGenreLessons">fetchGenreLessons</a></li><li data-type='method'><a href="module-Sanity-Services.html#.fetchLessonContent">fetchLessonContent</a></li><li data-type='method'><a href="module-Sanity-Services.html#.fetchMetadata">fetchMetadata</a></li><li data-type='method'><a href="module-Sanity-Services.html#.fetchMethod">fetchMethod</a></li><li data-type='method'><a href="module-Sanity-Services.html#.fetchMethodChildren">fetchMethodChildren</a></li><li data-type='method'><a href="module-Sanity-Services.html#.fetchMethodChildrenIds">fetchMethodChildrenIds</a></li><li data-type='method'><a href="module-Sanity-Services.html#.fetchMethodNextLesson">fetchMethodNextLesson</a></li><li data-type='method'><a href="module-Sanity-Services.html#.fetchMethodPreviousNextLesson">fetchMethodPreviousNextLesson</a></li><li data-type='method'><a href="module-Sanity-Services.html#.fetchMethods">fetchMethods</a></li><li data-type='method'><a href="module-Sanity-Services.html#.fetchNewReleases">fetchNewReleases</a></li><li data-type='method'><a href="module-Sanity-Services.html#.fetchNextPreviousLesson">fetchNextPreviousLesson</a></li><li data-type='method'><a href="module-Sanity-Services.html#.fetchPackAll">fetchPackAll</a></li><li data-type='method'><a href="module-Sanity-Services.html#.fetchPackChildren">fetchPackChildren</a></li><li data-type='method'><a href="module-Sanity-Services.html#.fetchPackData">fetchPackData</a></li><li data-type='method'><a href="module-Sanity-Services.html#.fetchParentByRailContentId">fetchParentByRailContentId</a></li><li data-type='method'><a href="module-Sanity-Services.html#.fetchParentForDownload">fetchParentForDownload</a></li><li data-type='method'><a href="module-Sanity-Services.html#.fetchRelatedLessons">fetchRelatedLessons</a></li><li data-type='method'><a href="module-Sanity-Services.html#.fetchRelatedMethodLessons">fetchRelatedMethodLessons</a></li><li data-type='method'><a href="module-Sanity-Services.html#.fetchRelatedSongs">fetchRelatedSongs</a></li><li data-type='method'><a href="module-Sanity-Services.html#.fetchSanity">fetchSanity</a></li><li data-type='method'><a href="module-Sanity-Services.html#.fetchScheduledReleases">fetchScheduledReleases</a></li><li data-type='method'><a href="module-Sanity-Services.html#.fetchShowsData">fetchShowsData</a></li><li data-type='method'><a href="module-Sanity-Services.html#.fetchSongArtistCount">fetchSongArtistCount</a></li><li data-type='method'><a href="module-Sanity-Services.html#.fetchSongById">fetchSongById</a></li><li data-type='method'><a href="module-Sanity-Services.html#.fetchSongCount">fetchSongCount</a></li><li data-type='method'><a href="module-Sanity-Services.html#.fetchSongFilterOptions">fetchSongFilterOptions</a></li><li data-type='method'><a href="module-Sanity-Services.html#.fetchUpcomingEvents">fetchUpcomingEvents</a></li><li data-type='method'><a href="module-Sanity-Services.html#.fetchWorkouts">fetchWorkouts</a></li><li data-type='method'><a href="module-Sanity-Services.html#~handleCustomFetchAll">handleCustomFetchAll</a></li></ul></li></ul>
     
 </nav>
 
@@ -70,7 +70,12 @@ import {
 
 import {globalConfig} from "./config";
 
-import {fetchAllCompletedStates, fetchCurrentSongComplete} from './railcontent.js';
+import {
+    fetchAllCompletedStates,
+    fetchCompletedChallenges,
+    fetchCurrentSongComplete,
+    fetchOwnedChallenges
+} from './railcontent.js';
 import {arrayToStringRepresentation, FilterBuilder} from "../filterBuilder";
 import {fetchUserPermissions} from "./userPermissions";
 import {getAllCompleted, getAllStarted, getAllStartedOrCompleted} from "./contentProgress";
@@ -80,7 +85,7 @@ import {getAllCompleted, getAllStarted, getAllStartedOrCompleted} from "./conten
  *
  * @type {string[]}
  */
-const excludeFromGeneratedIndex = [];
+const excludeFromGeneratedIndex = ['handleCustomFetchAll'];
 
 /**
  * Fetch a song by its document ID from Sanity.
@@ -326,7 +331,7 @@ export async function fetchNewReleases(brand, {page = 1, limit = 20, sort = "-pu
     const typesString = arrayToStringRepresentation(newTypes);
     const start = (page - 1) * limit;
     const end = start + limit;
-    const sortOrder = getSortOrder(sort);
+    const sortOrder = getSortOrder(sort, brand);
     const filter = `_type in ${typesString} &amp;&amp; brand == '${brand}'`;
     const fields = `
      "id": railcontent_id,
@@ -531,12 +536,29 @@ export async function fetchAll(brand, type, {
     customFields = [],
     progress = "all"
 } = {}) {
+    let customResults = await handleCustomFetchAll(brand, type, {
+        page,
+        limit,
+        searchTerm,
+        sort,
+        includedFields,
+        groupBy,
+        progressIds,
+        useDefaultFields,
+        customFields,
+        progress
+    });
+    if (customResults) {
+        return customResults;
+    }
+
     let config = contentTypeConfig[type] ?? {};
     let additionalFields = config?.fields ?? [];
     let isGroupByOneToOne = (groupBy ? config?.relationships?.[groupBy]?.isOneToOne : false) ?? false;
     let webUrlPathType = config?.slug ?? type;
     const start = (page - 1) * limit;
     const end = start + limit;
+    let bypassStatusAndPublishedValidation = (type == 'instructor' || groupBy == 'artist' || groupBy == 'genre' || groupBy == 'instructor');
 
     // Construct the type filter
     const typeFilter = type ? `&amp;&amp; _type == '${type}'` : "";
@@ -557,26 +579,31 @@ export async function fetchAll(brand, type, {
     const progressFilter = await getProgressFilter(progress, progressIds);
 
     // Determine the sort order
-    const sortOrder = getSortOrder(sort);
+    const sortOrder = getSortOrder(sort, brand, groupBy);
 
     let fields = useDefaultFields ? customFields.concat(DEFAULT_FIELDS, additionalFields) : customFields;
     let fieldsString = fields.join(',');
 
+    let customFilter = '';
+    if (type == 'instructor') {
+        customFilter = '&amp;&amp; coach_card_image != null'
+    }
     // Determine the group by clause
     let query = "";
     let entityFieldsString = "";
     let filter = "";
     if (groupBy !== "" &amp;&amp; isGroupByOneToOne) {
         const webUrlPath = 'artists';
-        const lessonsFilter = `_type == '${type}' &amp;&amp; brand == '${brand}' &amp;&amp; ^._id == ${groupBy}._ref ${searchFilter} ${includedFieldsFilter} ${progressFilter}`;
+        const lessonsFilter = `_type == '${type}' &amp;&amp; brand == '${brand}' &amp;&amp; ^._id == ${groupBy}._ref ${searchFilter} ${includedFieldsFilter} ${progressFilter} ${customFilter}`;
+        const lessonsFilterWithRestrictions = await new FilterBuilder(lessonsFilter).buildFilter();
         entityFieldsString = `
                 'id': railcontent_id,
                 'type': _type,
                 name,
                 'head_shot_picture_url': thumbnail_url.asset->url,
                 'web_url_path': '/${brand}/${webUrlPath}/'+name+'?included_fieds[]=type,${type}',
-                'all_lessons_count': count(*[${lessonsFilter}]._id),
-                'lessons': *[${lessonsFilter}]{
+                'all_lessons_count': count(*[${lessonsFilterWithRestrictions}]._id),
+                'lessons': *[${lessonsFilterWithRestrictions}]{
                     ${fieldsString},
                     ${groupBy}
                 }[0...20]
@@ -584,25 +611,33 @@ export async function fetchAll(brand, type, {
         filter = `_type == '${groupBy}' &amp;&amp; count(*[brand == '${brand}' &amp;&amp; ^._id == ${groupBy}._ref ${typeFilter} ${searchFilter} ${includedFieldsFilter} ${progressFilter}]._id) > 0`;
     } else if (groupBy !== "") {
         const webUrlPath = (groupBy == 'genre') ? '/genres' : '';
-        const lessonsFilter = `brand == '${brand}' &amp;&amp; ^._id in ${groupBy}[]._ref ${typeFilter} ${searchFilter} ${includedFieldsFilter} ${progressFilter}`;
+        const lessonsFilter = `brand == '${brand}' &amp;&amp; ^._id in ${groupBy}[]._ref ${typeFilter} ${searchFilter} ${includedFieldsFilter} ${progressFilter} ${customFilter}`;
+        const lessonsFilterWithRestrictions = await new FilterBuilder(lessonsFilter).buildFilter();
+
         entityFieldsString = `
                 'id': railcontent_id,
                 'type': _type,
                 name,
                 'head_shot_picture_url': thumbnail_url.asset->url,
                 'web_url_path': select(defined(web_url_path)=> web_url_path +'?included_fieds[]=type,${type}',!defined(web_url_path)=> '/${brand}${webUrlPath}/'+name+'/${webUrlPathType}'),
-                'all_lessons_count': count(*[${lessonsFilter}]._id),
-                'lessons': *[${lessonsFilter}]{
+                'all_lessons_count': count(*[${lessonsFilterWithRestrictions}]._id),
+                'lessons': *[${lessonsFilterWithRestrictions}]{
                     ${fieldsString},
                     ${groupBy}
                 }[0...20]`;
         filter = `_type == '${groupBy}' &amp;&amp; count(*[brand == '${brand}' &amp;&amp; ^._id in ${groupBy}[]._ref ${typeFilter} ${searchFilter} ${includedFieldsFilter} ${progressFilter}]._id) > 0`;
     } else {
-        filter = `brand == "${brand}" ${typeFilter} ${searchFilter} ${includedFieldsFilter} ${progressFilter}`
+        filter = `brand == "${brand}" ${typeFilter} ${searchFilter} ${includedFieldsFilter} ${progressFilter} ${customFilter}`
         entityFieldsString = fieldsString;
     }
+
+    const filterWithRestrictions = await new FilterBuilder(filter, {
+        bypassStatuses: bypassStatusAndPublishedValidation,
+        bypassPermissions: bypassStatusAndPublishedValidation,
+        bypassPublishedDateRestriction: bypassStatusAndPublishedValidation
+    }).buildFilter();
     query = buildEntityAndTotalQuery(
-        filter,
+        filterWithRestrictions,
         entityFieldsString,
         {
             sortOrder: sortOrder,
@@ -613,6 +648,125 @@ export async function fetchAll(brand, type, {
     return fetchSanity(query, true);
 }
 
+/**
+ * Fetch all content that requires custom handling or a distinct external call
+ * @param {string} brand - The brand for which to fetch content.
+ * @param {string} type - The content type to fetch (e.g., 'song', 'artist').
+ * @param {Object} params - Parameters for pagination, filtering, sorting, and grouping.
+ * @param {number} [params.page=1] - The page number for pagination.
+ * @param {number} [params.limit=10] - The number of items per page.
+ * @param {string} [params.searchTerm=""] - The search term to filter content by title or artist.
+ * @param {string} [params.sort="-published_on"] - The field to sort the content by.
+ * @param {Array&lt;string>} [params.includedFields=[]] - The fields to include in the query.
+ * @param {string} [params.groupBy=""] - The field to group the results by (e.g., 'artist', 'genre').
+ * @param {Array&lt;string>} [params.progressIds=undefined] - An array of railcontent IDs to filter the results by. Used for filtering by progress.
+ * @param {boolean} [params.useDefaultFields=true] - use the default sanity fields for content Type
+ * @param {Array&lt;string>} [params.customFields=[]] - An array of sanity fields to include in the request
+ * @param {string} [params.progress="all"] - An string representing which progress filter to use ("all", "in progress", "complete", "not started").
+ * @returns {Promise&lt;Object|null>} - The fetched content data or null if not found.
+ */
+async function handleCustomFetchAll(brand, type, {
+    page = 1,
+    limit = 10,
+    searchTerm = "",
+    sort = "-published_on",
+    includedFields = [],
+    groupBy = "",
+    progressIds = undefined,
+    useDefaultFields = true,
+    customFields = [],
+    progress = "all"
+} = {}) {
+    if (type === 'challenge') {
+        if (groupBy === 'completed') {
+            const completedIds = await fetchCompletedChallenges(brand, page, limit);
+            return fetchAll(brand, type,
+                {
+                    page,
+                    limit,
+                    searchTerm,
+                    sort,
+                    includedFields,
+                    groupBy: '',
+                    progressIds: completedIds,
+                    useDefaultFields,
+                    customFields,
+                    progress
+                });
+        } else if (groupBy === 'owned') {
+            const ownedIds = await fetchOwnedChallenges(brand, page, limit);
+            return fetchAll(brand, type,
+                {
+                    page,
+                    limit,
+                    searchTerm,
+                    sort,
+                    includedFields,
+                    groupBy: '',
+                    progressIds: ownedIds,
+                    useDefaultFields,
+                    customFields,
+                    progress
+                });
+        } else if (groupBy === 'difficulty_string') {
+            return fetchChallengesByDifficulty(brand, type, page, limit, searchTerm, sort, includedFields, groupBy, progressIds, useDefaultFields, customFields, progress);
+        }
+    }
+    return null;
+}
+
+async function fetchChallengesByDifficulty(brand, type, page, limit, searchTerm, sort, includedFields, groupBy, progressIds, useDefaultFields, customFields, progress) {
+    let config = contentTypeConfig['challenge'] ?? {};
+    let additionalFields = config?.fields ?? [];
+
+    // Construct the search filter
+    const searchFilter = searchTerm
+        ? groupBy !== "" ?
+            `&amp;&amp; (^.name match "${searchTerm}*" || title match "${searchTerm}*")`
+            : `&amp;&amp; (artist->name match "${searchTerm}*" || instructor[]->name match "${searchTerm}*" || title match "${searchTerm}*" || name match "${searchTerm}*")`
+        : "";
+
+    // Construct the included fields filter, replacing 'difficulty' with 'difficulty_string'
+    const includedFieldsFilter = includedFields.length > 0
+        ? filtersToGroq(includedFields)
+        : "";
+
+    // limits the results to supplied progressIds for started &amp; completed filters
+    const progressFilter = await getProgressFilter(progress, progressIds);
+
+    let fields = useDefaultFields ? customFields.concat(DEFAULT_FIELDS, additionalFields) : customFields;
+    let fieldsString = fields.join(',');
+
+
+    const lessonsFilter = `_type == 'challenge' &amp;&amp; brand == '${brand}' &amp;&amp; ^.name == difficulty_string ${searchFilter} ${includedFieldsFilter} ${progressFilter}`;
+    const lessonsFilterWithRestrictions = await new FilterBuilder(lessonsFilter).buildFilter();
+
+    const query = `{
+      "entity": [
+        {"name": "All"},
+        {"name": "Novice"},
+        {"name": "Beginner"},
+        {"name": "Intermediate"},
+        {"name": "Advanced"},
+        {"name": "Expert"}]
+          {
+            'id': 0,
+            name,
+            'all_lessons_count': count(*[${lessonsFilterWithRestrictions}]._id),
+            'lessons': *[${lessonsFilterWithRestrictions}]{
+                ${fieldsString},
+                name
+            }[0...20]
+          },
+          "total": 0
+        }`;
+    let data = await fetchSanity(query, true);
+    data.entity = data.entity.filter(function (difficulty) {
+        return difficulty.lessons.length > 0;
+    });
+    return data;
+}
+
 async function getProgressFilter(progress, progressIds) {
     switch (progress) {
         case "all":
@@ -635,7 +789,7 @@ async function getProgressFilter(progress, progressIds) {
     }
 }
 
-export function getSortOrder(sort = '-published_on', groupBy) {
+export function getSortOrder(sort = '-published_on', brand, groupBy) {
     // Determine the sort order
     let sortOrder = '';
     const isDesc = sort.startsWith('-');
@@ -645,9 +799,15 @@ export function getSortOrder(sort = '-published_on', groupBy) {
             sortOrder = groupBy ? 'name' : "title";
             break;
         case "name":
-        case "popularity":
             sortOrder = sort;
             break;
+        case "popularity":
+            if (groupBy == "artist" || groupBy == "genre") {
+                sortOrder = isDesc ? `coalesce(popularity.${brand}, -1)` : "popularity";
+            } else {
+                sortOrder = isDesc ? "coalesce(popularity, -1)" : "popularity";
+            }
+            break;
         case "published_on":
         default:
             sortOrder = "published_on";
@@ -838,6 +998,7 @@ export async function fetchMethod(brand, slug) {
         "url": web_url_path,
         web_url_path,
         xp,
+        total_xp
       }
   } | order(published_on asc)`
     return fetchSanity(query, false);
@@ -891,7 +1052,10 @@ export async function fetchMethodPreviousNextLesson(railcontentId, methodId) {
     const index = sortedChildren.indexOf(Number(railcontentId));
     let nextId = sortedChildren[index + 1];
     let previousId = sortedChildren[index - 1];
-    let nextPrev = await fetchByRailContentIds([nextId, previousId]);
+    let ids = [];
+    if (nextId) ids.push(nextId);
+    if (previousId) ids.push(previousId);
+    let nextPrev = await fetchByRailContentIds(ids);
     const nextLesson = nextPrev.find((elem) => {
         return elem['id'] === nextId
     });
@@ -978,7 +1142,7 @@ export async function fetchNextPreviousLesson(railcontentId) {
  *   .catch(error => console.error(error));
  */
 export async function fetchLessonContent(railContentId) {
-    const filterParams = {};
+    const filterParams = {isSingle: true, pullFutureContent: true};
     // Format changes made to the `fields` object may also need to be reflected in Musora-web-platform SanityGateway.php $fields object
     // Currently only for challenges and challenge lessons
     // If you're unsure, message Adrian, or just add them.
@@ -1089,7 +1253,7 @@ export async function fetchRelatedMethodLessons(railContentId, brand) {
  * @returns {Promise&lt;Array&lt;Object>|null>} - The fetched pack content data or null if not found.
  */
 export async function fetchAllPacks(brand, sort = "-published_on", searchTerm = "", page = 1, limit = 10) {
-    const sortOrder = getSortOrder(sort);
+    const sortOrder = getSortOrder(sort, brand);
     const filter = `_type == 'pack' &amp;&amp; brand == '${brand}' &amp;&amp; title match "${searchTerm}*"`
     const filterParams = {};
     const fields = getFieldsForContentType('pack');
@@ -1145,7 +1309,7 @@ export async function fetchLiveEvent(brand) {
     // See LiveStreamEventService.getCurrentOrNextLiveEvent for some nice complicated logic which I don't think is actually importart
     // this has some +- on times
     // But this query just finds the first scheduled event (sorted by start_time) that ends after now()
-    const query = `*[status == 'scheduled' &amp;&amp; defined(live_event_start_time) &amp;&amp; published_on > '${getSanityDate(dateTemp)}' &amp;&amp; live_event_end_time >= '${getSanityDate(new Date())}']{
+    const query = `*[status == 'scheduled' &amp;&amp; defined(live_event_start_time) &amp;&amp; published_on > '${getSanityDate(dateTemp, false)}' &amp;&amp; live_event_end_time >= '${getSanityDate(new Date(), false)}']{
       'slug': slug.current,
       'id': railcontent_id,
       live_event_start_time,
@@ -1247,7 +1411,7 @@ export async function fetchCoachLessons(brand, id, {
         : "";
     const filter = `brand == '${brand}' ${searchFilter} ${includedFieldsFilter} &amp;&amp; references(*[_type=='instructor' &amp;&amp; railcontent_id == ${id}]._id)`;
 
-    sortOrder = getSortOrder(sortOrder);
+    sortOrder = getSortOrder(sortOrder, brand);
     const query = buildEntityAndTotalQuery(
         filter,
         fieldsString,
@@ -1321,12 +1485,14 @@ export async function fetchByReference(brand, {
     const includedFieldsFilter = includedFields.length > 0
         ? includedFields.join(' &amp;&amp; ')
         : "";
+
     const filter = `brand == '${brand}' ${searchFilter} &amp;&amp; references(*[${includedFieldsFilter}]._id)`;
+    const filterWithRestrictions = await new FilterBuilder(filter).buildFilter();
     const query = buildEntityAndTotalQuery(
-        filter,
+        filterWithRestrictions,
         fieldsString,
         {
-            sortOrder: getSortOrder(sortOrder),
+            sortOrder: getSortOrder(sortOrder, brand),
             start: start,
             end: end,
         },
@@ -1366,7 +1532,7 @@ export async function fetchArtistLessons(brand, name, contentType, {
     const start = (page - 1) * limit;
     const end = start + limit;
     const searchFilter = searchTerm ? `&amp;&amp; title match "${searchTerm}*"` : ''
-    const sortOrder = getSortOrder(sort);
+    const sortOrder = getSortOrder(sort, brand);
     const addType = contentType &amp;&amp; Array.isArray(contentType) ? `_type in ['${contentType.join("', '")}'] &amp;&amp;` : contentType ? `_type == '${contentType}' &amp;&amp; ` : ''
     const includedFieldsFilter = includedFields.length > 0
         ? filtersToGroq(includedFields)
@@ -1417,7 +1583,7 @@ export async function fetchGenreLessons(brand, name, contentType, {
     const start = (page - 1) * limit;
     const end = start + limit;
     const searchFilter = searchTerm ? `&amp;&amp; title match "${searchTerm}*"` : ''
-    const sortOrder = getSortOrder(sort);
+    const sortOrder = getSortOrder(sort, brand);
     const addType = contentType ? `_type == '${contentType}' &amp;&amp; ` : ''
     const includedFieldsFilter = includedFields.length > 0
         ? filtersToGroq(includedFields)
@@ -1617,6 +1783,7 @@ export async function fetchSanity(query,
         ]);
         const response = promisesResult[0];
         const userPermissions = promisesResult[1]?.permissions;
+        const isAdmin = promisesResult[1]?.isAdmin;
 
         if (!response.ok) {
             throw new Error(`Sanity API error: ${response.status} - ${response.statusText}`);
@@ -1627,7 +1794,7 @@ export async function fetchSanity(query,
                 console.log("fetchSanity Results:", result);
             }
             let results = isList ? result.result : result.result[0];
-            results = processNeedAccess ? await needsAccessDecorator(results, userPermissions) : results;
+            results = processNeedAccess ? await needsAccessDecorator(results, userPermissions, isAdmin) : results;
             return customPostProcess ? customPostProcess(results) : results;
         } else {
             throw new Error('No results found');
@@ -1638,38 +1805,41 @@ export async function fetchSanity(query,
     }
 }
 
-function needsAccessDecorator(results, userPermissions) {
+function needsAccessDecorator(results, userPermissions, isAdmin) {
     if (globalConfig.sanityConfig.useDummyRailContentMethods) return results;
 
     userPermissions = new Set(userPermissions);
 
     if (Array.isArray(results)) {
         results.forEach((result) => {
-            result['need_access'] = doesUserNeedAccessToContent(result, userPermissions);
+            result['need_access'] = doesUserNeedAccessToContent(result, userPermissions, isAdmin);
         });
     } else if (results.entity &amp;&amp; Array.isArray(results.entity)) {
         // Group By
         results.entity.forEach((result) => {
             if (result.lessons) {
                 result.lessons.forEach((lesson) => {
-                    lesson['need_access'] = doesUserNeedAccessToContent(lesson, userPermissions); // Updated to check lesson access
+                    lesson['need_access'] = doesUserNeedAccessToContent(lesson, userPermissions, isAdmin); // Updated to check lesson access
                 });
             } else {
-                result['need_access'] = doesUserNeedAccessToContent(result, userPermissions);
+                result['need_access'] = doesUserNeedAccessToContent(result, userPermissions, isAdmin);
             }
         });
     } else if (results.related_lessons &amp;&amp; Array.isArray(results.related_lessons)) {
         results.related_lessons.forEach((result) => {
-            result['need_access'] = doesUserNeedAccessToContent(result, userPermissions);
+            result['need_access'] = doesUserNeedAccessToContent(result, userPermissions, isAdmin);
         })
     } else {
-        results['need_access'] = doesUserNeedAccessToContent(results, userPermissions);
+        results['need_access'] = doesUserNeedAccessToContent(results, userPermissions, isAdmin);
     }
 
     return results;
 }
 
-function doesUserNeedAccessToContent(result, userPermissions) {
+function doesUserNeedAccessToContent(result, userPermissions, isAdmin) {
+    if (isAdmin ?? false) {
+        return false;
+    }
     const permissions = new Set(result?.permission_id ?? []);
     if (permissions.size === 0) {
         return false;
@@ -1757,7 +1927,18 @@ function arrayJoinWithQuotes(array, delimiter = ',') {
     return wrapped.join(delimiter)
 }
 
-function getSanityDate(date) {
+function getSanityDate(date, roundToHourForCaching = true) {
+    if (roundToHourForCaching) {
+        // We need to set the published on filter date to be a round time so that it doesn't bypass the query cache
+        // with every request by changing the filter date every second. I've set it to one minute past the current hour
+        // because publishing usually publishes content on the hour exactly which means it should still skip the cache
+        // when the new content is available.
+        // Round to the start of the current hour
+        const roundedDate = new Date(date.getFullYear(), date.getMonth(), date.getDate(), date.getHours());
+
+        return roundedDate.toISOString();
+    }
+
     return date.toISOString();
 }
 
@@ -1810,7 +1991,7 @@ function buildRawQuery(
 
 async function buildQuery(
     baseFilter = '',
-    filterParams = {},
+    filterParams = {pullFutureContent: false},
     fields = '...',
     {
         sortOrder = 'published_on desc',
@@ -1840,7 +2021,7 @@ function buildEntityAndTotalQuery(
       {
         ${fields}
       },
-      "total": count(*[${filter}])
+      "total": 0
     }`;
     return query;
 }
@@ -1954,7 +2135,7 @@ function cleanUpGroq(query) {
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.3</a> on Fri Nov 15 2024 13:01:14 GMT+0000 (Coordinated Universal Time) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.3</a> on Mon Dec 02 2024 10:19:36 GMT+0000 (Coordinated Universal Time) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/package.json

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

package/src/index.d.ts

@@ -75,6 +75,7 @@ import {
 	postContentReset,
 	postContentUnliked,
 	postRecordWatchSession,
+	reportPlaylist,
 	unpinPlaylist,
 	updatePlaylist,
 	updatePlaylistItem
@@ -253,6 +254,7 @@ declare module 'musora-content-services' {
 		postContentUnliked,
 		postRecordWatchSession,
 		recordWatchSession,
+		reportPlaylist,
 		reset,
 		unlikeContent,
 		unpinPlaylist,

package/src/index.js

@@ -75,6 +75,7 @@ import {
 	postContentReset,
 	postContentUnliked,
 	postRecordWatchSession,
+	reportPlaylist,
 	unpinPlaylist,
 	updatePlaylist,
 	updatePlaylistItem
@@ -252,6 +253,7 @@ export {
 	postContentUnliked,
 	postRecordWatchSession,
 	recordWatchSession,
+	reportPlaylist,
 	reset,
 	unlikeContent,
 	unpinPlaylist,

package/src/services/railcontent.js

@@ -1090,6 +1090,19 @@ export async function fetchPinnedPlaylists(brand) {
     return await fetchHandler(url, "GET");
 }
 
+/**
+ * Report playlist endpoint
+ * 
+ * @param playlistId
+ * @param issue
+ * @returns {Promise<any|null>}
+ */
+export async function reportPlaylist(playlistId,  {issue} = {}) {
+    const issueString = issue ? `?issue=${issue}` : '';
+    const url = `/playlists/report/${playlistId}${issueString}`;
+    return await fetchHandler(url, "PUT");
+}
+
 function fetchAbsolute(url, params) {
     if (globalConfig.railcontentConfig.baseUrl) {
         if (url.startsWith('/')) {

package/src/services/sanity.js

@@ -951,6 +951,7 @@ export async function fetchMethod(brand, slug) {
         "url": web_url_path,
         web_url_path,
         xp,
+        total_xp
       }
   } | order(published_on asc)`
     return fetchSanity(query, false);