musora-content-services 1.0.70 → 1.0.72

package/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 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.72](https://github.com/railroadmedia/musora-content-services/compare/v1.0.71...v1.0.72) (2024-08-29)
+
+### [1.0.71](https://github.com/railroadmedia/musora-content-services/compare/v1.0.70...v1.0.71) (2024-08-28)
+
 ### [1.0.70](https://github.com/railroadmedia/musora-content-services/compare/v1.0.69...v1.0.70) (2024-08-27)
 
 ### [1.0.69](https://github.com/railroadmedia/musora-content-services/compare/v1.0.68...v1.0.69) (2024-08-27)

package/package.json

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

package/src/contentTypeConfig.js

@@ -85,6 +85,11 @@ let contentTypeConfig = {
             'xp',
         ]
     },
+    'workout': {
+        'fields': [
+            artistOrInstructorNameAsArray(),
+        ]
+    },
     'quick-tips': {
         'fields': [
             '"instructors": instructor[]->name'
@@ -220,6 +225,7 @@ let contentTypeConfig = {
             '"lesson_count": child_count',
             'xp',
            `"description": ${descriptionField}`,
+           '"instructors": instructor[]->name'
         ],
     }
 }
@@ -237,12 +243,37 @@ function getFieldsForContentType(contentType, asQueryString=true) {
     const fields = contentType ? DEFAULT_FIELDS.concat(contentTypeConfig?.[contentType]?.fields ?? []) : DEFAULT_FIELDS;
     return asQueryString ? fields.toString() + ',' : fields;
 }
+/**
+ * Takes the included fields array and returns a string that can be used in a groq query.
+ * @param {Array<string>} filters - An array of strings that represent applied filters. This should be in the format of a key,value array. eg. ['difficulty,Intermediate', 'genre,rock']
+ * @returns {string} - A string that can be used in a groq query
+ */
+function filtersToGroq(filters) {
+    const groq = filters.map(field => {
+            let [key, value] = field.split(',');
+            switch (key) {
+              case 'difficulty':
+                return `&& difficulty_string == "${value}"`;
+              case 'genre':
+                return `&& genre[]->name match "${value}"`;
+              case 'topic':
+                return `&& topic[]->name match "${value}"`;
+              case 'instrumentless':
+                return `&& instrumentless == ${value}`;
+              default:
+                return `&& ${key} == "${value}"`;
+            }
+        }).join(' ');
+    return groq;
+}
 
 module.exports = {
     contentTypeConfig,
+    descriptionField,
     artistOrInstructorName,
     artistOrInstructorNameAsArray,
     getFieldsForContentType,
     DEFAULT_FIELDS,
-    assignmentsField
+    assignmentsField,
+    filtersToGroq,
 }

package/src/index.js

@@ -29,6 +29,7 @@ import {
   fetchChildren,
   fetchParentByRailContentId,
   fetchMethodPreviousNextLesson,
+  fetchLiveEvent,
 } from './services/sanity.js';
 
 import { 
@@ -71,4 +72,5 @@ export {
     fetchChildren,
     fetchParentByRailContentId,
     fetchMethodPreviousNextLesson,
+    fetchLiveEvent,
 }

package/src/services/sanity.js

@@ -1,7 +1,16 @@
 /**
  * @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';
@@ -232,18 +241,9 @@ export async function fetchSongCount(brand) {
  *   .catch(error => console.error(error));
  */
 export async function fetchWorkouts(brand) {
+  const fields = getFieldsForContentType('workout');
   const query = `*[_type == 'workout' && 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);
 }
@@ -301,8 +301,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}] && brand == '${brand}' && published_on > '${now}']{
+  const query = `*[_type in [${typesString}] && brand == '${brand}' && published_on > '${now}' && status == 'scheduled']{
         "id": railcontent_id,
         title,
         "image": thumbnail.asset->url,
@@ -404,13 +403,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 `&& ${key} == "${value}"`;
-        }).join(' ')
+        ? filtersToGroq(includedFields)
         : "";
 
     // Determine the sort order
@@ -524,16 +517,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 `&& ${key} == "${value}"`;
-        }).join(' ')
-        : undefined;
+    const includedFieldsFilter = filters?.length > 0 ? filtersToGroq(filters) : undefined;
 
-    const commonFilter = `_type == '${contentType}' && brand == "${brand}"${style ? ` && '${style}' in genre[]->name` : ''}${artist ? ` && artist->name == '${artist}'` : ''} ${filtersToGroq ? filtersToGroq : ''}`;
+    const commonFilter = `_type == '${contentType}' && brand == "${brand}"${style ? ` && '${style}' in genre[]->name` : ''}${artist ? ` && artist->name == '${artist}'` : ''} ${includedFieldsFilter ? includedFieldsFilter : ''}`;
     const query = `
         {
           "meta": {
@@ -569,6 +555,8 @@ export async function fetchAllFilterOptions(
 */
 export async function fetchChildren(railcontentId, contentType) {
   const query = `*[railcontent_id == ${railcontentId}]{
+        title,
+
         'children': child[]->{
                            ${getFieldsForContentType(contentType)}
                         },
@@ -600,11 +588,8 @@ export async function fetchParentByRailContentId(railcontentId) {
 * @returns {Promise<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' && brand == '${brand}'] {
-      ${ getFieldsForContentType() },
-      "position": count(*[_type == 'learning-path' && brand == '${brand}' && (published_on < ^.published_on || (published_on == ^.published_on && _id < ^._id))]) + 1
+      ${ getFieldsForContentType() }
     } | order(published_on asc)`
   return fetchSanity(query, true);
 }
@@ -617,7 +602,7 @@ export async function fetchMethods(brand) {
 */
 export async function fetchMethod(brand, slug) {
   const query = `*[_type == 'learning-path' && brand == "${brand}" && slug.current == "${slug}"] {
-    "description": description[0].children[0].text,
+    "description": ${descriptionField},
     "instructors":instructor[]->name,
     published_on,
     "id": railcontent_id,
@@ -638,7 +623,7 @@ export async function fetchMethod(brand, slug) {
         "instructor": instructor[]->{name},
         title,
         "type": _type,
-        "description": description[0].children[0].text,
+        "description": ${descriptionField},
         "url": web_url_path,
         xp,
       }
@@ -652,7 +637,16 @@ return fetchSanity(query, false);
 * @returns {Promise<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,
+    "description": ${descriptionField},
+    title,
+    xp,
+    'children': child[]->{
+        ${getFieldsForContentType('method')}
+    },
+  }[0..1]`;
+  return fetchSanity(query, true);
 }
 
 /**
@@ -758,8 +752,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,
@@ -820,6 +829,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' && defined(live_event_start_time) && published_on > '${getSanityDate(dateTemp)}' && 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.