musora-content-services 2.71.0 → 2.72.1

package/src/contentTypeConfig.js

@@ -1,6 +1,6 @@
 //import {AWSUrl, CloudFrontURl} from "./services/config";
-import {LengthFilterOptions, Tabs} from "./contentMetaData.js";
-import {FilterBuilder} from "./filterBuilder.js";
+import { LengthFilterOptions, Tabs } from './contentMetaData.js'
+import { FilterBuilder } from './filterBuilder.js'
 
 export const AWSUrl = 'https://s3.us-east-1.amazonaws.com/musora-web-platform'
 export const CloudFrontURl = 'https://d3fzm1tzeyr5n3.cloudfront.net'
@@ -9,8 +9,16 @@ export const CloudFrontURl = 'https://d3fzm1tzeyr5n3.cloudfront.net'
 export const SONG_TYPES = ['song', 'play-along', 'jam-track', 'song-tutorial-children']
 // Oct 2025: It turns out content-meta categories are not really clear
 // THis is used for the page_type field as a post processor so we include parents and children
- // Duplicated in SanityGateway.php if you update this, update that
-export const SONG_TYPES_WITH_CHILDREN = ['song', 'song-part', 'play-along', 'play-along-part', 'jam-track', 'song-tutorial', 'song-tutorial-children']
+// Duplicated in SanityGateway.php if you update this, update that
+export const SONG_TYPES_WITH_CHILDREN = [
+  'song',
+  'song-part',
+  'play-along',
+  'play-along-part',
+  'jam-track',
+  'song-tutorial',
+  'song-tutorial-children',
+]
 // Single hierarchy refers to only one element in the hierarchy has video lessons, not that they have a single parent
 export const SINGLE_PARENT_TYPES = ['course-part', 'pack-bundle-lesson', 'song-tutorial-children']
 
@@ -172,40 +180,51 @@ export const coachLessonsTypes = [
 ]
 
 export const childContentTypeConfig = {
-  'song-tutorial': [
-    `"genre": genre[]->name`,
-    `difficulty_string`,
-    `"type": _type`,
-  ]
+  'song-tutorial': [`"genre": genre[]->name`, `difficulty_string`, `"type": _type`],
 }
 
-export const singleLessonTypes = ['quick-tips', 'rudiment'];
-export const practiceAlongsLessonTypes = ['workout']; // challenges ->workouts
-export const performancesLessonTypes = ['performance'];
-export const documentariesLessonTypes = ['tama','sonor','history-of-electronic-drums','paiste-cymbals', 'backstage-secret'];
-export const liveArchivesLessonTypes = ['podcast', 'coach-stream', 'question-and-answer', 'live-streams', 'live'];
-export const studentArchivesLessonTypes = ['student-review', 'student-focus','student-collaboration'];
-export const tutorialsLessonTypes = ['song-tutorial'];
-export const transcriptionsLessonTypes = ['song'];
-export const playAlongLessonTypes = ['play-along'];
-export const jamTrackLessonTypes = ['jam-track'];
+export const singleLessonTypes = ['quick-tips', 'rudiment']
+export const practiceAlongsLessonTypes = ['workout'] // challenges ->workouts
+export const performancesLessonTypes = ['performance']
+export const documentariesLessonTypes = [
+  'tama',
+  'sonor',
+  'history-of-electronic-drums',
+  'paiste-cymbals',
+  'backstage-secret',
+]
+export const liveArchivesLessonTypes = [
+  'podcast',
+  'coach-stream',
+  'question-and-answer',
+  'live-streams',
+  'live',
+]
+export const studentArchivesLessonTypes = [
+  'student-review',
+  'student-focus',
+  'student-collaboration',
+]
+export const tutorialsLessonTypes = ['song-tutorial']
+export const transcriptionsLessonTypes = ['song']
+export const playAlongLessonTypes = ['play-along']
+export const jamTrackLessonTypes = ['jam-track']
 
 export const individualLessonsTypes = [
   ...singleLessonTypes,
   ...practiceAlongsLessonTypes,
   ...liveArchivesLessonTypes,
-  ...studentArchivesLessonTypes
-];
+  ...studentArchivesLessonTypes,
+]
 
 export const coursesLessonTypes = [
   'course',
   'tiered-course', // TODO: new content type
-  'guided-course'];
-
-export const skillLessonTypes = [
-  'skill-pack'
+  'guided-course',
 ]
 
+export const skillLessonTypes = ['skill-pack']
+
 export const showsLessonTypes = [
   'boot-camp',
   'diy-drum-experiment',
@@ -213,57 +232,75 @@ export const showsLessonTypes = [
   'in-rhythm',
   'rhythmic-adventures-of-captain-carson',
   'rhythms-from-another-planet',
-  'study-the-greats'];
+  'study-the-greats',
+]
 export const entertainmentLessonTypes = [
   'specials', // TODO: new type
   ...documentariesLessonTypes,
-  ...showsLessonTypes
-];
-export const collectionLessonTypes = [
-    ...coursesLessonTypes,
-    ...showsLessonTypes
-];
+  ...showsLessonTypes,
+]
+export const collectionLessonTypes = [...coursesLessonTypes, ...showsLessonTypes]
 
 export const lessonTypesMapping = {
-  'lessons': singleLessonTypes,
+  lessons: singleLessonTypes,
   'practice alongs': practiceAlongsLessonTypes,
   'live archives': liveArchivesLessonTypes,
-  'performances': performancesLessonTypes,
+  performances: performancesLessonTypes,
   'student archives': studentArchivesLessonTypes,
-  'documentaries': documentariesLessonTypes,
-  'courses': ['course'],
+  documentaries: documentariesLessonTypes,
+  courses: ['course'],
   'guided courses': ['guided-course'],
-  'tiered courses': ['tiered-course' ],
+  'tiered courses': ['tiered-course'],
   'skill packs': ['skill-pack'],
-  'specials': ['specials'],
-  'shows': showsLessonTypes,
-  'collections': collectionLessonTypes,
-  'individuals': individualLessonsTypes,
-  'tutorials': tutorialsLessonTypes,
-  'transcriptions': transcriptionsLessonTypes,
-  'tabs': transcriptionsLessonTypes,
+  specials: ['specials'],
+  shows: showsLessonTypes,
+  collections: collectionLessonTypes,
+  individuals: individualLessonsTypes,
+  tutorials: tutorialsLessonTypes,
+  transcriptions: transcriptionsLessonTypes,
+  tabs: transcriptionsLessonTypes,
   'sheet music': transcriptionsLessonTypes,
   'play-alongs': playAlongLessonTypes,
   'jam tracks': jamTrackLessonTypes,
-  'entertainment': entertainmentLessonTypes,
-  'single lessons': [...singleLessonTypes, ...liveArchivesLessonTypes, ...studentArchivesLessonTypes, ...practiceAlongsLessonTypes]
-};
+  entertainment: entertainmentLessonTypes,
+  'single lessons': [
+    ...singleLessonTypes,
+    ...liveArchivesLessonTypes,
+    ...studentArchivesLessonTypes,
+    ...practiceAlongsLessonTypes,
+  ],
+}
 
-export const getNextLessonLessonParentTypes = ['course', 'guided-course', 'pack', 'pack-bundle', 'song-tutorial'];
+export const getNextLessonLessonParentTypes = [
+  'course',
+  'guided-course',
+  'pack',
+  'pack-bundle',
+  'song-tutorial',
+]
 
 export const progressTypesMapping = {
-  'lesson': [...singleLessonTypes,...practiceAlongsLessonTypes, ...liveArchivesLessonTypes, ...performancesLessonTypes, ...studentArchivesLessonTypes, ...documentariesLessonTypes, 'live', 'pack-bundle-lesson'],
-  'course': ['course'],
-  'show': showsLessonTypes,
+  lesson: [
+    ...singleLessonTypes,
+    ...practiceAlongsLessonTypes,
+    ...liveArchivesLessonTypes,
+    ...performancesLessonTypes,
+    ...studentArchivesLessonTypes,
+    ...documentariesLessonTypes,
+    'live',
+    'pack-bundle-lesson',
+  ],
+  course: ['course'],
+  show: showsLessonTypes,
   'song tutorial': [...tutorialsLessonTypes, 'song-tutorial-children'],
-  'songs': transcriptionsLessonTypes,
+  songs: transcriptionsLessonTypes,
   'play along': playAlongLessonTypes,
   'guided course': ['guided-course'],
-  'pack': ['pack', 'semester-pack'],
-  'method': ['learning-path'],
+  pack: ['pack', 'semester-pack'],
+  method: ['learning-path'],
   'jam track': jamTrackLessonTypes,
   'course video': ['course-part'],
-};
+}
 
 export const songs = {
   drumeo: 'transcription',
@@ -274,23 +311,48 @@ export const songs = {
 }
 
 export const filterTypes = {
-  lessons: [...singleLessonTypes, ...practiceAlongsLessonTypes , ...liveArchivesLessonTypes, ...studentArchivesLessonTypes, ...coursesLessonTypes, ...skillLessonTypes , ...entertainmentLessonTypes],
-  songs: [...tutorialsLessonTypes, ...transcriptionsLessonTypes, ...playAlongLessonTypes, ...jamTrackLessonTypes],
+  lessons: [
+    ...singleLessonTypes,
+    ...practiceAlongsLessonTypes,
+    ...liveArchivesLessonTypes,
+    ...studentArchivesLessonTypes,
+    ...coursesLessonTypes,
+    ...skillLessonTypes,
+    ...entertainmentLessonTypes,
+  ],
+  songs: [
+    ...tutorialsLessonTypes,
+    ...transcriptionsLessonTypes,
+    ...playAlongLessonTypes,
+    ...jamTrackLessonTypes,
+  ],
 }
 
 export const recentTypes = {
-  lessons: [...individualLessonsTypes, 'course-part', 'pack-bundle-lesson', 'guided-course-part', 'quick-tips'],
+  lessons: [
+    ...individualLessonsTypes,
+    'course-part',
+    'pack-bundle-lesson',
+    'guided-course-part',
+    'quick-tips',
+  ],
   songs: [...SONG_TYPES],
-  home: [...individualLessonsTypes, ...tutorialsLessonTypes, ...transcriptionsLessonTypes, ...playAlongLessonTypes,
-  'guided-course', 'learning-path', 'live', 'course', 'pack']
+  home: [
+    ...individualLessonsTypes,
+    ...tutorialsLessonTypes,
+    ...transcriptionsLessonTypes,
+    ...playAlongLessonTypes,
+    'guided-course',
+    'learning-path',
+    'live',
+    'course',
+    'pack',
+  ],
 }
 
 export let contentTypeConfig = {
   'tab-data': {
-    fields: [
-      'enrollment_start_time',
-      'enrollment_end_time',
-    ],
+    fields: ['enrollment_start_time', 'enrollment_end_time'],
     includeChildFields: true,
   },
   'progress-tracker': {
@@ -353,7 +415,7 @@ export let contentTypeConfig = {
     ],
     slug: 'courses',
   },
-  'download': {
+  download: {
     fields: [
       `"resource": ${resourcesField}`,
       'soundslice',
@@ -372,8 +434,7 @@ export let contentTypeConfig = {
           "videoId": coalesce(live_event_stream_id, video.external_id),
           "live_event_is_global": live_global_event == true
         }
-      )`
-
+      )`,
     ],
     childFields: [
       `"resource": ${resourcesField}`,
@@ -393,9 +454,8 @@ export let contentTypeConfig = {
           "videoId": coalesce(live_event_stream_id, video.external_id),
           "live_event_is_global": live_global_event == true
         }
-      )`
-
-    ]
+      )`,
+    ],
   },
   method: {
     fields: [
@@ -519,9 +579,7 @@ export let contentTypeConfig = {
       `"description": ${descriptionField}`,
       'total_xp',
     ],
-    childFields: [
-      `"description": ${descriptionField}`,
-    ]
+    childFields: [`"description": ${descriptionField}`],
   },
   'pack-bundle-lesson': {
     fields: [`"resources": ${resourcesField}`],
@@ -609,23 +667,17 @@ export let contentTypeConfig = {
   'exploring-beats': contentWithSortField,
   sonor: contentWithSortField,
   returning: {
-    fields: [
-      `quarter_published`,
-      '"thumbnail": thumbnail.asset->url',
-    ]
+    fields: [`quarter_published`, '"thumbnail": thumbnail.asset->url'],
   },
   leaving: {
-    fields: [
-      `quarter_removed`,
-      '"thumbnail": thumbnail.asset->url',
-    ]
+    fields: [`quarter_removed`, '"thumbnail": thumbnail.asset->url'],
   },
-  "method-v2": [
+  'method-v2': [
     `"id":_id`,
     `"type":_type`,
-    "title",
-    "brand",
-    `"intro_video": intro_video->{ ${getIntroVideoFields().join(", ")} }`,
+    'title',
+    'brand',
+    `"intro_video": intro_video->{ ${getIntroVideoFields().join(', ')} }`,
     `child[]->{
       "resource": ${resourcesField},
       total_skills,
@@ -643,22 +695,21 @@ export let contentTypeConfig = {
       }
     }`,
   ],
-  "method-intro": getIntroVideoFields(),
+  'method-intro': getIntroVideoFields(),
 }
 
 export function getIntroVideoFields() {
   return [
-    "title",
-    "brand",
+    'title',
+    'brand',
     `"description": ${descriptionField}`,
     `"thumbnail": thumbnail.asset->url`,
-    "length_in_seconds",
-    "video_desktop",
-    "video_mobile",
-  ];
+    'length_in_seconds',
+    'video_desktop',
+    'video_mobile',
+  ]
 }
 
-
 export const plusMembershipPermissions = 92
 
 export function getNewReleasesTypes(brand) {
@@ -771,11 +822,14 @@ export function artistOrInstructorNameAsArray(key = 'artists') {
   return `'${key}': select(artist->name != null => [artist->name], instructor[]->name)`
 }
 
-export async function getFieldsForContentTypeWithFilteredChildren(contentType, asQueryString = true) {
+export async function getFieldsForContentTypeWithFilteredChildren(
+  contentType,
+  asQueryString = true
+) {
   const childFields = getChildFieldsForContentType(contentType, true)
   const parentFields = getFieldsForContentType(contentType, false)
   if (childFields) {
-    const childFilter = await new FilterBuilder('', {isChildrenFilter: true}).buildFilter()
+    const childFilter = await new FilterBuilder('', { isChildrenFilter: true }).buildFilter()
     parentFields.push(
       `"children": child[${childFilter}]->{
         ${childFields}
@@ -788,14 +842,16 @@ export async function getFieldsForContentTypeWithFilteredChildren(contentType, a
   return asQueryString ? parentFields.toString() + ',' : parentFields
 }
 
-export function getChildFieldsForContentType(contentType, asQueryString = true)
-{
+export function getChildFieldsForContentType(contentType, asQueryString = true) {
   // When contentType is undefined/null, return DEFAULT_CHILD_FIELDS to support mixed-type queries (e.g., from Algolia)
   if (!contentType) {
     return asQueryString ? DEFAULT_CHILD_FIELDS.toString() + ',' : DEFAULT_CHILD_FIELDS
   }
 
-  if (contentTypeConfig[contentType]?.childFields || contentTypeConfig[contentType]?.includeChildFields) {
+  if (
+    contentTypeConfig[contentType]?.childFields ||
+    contentTypeConfig[contentType]?.includeChildFields
+  ) {
     const childFields = contentType
       ? DEFAULT_CHILD_FIELDS.concat(contentTypeConfig?.[contentType]?.childFields ?? [])
       : DEFAULT_CHILD_FIELDS
@@ -817,7 +873,7 @@ export function getFieldsForContentType(contentType, asQueryString = true) {
  */
 function createTypeConditions(lessonTypes) {
   if (!lessonTypes || lessonTypes.length === 0) return ''
-  const conditions = lessonTypes.map(type => `_type == '${type}'`).join(' || ')
+  const conditions = lessonTypes.map((type) => `_type == '${type}'`).join(' || ')
   return conditions ? `(${conditions})` : ''
 }
 
@@ -872,8 +928,9 @@ const filterHandlers = {
 
   length: (value) => {
     // Find the matching length option by name
-    const lengthOption = Object.values(LengthFilterOptions)
-      .find(opt => typeof opt === 'object' && opt.name === value)
+    const lengthOption = Object.values(LengthFilterOptions).find(
+      (opt) => typeof opt === 'object' && opt.name === value
+    )
 
     if (!lengthOption) return ''
 
@@ -912,12 +969,12 @@ const filterHandlers = {
 export function filtersToGroq(filters = [], selectedFilters = [], pageName = '') {
   // Handle railcontent_id filters separately (they use different syntax)
   const railcontentIdFilters = filters
-    .filter(item => item.includes('railcontent_id in'))
-    .map(item => ` && ${item}`)
+    .filter((item) => item.includes('railcontent_id in'))
+    .map((item) => ` && ${item}`)
     .join('')
 
   // Remove railcontent_id filters from main processing
-  const regularFilters = filters.filter(item => !item.includes('railcontent_id in'))
+  const regularFilters = filters.filter((item) => !item.includes('railcontent_id in'))
 
   // Group filters by key
   const groupedFilters = groupFilters(regularFilters)
@@ -940,7 +997,7 @@ export function filtersToGroq(filters = [], selectedFilters = [], pageName = '')
 
       // Process each value with the appropriate handler
       const joinedValues = values
-        .map(value => {
+        .map((value) => {
           const handler = filterHandlers[key]
 
           if (handler) {

package/src/index.d.ts

@@ -13,6 +13,7 @@ import {
 } from './services/content-org/guided-courses.ts';
 
 import {
+	fetchLearningPathLessons,
 	getActivePath,
 	getDailySession,
 	updateActivePath,
@@ -459,6 +460,7 @@ declare module 'musora-content-services' {
 		fetchInterests,
 		fetchLastInteractedChild,
 		fetchLatestThreads,
+		fetchLearningPathLessons,
 		fetchLeaving,
 		fetchLessonContent,
 		fetchLessonsFeaturingThisContent,

package/src/index.js

@@ -13,6 +13,7 @@ import {
 } from './services/content-org/guided-courses.ts';
 
 import {
+	fetchLearningPathLessons,
 	getActivePath,
 	getDailySession,
 	updateActivePath,
@@ -458,6 +459,7 @@ export {
 	fetchInterests,
 	fetchLastInteractedChild,
 	fetchLatestThreads,
+	fetchLearningPathLessons,
 	fetchLeaving,
 	fetchLessonContent,
 	fetchLessonsFeaturingThisContent,

package/src/lib/httpHelper.js

@@ -36,6 +36,11 @@ export async function fetchJSONHandler(
     } else {
       console.error(`Fetch error: ${method} ${url} ${response.status} ${response.statusText}`)
       console.log(response)
+      const contentType = response.headers.get('content-type')
+      if (contentType && contentType.indexOf('json') !== -1) {
+        const data = await response.json()
+        console.log(data)
+      }
     }
   } catch (error) {
     console.error('Fetch error:', error)

package/src/services/content-org/learning-paths.ts

@@ -1,7 +1,9 @@
 import { fetchHandler } from '../railcontent.js'
-
+import { fetchByRailContentId, fetchByRailContentIds, fetchMethodV2Structure } from '../sanity.js'
+import { addContextToContent } from '../contentAggregator.js'
+import { getProgressStateByIds } from '../contentProgress.js'
 /**
- * @module GuidedCourses
+ * @module LearningPaths
  */
 const BASE_PATH: string = `/api/content-org`
 
@@ -23,7 +25,11 @@ export async function getDailySession(brand: string, userDate: Date) {
  * @param userDate - format 2025-10-31
  * @param keepFirstLearningPath
  */
-export async function updateDailySession(brand: string, userDate: Date, keepFirstLearningPath: boolean) {
+export async function updateDailySession(
+  brand: string,
+  userDate: Date,
+  keepFirstLearningPath: boolean
+) {
   const stringDate = userDate.toISOString().split('T')[0]
   const url: string = `${BASE_PATH}/v1/user/learning-paths/daily-session/update`
   const body = { brand: brand, userDate: stringDate, keepFirstLearningPath: keepFirstLearningPath }
@@ -49,3 +55,86 @@ export async function updateActivePath(brand: string) {
   const body = { brand: brand }
   return await fetchHandler(url, 'POST', null, body)
 }
+
+/** Fetches and organizes learning path lessons.
+ *
+ * @param {number} learningPathId - The learning path ID.
+ * @param {string} brand
+ * @param {Date} userDate - Users local date - format 2025-10-31
+ * @returns {Promise<Object>} result - The result object.
+ * @returns {number} result.id - The learning path ID.
+ * @returns {string} result.thumbnail - Optional thumbnail URL for the learning path.
+ * @returns {string} result.title - The title of the learning path.
+ * @returns {boolean} result.is_active_learning_path - Whether the learning path is currently active.
+ * @returns {Array} result.all_lessons - Array of all lessons.
+ * @returns {Array} result.upcoming_lessons - Array of upcoming/additional lessons.
+ * @returns {Array} result.todays_lessons - Array of today's lessons (max 3).
+ * @returns {Array} result.next_learning_path_lessons - Array of next lessons to be taken.
+ * @returns {Array} result.completed_lessons - Array of completed lessons.
+ */
+export async function fetchLearningPathLessons(
+  learningPathId: number,
+  brand: string,
+  userDate: Date
+) {
+  const [learningPath, dailySession] = await Promise.all([
+    fetchByRailContentId(learningPathId, 'learning-path-v2'),
+    getDailySession(brand, userDate),
+  ])
+
+  const addContextParameters = {
+    addProgressStatus: true,
+    addProgressPercentage: true,
+  }
+  const lessons = await addContextToContent(() => learningPath.children, addContextParameters)
+  const isActiveLearningPath = (dailySession?.active_learning_path_id || 0) == learningPathId
+  const todayContentIds = dailySession.daily_session[0]?.content_ids || []
+  const nextContentIds = dailySession.daily_session[1]?.content_ids || []
+  const completedLessons = []
+  let todaysLessons = []
+  let nextLPLessons = []
+  const upcomingLessons = []
+  const lessonIds = lessons.map((lesson: any) => lesson.id).filter(Boolean)
+
+  lessons.forEach((lesson: any) => {
+    if (todayContentIds.includes(lesson.id)) {
+      todaysLessons.push(lesson)
+    } else if (nextContentIds.includes(lesson.id)) {
+      nextLPLessons.push(lesson)
+    } else if (lesson.progressStatus === 'completed') {
+      completedLessons.push(lesson)
+    } else {
+      upcomingLessons.push(lesson)
+    }
+  })
+
+  if (todaysLessons.length == 0 && nextLPLessons.length > 0) {
+    // Daily sessions first lessons are not part of the active learning path, but next lessons are
+    // load todays lessons from previous learning path
+    todaysLessons = await addContextToContent(
+      fetchByRailContentIds,
+      todayContentIds,
+      addContextParameters
+    )
+  } else if (nextContentIds.length > 0 && nextLPLessons.length == 0 && todaysLessons.length > 0) {
+    // Daily sessions first lessons are the active learning path and the next lessons are not
+    // load next lessons from next learning path
+    nextLPLessons = await addContextToContent(
+      fetchByRailContentIds,
+      nextContentIds,
+      addContextParameters
+    )
+  }
+
+  return {
+    id: learningPathId,
+    thumbnail: learningPath.thumbnail,
+    title: learningPath.title || '',
+    is_active_learning_path: isActiveLearningPath,
+    all_lessons: lessons,
+    upcoming_lessons: upcomingLessons,
+    todays_lessons: todaysLessons,
+    next_learning_path_lessons: nextLPLessons,
+    completed_lessons: completedLessons,
+  }
+}