musora-content-services 2.112.2 → 2.113.0

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.113.0](https://github.com/railroadmedia/musora-content-services/compare/v2.112.2...v2.113.0) (2026-01-08)
+
+
+### Features
+
+* **BEH-1491:** proper card ordering (and hiding) on progress row ([#686](https://github.com/railroadmedia/musora-content-services/issues/686)) ([e519c35](https://github.com/railroadmedia/musora-content-services/commit/e519c352ac5e8d09a910b89fa03baf31490da102))
+
 ### [2.112.2](https://github.com/railroadmedia/musora-content-services/compare/v2.112.1...v2.112.2) (2026-01-08)
 
 

package/package.json

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

package/src/services/contentProgress.js

@@ -467,7 +467,7 @@ export async function contentStatusReset(contentId, collection = null, {skipPush
   return resetStatus(contentId, collection, {skipPush})
 }
 
-async function saveContentProgress(contentId, collection, progress, currentSeconds, {skipPush = false, hideFromProgressRow = false} = {}) {
+async function saveContentProgress(contentId, collection, progress, currentSeconds, {skipPush = false, fromLearningPath = false} = {}) {
   const isLP = collection?.type === COLLECTION_TYPE.LEARNING_PATH
 
   // filter out contentIds that are setting progress lower than existing
@@ -482,12 +482,14 @@ async function saveContentProgress(contentId, collection, progress, currentSecon
     collection,
     progress,
     currentSeconds,
-    {skipPush: true, hideFromProgressRow}
+    {skipPush: true, fromLearningPath}
   )
   // note - previous implementation explicitly did not trickle progress to children here
   // (only to siblings/parents via le bubbles)
 
+  // skip bubbling if progress hasnt changed
   if (progress === currentProgress) {
+    if (!skipPush) db.contentProgress.requestPushUnsynced()
     return
   }
 
@@ -561,45 +563,6 @@ async function setStartedOrCompletedStatus(contentId, collection, isCompleted, {
   return response
 }
 
-// we cannot simply pass LP id with self collection, because we do not have a-la-carte LP's set up yet,
-//   and we need each lesson to bubble to its parent outside of LP
-async function duplicateLearningPathProgressToExternalContents(ids, collection, hierarchy, {skipPush = false} = {}) {
-  // filter out LPs. we dont want to duplicate to LP's while we dont have a-la-cart LP's set up.
-  let filteredIds = Object.fromEntries(
-    Object.entries(ids).filter(([id]) => {
-      return hierarchy.parents[parseInt(id)] !== null
-    })
-  )
-
-  const extProgresses = await getProgressDataByIds(Object.keys(filteredIds), null)
-
-  // overwrite if LP progress greater, unless LP progress was reset to 0
-  filteredIds = Object.entries(filteredIds).filter(([id, pct]) => {
-    const extPct = extProgresses[id]?.progress
-    return (pct !== 0)
-      ? pct > extPct
-      : false
-  })
-
-  // each handles its own bubbling.
-  // skipPush on all but last to avoid multiple push requests
-  filteredIds.forEach(([id, pct], index) => {
-    let skip = true
-    if (index === filteredIds.length - 1) {
-      skip = skipPush
-    }
-    saveContentProgress(parseInt(id), null, pct, null, {skipPush: skip, hideFromProgressRow: true})
-  })
-}
-
-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 setStartedOrCompletedStatusMany(contentIds, collection, isCompleted, {skipPush = false} = {}) {
   const isLP = collection?.type === COLLECTION_TYPE.LEARNING_PATH
   const progress = isCompleted ? 100 : 0
@@ -651,6 +614,7 @@ async function resetStatus(contentId, collection = null, {skipPush = false} = {}
 
   const progress = 0
   const response = await db.contentProgress.eraseProgress(contentId, collection, {skipPush: true})
+
   const hierarchy = await getHierarchy(contentId, collection)
 
   let progresses = {
@@ -670,6 +634,45 @@ async function resetStatus(contentId, collection = null, {skipPush = false} = {}
   return response
 }
 
+// we cannot simply pass LP id with self collection, because we do not have a-la-carte LP's set up yet,
+//   and we need each lesson to bubble to its parent outside of LP
+async function duplicateLearningPathProgressToExternalContents(ids, collection, hierarchy, {skipPush = false} = {}) {
+  // filter out LPs. we dont want to duplicate to LP's while we dont have a-la-cart LP's set up.
+  let filteredIds = Object.fromEntries(
+    Object.entries(ids).filter(([id]) => {
+      return hierarchy.parents[parseInt(id)] !== null
+    })
+  )
+
+  const extProgresses = await getProgressDataByIds(Object.keys(filteredIds), null)
+
+  // overwrite if LP progress greater, unless LP progress was reset to 0
+  filteredIds = Object.entries(filteredIds).filter(([id, pct]) => {
+    const extPct = extProgresses[id]?.progress
+    return (pct !== 0)
+      ? pct > extPct
+      : false
+  })
+
+  // each handles its own bubbling.
+  // skipPush on all but last to avoid multiple push requests
+  filteredIds.forEach(([id, pct], index) => {
+    let skip = true
+    if (index === filteredIds.length - 1) {
+      skip = skipPush
+    }
+    saveContentProgress(parseInt(id), null, pct, null, {skipPush: skip, fromLearningPath: true})
+  })
+}
+
+async function getHierarchy(contentId, collection) {
+  if (collection && collection.type === COLLECTION_TYPE.LEARNING_PATH) {
+    return await fetchLearningPathHierarchy(contentId, collection)
+  } else {
+    return await fetchHierarchy(contentId)
+  }
+}
+
 // agnostic to collection - makes returned data structure simpler,
 // as long as callers remember to pass collection where needed
 function trickleProgress(hierarchy, contentId, _collection, progress) {

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

@@ -107,7 +107,8 @@ export async function getMethodCard(brand) {
     )
 
     if (!maxProgressTimestamp) {
-      maxProgressTimestamp = learningPath.active_learning_path_created_at
+      // active LP created_at is stored in seconds, so *1000 to match rest of cards
+      maxProgressTimestamp = learningPath.active_learning_path_created_at * 1000
     }
 
     return {

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

@@ -29,6 +29,7 @@ export default class ContentProgress extends BaseModel<{
   state: STATE
   progress_percent: number
   resume_time_seconds: number | null
+  last_interacted_a_la_carte: number | null
 }> {
   static table = SYNC_TABLES.CONTENT_PROGRESS
 
@@ -53,8 +54,8 @@ export default class ContentProgress extends BaseModel<{
   get resume_time_seconds() {
     return (this._getRaw('resume_time_seconds') as number) || null
   }
-  get hide_from_progress_row() {
-    return this._getRaw('hide_from_progress_row') as boolean
+  get last_interacted_a_la_carte() {
+    return this._getRaw('last_interacted_a_la_carte') as number
   }
 
   set content_id(value: number) {
@@ -90,8 +91,8 @@ export default class ContentProgress extends BaseModel<{
     throwIfNotNullableNumber(value)
     this._setRaw('resume_time_seconds', value !== null ? throwIfOutsideRange(value, 0, 65535) : value)
   }
-  set hide_from_progress_row(value: boolean) {
-    this._setRaw('hide_from_progress_row', value)
+  set last_interacted_a_la_carte(value: number) {
+    this._setRaw('last_interacted_a_la_carte', value)
   }
 
 }

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

@@ -62,7 +62,7 @@ export default class ProgressRepository extends SyncRepository<ContentProgress>
       Q.where('collection_type', COLLECTION_TYPE.SELF),
       Q.where('collection_id', COLLECTION_ID_SELF),
 
-      Q.where('hide_from_progress_row', false),
+      Q.where('last_interacted_a_la_carte', Q.notEq(null)),
 
       Q.or(Q.where('state', STATE.STARTED), Q.where('state', STATE.COMPLETED)),
       Q.sortBy('updated_at', 'desc'),
@@ -135,9 +135,13 @@ export default class ProgressRepository extends SyncRepository<ContentProgress>
     }
   }
 
-  recordProgress(contentId: number, collection: CollectionParameter | null, progressPct: number, resumeTime?: number, {skipPush = false, hideFromProgressRow = false} = {}) {
+  recordProgress(contentId: number, collection: CollectionParameter | null, progressPct: number, resumeTime?: number, {skipPush = false, fromLearningPath = false} = {}) {
     const id = ProgressRepository.generateId(contentId, collection)
 
+    if (collection?.type === COLLECTION_TYPE.LEARNING_PATH) {
+      fromLearningPath = true
+    }
+
     const result = this.upsertOne(id, (r) => {
       r.content_id = contentId
       r.collection_type = collection?.type ?? COLLECTION_TYPE.SELF
@@ -149,7 +153,10 @@ export default class ProgressRepository extends SyncRepository<ContentProgress>
         r.resume_time_seconds = Math.floor(resumeTime)
       }
 
-      r.hide_from_progress_row = hideFromProgressRow
+      if (!fromLearningPath) {
+        r.last_interacted_a_la_carte = Date.now()
+      }
+
     }, { skipPush })
 
     // Emit event AFTER database write completes
@@ -180,8 +187,11 @@ export default class ProgressRepository extends SyncRepository<ContentProgress>
   recordProgressMany(
     contentProgresses: Record<string, number>, // Accept plain object
     collection: CollectionParameter | null,
-    { tentative = true, skipPush = false, hideFromProgressRow = false }: { tentative?: boolean; skipPush?: boolean; hideFromProgressRow?: boolean } = {}
+    { tentative = true, skipPush = false, fromLearningPath = false }: { tentative?: boolean; skipPush?: boolean; fromLearningPath?: boolean } = {}
   ) {
+    if (collection?.type === COLLECTION_TYPE.LEARNING_PATH) {
+      fromLearningPath = true
+    }
 
     const data = Object.fromEntries(
       Object.entries(contentProgresses).map(([contentId, progressPct]) => [
@@ -193,7 +203,9 @@ export default class ProgressRepository extends SyncRepository<ContentProgress>
 
           r.progress_percent = progressPct
 
-          r.hide_from_progress_row = hideFromProgressRow
+          if (!fromLearningPath) {
+            r.last_interacted_a_la_carte = Date.now()
+          }
         },
       ])
     )

package/src/services/sync/schema/index.ts

@@ -26,7 +26,7 @@ const contentProgressTable = tableSchema({
     { name: 'state', type: 'string', isIndexed: true },
     { name: 'progress_percent', type: 'number' },
     { name: 'resume_time_seconds', type: 'number', isOptional: true },
-    { name: 'hide_from_progress_row', type: 'boolean'},
+    { name: 'last_interacted_a_la_carte', type: 'number', isOptional: true },
     { name: 'created_at', type: 'number' },
     { name: 'updated_at', type: 'number', isIndexed: true }
   ]