musora-content-services 1.0.68 → 1.0.69

package/CHANGELOG.md

@@ -2,6 +2,8 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [1.0.69](https://github.com/railroadmedia/musora-content-services/compare/v1.0.68...v1.0.69) (2024-08-27)
+
 ### [1.0.68](https://github.com/railroadmedia/musora-content-services/compare/v1.0.67...v1.0.68) (2024-08-27)
 
 ### [1.0.67](https://github.com/railroadmedia/musora-content-services/compare/v1.0.66...v1.0.67) (2024-08-27)

package/package.json

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

package/src/contentTypeConfig.js

@@ -62,7 +62,8 @@ let contentTypeConfig = {
     },
     'student-focus': {
         'fields': [
-            '"instructors": instructor[]->name',
+            'length_in_seconds',
+            '"instructors": instructor[]->name'
         ]
     },
     'method': {
@@ -84,6 +85,166 @@ let contentTypeConfig = {
             '"url": web_url_path',
             'xp',
         ]
+    },
+    'quick-tips': {
+        'fields': [
+            'length_in_seconds',
+            '"instructors": instructor[]->name'
+        ]
+    },
+    'rudiment': {
+        'fields': [
+            'sheet_music_thumbnail_url',
+        ]
+    },
+    'drum-fest-international-aa2022': {
+        'fields': [
+            'length_in_seconds',
+            '"instructors": instructor[]->name'
+        ]
+    },
+    'spotlight': {
+        'fields': [
+            'length_in_seconds',
+            '"instructors": instructor[]->name'
+        ]
+    },
+    'the-history-of-electronic-drums': {
+        'fields': [
+            'length_in_seconds',
+            '"instructors": instructor[]->name'
+        ]
+    },
+    'backstage-secrets': {
+        'fields': [
+            'length_in_seconds',
+            '"instructors": instructor[]->name'
+        ]
+    },
+    'question-and-answer': {
+        'fields': [
+            'length_in_seconds',
+            '"instructors": instructor[]->name'
+        ]
+    },
+    'student-collaborations': {
+        'fields': [
+            'length_in_seconds',
+            '"instructors": instructor[]->name'
+        ]
+    },
+    'live': {
+        'fields': [
+            'length_in_seconds',
+            '"instructors": instructor[]->name'
+        ]
+    },
+    'podcasts': {
+        'fields': [
+            'sort',
+            'length_in_seconds',
+        ]
+    },
+    'solos': {
+        'fields': [
+            'length_in_seconds',
+            '"instructors": instructor[]->name'
+        ]
+    },
+    'boot-camps': {
+        'fields': [
+            'length_in_seconds',
+            '"instructors": instructor[]->name'
+        ]
+    },
+    'gear-guids': {
+        'fields': [
+            'length_in_seconds',
+            '"instructors": instructor[]->name'
+        ]
+    },
+    'performances': {
+        'fields': [
+            'length_in_seconds',
+            '"instructors": instructor[]->name'
+        ]
+    },
+    'in-rhythm': {
+        'fields': [
+            'sort',
+            'length_in_seconds',
+        ]
+    },
+    'challenges': {
+        'fields': [
+            'length_in_seconds',
+            '"instructors": instructor[]->name'
+        ]
+    },
+    'on-the-road': {
+        'fields': [
+            'length_in_seconds',
+            '"instructors": instructor[]->name'
+        ]
+    },
+    'diy-drum-experiments': {
+        'fields': [
+            'sort',
+            'length_in_seconds',
+        ]
+    },
+    'rhythmic-adventures-of-captain-carson': {
+        'fields': [
+            'sort',
+            'length_in_seconds',
+        ]
+    },
+    'study-the-greats': {
+        'fields': [
+            'sort',
+            'length_in_seconds',
+        ]
+    },
+    'rhythms-from-another-planet': {
+        'fields': [
+            'sort',
+            'length_in_seconds',
+        ]
+    },
+    'paiste-cymbals': {
+        'fields': [
+            'length_in_seconds',
+            '"instructors": instructor[]->name'
+        ]
+    },
+    'behind-the-scenes': {
+        'fields': [
+            'sort',
+            'length_in_seconds',
+        ]
+    },
+    'exploring-beats': {
+        'fields': [
+            'sort',
+            'length_in_seconds',
+        ]
+    },
+    'play-along': {
+        'fields': [
+            '"style": genre[]->name',
+            'mp3_no_drums_no_click_url',
+            'mp3_yes_drums_yes_click_url',
+            'mp3_no_drums_yes_click_url',
+            'mp3_yes_drums_no_click_url',
+            'bpm',
+        ]
+    },
+    'pack': {
+        'fields': [
+            '"lesson_count": child_count',
+            'xp',
+           `"description": ${descriptionField}`,
+        ],
     }
 }
 
@@ -96,6 +257,7 @@ 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.js

@@ -18,6 +18,7 @@ import {
   fetchMethodNextLesson,
   fetchMethod,
   fetchMethods,
+  fetchMethodChildren,
   fetchMethodChildrenIds,
   fetchNextPreviousLesson,
   fetchRelatedLessons,
@@ -55,6 +56,7 @@ export {
     fetchAllFilterOptions,
     fetchMethods,
     fetchMethod,
+    fetchMethodChildren,
     fetchMethodNextLesson,
     fetchMethodChildrenIds,
     fetchNextPreviousLesson,

package/src/services/sanity.js

@@ -397,7 +397,9 @@ export async function fetchAll(brand, type, {
 
     // Construct the search filter
     const searchFilter = searchTerm
-        ? `&& (artist->name match "${searchTerm}*" || title match "${searchTerm}*")`
+        ? groupBy !== "" ?
+          `&& (^.name match "${searchTerm}*" || title match "${searchTerm}*")`
+          : `&& (artist->name match "${searchTerm}*" || instructor[]->name match "${searchTerm}*" || title match "${searchTerm}*")`
         : "";
 
     // Construct the included fields filter, replacing 'difficulty' with 'difficulty_string'
@@ -422,15 +424,15 @@ export async function fetchAll(brand, type, {
     if (groupBy !== "" && isGroupByOneToOne) {
         query = `
         {
-            "total": count(*[_type == '${groupBy}' && count(*[_type == '${type}' && brand == '${brand}' && ^._id == ${groupBy}._ref ]._id) > 0]),
-            "entity": *[_type == '${groupBy}' && count(*[_type == '${type}' && brand == '${brand}' && ^._id == ${groupBy}._ref ]._id) > 0]
+            "total": count(*[_type == '${groupBy}' && count(*[_type == '${type}' && brand == '${brand}' && ^._id == ${groupBy}._ref ${searchFilter} ${includedFieldsFilter}]._id) > 0]),
+            "entity": *[_type == '${groupBy}' && count(*[_type == '${type}' && brand == '${brand}' && ^._id == ${groupBy}._ref ${searchFilter} ${includedFieldsFilter}]._id) > 0]
             {
                 'id': _id,
                 'type': _type,
                 name,
                 'head_shot_picture_url': thumbnail_url.asset->url,
-                'all_lessons_count': count(*[_type == '${type}' && brand == '${brand}' && ^._id == ${groupBy}._ref ]._id),
-                'lessons': *[_type == '${type}' && brand == '${brand}' && ^._id == ${groupBy}._ref ]{
+                'all_lessons_count': count(*[_type == '${type}' && brand == '${brand}' && ^._id == ${groupBy}._ref ${searchFilter} ${includedFieldsFilter}]._id),
+                'lessons': *[_type == '${type}' && brand == '${brand}' && ^._id == ${groupBy}._ref ${searchFilter} ${includedFieldsFilter}]{
                     ${fieldsString},
                     ${groupBy}
                 }[0...10]
@@ -441,15 +443,15 @@ export async function fetchAll(brand, type, {
     } else if (groupBy !== "") {
         query = `
         {
-            "total": count(*[_type == '${groupBy}' && count(*[_type == '${type}' && brand == '${brand}' && ^._id in ${groupBy}[]._ref]._id)>0]),
-            "entity": *[_type == '${groupBy}' && count(*[_type == '${type}' && brand == '${brand}' && ^._id in ${groupBy}[]._ref]._id) > 0]
+            "total": count(*[_type == '${groupBy}' && count(*[_type == '${type}' && brand == '${brand}' && ^._id in ${groupBy}[]._ref ${searchFilter} ${includedFieldsFilter}]._id) > 0]),
+            "entity": *[_type == '${groupBy}' && count(*[_type == '${type}' && brand == '${brand}' && ^._id in ${groupBy}[]._ref ${searchFilter} ${includedFieldsFilter}]._id) > 0]
             {
                 'id': _id,
                 'type': _type,
                 name,
                 'head_shot_picture_url': thumbnail_url.asset->url,
-                'all_lessons_count': count(*[_type == '${type}' && brand == '${brand}' && ^._id in ${groupBy}[]._ref ]._id),
-                'lessons': *[_type == '${type}' && brand == '${brand}' && ^._id in ${groupBy}[]._ref ]{
+                'all_lessons_count': count(*[_type == '${type}' && brand == '${brand}' && ^._id in ${groupBy}[]._ref ${searchFilter} ${includedFieldsFilter}]._id),
+                'lessons': *[_type == '${type}' && brand == '${brand}' && ^._id in ${groupBy}[]._ref ${searchFilter} ${includedFieldsFilter}]{
                     ${fieldsString},
                     ${groupBy}
                 }[0...10]
@@ -562,12 +564,13 @@ export async function fetchAllFilterOptions(
 /**
 * 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<Array<Object>|null>} - The fetched children content data or [] if not found.
 */
-export async function fetchChildren(railcontentId) {
+export async function fetchChildren(railcontentId, contentType) {
   const query = `*[railcontent_id == ${railcontentId}]{
         'children': child[]->{
-                           ${getFieldsForContentType()}
+                           ${getFieldsForContentType(contentType)}
                         },
       }[0..1]`;
   let parent = await fetchSanity(query, true);
@@ -600,8 +603,8 @@ export async function fetchMethods(brand) {
     //TODOS
     //ADD INSTRUCTORS AND POSITION
     const query = `*[_type == 'learning-path' && brand == '${brand}'] {
-      ${getFieldsForContentType('method')}
-      "position": count(*[_type == 'learning-path' && brand == '${brand}' && (published_on < ^.published_on || (published_on == ^.published_on && _id < ^._id))]) + 1,
+      ${ getFieldsForContentType() },
+      "position": count(*[_type == 'learning-path' && brand == '${brand}' && (published_on < ^.published_on || (published_on == ^.published_on && _id < ^._id))]) + 1
     } | order(published_on asc)`
   return fetchSanity(query, true);
 }
@@ -628,9 +631,7 @@ 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,
@@ -643,6 +644,15 @@ export async function fetchMethod(brand, slug) {
 return fetchSanity(query, false);
 }
 
+/**
+* Fetch the child courses for a specific method by Railcontent ID.
+* @param {string} railcontentId - The Railcontent ID of the current lesson.
+* @returns {Promise<Object|null>} - The fetched next lesson data or null if not found.
+*/
+export async function fetchMethodChildren(railcontentId) {
+  return fetchChildren(railcontentId, 'method');
+}
+
 /**
 * Fetch the next lesson for a specific method by Railcontent ID.
 * @param {string} railcontentId - The Railcontent ID of the current lesson.