musora-content-services 2.30.0 → 2.30.4

package/CHANGELOG.md

@@ -2,6 +2,25 @@
 
 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.30.4](https://github.com/railroadmedia/musora-content-services/compare/v2.30.3...v2.30.4) (2025-08-05)
+
+
+### Bug Fixes
+
+* **MU2-912:** pagination for Incomplete and Completed tabs ([#396](https://github.com/railroadmedia/musora-content-services/issues/396)) ([b66d574](https://github.com/railroadmedia/musora-content-services/commit/b66d57483df4bdd158a985bade3cf63fa3aa65bb))
+* **MU2-916:** Add navigateTo and parentId to practice tracker and recent activity ([#398](https://github.com/railroadmedia/musora-content-services/issues/398)) ([6e43768](https://github.com/railroadmedia/musora-content-services/commit/6e437682f09655cc41966277c967c304b275d0ea))
+
+### [2.30.3](https://github.com/railroadmedia/musora-content-services/compare/v2.30.2...v2.30.3) (2025-08-04)
+
+### [2.30.2](https://github.com/railroadmedia/musora-content-services/compare/v2.30.1...v2.30.2) (2025-08-04)
+
+### [2.30.1](https://github.com/railroadmedia/musora-content-services/compare/v2.30.0...v2.30.1) (2025-08-04)
+
+
+### Bug Fixes
+
+* null check on buildNavigateTo ([#397](https://github.com/railroadmedia/musora-content-services/issues/397)) ([2387877](https://github.com/railroadmedia/musora-content-services/commit/238787786fa322872f733d769547a49796fc0bf1))
+
 ## [2.30.0](https://github.com/railroadmedia/musora-content-services/compare/v2.28.6...v2.30.0) (2025-08-01)
 
 

package/package.json

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

package/src/services/contentProgress.js

@@ -5,9 +5,9 @@ import {
   postRecordWatchSession,
 } from './railcontent.js'
 import { DataContext, ContentProgressVersionKey } from './dataContext.js'
-import {fetchHierarchy} from './sanity.js'
-import {recordUserPractice, findIncompleteLesson} from "./userActivity";
-import {getNextLessonLessonParentTypes} from "../contentTypeConfig.js";
+import { fetchHierarchy } from './sanity.js'
+import { recordUserPractice, findIncompleteLesson } from './userActivity'
+import { getNextLessonLessonParentTypes } from '../contentTypeConfig.js'
 
 const STATE_STARTED = 'started'
 const STATE_COMPLETED = 'completed'
@@ -45,22 +45,19 @@ export async function getResumeTimeSecondsByIds(contentIds) {
   return getByIds(contentIds, DATA_KEY_RESUME_TIME, 0)
 }
 
-export async function getNextLesson(data)
-{
+export async function getNextLesson(data) {
   let nextLessonData = {}
 
   for (const content of data) {
-    const children = content.children?.map(child => child.id) ?? []
+    const children = content.children?.map((child) => child.id) ?? []
     //only calculate nextLesson if needed, based on content type
     if (!getNextLessonLessonParentTypes.includes(content.type)) {
       nextLessonData[content.id] = null
-
     } else {
       //return first child if parent-content is complete or no progress
       const contentState = await getProgressState(content.id)
       if (contentState !== STATE_STARTED) {
         nextLessonData[content.id] = children[0]
-
       } else {
         const childrenStates = await getProgressStateByIds(children)
 
@@ -73,16 +70,23 @@ export async function getNextLesson(data)
           if (lastInteractedStatus === STATE_STARTED) {
             nextLessonData[content.id] = lastInteracted
           } else {
-            nextLessonData[content.id] = findIncompleteLesson(childrenStates, lastInteracted, content.type)
+            nextLessonData[content.id] = findIncompleteLesson(
+              childrenStates,
+              lastInteracted,
+              content.type
+            )
           }
-
         } else if (content.type === 'guided-course' || content.type === 'song-tutorial') {
-          nextLessonData[content.id] = findIncompleteLesson(childrenStates, lastInteracted, content.type)
+          nextLessonData[content.id] = findIncompleteLesson(
+            childrenStates,
+            lastInteracted,
+            content.type
+          )
         } else if (content.type === 'pack') {
           const packBundles = content.children ?? []
           const packBundleProgressData = await getNextLesson(packBundles)
-          const parentId = await getLastInteractedOf(packBundles.map(bundle => bundle.id));
-          nextLessonData[content.id] = packBundleProgressData[parentId];
+          const parentId = await getLastInteractedOf(packBundles.map((bundle) => bundle.id))
+          nextLessonData[content.id] = packBundleProgressData[parentId]
         }
       }
     }
@@ -90,31 +94,32 @@ export async function getNextLesson(data)
   return nextLessonData
 }
 
-export async function getNavigateTo(data)
-{
+export async function getNavigateTo(data) {
   let navigateToData = {}
   const twoDepthContentTypes = ['pack'] //TODO add method when we know what it's called
   //TODO add parent hierarchy upwards as well
   // data structure is the same but instead of child{} we use parent{}
   for (const content of data) {
-
     //only calculate nextLesson if needed, based on content type
     if (!getNextLessonLessonParentTypes.includes(content.type) || !content.children) {
       navigateToData[content.id] = null
     } else {
       const children = new Map()
       const childrenIds = []
-      content.children.forEach(child => {
-          childrenIds.push(child.id)
-          children.set(child.id, child)
-        }
-      )
+      content.children.forEach((child) => {
+        childrenIds.push(child.id)
+        children.set(child.id, child)
+      })
       // return first child (or grand child) if parent-content is complete or no progress
       const contentState = await getProgressState(content.id)
       if (contentState !== STATE_STARTED) {
         const firstChild = content.children[0]
-        let lastInteractedChildNavToData = await getNavigateTo([firstChild])[firstChild.id] ?? null
-        navigateToData[content.id] = buildNavigateTo(content.children[0], lastInteractedChildNavToData)
+        let lastInteractedChildNavToData =
+          (await getNavigateTo([firstChild])[firstChild.id]) ?? null
+        navigateToData[content.id] = buildNavigateTo(
+          content.children[0],
+          lastInteractedChildNavToData
+        )
       } else {
         const childrenStates = await getProgressStateByIds(childrenIds)
         const lastInteracted = await getLastInteractedOf(childrenIds)
@@ -132,13 +137,18 @@ export async function getNavigateTo(data)
           navigateToData[content.id] = buildNavigateTo(children.get(incompleteChild))
         } else if (twoDepthContentTypes.includes(content.type)) {
           const firstChildren = content.children ?? []
-          const lastInteractedChildId = await getLastInteractedOf(firstChildren.map(child => child.id));
+          const lastInteractedChildId = await getLastInteractedOf(
+            firstChildren.map((child) => child.id)
+          )
           if (childrenStates[lastInteractedChildId] === STATE_COMPLETED) {
             // TODO: packs have an extra situation where we need to jump to the next course if all lessons in the last engaged course are completed
           }
           let lastInteractedChildNavToData = await getNavigateTo(firstChildren)
           lastInteractedChildNavToData = lastInteractedChildNavToData[lastInteractedChildId]
-          navigateToData[content.id] = buildNavigateTo(children.get(lastInteractedChildId), lastInteractedChildNavToData);
+          navigateToData[content.id] = buildNavigateTo(
+            children.get(lastInteractedChildId),
+            lastInteractedChildNavToData
+          )
         }
       }
     }
@@ -146,13 +156,16 @@ export async function getNavigateTo(data)
   return navigateToData
 }
 
-function buildNavigateTo(content, child = null)
-{
+function buildNavigateTo(content, child = null) {
+  if (!content) {
+    return null
+  }
+
   return {
-    brand: content.brand,
+    brand: content.brand ?? '',
     thumbnail: content.thumbnail ?? '',
-    id: content.id,
-    type: content.type,
+    id: content.id ?? null,
+    type: content.type ?? '',
     child: child,
   }
 }
@@ -182,10 +195,14 @@ export async function getLastInteractedOf(contentIds) {
 export async function getProgressDateByIds(contentIds) {
   let data = await dataContext.getData()
   let progress = {}
-  contentIds?.forEach((id) => (progress[id] = {
-    'last_update': data[id]?.[DATA_KEY_LAST_UPDATED_TIME] ?? 0,
-    'progress': data[id]?.[DATA_KEY_PROGRESS] ?? 0,
-    'status': data[id]?.[DATA_KEY_STATUS] ?? ''}))
+  contentIds?.forEach(
+    (id) =>
+      (progress[id] = {
+        last_update: data[id]?.[DATA_KEY_LAST_UPDATED_TIME] ?? 0,
+        progress: data[id]?.[DATA_KEY_PROGRESS] ?? 0,
+        status: data[id]?.[DATA_KEY_STATUS] ?? '',
+      })
+  )
   return progress
 }
 
@@ -245,11 +262,16 @@ export async function getAllCompleted(limit = null) {
   return ids
 }
 
-export async function getAllStartedOrCompleted({ limit = null, onlyIds = true, brand = null, excludedIds = [] } = {}) {
+export async function getAllStartedOrCompleted({
+  limit = null,
+  onlyIds = true,
+  brand = null,
+  excludedIds = [],
+} = {}) {
   const data = await dataContext.getData()
   const oneMonthAgoInSeconds = Math.floor(Date.now() / 1000) - 60 * 24 * 60 * 60 // 60 days in seconds
 
-  const excludedSet = new Set(excludedIds.map(id => parseInt(id))) // ensure IDs are numbers
+  const excludedSet = new Set(excludedIds.map((id) => parseInt(id))) // ensure IDs are numbers
 
   let filtered = Object.entries(data)
     .filter(([key, item]) => {
@@ -307,13 +329,14 @@ export async function getAllStartedOrCompleted({ limit = null, onlyIds = true, b
  * const progressMap = await getStartedOrCompletedProgressOnly({ brand: 'drumeo' });
  * console.log(progressMap[123]); // => 52
  */
-export async function getStartedOrCompletedProgressOnly({ brand = null} = {}) {
+export async function getStartedOrCompletedProgressOnly({ brand = null } = {}) {
   const data = await dataContext.getData()
   const result = {}
 
   Object.entries(data).forEach(([key, item]) => {
     const id = parseInt(key)
-    const isRelevantStatus = item[DATA_KEY_STATUS] === STATE_STARTED || item[DATA_KEY_STATUS] === STATE_COMPLETED
+    const isRelevantStatus =
+      item[DATA_KEY_STATUS] === STATE_STARTED || item[DATA_KEY_STATUS] === STATE_COMPLETED
     const isCorrectBrand = !brand || item.b === brand
 
     if (isRelevantStatus && isCorrectBrand) {
@@ -427,7 +450,7 @@ export async function recordWatchSession(
   secondsPlayed,
   sessionId = null,
   instrumentId = null,
-  categoryId = null,
+  categoryId = null
 ) {
   let mediaTypeId = getMediaTypeId(mediaType, mediaCategory)
   let updateLocalProgress = mediaTypeId === 1 || mediaTypeId === 2 //only update for video playback
@@ -438,10 +461,16 @@ export async function recordWatchSession(
   try {
     //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,  instrument_id: instrumentId })
+    const secondsSinceLastUpdate = Math.ceil(
+      secondsPlayed - (sessionData[sessionId][contentId] ?? 0)
+    )
+    await recordUserPractice({
+      content_id: contentId,
+      duration_seconds: secondsSinceLastUpdate,
+      instrument_id: instrumentId,
+    })
   } catch (error) {
-      console.error('Failed to record user practice:', error)
+    console.error('Failed to record user practice:', error)
   }
   sessionData[sessionId][contentId] = secondsPlayed
 
@@ -506,7 +535,7 @@ function bubbleProgress(hierarchy, contentId, localContext) {
     return localContext.data[childId]?.[DATA_KEY_PROGRESS] ?? 0
   })
   let progress = Math.round(childProgress.reduce((a, b) => a + b, 0) / childProgress.length)
-  const brand =localContext.data[contentId]?.[DATA_KEY_BRAND] ?? null
+  const brand = localContext.data[contentId]?.[DATA_KEY_BRAND] ?? null
   data[DATA_KEY_PROGRESS] = progress
   data[DATA_KEY_STATUS] = progress === 100 ? STATE_COMPLETED : STATE_STARTED
   data[DATA_KEY_LAST_UPDATED_TIME] = Math.round(new Date().getTime() / 1000)

package/src/services/sanity.js

@@ -2173,10 +2173,12 @@ export async function fetchTabData(
     case 'incomplete':
       progressIds = await getAllStarted();
       sortOrder = null;
+      withoutPagination = true;
       break;
     case 'completed':
       progressIds = await getAllCompleted();
       sortOrder = null;
+      withoutPagination = true;
       break;
   }
 

package/src/services/userActivity.js

@@ -407,7 +407,7 @@ export async function restoreUserPractice(id) {
     const restoredPractice = response.data.find((p) => p.id === id)
     if (restoredPractice) {
       await userActivityContext.updateLocal(async function (localContext) {
-        if (localContext.data[DATA_KEY_PRACTICES][restoredPractice.day]) {
+        if (!localContext.data[DATA_KEY_PRACTICES][restoredPractice.day]) {
           localContext.data[DATA_KEY_PRACTICES][restoredPractice.day] = []
         }
         response.data.forEach((restoredPractice) => {
@@ -581,7 +581,21 @@ export async function getPracticeNotes(day) {
  *   .catch(error => console.error("Failed to get recent activity:", error));
  */
 export async function getRecentActivity({ page = 1, limit = 5, tabName = null } = {}) {
-  return await fetchRecentUserActivities({ page, limit, tabName })
+  const recentActivityData = await fetchRecentUserActivities({ page, limit, tabName })
+  const contentIds = recentActivityData.data.map((p) => p.contentId).filter((id) => id !== null)
+  const contents = await addContextToContent(fetchByRailContentIds, contentIds, {
+    addNavigateTo: true,
+    addNextLesson: true
+  })
+  recentActivityData.data = recentActivityData.data.map((practice) => {
+    const content = contents.find((c) => c.id === practice.contentId) || {}
+    return {
+      ...practice,
+      parent_id: content.parent_id || null,
+      navigateTo: content.navigateTo,
+    }
+  })
+  return recentActivityData
 }
 
 /**
@@ -841,8 +855,10 @@ export async function calculateLongestStreaks(userId = globalConfig.sessionConfi
 
 async function formatPracticeMeta(practices) {
   const contentIds = practices.map((p) => p.content_id).filter((id) => id !== null)
-  const contents = await fetchByRailContentIds(contentIds)
-
+  const contents = await addContextToContent(fetchByRailContentIds, contentIds, {
+    addNavigateTo: true,
+    addNextLesson: true
+  })
   return practices.map((practice) => {
     const content = contents.find((c) => c.id === practice.content_id) || {}
 
@@ -863,6 +879,8 @@ async function formatPracticeMeta(practices) {
       created_at: dayjs(practice.created_at),
       sanity_type: content.type || null,
       content_slug: content.slug || null,
+      parent_id: content.parent_id || null,
+      navigateTo: content.navigateTo || null,
     }
   })
 }