musora-content-services 2.122.0 → 2.122.1

package/.claude/settings.local.json

@@ -1,16 +1,9 @@
 {
   "permissions": {
     "allow": [
-      "Read(//app/musora-platform-backend/**)",
-      "Read(//app/musora-platform-frontend/**)",
-      "Bash(find:*)",
-      "Bash(sed:*)",
-      "Read(//app/**)",
-      "Bash(cat:*)",
-      "Bash(docker exec:*)",
-      "Bash(npm config:*)"
+      "Bash(rg:*)",
+      "Bash(npm run lint:*)"
     ],
-    "deny": [],
-    "ask": []
+    "deny": []
   }
 }

package/CHANGELOG.md

@@ -2,6 +2,16 @@
 
 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.122.1](https://github.com/railroadmedia/musora-content-services/compare/v2.122.0...v2.122.1) (2026-01-23)
+
+
+### Bug Fixes
+
+* handle global live streams ([#727](https://github.com/railroadmedia/musora-content-services/issues/727)) ([e0ed5f3](https://github.com/railroadmedia/musora-content-services/commit/e0ed5f398f61a2188beae56a05547494862a16b7))
+* removes tentative progress call functionality ([#716](https://github.com/railroadmedia/musora-content-services/issues/716)) ([a167d3b](https://github.com/railroadmedia/musora-content-services/commit/a167d3b94c1d2ef6df9a7f76e4c4ea4c71f9bfb5))
+* **T3PS-1562:** hide nonpinned method card ([#721](https://github.com/railroadmedia/musora-content-services/issues/721)) ([cc250ee](https://github.com/railroadmedia/musora-content-services/commit/cc250ee072cac976fc7389eb86e77eff1230b73a))
+* **T3PS-1579:** fix reset bubbling ([#718](https://github.com/railroadmedia/musora-content-services/issues/718)) ([a9490a8](https://github.com/railroadmedia/musora-content-services/commit/a9490a85aeb4df947770a265543fa6782e30b436))
+
 ## [2.122.0](https://github.com/railroadmedia/musora-content-services/compare/v2.118.1...v2.122.0) (2026-01-22)
 
 

package/package.json

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

package/src/contentTypeConfig.js

@@ -145,6 +145,7 @@ export const liveFields = `
     "thumbnail": thumbnail.asset->url,
     ${artistOrInstructorName()},
     difficulty_string,
+    railcontent_id,
     "instructors": ${instructorField},
     'videoId': coalesce(live_event_stream_id, video.external_id)
   `
@@ -647,9 +648,9 @@ export function getIntroVideoFields(type) {
     `"id": railcontent_id`,
     'title',
     'brand',
-    `"instructor": *[_type == "method-v2" && brand == ^.brand && references(^._id)][0].${instructorField}`,
-    `"difficulty": *[_type == "method-v2" && brand == ^.brand && references(^._id)][0].difficulty`,
-    `"difficulty_string": *[_type == "method-v2" && brand == ^.brand][0].difficulty_string`,
+    `"instructor": ${instructorField}`,
+    `difficulty`,
+    `difficulty_string`,
     `"type": _type`,
     'brand',
     `"description": ${descriptionField}`,

package/src/services/contentProgress.js

@@ -531,9 +531,8 @@ async function saveContentProgress(contentId, collection, progress, currentSecon
     }
   }
 
-  if (Object.keys(bubbledProgresses).length >= 0) {
-    // BE bubbling/trickling currently does not work, so we utilize non-tentative pushing when learning path collection
-    await db.contentProgress.recordProgressMany(bubbledProgresses, collection, {tentative: !isLP, skipPush: true, fromLearningPath})
+  if (Object.keys(bubbledProgresses).length > 0) {
+    await db.contentProgress.recordProgressMany(bubbledProgresses, collection, {skipPush: true, fromLearningPath})
   }
 
   if (isLP) {
@@ -567,8 +566,7 @@ async function setStartedOrCompletedStatus(contentId, collection, isCompleted, {
     ...trickleProgress(hierarchy, contentId, collection, progress),
     ...await bubbleProgress(hierarchy, contentId, collection)
   }
-  // BE bubbling/trickling currently does not work, so we utilize non-tentative pushing when learning path collection
-  await db.contentProgress.recordProgressMany(progresses, collection, {tentative: !isLP, skipPush: true})
+  await db.contentProgress.recordProgressMany(progresses, collection, {skipPush: true})
 
   if (isLP) {
     let exportProgresses = progresses
@@ -600,7 +598,7 @@ async function setStartedOrCompletedStatusMany(contentIds, collection, isComplet
   }
 
   const contents = Object.fromEntries(contentIds.map((id) => [id, progress]))
-  const response = await db.contentProgress.recordProgressMany(contents, collection, {tentative: !isLP, skipPush: true})
+  const response = await db.contentProgress.recordProgressMany(contents, collection, {skipPush: true})
 
   // we assume this is used only for contents within the same hierarchy
   const hierarchy = await getHierarchy(collection.id, collection)
@@ -613,8 +611,7 @@ async function setStartedOrCompletedStatusMany(contentIds, collection, isComplet
       ...(await bubbleProgress(hierarchy, contentId, collection)),
     }
   }
-  // BE bubbling/trickling currently does not work, so we utilize non-tentative pushing when learning path collection
-  await db.contentProgress.recordProgressMany(progresses, collection, {tentative: !isLP, skipPush: true})
+  await db.contentProgress.recordProgressMany(progresses, collection, {skipPush: true})
 
   if (isLP) {
     let exportProgresses = progresses
@@ -647,8 +644,21 @@ async function resetStatus(contentId, collection = null, {skipPush = false} = {}
     ...trickleProgress(hierarchy, contentId, collection, progress),
     ...await bubbleProgress(hierarchy, contentId, collection)
   }
-  // BE bubbling/trickling currently does not work, so we utilize non-tentative pushing when learning path collection
-  await db.contentProgress.recordProgressMany(progresses, collection, {tentative: !isLP, skipPush: true})
+  // have to use different endpoints for erase vs record
+  const eraseProgresses = Object.fromEntries(
+    Object.entries(progresses).filter(([_, pct]) => pct === 0)
+  )
+  progresses = Object.fromEntries(
+    Object.entries(progresses).filter(([_, pct]) => pct > 0)
+  )
+
+  if (Object.keys(progresses).length > 0) {
+    await db.contentProgress.recordProgressMany(progresses, collection, {skipPush: true, fromLearningPath: isLP})
+  }
+  if (Object.keys(eraseProgresses).length > 0) {
+    const eraseIds = Object.keys(eraseProgresses).map(Number)
+    await db.contentProgress.eraseProgressMany(eraseIds, collection, {skipPush: true})
+  }
 
   if (isLP) {
     progresses[contentId] = progress

package/src/services/progress-row/base.js

@@ -178,12 +178,16 @@ function sortCards(pinnedCard, contentCardMap, playlistCards, methodCard, limit)
     combined.push(pinnedCard)
   }
 
-  if (!(pinnedCard && pinnedCard.progressType === 'method')) {
+  const progressList = Array.from(contentCardMap.values())
+
+  combined = [...combined, ...progressList, ...playlistCards]
+
+  // welcome card state will only show if pinned
+  if (methodCard.type !== 'method') {
     combined.push(methodCard)
   }
 
-  const progressList = Array.from(contentCardMap.values())
-  return mergeAndSortItems([...combined, ...progressList, ...playlistCards], limit)
+  return mergeAndSortItems(combined, limit)
 }
 
 function mergeAndSortItems(items, limit) {

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

@@ -111,7 +111,7 @@ export async function getMethodCard(brand) {
     }
 
     return {
-      id: learningPath?.id,
+      id: 1,
       type: COLLECTION_TYPE.LEARNING_PATH,
       progressType: 'method',
       header: 'Method',

package/src/services/sanity.js

@@ -1192,7 +1192,7 @@ export async function fetchLiveEvent(brand, forcedContentId = null) {
     forcedContentId !== null
       ? `railcontent_id == ${forcedContentId}`
       : `status == 'scheduled'
-      && brand == '${brand}'
+      && (brand == '${brand}' || live_global_event == true)
       && defined(live_event_start_time)
       && live_event_start_time <= '${getSanityDate(startDateTemp, false)}'
       && live_event_end_time >= '${getSanityDate(endDateTemp, false)}'`

package/src/services/sync/repositories/base.ts

@@ -100,13 +100,6 @@ export default class SyncRepository<TModel extends BaseModel> {
     )
   }
 
-  protected async upsertOneTentative(id: RecordId, builder: (record: TModel) => void) {
-    return this.store.telemetry.trace(
-      { name: `upsertOneTentative:${this.store.model.table}`, op: 'upsert', attributes: { ...this.context.session.toJSON() } },
-      (span) => this._respondToWrite(() => this.store.upsertOneTentative(id, builder, span), span)
-    )
-  }
-
   protected async upsertSome(builders: Record<RecordId, (record: TModel) => void>, { skipPush = false } = {}) {
     return this.store.telemetry.trace(
       { name: `upsertSome:${this.store.model.table}`, op: 'upsert', attributes: { ...this.context.session.toJSON() } },
@@ -114,13 +107,6 @@ export default class SyncRepository<TModel extends BaseModel> {
     )
   }
 
-  protected async upsertSomeTentative(builders: Record<RecordId, (record: TModel) => void>, { skipPush = false } = {}) {
-    return this.store.telemetry.trace(
-      { name: `upsertSomeTentative:${this.store.model.table}`, op: 'upsert', attributes: { ...this.context.session.toJSON() } },
-      (span) => this._respondToWrite(() => this.store.upsertSomeTentative(builders, span, {skipPush}), span)
-    )
-  }
-
   protected async deleteOne(id: RecordId, { skipPush = false } = {}) {
     return this.store.telemetry.trace(
       { name: `delete:${this.store.model.table}`, op: 'delete', attributes: { ...this.context.session.toJSON() } },
@@ -128,10 +114,10 @@ export default class SyncRepository<TModel extends BaseModel> {
     )
   }
 
-  protected async deleteSome(ids: RecordId[]) {
+  protected async deleteSome(ids: RecordId[], { skipPush = false } = {}) {
     return this.store.telemetry.trace(
       { name: `deleteSome:${this.store.model.table}`, op: 'delete', attributes: { ...this.context.session.toJSON() } },
-      (span) => this._respondToWriteIds(() => this.store.deleteSome(ids, span), span)
+      (span) => this._respondToWriteIds(() => this.store.deleteSome(ids, span, {skipPush}), span)
     )
   }
 

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

@@ -187,7 +187,7 @@ export default class ProgressRepository extends SyncRepository<ContentProgress>
   recordProgressMany(
     contentProgresses: Record<string, number>, // Accept plain object
     collection: CollectionParameter | null,
-    { tentative = true, skipPush = false, fromLearningPath = false }: { tentative?: boolean; skipPush?: boolean; fromLearningPath?: boolean } = {}
+    { skipPush = false, fromLearningPath = false }: { skipPush?: boolean; fromLearningPath?: boolean } = {}
   ) {
     if (collection?.type === COLLECTION_TYPE.LEARNING_PATH) {
       fromLearningPath = true
@@ -209,9 +209,7 @@ export default class ProgressRepository extends SyncRepository<ContentProgress>
         },
       ])
     )
-    return tentative
-      ? this.upsertSomeTentative(data, { skipPush })
-      : this.upsertSome(data, { skipPush })
+    return this.upsertSome(data, { skipPush })
 
     //todo add event emitting for bulk updates?
   }
@@ -220,6 +218,11 @@ export default class ProgressRepository extends SyncRepository<ContentProgress>
     return this.deleteOne(ProgressRepository.generateId(contentId, collection), { skipPush })
   }
 
+  eraseProgressMany(contentIds: number[], collection: CollectionParameter | null, {skipPush = false} = {}) {
+    const ids = contentIds.map((id) => ProgressRepository.generateId(id, collection))
+    return this.deleteSome(ids, { skipPush })
+  }
+
   private static generateId(
     contentId: number,
     collection: CollectionParameter | null

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

@@ -354,7 +354,7 @@ export default class SyncStore<TModel extends BaseModel = BaseModel> {
     })
   }
 
-  async deleteSome(ids: RecordId[], span?: Span) {
+  async deleteSome(ids: RecordId[], span?: Span, { skipPush = false } = {}) {
     return this.runScope.abortable(async () => {
       await this.telemeterizedWrite(span, async writer => {
         const existing = await this.queryRecords(Q.where('id', Q.oneOf(ids)))
@@ -364,7 +364,9 @@ export default class SyncStore<TModel extends BaseModel = BaseModel> {
 
       this.emit('deleted', ids)
 
-      this.pushUnsyncedWithRetry(span)
+      if (!skipPush) {
+        this.pushUnsyncedWithRetry(span)
+      }
       await this.ensurePersistence()
 
       return ids