musora-content-services 2.93.1 → 2.93.2

package/.claude/settings.local.json

@@ -0,0 +1,9 @@
+{
+  "permissions": {
+    "allow": [
+      "Bash(rg:*)",
+      "Bash(npm run lint:*)"
+    ],
+    "deny": []
+  }
+}

package/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 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.93.2](https://github.com/railroadmedia/musora-content-services/compare/v2.93.1...v2.93.2) (2025-12-02)
+
+
+### Bug Fixes
+
+* progress fixes and features with watermelon ([#607](https://github.com/railroadmedia/musora-content-services/issues/607)) ([005403c](https://github.com/railroadmedia/musora-content-services/commit/005403c9bbaeebe8c5ecb5315754de4448bcbf43))
+
 ### [2.93.1](https://github.com/railroadmedia/musora-content-services/compare/v2.93.0...v2.93.1) (2025-12-02)
 
 ## [2.93.0](https://github.com/railroadmedia/musora-content-services/compare/v2.92.7...v2.93.0) (2025-12-02)

package/package.json

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

package/src/index.d.ts

@@ -91,6 +91,7 @@ import {
 	contentStatusCompleted,
 	contentStatusReset,
 	contentStatusStarted,
+	contentsStatusCompleted,
 	getAllCompleted,
 	getAllCompletedByIds,
 	getAllStarted,
@@ -250,6 +251,7 @@ import {
 	fetchContentRows,
 	fetchFoundation,
 	fetchHierarchy,
+	fetchLearningPathHierarchy,
 	fetchLeaving,
 	fetchLessonContent,
 	fetchLessonsFeaturingThisContent,
@@ -428,6 +430,7 @@ declare module 'musora-content-services' {
 		contentStatusCompleted,
 		contentStatusReset,
 		contentStatusStarted,
+		contentsStatusCompleted,
 		convertToTimeZone,
 		createComment,
 		createForumCategory,
@@ -494,6 +497,7 @@ declare module 'musora-content-services' {
 		fetchInterests,
 		fetchLastInteractedChild,
 		fetchLatestThreads,
+		fetchLearningPathHierarchy,
 		fetchLearningPathLessons,
 		fetchLearningPathProgressCheckLessons,
 		fetchLeaving,

package/src/index.js

@@ -95,6 +95,7 @@ import {
 	contentStatusCompleted,
 	contentStatusReset,
 	contentStatusStarted,
+	contentsStatusCompleted,
 	getAllCompleted,
 	getAllCompletedByIds,
 	getAllStarted,
@@ -254,6 +255,7 @@ import {
 	fetchContentRows,
 	fetchFoundation,
 	fetchHierarchy,
+	fetchLearningPathHierarchy,
 	fetchLeaving,
 	fetchLessonContent,
 	fetchLessonsFeaturingThisContent,
@@ -427,6 +429,7 @@ export {
 	contentStatusCompleted,
 	contentStatusReset,
 	contentStatusStarted,
+	contentsStatusCompleted,
 	convertToTimeZone,
 	createComment,
 	createForumCategory,
@@ -493,6 +496,7 @@ export {
 	fetchInterests,
 	fetchLastInteractedChild,
 	fetchLatestThreads,
+	fetchLearningPathHierarchy,
 	fetchLearningPathLessons,
 	fetchLearningPathProgressCheckLessons,
 	fetchLeaving,

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

@@ -7,11 +7,14 @@ import { fetchByRailContentId, fetchMethodV2Structure } from '../sanity.js'
 import { addContextToContent } from '../contentAggregator.js'
 import {
   contentStatusCompleted,
+  contentsStatusCompleted,
   contentStatusReset,
   getAllCompletedByIds,
   getProgressState,
 } from '../contentProgress.js'
-import { STATE } from '../sync/models/ContentProgress'
+import { COLLECTION_TYPE, STATE } from "../sync/models/ContentProgress";
+import { SyncWriteDTO } from "../sync";
+import { ContentProgress } from "../sync/models";
 
 const BASE_PATH: string = `/api/content-org`
 const LEARNING_PATHS_PATH = `${BASE_PATH}/v1/user/learning-paths`
@@ -22,6 +25,20 @@ interface ActiveLearningPathResponse {
   active_learning_path_id: number,
 }
 
+interface DailySessionResponse {
+  user_id: number,
+  brand: string,
+  user_date: string
+  daily_session: DailySession[],
+  active_learning_path_id: number,
+  active_learning_path_created_at: string,
+}
+
+interface DailySession {
+  content_ids: number[],
+  learning_path_id: number,
+}
+
 /**
  * Gets today's daily session for the user.
  * @param brand
@@ -30,7 +47,7 @@ interface ActiveLearningPathResponse {
 export async function getDailySession(brand: string, userDate: Date) {
   const stringDate = userDate.toISOString().split('T')[0]
   const url: string = `${LEARNING_PATHS_PATH}/daily-session/get?brand=${brand}&userDate=${stringDate}`
-  return await fetchHandler(url, 'GET', null, null)
+  return await fetchHandler(url, 'GET', null, null) as DailySessionResponse
 }
 
 /**
@@ -47,7 +64,7 @@ export async function updateDailySession(
   const stringDate = userDate.toISOString().split('T')[0]
   const url: string = `${LEARNING_PATHS_PATH}/daily-session/create`
   const body = { brand: brand, userDate: stringDate, keepFirstLearningPath: keepFirstLearningPath }
-  return await fetchHandler(url, 'POST', null, body)
+  return await fetchHandler(url, 'POST', null, body) as DailySessionResponse
 }
 
 /**
@@ -56,7 +73,7 @@ export async function updateDailySession(
  */
 export async function getActivePath(brand: string) {
   const url: string = `${LEARNING_PATHS_PATH}/active-path/get?brand=${brand}`
-  return await fetchHandler(url, 'GET', null, null)
+  return await fetchHandler(url, 'GET', null, null) as ActiveLearningPathResponse
 }
 
 /**
@@ -67,7 +84,7 @@ export async function getActivePath(brand: string) {
 export async function startLearningPath(brand: string, learningPathId: number) {
   const url: string = `${LEARNING_PATHS_PATH}/active-path/set`
   const body = { brand: brand, learning_path_id: learningPathId }
-  return await fetchHandler(url, 'POST', null, body)
+  return await fetchHandler(url, 'POST', null, body) as ActiveLearningPathResponse
 }
 
 /**
@@ -87,9 +104,9 @@ export async function getEnrichedLearningPath(learningPathId) {
   const response = (await addContextToContent(
     fetchByRailContentId,
     learningPathId,
-    'learning-path-v2',
+    COLLECTION_TYPE.LEARNING_PATH,
     {
-      collection: { id: learningPathId, type: 'learning-path-v2' },
+      collection: { id: learningPathId, type: COLLECTION_TYPE.LEARNING_PATH },
       dataField: 'children',
       dataField_includeParent: true,
       addProgressStatus: true,
@@ -241,7 +258,7 @@ export async function fetchLearningPathProgressCheckLessons(contentIds: number[]
 }
 
 interface completeMethodIntroVideo {
-  intro_video_response: Object | null,
+  intro_video_response: SyncWriteDTO<ContentProgress, any> | null,
   active_path_response: ActiveLearningPathResponse
 }
 /**
@@ -267,9 +284,9 @@ export async function completeMethodIntroVideo(introVideoId: number, brand: stri
 }
 
 interface completeLearningPathIntroVideo {
-  intro_video_response: Object | null,
-  learning_path_reset_response: void | null,
-  lesson_import_response: Object | null
+  intro_video_response: SyncWriteDTO<ContentProgress, any> | null,
+  learning_path_reset_response: SyncWriteDTO<ContentProgress, any> | null,
+  lesson_import_response: SyncWriteDTO<ContentProgress, any> | null
 }
 /**
  * Handles completion of learning path intro video and other related actions.
@@ -286,24 +303,20 @@ export async function completeLearningPathIntroVideo(introVideoId: number, learn
 
   response.intro_video_response = await completeIfNotCompleted(introVideoId)
 
-  const collection = { id: learningPathId, type: 'learning-path-v2' }
+  const collection = { id: learningPathId, type: COLLECTION_TYPE.LEARNING_PATH }
 
   if (!lessonsToImport) {
     response.learning_path_reset_response = await contentStatusReset(learningPathId, collection)
 
   } else {
-      response.lesson_import_response = {}
-    for (const contentId of lessonsToImport) {
-      // todo: create bulk complete endpoint with bubbling. and set up watermelon method bubbling
-      response.lesson_import_response[contentId] = await contentStatusCompleted(contentId, collection)
-    }
+    response.lesson_import_response = await contentsStatusCompleted(lessonsToImport, collection)
   }
 
   return response
 }
 
 
-async function completeIfNotCompleted(contentId: number): Promise<Object | null> {
+async function completeIfNotCompleted(contentId: number): Promise<SyncWriteDTO<ContentProgress, any> | null> {
   const introVideoStatus = await getProgressState(contentId)
 
   return introVideoStatus !== 'completed' ? await contentStatusCompleted(contentId) : null

package/src/services/contentProgress.js

@@ -1,6 +1,6 @@
-import { fetchHierarchy } from './sanity.js'
+import { fetchHierarchy, fetchLearningPathHierarchy } from './sanity.js'
 import { db } from './sync'
-import { STATE } from './sync/models/ContentProgress'
+import {COLLECTION_TYPE, STATE} from './sync/models/ContentProgress'
 import { trackUserPractice, findIncompleteLesson } from './userActivity'
 import { getNextLessonLessonParentTypes } from '../contentTypeConfig.js'
 
@@ -66,7 +66,7 @@ export async function getNavigateTo(data, collection = null) {
             let incompleteChild = findIncompleteLesson(childrenStates, lastInteracted, content.type)
             navigateToData[content.id] = buildNavigateTo(children.get(incompleteChild), null, collection)
           }
-        } else if (['song-tutorial', 'guided-course', 'learning-path-v2'].includes(content.type)) { // send to first incomplete
+        } else if (['song-tutorial', 'guided-course', COLLECTION_TYPE.LEARNING_PATH].includes(content.type)) { // send to first incomplete
           let incompleteChild = findIncompleteLesson(childrenStates, lastInteracted, content.type)
           navigateToData[content.id] = buildNavigateTo(children.get(incompleteChild), null, collection)
         } else if (twoDepthContentTypes.includes(content.type)) { // send to navigateTo child of last interacted child
@@ -268,6 +268,11 @@ async function trackProgress(contentId, collection, currentSeconds, mediaLengthS
 export async function contentStatusCompleted(contentId, collection = null) {
   return setStartedOrCompletedStatus(contentId, collection, true)
 }
+
+export async function contentsStatusCompleted(contentIds, collection = null) {
+  return setStartedOrCompletedStatuses(contentIds, collection, true)
+}
+
 export async function contentStatusStarted(contentId, collection = null) {
   return setStartedOrCompletedStatus(contentId, collection, false)
 }
@@ -276,12 +281,12 @@ export async function contentStatusReset(contentId, collection = null) {
 }
 
 async function saveContentProgress(contentId, collection, progress, currentSeconds) {
-  const response = await db.contentProgress.recordProgressRemotely(contentId, collection, progress, currentSeconds)
+  const response = await db.contentProgress.recordProgress(contentId, collection, progress, currentSeconds)
 
   // note - previous implementation explicitly did not trickle progress to children here
   // (only to siblings/parents via le bubbles)
 
-  const bubbledProgresses = bubbleProgress(await fetchHierarchy(contentId), contentId, collection)
+  const bubbledProgresses = bubbleProgress(await getHierarchy(contentId, collection), contentId, collection)
   await db.contentProgress.recordProgressesTentative(bubbledProgresses, collection)
 
   return response
@@ -292,23 +297,55 @@ async function setStartedOrCompletedStatus(contentId, collection, isCompleted) {
   // we explicitly pessimistically await a remote push here
   // because awards may be generated (on server) on completion
   // which we would want to toast the user about *in band*
-  const response = await db.contentProgress.recordProgressRemotely(contentId, collection, progress)
+  const response = await db.contentProgress.recordProgress(contentId, collection, progress)
+
+  const hierarchy = await getHierarchy(contentId, collection)
+
+  await Promise.all([
+    db.contentProgress.recordProgressesTentative(trickleProgress(hierarchy, contentId, collection, progress), collection),
+    bubbleProgress(hierarchy, contentId, collection).then(bubbledProgresses => db.contentProgress.recordProgressesTentative(bubbledProgresses, collection))
+  ])
 
-  if (response.pushStatus === 'success') {
-    const hierarchy = await fetchHierarchy(contentId)
+  return response
+}
 
-    await Promise.all([
-      db.contentProgress.recordProgressesTentative(trickleProgress(hierarchy, contentId, collection, progress), collection),
-      bubbleProgress(hierarchy, contentId, collection).then(bubbledProgresses => db.contentProgress.recordProgressesTentative(bubbledProgresses, collection))
-    ])
+async function getHierarchy(contentId, collection) {
+  if (collection && collection.type === COLLECTION_TYPE.LEARNING_PATH) {
+    return await fetchLearningPathHierarchy(contentId, collection)
+  } else {
+    return await fetchHierarchy(contentId)
   }
+}
+
+async function setStartedOrCompletedStatuses(contentIds, collection, isCompleted) {
+  const progress = isCompleted ? 100 : 0
+  // we explicitly pessimistically await a remote push here
+  // because awards may be generated (on server) on completion
+  // which we would want to toast the user about *in band*
+  const response = await db.contentProgress.recordProgresses(contentIds, collection, progress)
+
+  // we assume this is used only for contents within the same hierarchy
+  const hierarchy = await getHierarchy(contentIds[0], collection)
+
+  let ids = {}
+  for (const contentId of contentIds) {
+    ids = {
+      ...ids,
+      ...trickleProgress(hierarchy, contentId, collection, progress),
+      ...await bubbleProgress(hierarchy, contentId, collection)
+    }
+  }
+
+  await Promise.all([
+    db.contentProgress.recordProgressesTentative(ids, collection),
+  ]);
 
   return response
 }
 
 async function resetStatus(contentId, collection = null) {
   const response = await db.contentProgress.eraseProgress(contentId, collection)
-  const hierarchy = await fetchHierarchy(contentId)
+  const hierarchy = await getHierarchy(contentId, collection)
 
   await Promise.all([
     db.contentProgress.recordProgressesTentative(trickleProgress(hierarchy, contentId, collection, 0), collection),

package/src/services/progress-row/method-card.js

@@ -6,6 +6,7 @@ import { getActivePath, fetchLearningPathLessons } from '../content-org/learning
 import { getToday } from '../dateUtils.js'
 import { fetchMethodV2IntroVideo } from '../sanity'
 import { getProgressState } from '../contentProgress'
+import {COLLECTION_TYPE} from "../sync/models/ContentProgress.js";
 
 export async function getMethodCard(brand) {
   const introVideo = await fetchMethodV2IntroVideo(brand)
@@ -82,7 +83,7 @@ export async function getMethodCard(brand) {
 
     return {
       id: 1,
-      type: 'learning-path-v2',
+      type: COLLECTION_TYPE.LEARNING_PATH,
       progressType: 'method',
       header: 'Method',
       body: learningPath,

package/src/services/sanity.js

@@ -1523,6 +1523,25 @@ export async function fetchTopLevelParentId(railcontentId) {
   return response['railcontent_id']
 }
 
+export async function fetchLearningPathHierarchy(railcontentId, collection) {
+  if (!collection) {
+    return null
+  }
+
+  const topLevelId = collection.id
+
+  let response = await fetchByRailContentId(topLevelId, collection.type)
+  if (!response) return null
+
+  let data = {
+    topLevelId: topLevelId,
+    parents: {},
+    children: {},
+  }
+  populateHierarchyLookups(response, data, null)
+  return data
+}
+
 export async function fetchHierarchy(railcontentId) {
   let topLevelId = await fetchTopLevelParentId(railcontentId)
   const childrenFilter = await new FilterBuilder(``, { isChildrenFilter: true }).buildFilter()
@@ -1557,12 +1576,14 @@ export async function fetchHierarchy(railcontentId) {
 }
 
 function populateHierarchyLookups(currentLevel, data, parentId) {
-  let contentId = currentLevel['railcontent_id']
+  const railcontentIdField = currentLevel.railcontent_id ? "railcontent_id" : "id";
+
+  let contentId = currentLevel[railcontentIdField]
   let children = currentLevel['children']
 
   data.parents[contentId] = parentId
   if (children) {
-    data.children[contentId] = children.map((child) => child['railcontent_id'])
+    data.children[contentId] = children.map((child) => child[railcontentIdField])
     for (let i = 0; i < children.length; i++) {
       populateHierarchyLookups(children[i], data, contentId)
     }
@@ -1572,7 +1593,7 @@ function populateHierarchyLookups(currentLevel, data, parentId) {
 
   let assignments = currentLevel['assignments']
   if (assignments) {
-    let assignmentIds = assignments.map((assignment) => assignment['railcontent_id'])
+    let assignmentIds = assignments.map((assignment) => assignment[railcontentIdField])
     data.children[contentId] = (data.children[contentId] ?? []).concat(assignmentIds)
     assignmentIds.forEach((assignmentId) => {
       data.parents[assignmentId] = contentId

package/src/services/sync/models/ContentProgress.ts

@@ -3,7 +3,7 @@ import { SYNC_TABLES } from '../schema'
 
 export enum COLLECTION_TYPE {
   SKILL_PACK = 'skill-pack',
-  LEARNING_PATH = 'learning-path',
+  LEARNING_PATH = 'learning-path-v2',
   PLAYLIST = 'playlist',
 }
 

package/src/services/sync/repositories/content-progress.ts

@@ -115,10 +115,10 @@ export default class ProgressRepository extends SyncRepository<ContentProgress>
     return await this.queryAll(...clauses)
   }
 
-  recordProgressRemotely(contentId: number, collection: { type: COLLECTION_TYPE; id: number } | null, progressPct: number, resumeTime?: number) {
+  recordProgress(contentId: number, collection: { type: COLLECTION_TYPE; id: number } | null, progressPct: number, resumeTime?: number) {
     const id = ProgressRepository.generateId(contentId, collection)
 
-    return this.upsertOneRemote(id, (r) => {
+    return this.upsertOne(id, (r) => {
       r.content_id = contentId
       r.collection_type = collection?.type ?? null
       r.collection_id = collection?.id ?? null
@@ -132,12 +132,16 @@ export default class ProgressRepository extends SyncRepository<ContentProgress>
     })
   }
 
-  recordProgressesTentative(contentProgresses: Map<number, number>, collection: { type: COLLECTION_TYPE; id: number } | null) {
-    return this.upsertSomeTentative(
+  recordProgresses(
+    contentIds: number[],
+    collection: { type: COLLECTION_TYPE; id: number } | null,
+    progressPct: number
+  ) {
+    return this.upsertSome(
       Object.fromEntries(
-        Array.from(contentProgresses, ([contentId, progressPct]) => [
-          ProgressRepository.generateId(contentId, null),
-          (r) => {
+        contentIds.map((contentId) => [
+          ProgressRepository.generateId(contentId, collection),
+          (r: ContentProgress) => {
             r.content_id = contentId
             r.collection_type = collection?.type ?? null
             r.collection_id = collection?.id ?? null
@@ -150,6 +154,29 @@ export default class ProgressRepository extends SyncRepository<ContentProgress>
     )
   }
 
+  recordProgressesTentative(
+    contentProgresses: Record<string, number>, // Accept plain object
+    collection: { type: COLLECTION_TYPE; id: number } | null
+  ) {
+    const data = Object.fromEntries(
+      Object.entries(contentProgresses).map(([contentId, progressPct]) => {
+        const generatedId = ProgressRepository.generateId(Number(contentId), collection)
+        console.log('Processing:', { contentId, progressPct, generatedId, collection })
+        return [
+          generatedId,
+          (record: ContentProgress) => {
+            record.content_id = Number(contentId)
+            record.collection_type = collection?.type ?? null
+            record.collection_id = collection?.id ?? null
+            record.state = progressPct === 100 ? STATE.COMPLETED : STATE.STARTED
+            record.progress_percent = progressPct
+          },
+        ]
+      })
+    )
+    return this.upsertSomeTentative(data)
+  }
+
   eraseProgress(contentId: number, collection: { type: COLLECTION_TYPE; id: number } | null) {
     return this.deleteOne(ProgressRepository.generateId(contentId, collection))
   }

package/src/services/userActivity.js

@@ -40,6 +40,7 @@ import dayjs from 'dayjs'
 import { addContextToContent } from './contentAggregator.js'
 import { getMethodCard } from './progress-row/method-card.js'
 import { db, Q } from './sync'
+import {COLLECTION_TYPE} from "./sync/models/ContentProgress.js";
 
 const DATA_KEY_PRACTICES = 'practices'
 
@@ -1039,7 +1040,7 @@ export async function getProgressRows({ brand = 'drumeo', limit = 8 } = {}) {
       switch (item.type) {
         case 'playlist':
           return processPlaylistItem(item)
-        case 'learning-path-v2':
+        case COLLECTION_TYPE.LEARNING_PATH:
         case 'method':
           return item
         default:
@@ -1282,7 +1283,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-v2') {
+  if (contentType === 'guided-course' || contentType === COLLECTION_TYPE.LEARNING_PATH) {
     // Return first incomplete lesson
     return ids.find((id) => progressOnItems[id] !== 'completed') || ids.at(0)
   }