musora-content-services 1.0.60 → 1.0.62

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#.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#.fetchMethodNextLesson">fetchMethodNextLesson</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#.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#.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#.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 Mon Aug 26 2024 19:46:17 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 Aug 26 2024 20:15:19 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#.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#.fetchMethodNextLesson">fetchMethodNextLesson</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#.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#.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#.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,23 +48,11 @@
             <pre class="prettyprint source linenums"><code>/**
  * @module Sanity-Services
  */
-import {contentTypeConfig} from "../contentTypeConfig";
+import {assignmentsField, contentTypeConfig, DEFAULT_FIELDS, getFieldsForContentType} from "../contentTypeConfig";
 import {globalConfig} from "./config";
 
 import { fetchAllCompletedStates, fetchCurrentSongComplete } from './railcontent.js';
 
-const DEFAULT_FIELDS = [
-        '"id": railcontent_id',
-        'railcontent_id',
-        '"type": _type',
-        'title',
-        '"image": thumbnail.asset->url',
-        'difficulty',
-        'difficulty_string',
-        'web_url_path',
-        'published_on'
-      ];
-
 /**
 * Fetch a song by its document ID from Sanity.
 *
@@ -77,25 +65,10 @@ const DEFAULT_FIELDS = [
 *   .catch(error => console.error(error));
 */
 export async function fetchSongById(documentId) {
-    const fields = [
-      '"id": railcontent_id',
-      'railcontent_id',
-      '"type": _type',
-      'description',
-      'title',
-      '"thumbnail_url": thumbnail.asset->url',
-      '"style": genre[0]->name',
-      '"artist": artist->name',
-      'album',
-      'instrumentless',
-      'soundslice',
-      '"resources": resource[]{resource_url, resource_name}',
-      '"url": web_url_path',
-    ];
 
     const query = `
         *[_type == "song" &amp;&amp; railcontent_id == ${documentId}]{
-            ${fields.join(', ')}
+            ${getFieldsForContentType('song', true)}
         }`;
 
     return fetchSanity(query, false);
@@ -296,10 +269,10 @@ export async function fetchSongCount(brand) {
  * 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))
@@ -310,12 +283,12 @@ export async function fetchWorkouts(brand) {
         "id": railcontent_id,
         title,
         "image": thumbnail.asset->url,
-        "artist_name": instructor[0]->name,
-        "artists": instructor[]->name,
+        ${artistOrInstructor()},
+        ${artistOrInstructorAsArray()},
         difficulty,
         difficulty_string,
         length_in_seconds,
-        published_on,
+        published_on,;
         "type": _type,
         web_url_path,
       } | order(published_on desc)[0...5]`
@@ -403,17 +376,9 @@ export async function fetchUpcomingEvents(brand) {
 *   .then(content => console.log(content))
 *   .catch(error => console.error(error));
 */
-export async function fetchByRailContentId(id) {
+export async function fetchByRailContentId(id, contentType) {
   const query = `*[railcontent_id == ${id}]{
-        railcontent_id,
-        title,
-        "image": thumbnail.asset->url,
-        "artist_name": artist->name,
-        artist,
-        difficulty,
-        difficulty_string,
-        web_url_path,
-        published_on
+        ${getFieldsForContentType(contentType)}
       }`
   return fetchSanity(query, false);
 }
@@ -431,10 +396,9 @@ export async function fetchByRailContentId(id) {
 *   .catch(error => console.error(error));
 */
 export async function fetchByRailContentIds(ids, contentType = undefined) {
-  const fields = contentType ? DEFAULT_FIELDS.concat(contentTypeConfig?.[contentType]?.fields ?? []) : DEFAULT_FIELDS;
   const idsString = ids.join(',');
   const query = `*[railcontent_id in [${idsString}]]{
-        ${fields.join(', ')}
+        ${getFieldsForContentType(contentType)}
       }`
   return fetchSanity(query, true);
 }
@@ -495,37 +459,7 @@ export async function fetchAll(brand, type, {
         : "";
 
     // Determine the sort order
-    let sortOrder;
-    switch (sort) {
-        case "slug":
-            if(groupBy){
-              sortOrder = "name asc";
-            } else {
-              sortOrder = "title asc";
-            }
-
-            break;
-        case "published_on":
-            sortOrder = "published_on asc";
-            break;
-        case "-published_on":
-            sortOrder = "published_on desc";
-            break;
-        case "-slug":
-            if(groupBy){
-              sortOrder = "name desc";
-            } else {
-              sortOrder = "title desc";
-            }
-
-            break;
-        case "-popularity":
-            sortOrder = "popularity desc";
-            break;
-        default:
-            sortOrder = "published_on asc";
-            break;
-    }
+    const sortOrder = getSortOrder(sort);
 
     let fields = DEFAULT_FIELDS.concat(additionalFields);
     let fieldsString = fields.join(',');
@@ -584,6 +518,28 @@ export async function fetchAll(brand, type, {
     return fetchSanity(query, true);
 }
 
+export function getSortOrder(sort= '-published_on', groupBy)
+{
+    // Determine the sort order
+    let sortOrder = '';
+    const isDesc = sort.startsWith('-');
+    sort = isDesc ? sort.substring(1) : sort;
+    switch (sort) {
+        case "slug":
+            sortOrder = groupBy ? 'name' : "title";
+            break;
+        case "popularity":
+            sortOrder = "popularity";
+            break;
+        case "published_on":
+        default:
+            sortOrder = "published_on";
+            break;
+    }
+    sortOrder += isDesc ? ' desc' : ' asc';
+    return sortOrder;
+}
+
 /**
 * Fetches all available filter options based on various criteria such as brand, filters, style, artist, content type, and search term.
 *
@@ -621,10 +577,10 @@ export async function fetchAllFilterOptions(
             return `&amp;&amp; ${key} == "${value}"`;
         }).join(' ')
         : 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 query = `
-        {  
+        {
           "meta": {
             "totalResults": count(*[${commonFilter}
               ${term ? ` &amp;&amp; (title match "${term}" || album match "${term}" || artist->name match "${term}" || genre[]->name match "${term}")` : ''}]),
@@ -653,22 +609,33 @@ export async function fetchAllFilterOptions(
 /**
 * Fetch children content by Railcontent ID.
 * @param {string} railcontentId - The Railcontent ID of the parent content.
-* @returns {Promise&lt;Array&lt;Object>|null>} - The fetched children content data or null if not found.
+* @returns {Promise&lt;Array&lt;Object>|null>} - The fetched children content data or [] if not found.
 */
 export async function fetchChildren(railcontentId) {
-  //TODO: Implement getByParentId include sum XP
-  const query = `*[_railcontent_id == ${railcontentId}]{
-        railcontent_id,
-        title,
-        "image": thumbnail.asset->url,
-        "artist_name": artist->name,
-        artist,
-        difficulty,
-        difficulty_string,
-        web_url_path,
-        published_on
-      } | order(published_on asc)`
-  return fetchSanity(query, true);
+  const query = `*[railcontent_id == ${railcontentId}]{
+        'children': child[]->{
+                           ${getFieldsForContentType()}
+                        },
+      }[0..1]`;
+  let parent = await fetchSanity(query, true);
+  return parent[0]['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, true);
+    return child[0]['parents'][0] ?? [];
 }
 
 /**
@@ -677,31 +644,11 @@ export async function fetchChildren(railcontentId) {
 * @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}"] {
-      child_count,
-      difficulty,
-      difficulty_string,
-      "description": description[0].children[0].text,
-      hide_from_recsys,
-      "image": thumbnail.asset->url,
-      "instructors":instructor[]->name,
-      "lesson_count": child_count,
-      length_in_seconds,
-      permission,
-      popularity,
+    //TODOS
+    //ADD INSTRUCTORS AND POSITION
+    const query = `*[_type == 'learning-path' &amp;&amp; brand == '${brand}'] {
+      ${getFieldsForContentType('method')}
       "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,
-      published_on,
-      railcontent_id,
-      "slug": slug.current,
-      status,
-      "thumbnail": thumbnail.asset->url,
-      "thumbnail_logo": logo_image_url.asset->url,
-      title,
-      total_xp,
-      "type": _type,
-      web_url_path,
-      "url": web_url_path,
-      xp,
     } | order(published_on asc)`
   return fetchSanity(query, true);
 }
@@ -740,22 +687,36 @@ return fetchSanity(query, false);
 /**
 * 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) {
-  //TODO: Implement getNextContentForParentContentForUser
-  const query = `*[_railcontent_id == ${railcontentId}]{
-        railcontent_id,
-        title,
-        "image": thumbnail.asset->url,
-        "artist_name": artist->name,
-        artist,
-        difficulty,
-        difficulty_string,
-        web_url_path,
-        published_on
-      }`
-  return fetchSanity(query, false);
+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.
+ * @param {string} methodId - The RailcontentID of the method
+ * @returns {Promise&lt;Object|null>} - object with `nextLesson` and `previousLesson` attributes
+ * @example
+ * fetchMethodPreviousNextLesson(241284, 241247)
+ *  .then(data => { console.log('nextLesson', data.nextLesson); console.log('prevlesson', data.prevLesson);})
+ *  .catch(error => console.error(error));
+ */
+export async function fetchMethodPreviousNextLesson(railcontentId, methodId) {
+    const sortedChildren = await fetchMethodChildrenIds(methodId);
+    const index = sortedChildren.indexOf(railcontentId);
+    let nextId = sortedChildren[index + 1];
+    let previousId = sortedChildren[index  -1];
+    let nextPrev = await fetchByRailContentIds([nextId, previousId]);
+    const nextLesson = nextPrev.find((elem) => {return elem['id'] === nextId});
+    const prevLesson = nextPrev.find((elem) => {return elem['id'] === previousId});
+    return {nextLesson, prevLesson};
 }
 
 /**
@@ -763,11 +724,37 @@ export async function fetchMethodNextLesson(railcontentId) {
 * @param {string} railcontentId - The Railcontent ID of the method.
 * @returns {Promise&lt;Array&lt;Object>|null>} - The fetched children data or null if not found.
 */
-export async function fetchMethodChildren(railcontentId) {
+export async function fetchMethodChildrenIds(railcontentId) {
   //TODO: Implement getByParentId include sum XP
-  return fetchChildren(railcontentId);
+    const query = `*[_type == 'learning-path' &amp;&amp; railcontent_id == ${railcontentId}]{
+    'children': child[]-> {
+        'id': railcontent_id,
+            'children': child[]-> {
+            'id': railcontent_id,
+                'children': child[]-> {
+                'id': railcontent_id,
+            }
+        }
+    }
+}`;
+    let allChildren = await fetchSanity(query, false);
+    return getChildrenToDepth(allChildren, 4);;
 }
 
+function getChildrenToDepth(parent, depth = 1)
+{
+    let allChildrenIds = [];
+    if (parent['children']) {
+        parent['children'].forEach((child) => {
+            allChildrenIds.push(child['id']);
+            allChildrenIds = allChildrenIds.concat(getChildrenToDepth(child, depth-1));
+        })
+    }
+    return allChildrenIds;
+}
+
+
+
 /**
 * Fetch the next and previous lessons for a specific lesson by Railcontent ID.
 * @param {string} railcontentId - The Railcontent ID of the current lesson.
@@ -806,22 +793,15 @@ export async function fetchLessonContent(railContentId) {
             chapter_description,
             chapter_timecode,
             "chapter_thumbnail_url": chapter_thumbnail_url.asset->url
-          }, 
+          },
           "coaches": instructor[]-> {
-            name, 
+            name,
             "id":_id,
             "coach_profile_image":thumbnail_url.asset->url
           },
           "instructors":instructor[]->name,
           instructor[]->,
-          "assignments":assignment[]{
-            "id": railcontent_id,
-            "soundslice_slug": assignment_soundslice,
-            "title": assignment_title,
-            "sheet_music_image_url": assignment_sheet_music_image,
-            "timecode": assignment_timecode,
-            "description": assignment_description
-          },
+          ${assignmentsField}
          video}`
   return fetchSanity(query, false);
 }
@@ -887,7 +867,7 @@ export async function fetchPackChildren(railcontentId) {
  * 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))
@@ -972,6 +952,32 @@ export async function fetchSanity(query, isList) {
   }
 }
 
+/**
+ * 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);
+}
+
 
 //Helper Functions
 function arrayJoinWithQuotes(array, delimiter = ',') {
@@ -1002,6 +1008,8 @@ function checkSanityConfig(config) {
   }
   return true;
 }
+
+
 </code></pre>
         </article>
     </section>
@@ -1016,7 +1024,7 @@ function checkSanityConfig(config) {
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.3</a> on Mon Aug 26 2024 19:46:17 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 Aug 26 2024 20:15:19 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.60",
+  "version": "1.0.62",
   "description": "A package for Musoras content services ",
   "main": "src/index.js",
   "scripts": {

package/src/contentTypeConfig.js

@@ -1,11 +1,41 @@
+const DEFAULT_FIELDS = [
+    "'sanity_id' : _id",
+    "'id': railcontent_id",
+    'railcontent_id',
+    artistOrInstructorName(),
+    "artist",
+    "title",
+    "'image': thumbnail.asset->url",
+    "'thumbnail': thumbnail.asset->url",
+    "difficulty",
+    "difficulty_string",
+    "web_url_path",
+    "published_on",
+    "'type': _type",
+    "progress_percent",
+    "'length_in_seconds' : coalesce(length_in_seconds, soundslice[0].soundslice_length_in_second)",
+    "brand",
+    "'genre': genre[]->name",
+    'status',
+    "'slug' : slug.current",
+];
+
+const descriptionField = 'description[0].children[0].text';
+
+const assignmentsField = `"assignments":assignment[]{
+    "id": railcontent_id,
+        "soundslice_slug": assignment_soundslice,
+        "title": assignment_title,
+        "sheet_music_image_url": assignment_sheet_music_image,
+        "timecode": assignment_timecode,
+        "description": assignment_description
+},`
+
 let contentTypeConfig = {
     'song': {
         'fields': [
-            '"artist_name": artist->name',
             'soundslice',
             'instrumentless',
-            '"id": railcontent_id',
-            '"type": _type',
         ],
         'relationships': {
             'artist': {
@@ -35,9 +65,46 @@ let contentTypeConfig = {
             '"instructors": instructor[]->name',
         ]
     },
+    'method': {
+        'fields': [
+            `"description": ${descriptionField}`,
+            'hide_from_recsys',
+            '"image": thumbnail.asset->url',
+            '"instructors":instructor[]->name',
+            '"lesson_count": child_count',
+            'length_in_seconds',
+            'permission',
+            'popularity',
+            'published_on',
+            'railcontent_id',
+            '"thumbnail_logo": logo_image_url.asset->url',
+            'title',
+            'total_xp',
+            '"type": _type',
+            '"url": web_url_path',
+            'xp',
+        ]
+    }
+}
+
+function artistOrInstructorName(key='artist_name') {
+    return `'${key}': coalesce(artist->name, instructor[0]->name)`;
 }
 
+function artistOrInstructorNameAsArray(key='artists') {
+    return `'${key}': select(artist->name != null => [artist->name], instructor[]->name)`;
+}
+
+function getFieldsForContentType(contentType, asQueryString=true) {
+    const fields = contentType ? DEFAULT_FIELDS.concat(contentTypeConfig?.[contentType]?.fields ?? []) : DEFAULT_FIELDS;
+    return asQueryString ? fields.toString() + ',' : fields;
+}
 
 module.exports = {
-    contentTypeConfig
+    contentTypeConfig,
+    artistOrInstructorName,
+    artistOrInstructorNameAsArray,
+    getFieldsForContentType,
+    DEFAULT_FIELDS,
+    assignmentsField
 }

package/src/index.d.ts

@@ -17,7 +17,7 @@ import {
     fetchMethods,
     fetchMethod,
     fetchMethodNextLesson,
-    fetchMethodChildren,
+    fetchMethodChildrenIds,
     fetchNextPreviousLesson,
     fetchRelatedLessons,
     fetchPackAll,
@@ -48,7 +48,7 @@ declare module 'musora-content-services' {
         fetchMethods,
         fetchMethod,
         fetchMethodNextLesson,
-        fetchMethodChildren,
+        fetchMethodChildrenIds,
         fetchNextPreviousLesson,
         fetchRelatedLessons,
         fetchPackAll,