musora-content-services 2.85.1 → 2.86.1

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

@@ -101,22 +101,22 @@ export async function resetAllLearningPaths() {
  * @returns {Promise<Object>} Learning path with enriched lesson data
  */
 export async function getEnrichedLearningPath(learningPathId) {
-  // TODO: replace addNextLesson with addNaviageTo
   const response = (await addContextToContent(
     fetchByRailContentId,
     learningPathId,
     'learning-path-v2',
     {
+      collection: { id: learningPathId, type: 'learning-path-v2' },
       dataField: 'children',
       dataField_includeParent: true,
       addProgressStatus: true,
       addProgressPercentage: true,
       addProgressTimestamp: true,
-      addNextLesson: true,
+      addNavigateTo: true,
     }
   )) as any
   if (!response) return response
-  
+
   response.children = mapContentToParent(
     response.children,
     'learning-path-lesson-v2',
@@ -222,7 +222,7 @@ export async function fetchLearningPathLessons(
     nextLPLessons = await getLearningPathLessonsByIds(nextContentIds, nextLearningPathId)
   }
 
-  
+
 
   return {
     ...learningPath,

package/src/services/contentAggregator.js

@@ -173,7 +173,11 @@ function extractItemsFromData(data, dataField, isParentArray, includeParent) {
     if (includeParent) {
       if (isParentArray) {
         for (const parent of data) {
-          items = [...items, ...parent]
+          if(Array.isArray(parent)){
+            items = [...items, ...parent]
+          } else {
+            items = [...items, parent]
+          }
         }
       } else {
         items = [...items, data]

package/src/services/contentProgress.js

@@ -410,7 +410,7 @@ function setStartedOrCompletedStatusInLocalContext(
 
   if (!hierarchy) return
 
-  if (collection && collection.type === 'learning-path') {
+  if (collection && collection.type === 'learning-path-v2') {
     bubbleOrTrickleLearningPathProgress(hierarchy, contentId, localContext, isCompleted, collection)
     return
   }
@@ -453,7 +453,7 @@ function resetStatusInLocalContext(localContext, contentId, hierarchy, collectio
   let allChildIds
   let learningPathId = null
   let childrenIds = []
-  if (collection && collection.type === 'learning-path') {
+  if (collection && collection.type === 'learning-path-v2') {
     [learningPathId, childrenIds] = findLearningPathAndChildren(hierarchy, contentId)
     allChildIds = (learningPathId === contentId) ? childrenIds : []
   } else {
@@ -471,7 +471,7 @@ function resetStatusInLocalContext(localContext, contentId, hierarchy, collectio
       delete localContext.data[key]
     }
   })
-  if (collection && collection.type === 'learning-path') { // manual bubbling for LP
+  if (collection && collection.type === 'learning-path-v2') { // manual bubbling for LP
     if (learningPathId !== contentId) {
       bubbleLearningPathProgress(hierarchy, contentId, localContext, collection)
     }
@@ -492,7 +492,7 @@ function resetStatusInLocalContext(localContext, contentId, hierarchy, collectio
  * @param {string} sessionId - This function records a sessionId to pass into future updates to progress on the same video
  * @param {int} instrumentId - enum value of instrument id
  * @param {int} categoryId - enum value of category id
- * @param {object|null} collection - optional collection info { type: 'learning-path', id: 123 }
+ * @param {object|null} collection - optional collection info { type: 'learning-path-v2', id: 123 }
  */
 // NOTE: have not set up collection because its not super important for testing and this will change soon with watermelon
 export async function recordWatchSession(
@@ -507,7 +507,7 @@ export async function recordWatchSession(
   categoryId = null,
   collection = null
 ) {
-  if (collection && collection.type === 'learning-path') {
+  if (collection && collection.type === 'learning-path-v2') {
     console.log('Learning Path lesson watch sessions are not set up yet without watermelon')
     return sessionId
   }
@@ -640,7 +640,7 @@ function extractContentIdFromRecordKey(key) {
 }
 
 async function getContentHierarchy(contentId, collection = null) {
-  if (collection && collection.type === 'learning-path') {
+  if (collection && collection.type === 'learning-path-v2') {
     return fetchMethodV2StructureFromId(contentId)
   }
   return await fetchHierarchy(contentId)

package/src/services/sanity.js

@@ -490,7 +490,10 @@ export async function fetchByRailContentIds(
     }
     return results.map(liveProcess)
   }
-  const results = await fetchSanity(query, true, { customPostProcess: customPostProcess, processNeedAccess: true })
+  const results = await fetchSanity(query, true, {
+    customPostProcess: customPostProcess,
+    processNeedAccess: true,
+  })
 
   const sortFuction = function compare(a, b) {
     const indexA = ids.indexOf(a['id'])
@@ -510,8 +513,14 @@ export async function fetchContentRows(brand, pageName, contentRowSlug) {
   if (pageName === 'lessons') pageName = 'lesson'
   if (pageName === 'songs') pageName = 'song'
   const rowString = contentRowSlug ? ` && slug.current == "${contentRowSlug.toLowerCase()}"` : ''
-  const lessonCountFilter = await new FilterBuilder(`_id in ^.child[]._ref`, {pullFutureContent: true, showMembershipRestrictedContent: true}).buildFilter()
-  const childFilter = await new FilterBuilder('', {isChildrenFilter: true, showMembershipRestrictedContent: true}).buildFilter()
+  const lessonCountFilter = await new FilterBuilder(`_id in ^.child[]._ref`, {
+    pullFutureContent: true,
+    showMembershipRestrictedContent: true,
+  }).buildFilter()
+  const childFilter = await new FilterBuilder('', {
+    isChildrenFilter: true,
+    showMembershipRestrictedContent: true,
+  }).buildFilter()
   const query = `*[_type == 'recommended-content-row' && brand == '${brand}' && type == '${pageName}'${rowString}]{
     brand,
     name,
@@ -524,7 +533,7 @@ export async function fetchContentRows(brand, pageName, contentRowSlug) {
         'lesson_count': coalesce(count(*[${lessonCountFilter}]), 0),
     },
   }`
-  return fetchSanity(query, true, {processNeedAccess: true})
+  return fetchSanity(query, true, { processNeedAccess: true })
 }
 
 /**
@@ -1084,7 +1093,11 @@ export async function jumpToContinueContent(railcontentId) {
  *   .catch(error => console.error(error));
  */
 export async function fetchLessonContent(railContentId, { addParent = false } = {}) {
-  const filterParams = { isSingle: true, pullFutureContent: true, showMembershipRestrictedContent: true }
+  const filterParams = {
+    isSingle: true,
+    pullFutureContent: true,
+    showMembershipRestrictedContent: true,
+  }
 
   const parentQuery = addParent
     ? `"parent_content_data": *[railcontent_id in [...(^.parent_content_data[].id)]]{
@@ -1236,20 +1249,20 @@ async function fetchRelatedByLicense(railcontentId, brand, onlyUseSongTypes, cou
 export async function fetchSiblingContent(railContentId, brand = null) {
   const filterGetParent = await new FilterBuilder(`references(^._id) && _type == ^.parent_type`, {
     pullFutureContent: true,
-    showMembershipRestrictedContent: true  // Show parent even without permissions
+    showMembershipRestrictedContent: true, // Show parent even without permissions
   }).buildFilter()
   const filterForParentList = await new FilterBuilder(
     `references(^._id) && _type == ^.parent_type`,
     {
       pullFutureContent: true,
       isParentFilter: true,
-      showMembershipRestrictedContent: true  // Show parent even without permissions
+      showMembershipRestrictedContent: true, // Show parent even without permissions
     }
   ).buildFilter()
 
   const childrenFilter = await new FilterBuilder(``, {
     isChildrenFilter: true,
-    showMembershipRestrictedContent: true  // Show all lessons in sidebar, need_access applied on individual page
+    showMembershipRestrictedContent: true, // Show all lessons in sidebar, need_access applied on individual page
   }).buildFilter()
 
   const brandString = brand ? ` && brand == "${brand}"` : ''
@@ -1480,35 +1493,34 @@ export async function fetchByReference(
   return fetchSanity(query, true)
 }
 
+/**
+ *
+ * Return the top level parent content railcontent_id.
+ * Ignores learning-path-v2 parents.
+ * ex: if railcontentId is of type 'skill-pack-lesson', return the corresponding 'skill-pack' railcontent_id
+ *
+ * @param {int} railcontentId
+ * @returns {Promise<int|null>}
+ */
 export async function fetchTopLevelParentId(railcontentId) {
+  const parentFilter = "railcontent_id in [...(^.parent_content_data[].id)]"
   const statusFilter = "&& status in ['scheduled', 'published', 'archived', 'unlisted']"
 
   const query = `*[railcontent_id == ${railcontentId}]{
       railcontent_id,
-      'parents': *[^._id in child[]._ref ${statusFilter}]{
-        railcontent_id,
-          'parents': *[^._id in child[]._ref ${statusFilter}]{
-            railcontent_id,
-            'parents': *[^._id in child[]._ref ${statusFilter}]{
-              railcontent_id,
-               'parents': *[^._id in child[]._ref ${statusFilter}]{
-                  railcontent_id,
-            }
-          }
-        }
+      'parents': *[${parentFilter} ${statusFilter}]{
+        railcontent_id
       }
     }`
   let response = await fetchSanity(query, false, { processNeedAccess: false })
   if (!response) return null
-  let currentLevel = response
-  for (let i = 0; i < 4; i++) {
-    if (currentLevel['parents'].length > 0) {
-      currentLevel = currentLevel['parents'][0]
-    } else {
-      return currentLevel['railcontent_id']
-    }
+  let parents = response['parents']
+  let parentsLength = parents ? response['parents'].length : 0
+  if (parentsLength > 0) {
+    // return the last parent
+    return parents[parentsLength - 1]['railcontent_id']
   }
-  return null
+  return response['railcontent_id']
 }
 
 export async function fetchHierarchy(railcontentId) {
@@ -1656,12 +1668,8 @@ export async function fetchSanity(
       if (!results) {
         throw new Error('No results found')
       }
-      results = processNeedAccess
-        ? await needsAccessDecorator(results, userPermissions)
-        : results
-      results = processPageType
-        ? pageTypeDecorator(results)
-        : results
+      results = processNeedAccess ? await needsAccessDecorator(results, userPermissions) : results
+      results = processPageType ? pageTypeDecorator(results) : results
       return customPostProcess ? customPostProcess(results) : results
     } else {
       throw new Error('No results found')
@@ -1715,7 +1723,6 @@ function pageTypeDecorator(results) {
   })
 }
 
-
 function needsAccessDecorator(results, userPermissions) {
   if (globalConfig.sanityConfig.useDummyRailContentMethods) return results
   const adapter = getPermissionsAdapter()
@@ -2037,7 +2044,10 @@ export async function fetchTabData(
   let filter = ''
 
   filter = `brand == "${brand}" && (defined(railcontent_id)) ${includedFieldsFilter} ${progressFilter}`
-  const childrenFilter = await new FilterBuilder(``, { isChildrenFilter: true, showMembershipRestrictedContent: true }).buildFilter()
+  const childrenFilter = await new FilterBuilder(``, {
+    isChildrenFilter: true,
+    showMembershipRestrictedContent: true,
+  }).buildFilter()
   const childrenFields = await getChildFieldsForContentType('tab-data')
   const lessonCountFilter = await new FilterBuilder(`_id in ^.child[]._ref`).buildFilter()
   entityFieldsString = ` ${fieldsString}
@@ -2052,14 +2062,16 @@ export async function fetchTabData(
       ),
       length_in_seconds
     ),`
-  const filterWithRestrictions = await new FilterBuilder(filter, {showMembershipRestrictedContent: true}).buildFilter()
+  const filterWithRestrictions = await new FilterBuilder(filter, {
+    showMembershipRestrictedContent: true,
+  }).buildFilter()
   query = buildEntityAndTotalQuery(filterWithRestrictions, entityFieldsString, {
     sortOrder: sortOrder,
     start: start,
     end: end,
   })
 
-  let results = await fetchSanity(query, true, {processNeedAccess: true});
+  let results = await fetchSanity(query, true, { processNeedAccess: true })
 
   if (['recent', 'incomplete', 'completed'].includes(progress) && results.entity.length > 1) {
     const orderMap = new Map(progressIds.map((id, index) => [id, index]))
@@ -2203,12 +2215,7 @@ export async function fetchMethodV2StructureFromId(contentId) {
  */
 export async function fetchOwnedContent(
   brand,
-  {
-    type = [],
-    page = 1,
-    limit = 10,
-    sort = '-published_on',
-  } = {}
+  { type = [], page = 1, limit = 10, sort = '-published_on' } = {}
 ) {
   const start = (page - 1) * limit
   const end = start + limit
@@ -2219,7 +2226,7 @@ export async function fetchOwnedContent(
   // Build the type filter
   let typeFilter = ''
   if (type.length > 0) {
-    const typesString = type.map(t => `'${t}'`).join(', ')
+    const typesString = type.map((t) => `'${t}'`).join(', ')
     typeFilter = `&& _type in [${typesString}]`
   }
 
@@ -2228,7 +2235,7 @@ export async function fetchOwnedContent(
 
   // Apply owned content filter
   const filterWithRestrictions = await new FilterBuilder(filter, {
-    showOnlyOwnedContent: true,  // Key parameter: exclude membership content
+    showOnlyOwnedContent: true, // Key parameter: exclude membership content
   }).buildFilter()
 
   const fieldsString = DEFAULT_FIELDS.join(',')

package/src/services/user/onboarding.ts

@@ -2,6 +2,7 @@
  * @module Onboarding
  */
 import { HttpClient } from '../../infrastructure/http/HttpClient'
+import { Brand } from '../../lib/brands'
 import { globalConfig } from '../config.js'
 
 export interface OnboardingSteps {
@@ -131,17 +132,107 @@ export interface OnboardingRecommendedContent {
   }
 }
 
+const recommendedContentCache: { [brand: string]: OnboardingRecommendedContent } = {
+  drumeo: {
+    id: 391995,
+    title: 'Getting Started On The Drums',
+    difficulty: 'Beginner',
+    lesson_count: 12,
+    skill_count: 1,
+    badge: 'https://cdn.sanity.io/files/4032r8py/staging/drumeo_badge.png',
+    description:
+      'Start your drumming journey with essential techniques and rhythms to get you playing quickly.',
+    video: {
+      external_id: '1002267396',
+      hlsManifestUrl:
+        'https://player.vimeo.com/external/1002267396.m3u8?s=abcdef1234567890abcdef1234567890abcdef12&oauth2_token_id=1284792284',
+      type: 'vimeo-video',
+    },
+  },
+  pianote: {
+    id: 412405,
+    title: 'Getting Started On The Piano',
+    difficulty: 'Beginner',
+    lesson_count: 4,
+    skill_count: 3,
+    badge:
+      'https://cdn.sanity.io/files/4032r8py/staging/9470587f03479b7c1f8019c3cbcbdfe12aa267f3.png',
+    description:
+      'The goal of this course is to introduce you to the keys, and get you playing a song as fast as possible. ',
+    video: {
+      external_id: '1001267395',
+      hlsManifestUrl:
+        'https://player.vimeo.com/external/1001267395.m3u8?s=8f8d8a8a762f688058e6e6fd6704c402baf1b797&oauth2_token_id=1284792283',
+      type: 'vimeo-video',
+    },
+  },
+  guitareo: {
+    id: 294635,
+    title: 'Getting Started On The Acoustic Guitar',
+    difficulty: 'Beginner',
+    lesson_count: 6,
+    skill_count: 5,
+    badge: 'https://cdn.sanity.io/files/4032r8py/staging/guitareo_badge.png',
+    description:
+      'New to the acoustic guitar? Then this Course is for you! Learn everything you need to get started on the acoustic guitar, and start playing music as fast as possible!',
+    video: {
+      external_id: '1003267397',
+      hlsManifestUrl:
+        'https://player.vimeo.com/external/1003267397.m3u8?s=1234567890abcdef1234567890abcdef12345678&oauth2_token_id=1284792285',
+      type: 'vimeo-video',
+    },
+  },
+  singeo: {
+    id: 712408,
+    title: 'Singing Starter Kit',
+    difficulty: 'Beginner',
+    lesson_count: 5,
+    skill_count: 4,
+    badge: 'https://cdn.sanity.io/files/4032r8py/staging/singeo_badge.png',
+    description:
+      'Welcome to the Singing Starter Kit! This course will teach you everything you need to know to sound better when you sing! You will learn how your unique voice works so that you can develop vocal strength, accurate pitch, and find confidence singing your favorite songs. You can sing, and the Singing Starter Kit is the perfect way to start your singing journey.',
+    video: {
+      external_id: '1004267398',
+      hlsManifestUrl:
+        'https://player.vimeo.com/external/1004267398.m3u8?s=fedcba0987654321fedcba0987654321fedcba09&oauth2_token_id=1284792286',
+      type: 'vimeo-video',
+    },
+  },
+  playbass: {
+    id: 294635,
+    title: 'Getting Started On The Acoustic Guitar',
+    difficulty: 'Beginner',
+    lesson_count: 6,
+    skill_count: 5,
+    badge: 'https://cdn.sanity.io/files/4032r8py/staging/guitareo_badge.png',
+    description:
+      'New to the acoustic guitar? Then this Course is for you! Learn everything you need to get started on the acoustic guitar, and start playing music as fast as possible!',
+    video: {
+      external_id: '1003267397',
+      hlsManifestUrl:
+        'https://player.vimeo.com/external/1003267397.m3u8?s=1234567890abcdef1234567890abcdef12345678&oauth2_token_id=1284792285',
+      type: 'vimeo-video',
+    },
+  },
+}
+
 /**
  * Fetches recommended content for onboarding based on the specified brand.
  *
- * @param {string} brand - The brand identifier.
+ * @param {string} email - The user's email address.
+ * @param {Brand} brand - The brand identifier.
  * @returns {Promise<OnboardingRecommendedContent>} - A promise that resolves with the recommended content.
  * @throws {HttpError} - If the HTTP request fails.
  */
 export async function getOnboardingRecommendedContent(
-  brand: string
+  email: string,
+  brand: Brand
 ): Promise<OnboardingRecommendedContent> {
   // TODO: Replace with real API call when available
+  if (recommendedContentCache[brand]) {
+    return recommendedContentCache[brand]
+  }
+
   return {
     id: 412405,
     title: 'Getting Started On The Piano',

package/src/services/userActivity.js

@@ -1347,7 +1347,7 @@ function mergeAndSortItems(items, limit) {
 
 export function findIncompleteLesson(progressOnItems, currentContentId, contentType) {
   const ids = Object.keys(progressOnItems).map(Number)
-  if (contentType === 'guided-course' || contentType === 'learning-path') {
+  if (contentType === 'guided-course' || contentType === 'learning-path-v2') {
     // Return first incomplete lesson
     return ids.find((id) => progressOnItems[id] !== 'completed') || ids.at(0)
   }

package/.claude/settings.local.json

@@ -1,14 +0,0 @@
-{
-  "permissions": {
-    "allow": [
-      "Read(//app/musora-platform-backend/**)",
-      "Read(//app/musora-platform-frontend/**)",
-      "Bash(find:*)",
-      "Bash(sed:*)",
-      "Read(//app/**)",
-      "Bash(cat:*)"
-    ],
-    "deny": [],
-    "ask": []
-  }
-}

package/.yarnrc.yml

@@ -1 +0,0 @@
-nodeLinker: node-modules