musora-content-services 1.0.76 → 1.0.78

package/docs/railcontent.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#.fetchAllCompletedStates">fetchAllCompletedStates</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#.fetchCurrentSongComplete">fetchCurrentSongComplete</a></li><li data-type='method'><a href="module-Railcontent-Services.html#.fetchSongsInProgress">fetchSongsInProgress</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#.fetchAllSongs">fetchAllSongs</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#.fetchCatalogMetadata">fetchCatalogMetadata</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#.fetchCourseOverview">fetchCourseOverview</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#.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#.fetchParentByRailContentId">fetchParentByRailContentId</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#.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#.fetchAllCompletedStates">fetchAllCompletedStates</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#.fetchCurrentSongComplete">fetchCurrentSongComplete</a></li><li data-type='method'><a href="module-Railcontent-Services.html#.fetchSongsInProgress">fetchSongsInProgress</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#.fetchAllSongs">fetchAllSongs</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#.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#.fetchCourseOverview">fetchCourseOverview</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#.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#.fetchParentByRailContentId">fetchParentByRailContentId</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#.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>
     
 </nav>
 
@@ -201,7 +201,7 @@ export async function fetchContentInProgress(type="all", brand) {
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.3</a> on Tue Aug 27 2024 20:09:43 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 Tue Sep 03 2024 21:48:28 GMT+0000 (Coordinated Universal Time) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

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#.fetchAllCompletedStates">fetchAllCompletedStates</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#.fetchCurrentSongComplete">fetchCurrentSongComplete</a></li><li data-type='method'><a href="module-Railcontent-Services.html#.fetchSongsInProgress">fetchSongsInProgress</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#.fetchAllSongs">fetchAllSongs</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#.fetchCatalogMetadata">fetchCatalogMetadata</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#.fetchCourseOverview">fetchCourseOverview</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#.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#.fetchParentByRailContentId">fetchParentByRailContentId</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#.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#.fetchAllCompletedStates">fetchAllCompletedStates</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#.fetchCurrentSongComplete">fetchCurrentSongComplete</a></li><li data-type='method'><a href="module-Railcontent-Services.html#.fetchSongsInProgress">fetchSongsInProgress</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#.fetchAllSongs">fetchAllSongs</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#.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#.fetchCourseOverview">fetchCourseOverview</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#.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#.fetchParentByRailContentId">fetchParentByRailContentId</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#.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>
     
 </nav>
 
@@ -48,7 +48,16 @@
             <pre class="prettyprint source linenums"><code>/**
  * @module Sanity-Services
  */
-import {assignmentsField, contentTypeConfig, DEFAULT_FIELDS, getFieldsForContentType} from "../contentTypeConfig";
+import {
+    artistOrInstructorName,
+    artistOrInstructorNameAsArray,
+    assignmentsField,
+    descriptionField,
+    contentTypeConfig,
+    DEFAULT_FIELDS,
+    getFieldsForContentType,
+    filtersToGroq
+} from "../contentTypeConfig";
 import {globalConfig} from "./config";
 
 import { fetchAllCompletedStates, fetchCurrentSongComplete } from './railcontent.js';
@@ -279,18 +288,9 @@ export async function fetchSongCount(brand) {
  *   .catch(error => console.error(error));
  */
 export async function fetchWorkouts(brand) {
+  const fields = getFieldsForContentType('workout');
   const query = `*[_type == 'workout' &amp;&amp; brand == '${brand}'] [0...5] {
-        "id": railcontent_id,
-        title,
-        "image": thumbnail.asset->url,
-        "artist_name": instructor[0]->name,
-        "artists": instructor[]->name,
-        difficulty,
-        difficulty_string,
-        length_in_seconds,
-        published_on,
-        "type": _type,
-        web_url_path,
+        ${fields.toString()}
       } | order(published_on desc)[0...5]`
   return fetchSanity(query, true);
 }
@@ -348,8 +348,7 @@ export async function fetchUpcomingEvents(brand) {
   };
   const typesString = arrayJoinWithQuotes(liveTypes[brand] ?? liveTypes['default']);
   const now = getSanityDate(new Date());
-  //TODO: status = 'scheduled'  is this handled in sanity?
-  const query = `*[_type in [${typesString}] &amp;&amp; brand == '${brand}' &amp;&amp; published_on > '${now}']{
+  const query = `*[_type in [${typesString}] &amp;&amp; brand == '${brand}' &amp;&amp; published_on > '${now}' &amp;&amp; status == 'scheduled']{
         "id": railcontent_id,
         title,
         "image": thumbnail.asset->url,
@@ -377,6 +376,7 @@ export async function fetchUpcomingEvents(brand) {
 *   .catch(error => console.error(error));
 */
 export async function fetchByRailContentId(id, contentType) {
+  console.log('contentType', contentType)
   const query = `*[railcontent_id == ${id}]{
         ${getFieldsForContentType(contentType)}
       }`
@@ -451,13 +451,7 @@ export async function fetchAll(brand, type, {
 
     // Construct the included fields filter, replacing 'difficulty' with 'difficulty_string'
     const includedFieldsFilter = includedFields.length > 0
-        ? includedFields.map(field => {
-            let [key, value] = field.split(',');
-            if (key === 'difficulty') {
-                key = 'difficulty_string';
-            }
-            return `&amp;&amp; ${key} == "${value}"`;
-        }).join(' ')
+        ? filtersToGroq(includedFields)
         : "";
 
     // Determine the sort order
@@ -571,16 +565,9 @@ export async function fetchAllFilterOptions(
     contentType,
     term
 ) {
-    const filtersToGroq = filters?.length > 0 ? filters.map(field => {
-            let [key, value] = field.split(',');
-            if (key === 'difficulty') {
-                key = 'difficulty_string';
-            }
-            return `&amp;&amp; ${key} == "${value}"`;
-        }).join(' ')
-        : undefined;
+    const includedFieldsFilter = filters?.length > 0 ? filtersToGroq(filters) : undefined;
 
-    const commonFilter = `_type == '${contentType}' &amp;&amp; brand == "${brand}"${style ? ` &amp;&amp; '${style}' in genre[]->name` : ''}${artist ? ` &amp;&amp; artist->name == '${artist}'` : ''} ${filtersToGroq ? filtersToGroq : ''}`;
+    const commonFilter = `_type == '${contentType}' &amp;&amp; brand == "${brand}"${style ? ` &amp;&amp; '${style}' in genre[]->name` : ''}${artist ? ` &amp;&amp; artist->name == '${artist}'` : ''} ${includedFieldsFilter ? includedFieldsFilter : ''}`;
     const query = `
         {
           "meta": {
@@ -616,6 +603,8 @@ export async function fetchAllFilterOptions(
 */
 export async function fetchChildren(railcontentId, contentType) {
   const query = `*[railcontent_id == ${railcontentId}]{
+        title,
+
         'children': child[]->{
                            ${getFieldsForContentType(contentType)}
                         },
@@ -647,11 +636,8 @@ export async function fetchParentByRailContentId(railcontentId) {
 * @returns {Promise&lt;Object|null>} - The fetched methods data or null if not found.
 */
 export async function fetchMethods(brand) {
-    //TODOS
-    //ADD INSTRUCTORS AND POSITION
     const query = `*[_type == 'learning-path' &amp;&amp; brand == '${brand}'] {
-      ${ getFieldsForContentType() },
-      "position": count(*[_type == 'learning-path' &amp;&amp; brand == '${brand}' &amp;&amp; (published_on &lt; ^.published_on || (published_on == ^.published_on &amp;&amp; _id &lt; ^._id))]) + 1
+      ${ getFieldsForContentType() }
     } | order(published_on asc)`
   return fetchSanity(query, true);
 }
@@ -664,7 +650,7 @@ export async function fetchMethods(brand) {
 */
 export async function fetchMethod(brand, slug) {
   const query = `*[_type == 'learning-path' &amp;&amp; brand == "${brand}" &amp;&amp; slug.current == "${slug}"] {
-    "description": description[0].children[0].text,
+    "description": ${descriptionField},
     "instructors":instructor[]->name,
     published_on,
     "id": railcontent_id,
@@ -678,12 +664,14 @@ export async function fetchMethod(brand, slug) {
       {
         "id": railcontent_id,
         published_on,
+        child_count,
         difficulty,
+        difficulty_string,
         "thumbnail_url": thumbnail.asset->url,
         "instructor": instructor[]->{name},
         title,
         "type": _type,
-        "description": description[0].children[0].text,
+        "description": ${descriptionField},
         "url": web_url_path,
         xp,
       }
@@ -697,7 +685,17 @@ return fetchSanity(query, false);
 * @returns {Promise&lt;Object|null>} - The fetched next lesson data or null if not found.
 */
 export async function fetchMethodChildren(railcontentId) {
-  return fetchChildren(railcontentId, 'method');
+  const query = `*[railcontent_id == ${railcontentId}]{
+    child_count,
+    "id": railcontent_id,
+    "description": ${descriptionField},
+    title,
+    xp,
+    'children': child[]->{
+        ${getFieldsForContentType('method')}
+    },
+  }[0..1]`;
+  return fetchSanity(query, true);
 }
 
 /**
@@ -803,8 +801,23 @@ export async function fetchNextPreviousLesson(railcontentId) {
  *   .catch(error => console.error(error));
  */
 export async function fetchLessonContent(railContentId) {
-  const query = `*[railcontent_id == ${railContentId} ]
-          {title, published_on,"type":_type, "resources": resource, difficulty, difficulty_string, brand, soundslice, instrumentless, railcontent_id, "id":railcontent_id, slug, artist->,"thumbnail_url":thumbnail.asset->url, "url": web_url_path, soundslice_slug,description,
+  const query = `*[railcontent_id == ${railContentId} ]{
+          title, 
+          published_on,
+          "type":_type, 
+          "resources": resource, 
+          difficulty, 
+          difficulty_string, 
+          brand, 
+          soundslice, 
+          instrumentless, 
+          railcontent_id, 
+          "id":railcontent_id, 
+          slug, artist->,
+          "thumbnail_url":thumbnail.asset->url, 
+          "url": web_url_path, 
+          soundslice_slug,
+          description,
           "chapters": chapter[]{
             chapter_description,
             chapter_timecode,
@@ -851,8 +864,9 @@ export async function fetchRelatedLessons(railContentId, brand) {
 */
 export async function fetchPackAll(railcontentId) {
   //TODO: Implement getPacks
-  const query = `*[_railcontent_id == ${railcontentId}]{
+  const query = `*[railcontent_id == ${railcontentId}]{
         railcontent_id,
+        "id": railcontent_id,
         title,
         "image": thumbnail.asset->url,
         "artist_name": artist->name,
@@ -865,6 +879,49 @@ export async function fetchPackAll(railcontentId) {
   return fetchSanity(query, true);
 }
 
+export async function fetchLiveEvent(brand) {
+    //calendarIDs taken from addevent.php
+    // TODO import instructor calendars to Sanity
+    let defaultCalendarID = '';
+    switch(brand) {
+        case ('drumeo'):
+            defaultCalendarID = 'GP142387';
+             break;
+        case ('pianote'):
+            defaultCalendarID = 'be142408';
+            break;
+        case ('guitareo'):
+            defaultCalendarID = 'IJ142407';
+            break;
+        case ('singeo'):
+            defaultCalendarID = 'bk354284';
+            break;
+        default:
+            break;
+    }
+    let dateTemp = new Date();
+    dateTemp.setDate(dateTemp.getDate() - 1);
+
+    // 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())}']{
+      'slug': slug.current,
+      'id': railcontent_id,
+      live_event_start_time,
+      live_event_end_time,
+      railcontent_id,
+      published_on,
+      'event_coach_url' : instructor[0]->web_url_path,
+      'event_coach_calendar_id': coalesce(calendar_id, '${defaultCalendarID}'),
+      title,
+      "image": thumbnail.asset->url,
+      "instructors": instructor[]->name,
+      '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.
@@ -879,6 +936,34 @@ export async function fetchPackChildren(railcontentId) {
   return fetchChildren(railcontentId, 'pack');
 }
 
+/**
+ * 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", true)}
+    "lessons": child[]->{
+      "id": railcontent_id,
+      title,
+      "image": thumbnail.asset->url,
+      "instructors": instructor[]->name,
+      length_in_seconds,
+      difficulty_string,
+      difficulty,
+      "type": _type,
+    }
+  }`;
+  return fetchSanity(query, false);
+}
+
 /**
  * Fetch the data needed for the Course Overview screen.
  * @param {string} id - The Railcontent ID of the course
@@ -1040,7 +1125,7 @@ function checkSanityConfig(config) {
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.3</a> on Tue Aug 27 2024 20:09:43 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 Tue Sep 03 2024 21:48:28 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.76",
+  "version": "1.0.78",
   "description": "A package for Musoras content services ",
   "main": "src/index.js",
   "scripts": {

package/src/contentTypeConfig.js

@@ -31,6 +31,18 @@ const assignmentsField = `"assignments":assignment[]{
         "description": assignment_description
 },`
 
+const contentWithInstructorsField = {
+    'fields': [
+        '"instructors": instructor[]->name',
+    ]
+}
+
+const contentWithSortField = {
+    'fields': [
+        'sort',
+    ]
+}
+
 let contentTypeConfig = {
     'song': {
         'fields': [
@@ -44,7 +56,7 @@ let contentTypeConfig = {
         }
     },
     'challenge':{
-        'fields':[
+        'fields': [
             'enrollment_start_time',
             'enrollment_end_time',
             'registration_url',
@@ -52,6 +64,12 @@ let contentTypeConfig = {
             '"primary_cta_text": select(dateTime(published_on) > dateTime(now()) && dateTime(enrollment_start_time) > dateTime(now()) => "Notify Me", "Start Challenge")',
             'challenge_state',
             'challenge_state_text',
+            `"description": ${descriptionField}`,
+            'total_xp',
+            'xp',
+            '"instructors": instructor[]->name',
+            '"header_image_url": header_image_url.asset->url',
+            '"logo_image_url": logo_image_url.asset->url',
         ]
     },
     'course': {
@@ -60,11 +78,7 @@ let contentTypeConfig = {
             '"instructors": instructor[]->name'
         ]
     },
-    'student-focus': {
-        'fields': [
-            '"instructors": instructor[]->name'
-        ]
-    },
+
     'method': {
         'fields': [
             `"description": ${descriptionField}`,
@@ -90,126 +104,6 @@ let contentTypeConfig = {
             artistOrInstructorNameAsArray(),
         ]
     },
-    'quick-tips': {
-        'fields': [
-            '"instructors": instructor[]->name'
-        ]
-    },
-    'rudiment': {
-        'fields': [
-            'sheet_music_thumbnail_url',
-        ]
-    },
-    'drum-fest-international-aa2022': {
-        'fields': [
-            '"instructors": instructor[]->name'
-        ]
-    },
-    'spotlight': {
-        'fields': [
-            '"instructors": instructor[]->name'
-        ]
-    },
-    'the-history-of-electronic-drums': {
-        'fields': [
-            '"instructors": instructor[]->name'
-        ]
-    },
-    'backstage-secrets': {
-        'fields': [
-            '"instructors": instructor[]->name'
-        ]
-    },
-    'question-and-answer': {
-        'fields': [
-            '"instructors": instructor[]->name'
-        ]
-    },
-    'student-collaborations': {
-        'fields': [
-            '"instructors": instructor[]->name'
-        ]
-    },
-    'live': {
-        'fields': [
-            '"instructors": instructor[]->name'
-        ]
-    },
-    'podcasts': {
-        'fields': [
-            'sort',
-        ]
-    },
-    'solos': {
-        'fields': [
-            '"instructors": instructor[]->name'
-        ]
-    },
-    'boot-camps': {
-        'fields': [
-            '"instructors": instructor[]->name'
-        ]
-    },
-    'gear-guids': {
-        'fields': [
-            '"instructors": instructor[]->name'
-        ]
-    },
-    'performances': {
-        'fields': [
-            '"instructors": instructor[]->name'
-        ]
-    },
-    'in-rhythm': {
-        'fields': [
-            'sort',
-        ]
-    },
-    'challenges': {
-        'fields': [
-            '"instructors": instructor[]->name'
-        ]
-    },
-    'on-the-road': {
-        'fields': [
-            '"instructors": instructor[]->name'
-        ]
-    },
-    'diy-drum-experiments': {
-        'fields': [
-            'sort',
-        ]
-    },
-    'rhythmic-adventures-of-captain-carson': {
-        'fields': [
-            'sort',
-        ]
-    },
-    'study-the-greats': {
-        'fields': [
-            'sort',
-        ]
-    },
-    'rhythms-from-another-planet': {
-        'fields': [
-            'sort',
-        ]
-    },
-    'paiste-cymbals': {
-        'fields': [
-            '"instructors": instructor[]->name'
-        ]
-    },
-    'behind-the-scenes': {
-        'fields': [
-            'sort',
-        ]
-    },
-    'exploring-beats': {
-        'fields': [
-            'sort',
-        ]
-    },
     'play-along': {
         'fields': [
             '"style": genre[]->name',
@@ -224,10 +118,63 @@ let contentTypeConfig = {
         'fields': [
             '"lesson_count": child_count',
             'xp',
-           `"description": ${descriptionField}`,
-           '"instructors": instructor[]->name'
+            `"description": ${descriptionField}`,
+            '"instructors": instructor[]->name'
         ],
-    }
+    },
+    'rudiment': {
+        'fields': [
+            'sheet_music_thumbnail_url',
+        ]
+    },
+    'routine':{
+        'fields': [
+            `"description": ${descriptionField}`,
+            'high_soundslice_slug',
+            'low_soundslice_slug'
+        ]
+    },
+    'pack-bundle': {
+        'fields': [
+            'child_count',
+            `"children": child[]->{
+                "description": ${descriptionField},
+                ${getFieldsForContentType()}
+            }`,
+            '"image": logo_image_url.asset->url',
+            '"thumbnail": thumbnail.asset->url',
+            '"light_logo": light_mode_logo_url.asset->url',
+            '"dark_logo": dark_mode_logo_url.asset->url',
+            `"description": ${descriptionField}`,
+            'total_xp',
+        ]
+    },
+    // content with just the added 'instructors' Field
+    'student-focus': contentWithInstructorsField,
+    'quick-tips': contentWithInstructorsField,
+    'drum-fest-international-aa2022': contentWithInstructorsField,
+    'spotlight': contentWithInstructorsField,
+    'the-history-of-electronic-drums': contentWithInstructorsField,
+    'backstage-secrets': contentWithInstructorsField,
+    'question-and-answer': contentWithInstructorsField,
+    'student-collaborations': contentWithInstructorsField,
+    'live': contentWithInstructorsField,
+    'solos': contentWithInstructorsField,
+    'boot-camps': contentWithInstructorsField,
+    'gear-guids': contentWithInstructorsField,
+    'performances': contentWithInstructorsField,
+    'challenges': contentWithInstructorsField,
+    'on-the-road': contentWithInstructorsField,
+    // content with just the added 'sort' field
+    'podcasts': contentWithSortField,
+    'in-rhythm': contentWithSortField,
+    'diy-drum-experiments': contentWithSortField,
+    'rhythmic-adventures-of-captain-carson': contentWithSortField,
+    'study-the-greats': contentWithSortField,
+    'rhythms-from-another-planet': contentWithSortField,
+    'paiste-cymbals': contentWithInstructorsField,
+    'behind-the-scenes': contentWithSortField,
+    'exploring-beats': contentWithSortField,
 }
 
 function artistOrInstructorName(key='artist_name') {
@@ -239,7 +186,6 @@ function artistOrInstructorNameAsArray(key='artists') {
 }
 
 function getFieldsForContentType(contentType, asQueryString=true) {
-    console.log('this was called, ', contentType)
     const fields = contentType ? DEFAULT_FIELDS.concat(contentTypeConfig?.[contentType]?.fields ?? []) : DEFAULT_FIELDS;
     return asQueryString ? fields.toString() + ',' : fields;
 }

package/src/index.d.ts

@@ -16,6 +16,7 @@ import {
     fetchAllFilterOptions,
     fetchMethods,
     fetchMethod,
+    fetchMethodChildren,
     fetchMethodNextLesson,
     fetchMethodChildrenIds,
     fetchNextPreviousLesson,
@@ -23,10 +24,15 @@ import {
     fetchPackAll,
     fetchPackChildren,
     fetchLessonContent,
-    fetchCourseOverview
+    fetchCourseOverview,
+    fetchChallengeOverview,
   } from './services/sanity.js';
-  
-  import { initializeService } from './services/config.js';
+
+import {
+    fetchVimeoData,
+} from "./services/railcontent";
+
+import { initializeService } from './services/config.js';
 
 declare module 'musora-content-services' {
     export {
@@ -48,6 +54,7 @@ declare module 'musora-content-services' {
         fetchMethods,
         fetchMethod,
         fetchMethodNextLesson,
+        fetchMethodChildren,
         fetchMethodChildrenIds,
         fetchNextPreviousLesson,
         fetchRelatedLessons,
@@ -55,6 +62,9 @@ declare module 'musora-content-services' {
         fetchPackChildren,
         fetchLessonContent,
         fetchCourseOverview,
+        fetchLiveEvent,
+        fetchChallengeOverview,
+        fetchVimeoData,
     }
     
 }