musora-content-services 1.2.2 → 1.2.4

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#.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#.fetchNextContentDataForParent">fetchNextContentDataForParent</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#.jumpToContinueContent">jumpToContinueContent</a></li><li data-type='method'><a href="module-Sanity-Services.html#~handleCustomFetchAll">handleCustomFetchAll</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#.fetchNextContentDataForParent">fetchNextContentDataForParent</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#.postChallengesSoloNotification">postChallengesSoloNotification</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#.setStudentViewForUser">setStudentViewForUser</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#.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#.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#.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#.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#.fetchMethodPreviousNextLesson">fetchMethodPreviousNextLesson</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#.fetchPackData">fetchPackData</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#.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#.fetchUpcomingEvents">fetchUpcomingEvents</a></li><li data-type='method'><a href="module-Sanity-Services.html#.jumpToContinueContent">jumpToContinueContent</a></li><li data-type='method'><a href="module-Sanity-Services.html#~handleCustomFetchAll">handleCustomFetchAll</a></li></ul></li></ul>
     
 </nav>
 
@@ -53,6 +53,7 @@ import {
     artistOrInstructorNameAsArray,
     assignmentsField,
     descriptionField,
+    resourcesField,
     contentTypeConfig,
     DEFAULT_FIELDS,
     getFieldsForContentType,
@@ -61,25 +62,25 @@ import {
     showsTypes,
     getNewReleasesTypes,
     coachLessonsTypes
-} from "../contentTypeConfig";
+} from "../contentTypeConfig.js";
 
 import {
     processMetadata,
     typeWithSortOrder
-} from "../contentMetaData";
+} from "../contentMetaData.js";
 
-import {globalConfig} from "./config";
+import {globalConfig} from "./config.js";
 
 import {
     fetchAllCompletedStates,
     fetchCompletedChallenges,
-    fetchCurrentSongComplete,
     fetchOwnedChallenges,
-    fetchNextContentDataForParent
+    fetchNextContentDataForParent,
+    fetchHandler,
 } from './railcontent.js';
-import {arrayToStringRepresentation, FilterBuilder} from "../filterBuilder";
-import {fetchUserPermissions} from "./userPermissions";
-import {getAllCompleted, getAllStarted, getAllStartedOrCompleted} from "./contentProgress";
+import {arrayToStringRepresentation, FilterBuilder} from "../filterBuilder.js";
+import {fetchUserPermissions} from "./userPermissions.js";
+import {getAllCompleted, getAllStarted, getAllStartedOrCompleted} from "./contentProgress.js";
 
 /**
  * Exported functions that are excluded from index generation.
@@ -161,10 +162,12 @@ export async function fetchPlayAlongsCount(brand) {
  *   .catch(error => console.error(error));
  */
 export async function fetchRelatedSongs(brand, songId) {
+    const now = getSanityDate(new Date());
     const query = `
       *[_type == "song" &amp;&amp; railcontent_id == ${songId}]{
         "entity": array::unique([
-            ...(*[_type == "song" &amp;&amp; brand == "${brand}" &amp;&amp; railcontent_id != ${songId} &amp;&amp; references(^.artist->_id)]{
+            ...(*[_type == "song" &amp;&amp; brand == "${brand}" &amp;&amp; railcontent_id != ${songId} &amp;&amp; references(^.artist->_id)
+            &amp;&amp; (status in ['published'] || (status == 'scheduled' &amp;&amp; defined(published_on) &amp;&amp; published_on >= '${now}'))]{
             "type": _type,
             "id": railcontent_id,
             "url": web_url_path,
@@ -190,7 +193,8 @@ export async function fetchRelatedSongs(brand, songId) {
               }
             ],
           }[0...10]),
-            ...(*[_type == "song" &amp;&amp; brand == "${brand}" &amp;&amp; railcontent_id != ${songId} &amp;&amp; references(^.genre[]->_id)]{
+            ...(*[_type == "song" &amp;&amp; brand == "${brand}" &amp;&amp; railcontent_id != ${songId} &amp;&amp; references(^.genre[]->_id)
+            &amp;&amp; (status in ['published'] || (status == 'scheduled' &amp;&amp; defined(published_on) &amp;&amp; published_on >= '${now}'))]{
             "type": _type,
             "id": railcontent_id,
             "url": web_url_path,
@@ -226,107 +230,6 @@ export async function fetchRelatedSongs(brand, songId) {
     return fetchSanity(query, false);
 }
 
-/**
- * Fetch all songs for a specific brand with pagination and search options.
- * @param {string} brand - The brand for which to fetch songs.
- * @param {Object} params - Parameters for pagination, filtering, and sorting.
- * @param {number} [params.page=1] - The page number for pagination.
- * @param {number} [params.limit=10] - The number of songs per page.
- * @param {string} [params.searchTerm=""] - The search term to filter songs by title or artist.
- * @param {string} [params.sort="-published_on"] - The field to sort the songs 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.
- * @returns {Promise&lt;Object|null>} - The fetched song data or null if not found.
- *
- * @example
- * fetchAllSongs('drumeo', {
- *   page: 2,
- *   limit: 20,
- *   searchTerm: 'rock',
- *   sort: 'published_on',
- *   includedFields: ['difficulty', 'style'],
- *   groupBy: 'artist'
- * })
- *   .then(result => console.log(result))
- *   .catch(error => console.error(error));
- */
-export async function fetchAllSongs(brand, {
-    page = 1,
-    limit = 10,
-    searchTerm = "",
-    sort = "-published_on",
-    includedFields = [],
-    groupBy = ""
-}) {
-    return fetchAll(brand, 'song', {page, limit, searchTerm, sort, includedFields, groupBy});
-}
-
-/**
- * Fetch filter options for a specific brand.
- *
- * @param {string} brand - The brand for which to fetch filter options.
- * @returns {Promise&lt;Object|null>} - A promise that resolves to an object containing filter options or null if not found.
- *
- * @example
- * fetchSongFilterOptions('drumeo')
- *   .then(options => console.log(options))
- *   .catch(error => console.error(error));
- */
-export async function fetchSongFilterOptions(brand) {
-    const query = `
-  {
-    "difficulty": [
-      {"type": "Introductory", "count": count(*[_type == 'song' &amp;&amp; brand == '${brand}' &amp;&amp; difficulty_string == "Introductory"]._id)},
-      {"type": "Beginner", "count": count(*[_type == 'song' &amp;&amp; brand == '${brand}' &amp;&amp; difficulty_string == "Beginner"]._id)},
-      {"type": "Intermediate", "count": count(*[_type == 'song' &amp;&amp; brand == '${brand}' &amp;&amp; difficulty_string == "Intermediate"]._id)},
-      {"type": "Advanced", "count": count(*[_type == 'song' &amp;&amp; brand == '${brand}' &amp;&amp; difficulty_string == "Advanced"]._id)},
-      {"type": "Expert", "count": count(*[_type == 'song' &amp;&amp; brand == '${brand}' &amp;&amp; difficulty_string == "Expert"]._id)}
-    ],
-    "genre": *[_type == 'genre' &amp;&amp; 'song' in filter_types] {
-      "type": name,
-      "count": count(*[_type == 'song' &amp;&amp; brand == '${brand}' &amp;&amp; references(^._id)]._id)
-    },
-    "instrumentless": [
-      {"type": "Full Song Only", "count": count(*[_type == 'song' &amp;&amp; brand == '${brand}' &amp;&amp; instrumentless == false]._id)},
-      {"type": "Instrument Removed", "count": count(*[_type == 'song' &amp;&amp; brand == '${brand}' &amp;&amp; instrumentless == true]._id)}
-    ]
-  }`;
-
-    return fetchSanity(query, true);
-}
-
-/**
- * Fetch the total count of songs for a specific brand.
- * @param {string} brand - The brand for which to fetch the song count.
- * @returns {Promise&lt;number|null>} - The total count of songs or null if an error occurs.
- */
-export async function fetchSongCount(brand) {
-    const query = `count(*[_type == 'song' &amp;&amp; brand == "${brand}"])`;
-    return fetchSanity(query, true, {processNeedAccess: false});
-}
-
-/**
- * Fetch the latest workouts for a specific brand, including completion status and progress.
- * This function retrieves up to five of the latest workout content for a given brand, sorted in descending order by their publication date.
- * It also includes completion status and progress percentage for each workout by fetching additional data about user progress.
- *
- * @param {string} brand - The brand for which to fetch workouts (e.g., 'drumeo', 'pianote').
- * @returns {Promise&lt;Array&lt;Object>|null>} - A promise that resolves to an array of workout data objects with additional properties for completion status and progress percentage,
- *     or null if no workouts are found.
- *
- * @example
- * fetchWorkouts('drumeo')
- *   .then(workouts => console.log(workouts))
- *   .catch(error => console.error(error));
- */
-export async function fetchWorkouts(brand) {
-    const fields = getFieldsForContentType('workout');
-    const query = `*[_type == 'workout' &amp;&amp; brand == '${brand}'] [0...5] {
-        ${fields.toString()}
-      } | order(published_on desc)[0...5]`
-    return fetchSanity(query, true);
-}
-
 /**
  * Fetch the latest new releases for a specific brand.
  * @param {string} brand - The brand for which to fetch new releases.
@@ -338,12 +241,12 @@ export async function fetchNewReleases(brand, {page = 1, limit = 20, sort = "-pu
     const start = (page - 1) * limit;
     const end = start + limit;
     const sortOrder = getSortOrder(sort, brand);
-    const filter = `_type in ${typesString} &amp;&amp; brand == '${brand}'`;
+    const filter = `_type in ${typesString} &amp;&amp; brand == '${brand}' &amp;&amp; show_in_new_feed == true`;
     const fields = `
      "id": railcontent_id,
       title,
       "image": thumbnail.asset->url,
-      "artist_name": instructor[0]->name,
+      ${artistOrInstructorName()},
       "artists": instructor[]->name,
       difficulty,
       difficulty_string,
@@ -353,7 +256,7 @@ export async function fetchNewReleases(brand, {page = 1, limit = 20, sort = "-pu
       web_url_path,
       "permission_id": permission[]->railcontent_id,
       `;
-    const filterParams = {};
+    const filterParams = {allowsPullSongsContent: false};
     const query = await buildQuery(
         filter,
         filterParams,
@@ -391,7 +294,7 @@ export async function fetchUpcomingEvents(brand, {page = 1, limit = 10} = {}) {
         "id": railcontent_id,
         title,
         "image": thumbnail.asset->url,
-        "artist_name": instructor[0]->name,
+        ${artistOrInstructorName()},
         "artists": instructor[]->name,
         difficulty,
         difficulty_string,
@@ -439,7 +342,7 @@ export async function fetchScheduledReleases(brand, {page = 1, limit = 10}) {
       "id": railcontent_id,
       title,
       "image": thumbnail.asset->url,
-      "artist_name": instructor[0]->name,
+      ${artistOrInstructorName()},
       "artists": instructor[]->name,
       difficulty,
       difficulty_string,
@@ -465,10 +368,29 @@ export async function fetchScheduledReleases(brand, {page = 1, limit = 10}) {
  *   .catch(error => console.error(error));
  */
 export async function fetchByRailContentId(id, contentType) {
+    const fields = getFieldsForContentType(contentType);
+    const childrenFilter = await new FilterBuilder(``, {isChildrenFilter: true} ).buildFilter();
+    const entityFieldsString = ` ${fields}
+                                    'child_count': coalesce(count(child[${childrenFilter}]->), 0) ,
+                                    "lessons": child[${childrenFilter}]->{
+                                        "id": railcontent_id,
+                                        title,
+                                        "image": thumbnail.asset->url,
+                                        "instructors": instructor[]->name,
+                                        length_in_seconds,
+                                    },
+                                    'length_in_seconds': coalesce(
+      math::sum(
+        select(
+          child[${childrenFilter}]->length_in_seconds
+        )
+      ),
+      length_in_seconds
+    ),`;
 
     const query = buildRawQuery(
         `railcontent_id == ${id} &amp;&amp; _type == '${contentType}'`,
-        getFieldsForContentType(contentType),
+        entityFieldsString,
         {
             isSingle: true,
         },
@@ -495,7 +417,20 @@ export async function fetchByRailContentIds(ids, contentType = undefined) {
     const query = `*[railcontent_id in [${idsString}]]{
         ${getFieldsForContentType(contentType)}
       }`
-    return fetchSanity(query, true);
+    const results = await fetchSanity(query, true);
+
+   const sortFuction = function compare(a,b){
+       const indexA = ids.indexOf(a['id']);
+       const indexB = ids.indexOf(b['id'])
+        if(indexA === indexB) return 0;
+        if(indexA > indexB) return 1;
+        return -1;
+    }
+
+    // Sort results to match the order of the input IDs
+    const sortedResults = results.sort(sortFuction);
+
+    return sortedResults;
 }
 
 /**
@@ -557,7 +492,7 @@ export async function fetchAll(brand, type, {
     if (customResults) {
         return customResults;
     }
-
+console.log('rox fetch all    ');
     let config = contentTypeConfig[type] ?? {};
     let additionalFields = config?.fields ?? [];
     let isGroupByOneToOne = (groupBy ? config?.relationships?.[groupBy]?.isOneToOne : false) ?? false;
@@ -565,15 +500,18 @@ export async function fetchAll(brand, type, {
     const start = (page - 1) * limit;
     const end = start + limit;
     let bypassStatusAndPublishedValidation = (type == 'instructor' || groupBy == 'artist' || groupBy == 'genre' || groupBy == 'instructor');
-
+    let bypassPermissions = bypassStatusAndPublishedValidation;
     // Construct the type filter
     let typeFilter;
 
-    if( type === 'archives' ) {
-        typeFilter = `&amp;&amp; status == "archived"`
+    if (type === 'archives') {
+        typeFilter = `&amp;&amp; status == "archived"`;
+        bypassStatusAndPublishedValidation = true;
+    } else if(type === 'pack'){
+        typeFilter = `&amp;&amp; (_type == 'pack' || _type == 'semester-pack')`;
     } else {
         typeFilter = type ? `&amp;&amp; _type == '${type}'` : "";
-    } 
+    }
 
     // Construct the search filter
     const searchFilter = searchTerm
@@ -622,6 +560,8 @@ export async function fetchAll(brand, type, {
         `;
         filter = `_type == '${groupBy}' &amp;&amp; count(*[${lessonsFilterWithRestrictions}]._id) > 0`;
     } else if (groupBy !== "") {
+        const childrenFilter = await new FilterBuilder(``, {isChildrenFilter: true} ).buildFilter();
+
         const webUrlPath = (groupBy == 'genre') ? '/genres' : '';
         const lessonsFilter = `brand == '${brand}' &amp;&amp; ^._id in ${groupBy}[]._ref ${typeFilter} ${searchFilter} ${includedFieldsFilter} ${progressFilter} ${customFilter}`;
         const lessonsFilterWithRestrictions = await new FilterBuilder(lessonsFilter).buildFilter();
@@ -635,17 +575,28 @@ export async function fetchAll(brand, type, {
                 'all_lessons_count': count(*[${lessonsFilterWithRestrictions}]._id),
                 'lessons': *[${lessonsFilterWithRestrictions}]{
                     ${fieldsString},
+                     'lesson_count': coalesce(count(child[${childrenFilter}]->), 0) ,
                     ${groupBy}
                 }[0...20]`;
         filter = `_type == '${groupBy}' &amp;&amp; count(*[${lessonsFilterWithRestrictions}]._id) > 0`;
     } else {
         filter = `brand == "${brand}" ${typeFilter} ${searchFilter} ${includedFieldsFilter} ${progressFilter} ${customFilter}`
-        entityFieldsString = fieldsString;
+        const childrenFilter = await new FilterBuilder(``, {isChildrenFilter: true} ).buildFilter();
+        entityFieldsString = ` ${fieldsString},
+                                    'lesson_count': coalesce(count(child[${childrenFilter}]->), 0) ,
+                                    'length_in_seconds': coalesce(
+      math::sum(
+        select(
+          child[${childrenFilter}]->length_in_seconds
+        )
+      ),
+      length_in_seconds
+    ),`;
     }
 
     const filterWithRestrictions = await new FilterBuilder(filter, {
         bypassStatuses: bypassStatusAndPublishedValidation,
-        bypassPermissions: bypassStatusAndPublishedValidation,
+        bypassPermissions: bypassPermissions,
         bypassPublishedDateRestriction: bypassStatusAndPublishedValidation
     }).buildFilter();
     query = buildEntityAndTotalQuery(
@@ -656,6 +607,7 @@ export async function fetchAll(brand, type, {
             start: start,
             end: end,
         });
+
     return fetchSanity(query, true);
 }
 
@@ -881,11 +833,11 @@ export async function fetchAllFilterOptions(
     const constructCommonFilter = (excludeFilter) => {
         const filterWithoutOption = excludeFilter ? filtersToGroq(filters, excludeFilter) : includedFieldsFilter;
         const statusFilter = ' &amp;&amp; status == "published"';
-        const includeStatusFilter = !isAdmin &amp;&amp; !['instructor','artist','genre'].includes(contentType);
+        const includeStatusFilter = !isAdmin &amp;&amp; !['instructor', 'artist', 'genre'].includes(contentType);
 
         return coachId
-            ? `brand == '${brand}' &amp;&amp; status == "published" &amp;&amp; references(*[_type=='instructor' &amp;&amp; railcontent_id == ${coachId}]._id) ${filterWithoutOption || ''}`
-            : `_type == '${contentType}' &amp;&amp; brand == "${brand}"${includeStatusFilter ? statusFilter : ''}${style &amp;&amp; excludeFilter !== "style" ? ` &amp;&amp; '${style}' in genre[]->name` : ''}${artist &amp;&amp; excludeFilter !== "artist" ? ` &amp;&amp; artist->name == '${artist}'` : ''} ${progressFilter} ${filterWithoutOption || ''}`;
+            ? `brand == '${brand}' &amp;&amp; status == "published" &amp;&amp; references(*[_type=='instructor' &amp;&amp; railcontent_id == ${coachId}]._id) ${filterWithoutOption || ''} ${term ? ` &amp;&amp; (title match "${term}" || album match "${term}" || artist->name match "${term}" || genre[]->name match "${term}")` : ''}`
+            : `_type == '${contentType}' &amp;&amp; brand == "${brand}"${includeStatusFilter ? statusFilter : ''}${style &amp;&amp; excludeFilter !== "style" ? ` &amp;&amp; '${style}' in genre[]->name` : ''}${artist &amp;&amp; excludeFilter !== "artist" ? ` &amp;&amp; artist->name == '${artist}'` : ''} ${progressFilter} ${filterWithoutOption || ''} ${term ? ` &amp;&amp; (title match "${term}" || album match "${term}" || artist->name match "${term}" || genre[]->name match "${term}")` : ''}`;
     };
 
     const metaData = processMetadata(brand, contentType, true);
@@ -911,54 +863,6 @@ export async function fetchAllFilterOptions(
     return includeTabs ? {...results, tabs, catalogName} : results;
 }
 
-
-/**
- * Fetch children content by Railcontent ID.
- * @param {string} railcontentId - The Railcontent ID of the parent content.
- * @param {string} [contentType] - The content type the IDs to add needed fields to the response.
- * @returns {Promise&lt;Array&lt;Object>|null>} - The fetched children content data or [] if not found.
- */
-export async function fetchChildren(railcontentId, contentType) {
-    const query = `*[railcontent_id == ${railcontentId}]{
-        title,
-
-        'children': child[]->{
-                           ${getFieldsForContentType(contentType)}
-                        },
-      }[0..1]`;
-    let parent = await fetchSanity(query, false);
-    return parent['children'] ?? [];
-}
-
-/**
- *
- * @param railcontentId - railcontent id of the child
- * @returns {Promise&lt;Array&lt;string>|null>} - The fetched parent content data or [] if not found
- */
-export async function fetchParentByRailContentId(railcontentId) {
-    const query = `*[railcontent_id == ${railcontentId}]{
-        'parents': array::unique([
-            ...(*[references(^._id)]{
-                ${getFieldsForContentType()}
-                })
-            ])
-        }[0...1]`;
-    let child = await fetchSanity(query, false);
-    return child['parents'][0] ?? [];
-}
-
-/**
- * Fetch the Methods (learning-paths) for a specific brand.
- * @param {string} brand - The brand for which to fetch methods.
- * @returns {Promise&lt;Object|null>} - The fetched methods data or null if not found.
- */
-export async function fetchMethods(brand) {
-    const query = `*[_type == 'learning-path' &amp;&amp; brand == '${brand}'] {
-      ${getFieldsForContentType()}
-    } | order(published_on asc)`
-    return fetchSanity(query, true);
-}
-
 /**
  * Fetch the Foundations 2019.
  * @param {string} slug - The slug of the method.
@@ -985,6 +889,8 @@ export async function fetchFoundation(slug) {
  * @returns {Promise&lt;Object|null>} - The fetched methods data or null if not found.
  */
 export async function fetchMethod(brand, slug) {
+    const childrenFilter = await new FilterBuilder(``, {isChildrenFilter: true} ).buildFilter();
+
     const query = `*[_type == 'learning-path' &amp;&amp; brand == "${brand}" &amp;&amp; slug.current == "${slug}"] {
     "description": ${descriptionField},
     "instructors":instructor[]->name,
@@ -996,9 +902,15 @@ export async function fetchMethod(brand, slug) {
     title,
     video,
     length_in_seconds,
+    parent_content_data,
+    "breadcrumbs_data": parent_content_data[] {
+        "id": id,
+        "title": *[railcontent_id == ^.id][0].title,
+        "url": *[railcontent_id == ^.id][0].web_url_path
+    } | order(length(url)),
     "type": _type,
     "permission_id": permission[]->railcontent_id,
-    "levels": child[]->
+    "levels": child[${childrenFilter}]->
       {
         "id": railcontent_id,
         published_on,
@@ -1025,34 +937,30 @@ export async function fetchMethod(brand, slug) {
  * @returns {Promise&lt;Object|null>} - The fetched next lesson data or null if not found.
  */
 export async function fetchMethodChildren(railcontentId) {
+    const childrenFilter = await new FilterBuilder(``, {isChildrenFilter: true} ).buildFilter();
+
     const query = `*[railcontent_id == ${railcontentId}]{
-    child_count,
+    "child_count":coalesce(count(child[${childrenFilter}]->), 0),
     "id": railcontent_id,
     "description": ${descriptionField},
     "thumbnail_url": thumbnail.asset->url,
     title,
     xp,
     total_xp,
-    'children': child[]->{
+    parent_content_data,
+     "resources": ${resourcesField},
+    "breadcrumbs_data": parent_content_data[] {
+        "id": id,
+        "title": *[railcontent_id == ^.id][0].title,
+        "url": *[railcontent_id == ^.id][0].web_url_path
+    } | order(length(url)),
+    'children': child[(${childrenFilter})]->{
         ${getFieldsForContentType('method')}
     },
   }[0..1]`;
     return fetchSanity(query, true);
 }
 
-/**
- * Fetch the next lesson for a specific method by Railcontent ID.
- * @param {string} railcontentId - The Railcontent ID of the current lesson.
- * @param {string} methodId - The RailcontentID of the method
- * @returns {Promise&lt;Object|null>} - The fetched next lesson data or null if not found.
- */
-export async function fetchMethodNextLesson(railcontentId, methodId) {
-    const sortedChildren = await fetchMethodChildrenIds(methodId);
-    const index = sortedChildren.indexOf(railcontentId);
-    const childIndex = sortedChildren[index + 1];
-    return childIndex ? await fetchByRailContentId(childIndex) : null;
-}
-
 /**
  * Fetch the next lesson for a specific method by Railcontent ID.
  * @param {string} railcontentId - The Railcontent ID of the current lesson.
@@ -1087,14 +995,16 @@ export async function fetchMethodPreviousNextLesson(railcontentId, methodId) {
  * @returns {Promise&lt;Array&lt;Object>|null>} - The fetched children data or null if not found.
  */
 export async function fetchMethodChildrenIds(railcontentId) {
+    const childrenFilter = await new FilterBuilder(``, {isChildrenFilter: true} ).buildFilter();
+
     const query = `*[ railcontent_id == ${railcontentId}]{
-    'children': child[]-> {
+    'children': child[${childrenFilter}]-> {
         'id': railcontent_id,
         'type' : _type,
-            'children': child[]-> {
+            'children': child[${childrenFilter}]-> {
                 'id': railcontent_id,
                 'type' : _type,
-                    'children': child[]-> {
+                    'children': child[${childrenFilter}]-> {
                         'id': railcontent_id,
                         'type' : _type,
             }
@@ -1162,7 +1072,7 @@ export async function fetchNextPreviousLesson(railcontentId) {
  */
 export async function jumpToContinueContent(railcontentId) {
     const nextContent = await fetchNextContentDataForParent(railcontentId);
-    if (!nextContent) {
+    if (!nextContent || !nextContent.id) {
         return null;
     }
     let next = await fetchByRailContentId(nextContent.id, nextContent.type);
@@ -1187,13 +1097,13 @@ export async function fetchLessonContent(railContentId) {
     const fields = `title, 
           published_on,
           "type":_type, 
-          "resources": resource, 
+          "resources": ${resourcesField},
           difficulty, 
           difficulty_string, 
           brand, 
           status,
           soundslice, 
-          instrumentless, 
+          instrumentless,    
           railcontent_id, 
           "id":railcontent_id, 
           slug, artist->,
@@ -1203,7 +1113,7 @@ export async function fetchLessonContent(railContentId) {
           "description": description[0].children[0].text,
           "chapters": chapter[]{
             chapter_description,
-            chapter_timecode,
+            chapter_timecode, 
             "chapter_thumbnail_url": chapter_thumbnail_url.asset->url
           },
           "instructors":instructor[]->name,
@@ -1224,7 +1134,13 @@ export async function fetchLessonContent(railContentId) {
           mp3_yes_drums_no_click_url,
           mp3_yes_drums_yes_click_url,
           "permission_id": permission[]->railcontent_id,
-          parent_content_data,
+          "parent_content_data": parent_content_data[]{
+            "id": id,
+            "title": *[railcontent_id == ^.id][0].title,
+            "web_url_path": *[railcontent_id == ^.id][0].web_url_path,
+            "slug":*[railcontent_id == ^.id][0].slug,
+            "type": *[railcontent_id == ^.id][0]._type,
+          },
           sort,
           xp`;
     const query = await buildQuery(
@@ -1250,11 +1166,12 @@ export async function fetchRelatedLessons(railContentId, brand) {
     const filterSongSameArtist = await new FilterBuilder(`_type=="song" &amp;&amp; _type==^._type &amp;&amp; brand == "${brand}" &amp;&amp; references(^.artist->_id) &amp;&amp; railcontent_id !=${railContentId}`).buildFilter();
     const filterSongSameGenre = await new FilterBuilder(`_type=="song" &amp;&amp; _type==^._type &amp;&amp; brand == "${brand}" &amp;&amp; references(^.genre[]->_id) &amp;&amp; railcontent_id !=${railContentId}`).buildFilter();
     const filterNeighbouringSiblings = await new FilterBuilder(`references(^._id)`).buildFilter();
+    const childrenFilter = await new FilterBuilder(``, {isChildrenFilter: true} ).buildFilter();
 
     const query = `*[railcontent_id == ${railContentId} &amp;&amp; brand == "${brand}" &amp;&amp; (!defined(permission) || references(*[_type=='permission']._id))]{
    _type, parent_type, railcontent_id,
     "related_lessons" : array::unique([
-      ...(*[${filterNeighbouringSiblings}][0].child[]->{_id, "id":railcontent_id, published_on, "instructor": instructor[0]->name, title, "thumbnail_url":thumbnail.asset->url, length_in_seconds, web_url_path, "type": _type, difficulty, difficulty_string, railcontent_id, artist->,"permission_id": permission[]->railcontent_id,_type}),
+      ...(*[${filterNeighbouringSiblings}][0].child[${childrenFilter}]->{_id, "id":railcontent_id, published_on, "instructor": instructor[0]->name, title, "thumbnail_url":thumbnail.asset->url, length_in_seconds, web_url_path, "type": _type, difficulty, difficulty_string, railcontent_id, artist->,"permission_id": permission[]->railcontent_id,_type}),
       ...(*[${filterSongSameArtist}]{_id, "id":railcontent_id, published_on, "instructor": instructor[0]->name, title, "thumbnail_url":thumbnail.asset->url, length_in_seconds, web_url_path, "type": _type, difficulty, difficulty_string, railcontent_id, artist->,"permission_id": permission[]->railcontent_id,_type}|order(published_on desc, title asc)[0...10]),
       ...(*[${filterSongSameGenre}]{_id, "id":railcontent_id, published_on, "instructor": instructor[0]->name, title, "thumbnail_url":thumbnail.asset->url, length_in_seconds, web_url_path, "type": _type, difficulty, difficulty_string, railcontent_id, artist->,"permission_id": permission[]->railcontent_id,_type}|order(published_on desc, title asc)[0...10]),
       ...(*[${filterSameTypeAndSortOrder}]{_id, "id":railcontent_id, published_on, "instructor": instructor[0]->name, title, "thumbnail_url":thumbnail.asset->url, length_in_seconds, web_url_path, "type": _type, difficulty, difficulty_string, railcontent_id, artist->,"permission_id": permission[]->railcontent_id,_type, sort}|order(sort asc, title asc)[0...10]),
@@ -1264,30 +1181,6 @@ export async function fetchRelatedLessons(railContentId, brand) {
     return fetchSanity(query, false);
 }
 
-/**
- * Fetch related method lessons for a specific lesson by RailContent ID and type.
- * @param {string} railContentId - The RailContent ID of the current lesson.
- * @param {string} brand - The current brand.
- * @returns {Promise&lt;Array&lt;Object>|null>} - The fetched related lessons
- */
-export async function fetchRelatedMethodLessons(railContentId, brand) {
-    const query = `*[railcontent_id == ${railContentId} &amp;&amp; brand == "${brand}"]{
-      "id":_id,
-      "related_lessons": *[references(^._id)][0].child[]->{
-        "id": railcontent_id,
-        "type": _type,
-        title,
-        "description": description[0].children[0].text, // Extraer texto plano
-        "thumbnail_url": thumbnail.asset->url,
-        "url": web_url_path,
-        difficulty,
-        difficulty_string,
-      }
-    }
-  }`
-    return fetchSanity(query, false);
-}
-
 /**
  * Fetch all packs.
  * @param {string} brand - The brand for which to fetch packs.
@@ -1299,7 +1192,7 @@ export async function fetchRelatedMethodLessons(railContentId, brand) {
  */
 export async function fetchAllPacks(brand, sort = "-published_on", searchTerm = "", page = 1, limit = 10) {
     const sortOrder = getSortOrder(sort, brand);
-    const filter = `_type == 'pack' &amp;&amp; brand == '${brand}' &amp;&amp; title match "${searchTerm}*"`
+    const filter = `(_type == 'pack' || _type == 'semester-pack') &amp;&amp; brand == '${brand}' &amp;&amp; title match "${searchTerm}*"`
     const filterParams = {};
     const fields = getFieldsForContentType('pack');
     const start = (page - 1) * limit;
@@ -1324,8 +1217,8 @@ export async function fetchAllPacks(brand, sort = "-published_on", searchTerm =
  * @param {string} railcontentId - The Railcontent ID of the pack.
  * @returns {Promise&lt;Array&lt;Object>|null>} - The fetched pack content data or null if not found.
  */
-export async function fetchPackAll(railcontentId) {
-    return fetchByRailContentId(railcontentId, 'pack');
+export async function fetchPackAll(railcontentId, type = 'pack') {
+    return fetchByRailContentId(railcontentId, type);
 }
 
 export async function fetchLiveEvent(brand) {
@@ -1348,17 +1241,20 @@ export async function fetchLiveEvent(brand) {
         default:
             break;
     }
-    let dateTemp = new Date();
-    dateTemp.setDate(dateTemp.getDate() - 1);
+    let startDateTemp = new Date();
+    let endDateTemp = new Date();
+    startDateTemp=  new Date (startDateTemp.setMinutes(startDateTemp.getMinutes() + 15));
+    endDateTemp = new Date(endDateTemp.setMinutes(endDateTemp.getMinutes() - 15));
 
     // 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, false)}' &amp;&amp; live_event_end_time >= '${getSanityDate(new Date(), false)}']{
+    const query = `*[status == 'scheduled' &amp;&amp; brand == '${brand}' &amp;&amp; defined(live_event_start_time) &amp;&amp; live_event_start_time &lt;= '${getSanityDate(startDateTemp, false)}' &amp;&amp; live_event_end_time >= '${getSanityDate(endDateTemp, false)}']{
       'slug': slug.current,
       'id': railcontent_id,
       live_event_start_time,
       live_event_end_time,
+      live_event_youtube_id,
       railcontent_id,
       published_on,
       'event_coach_url' : instructor[0]->web_url_path,
@@ -1371,21 +1267,7 @@ export async function fetchLiveEvent(brand) {
           },
       'videoId': coalesce(live_event_youtube_id, video.external_id),
     } | order(live_event_start_time)[0...1]`;
-    return await fetchSanity(query, false);
-}
-
-/**
- * Fetch all children of a specific pack by Railcontent ID.
- * @param {string} railcontentId - The Railcontent ID of the pack.
- * @returns {Promise&lt;Array&lt;Object>|null>} - The fetched pack children data or null if not found.
- *
- * @example
- * fetchPackChildren('pack123')
- *   .then(children => console.log(children))
- *   .catch(error => console.error(error));
- */
-export async function fetchPackChildren(railcontentId) {
-    return fetchChildren(railcontentId, 'pack-children');
+    return await fetchSanity(query, false, {processNeedAccess: false});
 }
 
 /**
@@ -1405,24 +1287,6 @@ export async function fetchPackData(id) {
     return fetchSanity(query, false);
 }
 
-/**
- * Fetch the data needed for the Challenge Overview screen.
- * @param {string} id - The Railcontent ID of the course
- * @returns {Promise&lt;Object|null>} - The challenge information and lessons or null if not found.
- *
- * @example
- * fetchChallengeOverview('challenge123')
- *   .then(challenge => console.log(challenge))
- *   .catch(error => console.error(error));
- */
-export async function fetchChallengeOverview(id) {
-    // WIP
-    const query = `*[railcontent_id == ${id}]{
-    ${getFieldsForContentType("challenge")}
-  } [0...1]`;
-    return fetchSanity(query, false);
-}
-
 /**
  * Fetch the data needed for the coach screen.
  * @param {string} brand - The brand for which to fetch coach lessons
@@ -1455,10 +1319,11 @@ export async function fetchCoachLessons(brand, id, {
         ? filtersToGroq(includedFields)
         : "";
     const filter = `brand == '${brand}' ${searchFilter} ${includedFieldsFilter} &amp;&amp; references(*[_type=='instructor' &amp;&amp; railcontent_id == ${id}]._id)`;
+    const filterWithRestrictions = await new FilterBuilder(filter).buildFilter();
 
     sortOrder = getSortOrder(sortOrder, brand);
     const query = buildEntityAndTotalQuery(
-        filter,
+        filterWithRestrictions,
         fieldsString,
         {
             sortOrder: sortOrder,
@@ -1469,20 +1334,6 @@ export async function fetchCoachLessons(brand, id, {
     return fetchSanity(query, true);
 }
 
-/**
- * Fetch the data needed for the Course Overview screen.
- * @param {string} id - The Railcontent ID of the course
- * @returns {Promise&lt;Object|null>} - The course information and lessons or null if not found.
- *
- * @example
- * fetchCourseOverview('course123')
- *   .then(course => console.log(course))
- *   .catch(error => console.error(error));
- */
-export async function fetchCourseOverview(id) {
-    return fetchByRailContentId(id, 'course');
-}
-
 /**
  * Fetch the data needed for the Course Overview screen.
  * @param {string} id - The Railcontent ID of the course
@@ -1585,13 +1436,13 @@ export async function fetchArtistLessons(brand, name, contentType, {
 
     // limits the results to supplied progressIds for started &amp; completed filters
     const progressFilter = progressIds !== undefined ? `&amp;&amp; railcontent_id in [${progressIds.join(',')}]` : "";
-
+    const now = getSanityDate(new Date());
     const query = `{
     "entity": 
       *[_type == 'artist' &amp;&amp; name == '${name}']
         {'type': _type, name, 'thumbnail_url':thumbnail_url.asset->url, 
         'lessons_count': count(*[${addType} brand == '${brand}' &amp;&amp; references(^._id)]), 
-        'lessons': *[${addType} brand == '${brand}' &amp;&amp; references(^._id) ${searchFilter} ${includedFieldsFilter} ${progressFilter}]{${fieldsString}}
+        'lessons': *[${addType} brand == '${brand}' &amp;&amp; references(^._id) &amp;&amp; (status in ['published'] || (status == 'scheduled' &amp;&amp; defined(published_on) &amp;&amp; published_on >= '${now}')) ${searchFilter} ${includedFieldsFilter} ${progressFilter}]{${fieldsString}}
       [${start}...${end}]}
       |order(${sortOrder})
   }`;
@@ -1635,13 +1486,13 @@ export async function fetchGenreLessons(brand, name, contentType, {
         : "";
     // limits the results to supplied progressIds for started &amp; completed filters
     const progressFilter = progressIds !== undefined ? `&amp;&amp; railcontent_id in [${progressIds.join(',')}]` : "";
-
+    const now = getSanityDate(new Date());
     const query = `{
     "entity": 
       *[_type == 'genre' &amp;&amp; name == '${name}']
         {'type': _type, name, 'thumbnail_url':thumbnail_url.asset->url, 
         'lessons_count': count(*[${addType} brand == '${brand}' &amp;&amp; references(^._id)]), 
-        'lessons': *[${addType} brand == '${brand}' &amp;&amp; references(^._id) ${searchFilter} ${includedFieldsFilter} ${progressFilter}]{${fieldsString}}
+        'lessons': *[${addType} brand == '${brand}' &amp;&amp; references(^._id) &amp;&amp; (status in ['published'] || (status == 'scheduled' &amp;&amp; defined(published_on) &amp;&amp; published_on >= '${now}')) ${searchFilter} ${includedFieldsFilter} ${progressFilter}]{${fieldsString}}
       [${start}...${end}]}
       |order(${sortOrder})
   }`;
@@ -1649,15 +1500,17 @@ export async function fetchGenreLessons(brand, name, contentType, {
 }
 
 export async function fetchTopLevelParentId(railcontentId) {
+    const statusFilter = "&amp;&amp; status in ['scheduled', 'published', 'archived', 'unlisted']";
+
     const query = `*[railcontent_id == ${railcontentId}]{
       railcontent_id,
-      'parents': *[^._id in child[]._ref &amp;&amp; !(_id in path('drafts.**'))]{
+      'parents': *[^._id in child[]._ref ${statusFilter}]{
         railcontent_id,
-          'parents': *[^._id in child[]._ref &amp;&amp; !(_id in path('drafts.**'))]{
+          'parents': *[^._id in child[]._ref ${statusFilter}]{
             railcontent_id,
-            'parents': *[^._id in child[]._ref &amp;&amp; !(_id in path('drafts.**'))]{
+            'parents': *[^._id in child[]._ref ${statusFilter}]{
               railcontent_id,
-               'parents': *[^._id in child[]._ref &amp;&amp; !(_id in path('drafts.**'))]{
+               'parents': *[^._id in child[]._ref ${statusFilter}]{
                   railcontent_id,               
             } 
           }
@@ -1679,19 +1532,20 @@ export async function fetchTopLevelParentId(railcontentId) {
 
 export async function fetchHierarchy(railcontentId) {
     let topLevelId = await fetchTopLevelParentId(railcontentId);
+    const childrenFilter = await new FilterBuilder(``, {isChildrenFilter: true} ).buildFilter();
     const query = `*[railcontent_id == ${topLevelId}]{
       railcontent_id,
       'assignments': assignment[]{railcontent_id},
-      'children': child[]->{
+      'children': child[${childrenFilter}]->{
         railcontent_id,
         'assignments': assignment[]{railcontent_id},
-        'children': child[]->{
+        'children': child[${childrenFilter}]->{
             railcontent_id,
             'assignments': assignment[]{railcontent_id},
-            'children': child[]->{
+            'children': child[${childrenFilter}]->{
                railcontent_id,
                'assignments': assignment[]{railcontent_id},
-               'children': child[]->{
+               'children': child[${childrenFilter}]->{
                   railcontent_id,                
             } 
           }
@@ -1701,6 +1555,7 @@ export async function fetchHierarchy(railcontentId) {
     let response = await fetchSanity(query, false, {processNeedAccess: false});
     if (!response) return null;
     let data = {
+        topLevelId: topLevelId,
         parents: {},
         children: {}
     };
@@ -1734,26 +1589,6 @@ function populateHierarchyLookups(currentLevel, data, parentId) {
 
 }
 
-/**
- * Fetch assignments for content
- *
- * @param {integer} contentId - List of ids get data for
- * @returns {Promise&lt;array|null>} - A promise that resolves to an array containing the data
- */
-export async function fetchAssignments(contentId) {
-    const fields = `"id": railcontent_id,"assignments":assignment[]{"id": railcontent_id}`;
-    const query = await buildQuery(`railcontent_id == ${contentId}`,
-        {bypassPermissions: true},
-        fields,
-        {end: 100});
-    let data = await fetchSanity(query, false);
-    let mapped = [];
-    data.assignments.forEach(function (content) {
-        mapped.push(content.id);
-    });
-    return mapped;
-}
-
 /**
  * Fetch data for comment mod page
  *
@@ -1813,17 +1648,23 @@ export async function fetchSanity(query,
         console.log("fetchSanity Query:", query);
     }
     const perspective = globalConfig.sanityConfig.perspective ?? 'published';
-    const encodedQuery = encodeURIComponent(query);
     const api = globalConfig.sanityConfig.useCachedAPI ? 'apicdn' : 'api';
-    const url = `https://${globalConfig.sanityConfig.projectId}.${api}.sanity.io/v${globalConfig.sanityConfig.version}/data/query/${globalConfig.sanityConfig.dataset}?perspective=${perspective}&amp;query=${encodedQuery}`;
+    const url = `https://${globalConfig.sanityConfig.projectId}.${api}.sanity.io/v${globalConfig.sanityConfig.version}/data/query/${globalConfig.sanityConfig.dataset}?perspective=${perspective}`;
     const headers = {
         'Authorization': `Bearer ${globalConfig.sanityConfig.token}`,
         'Content-Type': 'application/json'
     };
 
     try {
+        const method = 'post';
+        const options = {
+            method,
+            headers,
+            body: JSON.stringify({'query': query})
+        };
+
         let promisesResult = await Promise.all([
-            fetch(url, {headers}),
+            fetch(url, options),
             processNeedAccess ? fetchUserPermissions() : null
         ]);
         const response = promisesResult[0];
@@ -1897,32 +1738,6 @@ function doesUserNeedAccessToContent(result, userPermissions, isAdmin) {
     return true;
 }
 
-/**
- * Fetch CatalogueMetadata from Sanity. This information may be duplicated in the contentTypeConfig.js.
- * It's an ongoing discussion (Aug 2024), but it's been included here if necessary
- *
- * @param {string} contentType - name of the contentype to pull
- * @returns {Promise&lt;Object|null>} - A promise that resolves to the fetched data or null if an error occurs or no results are found.
- *
- * @example
- *
- * fetchCatalogMetadata('song')
- *   .then(data => console.log(data))
- *   .catch(error => console.error(error));
- */
-export async function fetchCatalogMetadata(contentType) {
-    const query = `*[_type == 'CatalogMetadata']{
-        catalog_type,
-        brand,
-        groq_results,
-        groq_search_fields,
-        meta_data_groq,
-        modal_text,
-        sort_by,
-      }`
-    return fetchSanity(query, false, {processNeedAccess: false});
-}
-
 /**
  * Fetch shows data for a brand.
  *
@@ -1965,6 +1780,17 @@ export async function fetchMetadata(brand, type) {
     return processedData ? processedData : {};
 }
 
+export async function fetchChatAndLiveEnvent(brand, forcedId = null) {
+    const liveEvent = (forcedId !== null) ? await fetchByRailContentIds([forcedId]): [await fetchLiveEvent(brand)];
+    if (liveEvent.length === 0 || (liveEvent.length === 1 &amp;&amp; liveEvent[0] === undefined)) {
+        return null;
+    }
+    let url = `/content/live-chat?brand=${brand}`;
+    const chatData = await fetchHandler(url);
+    const mergedData = { ...chatData, ...liveEvent[0] };
+    return mergedData;
+}
+
 
 //Helper Functions
 function arrayJoinWithQuotes(array, delimiter = ',') {
@@ -2080,6 +1906,7 @@ function getFilterOptions(option, commonFilter, contentType, brand) {
         case "difficulty":
             filterGroq = ` 
                 "difficulty": [
+        {"type": "All", "count": count(*[${commonFilter} &amp;&amp; difficulty_string == "All"])},
         {"type": "Introductory", "count": count(*[${commonFilter} &amp;&amp; difficulty_string == "Introductory"])},
         {"type": "Beginner", "count": count(*[${commonFilter} &amp;&amp; difficulty_string == "Beginner"])},
         {"type": "Intermediate", "count": count(*[${commonFilter} &amp;&amp; difficulty_string == "Intermediate" ])},
@@ -2088,7 +1915,9 @@ function getFilterOptions(option, commonFilter, contentType, brand) {
         ][count > 0],`;
             break;
         case "type":
-            const typesString = types.map(t => {return `{"type": "${t}"}`}).join(', ');
+            const typesString = types.map(t => {
+                return `{"type": "${t}"}`
+            }).join(', ');
             filterGroq = `"type": [${typesString}]{type, 'count': count(*[_type == ^.type &amp;&amp; ${commonFilter}])}[count > 0],`;
             break;
         case "genre":
@@ -2178,7 +2007,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 Dec 06 2024 14:20: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 Jan 20 2025 08:04:00 GMT+0000 (Coordinated Universal Time) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>