musora-content-services 2.20.0 → 2.21.1

package/.yarnrc.yml

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

package/CHANGELOG.md

@@ -2,6 +2,21 @@
 
 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.
 
+### [2.21.1](https://github.com/railroadmedia/musora-content-services/compare/v2.21.0...v2.21.1) (2025-07-14)
+
+
+### Bug Fixes
+
+* track correct amount of video watch time ([07d31c8](https://github.com/railroadmedia/musora-content-services/commit/07d31c802164b0625b5e72ce78e618fc5d12ecaf))
+* track correct amount of video watch time ([41a0d0b](https://github.com/railroadmedia/musora-content-services/commit/41a0d0b82d73183c52db7b510d00bbf7838554d0))
+
+## [2.21.0](https://github.com/railroadmedia/musora-content-services/compare/v2.20.0...v2.21.0) (2025-07-12)
+
+
+### Features
+
+* **BEH-572:** ai recommender row categories ([#337](https://github.com/railroadmedia/musora-content-services/issues/337)) ([d1984d2](https://github.com/railroadmedia/musora-content-services/commit/d1984d28371fa2d4f22d8ddb50fdcfd952399b46))
+
 ## [2.20.0](https://github.com/railroadmedia/musora-content-services/compare/v2.19.2...v2.20.0) (2025-07-11)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "musora-content-services",
-  "version": "2.20.0",
+  "version": "2.21.1",
   "description": "A package for Musoras content services ",
   "main": "src/index.js",
   "type": "module",

package/src/contentTypeConfig.js

@@ -24,7 +24,6 @@ export const DEFAULT_FIELDS = [
   "'url': 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",
@@ -139,7 +138,7 @@ export const singleLessonTypes = ['quick-tips', 'rudiment', 'coach-lessons'];
 export const practiceAlongsLessonTypes = ['workout', 'boot-camp','challenges'];
 export const performancesLessonTypes = ['performance','solo','drum-fest-international-2022'];
 export const documentariesLessonTypes = ['tama','sonor','history-of-electronic-drums','paiste-cymbals'];
-export const liveArchivesLessonTypes = ['podcast', 'coach-stream', 'question-and-answer', 'live-streams'];
+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'];
@@ -209,7 +208,8 @@ export const filterTypes = {
 export const recentTypes = {
   lessons: [...individualLessonsTypes],
   songs: [...tutorialsLessonTypes, ...transcriptionsLessonTypes, ...playAlongLessonTypes],
-  home: [...individualLessonsTypes, ...tutorialsLessonTypes, ...transcriptionsLessonTypes, ...playAlongLessonTypes]
+  home: [...individualLessonsTypes, ...tutorialsLessonTypes, ...transcriptionsLessonTypes, ...playAlongLessonTypes,
+  'guided-course', 'learning-path', 'live']
 }
 
 export let contentTypeConfig = {

package/src/index.d.ts

@@ -189,6 +189,7 @@ import {
 	fetchCoachLessons,
 	fetchComingSoon,
 	fetchCommentModContentData,
+	fetchContentRows,
 	fetchFoundation,
 	fetchGenreLessons,
 	fetchHierarchy,
@@ -364,6 +365,7 @@ declare module 'musora-content-services' {
 		fetchContentInProgress,
 		fetchContentPageUserData,
 		fetchContentProgress,
+		fetchContentRows,
 		fetchEnrollmentPageMetadata,
 		fetchFoundation,
 		fetchGenreLessons,

package/src/index.js

@@ -189,6 +189,7 @@ import {
 	fetchCoachLessons,
 	fetchComingSoon,
 	fetchCommentModContentData,
+	fetchContentRows,
 	fetchFoundation,
 	fetchGenreLessons,
 	fetchHierarchy,
@@ -363,6 +364,7 @@ export {
 	fetchContentInProgress,
 	fetchContentPageUserData,
 	fetchContentProgress,
+	fetchContentRows,
 	fetchEnrollmentPageMetadata,
 	fetchFoundation,
 	fetchGenreLessons,

package/src/services/content.js

@@ -11,11 +11,12 @@ import {
   fetchUpcomingEvents,
   fetchScheduledReleases,
   fetchReturning,
-  fetchLeaving, fetchScheduledAndNewReleases
+  fetchLeaving, fetchScheduledAndNewReleases, fetchContentRows
 } from './sanity.js'
 import {TabResponseType, Tabs, capitalizeFirstLetter} from '../contentMetaData.js'
 import {fetchHandler} from "./railcontent";
-import {recommendations} from "./recommendations";
+import {recommendations, rankCategories} from "./recommendations";
+import {addContextToContent} from "./contentAggregator.js";
 
 
 export async function getLessonContentRows (brand='drumeo', pageName = 'lessons') {
@@ -149,11 +150,11 @@ export async function getRecent(brand, pageName, tabName = 'all', {
 }
 
 /**
- * Fetches content rows for a given brand and page with optional filtering by content row id.
+ * Fetches content rows for a given brand and page with optional filtering by content row slug.
  *
  * @param {string} brand - The brand for which to fetch content rows.
  * @param {string} pageName - The page name (e.g., 'lessons', 'songs', 'challenges').
- * @param {string} [contentRowId] - The specific content row ID to fetch.
+ * @param {string|null} contentRowSlug - The specific content row ID to fetch.
  * @param {Object} params - Parameters for pagination.
  * @param {number} [params.page=1] - The page number for pagination.
  * @param {number} [params.limit=10] - The maximum number of content items per row.
@@ -168,32 +169,48 @@ export async function getRecent(brand, pageName, tabName = 'all', {
  *   .then(content => console.log(content))
  *   .catch(error => console.error(error));
  */
-export async function getContentRows(brand, pageName, contentRowId , {
+export async function getContentRows(brand, pageName, contentRowSlug = null, {
   page = 1,
-  limit = 10,
+  limit = 10
 } = {}) {
-  const contentRow = contentRowId ? `&content_row_id=${contentRowId}` : ''
-  const url = `/api/content/v1/rows?brand=${brand}&page_name=${pageName}${contentRow}&page=${page}&limit=${limit}`;
-  const contentRows =  await fetchHandler(url, 'get', null) || [];
-  const results = await Promise.all(
-    contentRows.map(async (row) => {
-      if (row.content.length === 0){
-        return { id: row.id, title: row.title, items: [] }
-      }
-      const data = await fetchByRailContentIds(row.content)
-      return { id: row.id, title: row.title, items: data }
-    })
-  )
+  const sanityData = await addContextToContent(fetchContentRows, brand, pageName, contentRowSlug, {
+    dataField: 'content',
+    iterateDataFieldOnEachArrayElement: true,
+    addProgressStatus: true,
+    addProgressPercentage: true,
+    addNextLesson: true
+  })
+  if (!sanityData) {
+    return []
+  }
+  let contentMap = {}
+  let recData = {}
+  let slugNameMap = {}
+  for (const category of sanityData) {
+    recData[category.slug] = category.content.map(item => item.railcontent_id)
+    for (const content of category.content) {
+      contentMap[content.railcontent_id] = content
+    }
+    slugNameMap[category.slug] = category.name
+  }
+  const start = (page - 1) * limit
+  const end = start + limit
+  const sortedData = await rankCategories(brand, recData)
+  let finalData = []
+  for (const category of sortedData) {
+    finalData.push( {
+      id: category.slug,
+      title: slugNameMap[category.slug],
+      items: category.items.slice(start, end).map(id => contentMap[id])})
+  }
 
-  if (contentRowId) {
-    return {
+  return contentRowSlug ?
+    {
       type: TabResponseType.CATALOG,
-      data: results[0].items,
+      data: finalData[0].items,
       meta: {}
-    };
-  }
-
-  return results
+    }
+    : finalData
 }
 
 /**

package/src/services/contentAggregator.js

@@ -16,6 +16,7 @@ export async function addContextToContent(dataPromise, ...dataArgs)
 
   const {
     dataField = null,
+    iterateDataFieldOnEachArrayElement = false,
     addProgressPercentage = false,
     addIsLiked = false,
     addLikeCount = false,
@@ -34,8 +35,14 @@ export async function addContextToContent(dataPromise, ...dataArgs)
   let items = []
   let dataMap = []
 
-  if (dataField && data?.[dataField]) {
-    items = data[dataField];
+  if (dataField && (data?.[dataField] || iterateDataFieldOnEachArrayElement)) {
+    if (iterateDataFieldOnEachArrayElement && Array.isArray(data)) {
+      for(const parent of data) {
+        ids = [...ids, ...parent[dataField].map(item => item?.id).filter(Boolean)]
+      }
+    } else {
+      ids = data[dataField].map(item => item?.id).filter(Boolean);
+    }
   } else if (Array.isArray(data)) {
     items = data;
   } else if (data?.id) {
@@ -85,9 +92,17 @@ export async function addContextToContent(dataPromise, ...dataArgs)
   }
 
   if (dataField) {
-    data[dataField] = Array.isArray(data[dataField])
+    if (iterateDataFieldOnEachArrayElement) {
+      for(let parent of data) {
+        parent[dataField] = Array.isArray(parent[dataField])
+          ? await Promise.all(parent[dataField].map(addContext))
+          : await addContext(parent[dataField])
+      }
+    } else {
+      data[dataField] = Array.isArray(data[dataField])
         ? await Promise.all(data[dataField].map(addContext))
         : await addContext(data[dataField])
+    }
     return data
   } else {
     return Array.isArray(data)

package/src/services/contentProgress.js

@@ -18,6 +18,8 @@ const DATA_KEY_LAST_UPDATED_TIME = 'u'
 
 export let dataContext = new DataContext(ContentProgressVersionKey, fetchContentProgress)
 
+let sessionData = []
+
 export async function getProgressPercentage(contentId) {
   return getById(contentId, DATA_KEY_PROGRESS, 0)
 }
@@ -383,10 +385,14 @@ export async function recordWatchSession(
   }
 
   try {
-      await recordUserPractice({ content_id: contentId, duration_seconds: Math.ceil(secondsPlayed)  })
+    //TODO: Good enough for Alpha, Refine in reliability improvements
+    sessionData[sessionId] = sessionData[sessionId] || {}
+    const secondsSinceLastUpdate = Math.ceil(secondsPlayed - (sessionData[sessionId][contentId] ?? 0))
+    await recordUserPractice({ content_id: contentId, duration_seconds: secondsSinceLastUpdate })
   } catch (error) {
       console.error('Failed to record user practice:', error)
   }
+  sessionData[sessionId][contentId] = secondsPlayed
 
   await dataContext.update(
     async function (localContext) {

package/src/services/recommendations.js

@@ -80,11 +80,14 @@ export async function rankCategories(brand, categories) {
       globalConfig.recommendationsConfig.token
     )
     const response = await httpClient.post(url, data)
-    let rankedCategories = {}
-    response['ranked_playlists'].forEach(
-      (category) =>
-        (rankedCategories[category['playlist_id']] = categories[category['playlist_id']])
-    )
+    let rankedCategories = []
+
+    for (const rankedPlaylist of response['ranked_playlists']) {
+      rankedCategories.push({
+        'slug': rankedPlaylist.playlist_id,
+        'items': rankedPlaylist.ranked_items
+      })
+    }
     return rankedCategories
   } catch (error) {
     console.error('Fetch error:', error)

package/src/services/sanity.js

@@ -540,6 +540,21 @@ export async function fetchByRailContentIds(ids, contentType = undefined, brand
   return sortedResults
 }
 
+export async function fetchContentRows(brand, pageName, contentRowSlug)
+{
+  if (pageName === 'lessons') pageName = 'lesson'
+  if (pageName === 'songs') pageName = 'song'
+  const rowString = contentRowSlug ? ` && slug.current == "${contentRowSlug.toLowerCase()}"` : ''
+  return fetchSanity(`*[_type == 'recommended-content-row' && brand == '${brand}' && type == '${pageName}'${rowString}]{
+    brand,
+    name,
+    'slug': slug.current,
+    'content': content[]->{ ${getFieldsForContentType()} }
+  }`, true)
+}
+
+
+
 /**
  * Fetch all content for a specific brand and type with pagination, search, and grouping options.
  * @param {string} brand - The brand for which to fetch content.