musora-content-services 2.121.2 → 2.122.1

package/.claude/settings.local.json

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

package/CHANGELOG.md

@@ -2,6 +2,35 @@
 
 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)
+
+
+### Features
+
+* add fetchLiveStreamData method ([aa9b704](https://github.com/railroadmedia/musora-content-services/commit/aa9b7046c7fc69e8b30c0f035577da62f8c5b5fd))
+* add vimeo_live_event_id to GROQ queries ([d4fff6f](https://github.com/railroadmedia/musora-content-services/commit/d4fff6f09ca62682f6cead7e43f6979a56b86e0a))
+* adds restore methods (for progress deletion undo) ([#705](https://github.com/railroadmedia/musora-content-services/issues/705)) ([b01a718](https://github.com/railroadmedia/musora-content-services/commit/b01a71892175b38789d62fffac0ce5f8e2e4513d))
+* **TP-1060:** method data caching in mcs ([#701](https://github.com/railroadmedia/musora-content-services/issues/701)) ([25efc43](https://github.com/railroadmedia/musora-content-services/commit/25efc43b6c07172db2f20d51d5b79ac9fc204eef))
+* update brand endpoint ([#719](https://github.com/railroadmedia/musora-content-services/issues/719)) ([4938b61](https://github.com/railroadmedia/musora-content-services/commit/4938b61c8526e31194b284c6daf172764b7900ed))
+
+
+### Bug Fixes
+
+* adds live_global_event field where live_event_stream_id is returned ([#708](https://github.com/railroadmedia/musora-content-services/issues/708)) ([23c58f4](https://github.com/railroadmedia/musora-content-services/commit/23c58f42da866cd1035276c62c773b82c09d3aa5))
+* better logs in Sentry for debugging ([#712](https://github.com/railroadmedia/musora-content-services/issues/712)) ([e1019b5](https://github.com/railroadmedia/musora-content-services/commit/e1019b50b0cf606b86e71028db0a2f9ac354cfca))
+* remove unsupported collection types ([#713](https://github.com/railroadmedia/musora-content-services/issues/713)) ([0441941](https://github.com/railroadmedia/musora-content-services/commit/04419413ffea82303258b839c8e1e11b3a4c507a))
+* **T3PS-1347:** Implement WatermelonDB-based streak calculator with year boundary fix ([916a8ef](https://github.com/railroadmedia/musora-content-services/commit/916a8ef532a858f82a8133d1725ad69ea3d550e9))
+
 ### [2.121.2](https://github.com/railroadmedia/musora-content-services/compare/v2.121.1...v2.121.2) (2026-01-20)
 
 ### [2.121.1](https://github.com/railroadmedia/musora-content-services/compare/v2.121.0...v2.121.1) (2026-01-20)

package/package.json

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

package/src/contentMetaData.js

@@ -128,6 +128,7 @@ export class Tabs {
   static SingleLessons = { name: 'Single Lessons', short_name: 'Single Lessons', value: 'type,Single Lessons', recSysSection: 'lesson', }
   static SkillPacks = { name: 'Skill Packs', short_name: 'Skill Packs', value: 'type,Skill Packs', recSysSection: 'lesson', }
   static Entertainment = { name: 'Entertainment', short_name: 'Entertainment', value: 'type,Entertainment', recSysSection: 'lesson', }
+  static Routines = { name: 'Routines', short_name: 'Routines', value: 'type,routine', recSysSection: 'lesson', }
 }
 
 /**
@@ -325,6 +326,41 @@ const contentMetadata = {
   },
   singeo: {
     'songs-types': ['Tutorials', 'Sheet Music', 'Play-Alongs', 'Jam Tracks'],
+    lessons: {
+      name: 'Lessons',
+      filterOptions: {
+        difficulty: DIFFICULTY_STRINGS,
+        length: LengthFilterOptions.AllOptions,
+        style: [
+          'Country/Folk',
+          'Funk/Disco',
+          'Hard Rock/Metal',
+          'Hip-Hop/Rap/EDM',
+          'Holiday/Soundtrack',
+          'Jazz/Blues',
+          'Latin/World',
+          'Pop/Rock',
+          'R&B/Soul',
+          'Worship/Gospel',
+        ],
+        type: LESSON_TYPE_FILTER,
+        progress: PROGRESS_NAMES,
+      },
+      sortingOptions: {
+        title: 'Sort By',
+        type: 'radio',
+        items: SortingOptions.AllSortingOptions,
+      },
+      tabs: [
+        Tabs.ForYou,
+        Tabs.SingleLessons,
+        Tabs.Courses,
+        Tabs.SkillPacks,
+        Tabs.Routines,
+        Tabs.Entertainment,
+        Tabs.ExploreAll,
+      ],
+    },
   },
 }
 

package/src/contentTypeConfig.js

@@ -50,7 +50,7 @@ export const DEFAULT_FIELDS = [
   "'image': thumbnail.asset->url",
   "'thumbnail': thumbnail.asset->url",
   'difficulty',
-  'difficulty_string',
+  difficultyStringField(),
   'published_on',
   "'type': _type",
   "'length_in_seconds' : coalesce(length_in_seconds, soundslice[0].soundslice_length_in_second)",
@@ -132,6 +132,24 @@ export const assignmentsField = `"assignments":assignment[]{
         "description": coalesce(assignment_description,'')
 },`
 
+// todo: refactor live event queries to use this
+export const liveFields = `
+    'slug': slug.current,
+    'id': railcontent_id,
+    title,
+    live_event_start_time,
+    live_event_end_time,
+    live_event_stream_id,
+    "live_event_is_global": live_global_event == true,
+    published_on,
+    "thumbnail": thumbnail.asset->url,
+    ${artistOrInstructorName()},
+    difficulty_string,
+    railcontent_id,
+    "instructors": ${instructorField},
+    'videoId': coalesce(live_event_stream_id, video.external_id)
+  `
+
 const contentWithInstructorsField = {
   fields: ['"instructors": instructor[]->name'],
 }
@@ -224,7 +242,7 @@ export const collectionLessonTypes = [...coursesLessonTypes, ...showsLessonTypes
 
 export const lessonTypesMapping = {
   lessons: singleLessonTypes,
-  'practice alongs': practiceAlongsLessonTypes,
+  'practice alongs': [ ...practiceAlongsLessonTypes, 'routine'],
   'live archives': liveArchivesLessonTypes,
   performances: performancesLessonTypes,
   'student archives': studentArchivesLessonTypes,
@@ -250,6 +268,7 @@ export const lessonTypesMapping = {
     ...studentArchivesLessonTypes,
     ...practiceAlongsLessonTypes,
   ],
+  routines: ['routine']
 }
 
 export const getNextLessonLessonParentTypes = [
@@ -270,7 +289,8 @@ export const progressTypesMapping = {
     ...studentArchivesLessonTypes,
     'documentary-lesson',
     'live',
-    'course-lesson'
+    'course-lesson',
+    'routine'
   ],
   course: ['course'],
   show: showsLessonTypes,
@@ -302,6 +322,7 @@ export const filterTypes = {
     ...coursesLessonTypes,
     ...skillLessonTypes,
     ...entertainmentLessonTypes,
+    'routine'
   ],
   songs: [
     ...tutorialsLessonTypes,
@@ -314,9 +335,12 @@ export const filterTypes = {
 export const recentTypes = {
   lessons: [
     ...individualLessonsTypes,
+    ...skillLessonTypes,
+    ...entertainmentLessonTypes,
     'course-lesson',
     'guided-course-lesson',
     'quick-tips',
+    'routine'
   ],
   songs: [...SONG_TYPES],
   home: [
@@ -331,6 +355,7 @@ export const recentTypes = {
     'live',
     'course',
     'course-collection',
+    'routine'
   ],
 }
 
@@ -623,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}`,
@@ -666,7 +691,7 @@ export function getNewReleasesTypes(brand) {
     'quick-tips',
     'workout',
     'podcasts',
-    'pack',
+    'course-collection',
     'song',
     'play-along',
     'course',
@@ -703,7 +728,6 @@ export function getUpcomingEventsTypes(brand) {
     'boot-camp',
     'quick-tips',
     'recording',
-    'pack-bundle-lesson',
   ]
   switch (brand) {
     case 'drumeo':
@@ -732,6 +756,10 @@ export function artistOrInstructorNameAsArray(key = 'artists') {
   return `'${key}': select(artist->name != null => [artist->name], instructor[]->name)`
 }
 
+export function difficultyStringField(key = 'difficulty_string') {
+  return `'${key}': select(difficulty_string == 'Novice' => 'Introductory', difficulty_string)`
+}
+
 export async function getFieldsForContentTypeWithFilteredChildren(
   contentType,
   asQueryString = true

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

@@ -9,6 +9,7 @@ import {
   contentTypeConfig,
   DEFAULT_FIELDS,
   descriptionField,
+  difficultyStringField,
   filtersToGroq,
   getChildFieldsForContentType,
   getFieldsForContentType,
@@ -31,6 +32,7 @@ import {
   showsTypes,
   SONG_TYPES,
   SONG_TYPES_WITH_CHILDREN,
+  liveFields,
 } from '../contentTypeConfig.js'
 import { fetchSimilarItems, recommendations } from './recommendations.js'
 import { getSongType, processMetadata, ALWAYS_VISIBLE_TABS } from '../contentMetaData.js'
@@ -330,7 +332,7 @@ export async function fetchNewReleases(
       "instructor": ${instructorField},
       "artists": instructor[]->name,
       difficulty,
-      difficulty_string,
+      ${difficultyStringField()},
       length_in_seconds,
       published_on,
       "type": _type,
@@ -368,7 +370,7 @@ export async function fetchUpcomingEvents(brand, { page = 1, limit = 10 } = {})
         "artists": instructor[]->name,
         "instructor": ${instructorField},
         difficulty,
-        difficulty_string,
+        ${difficultyStringField()},
         length_in_seconds,
         published_on,
         "type": _type,
@@ -421,7 +423,7 @@ export async function fetchScheduledReleases(brand, { page = 1, limit = 10 }) {
       "instructor": ${instructorField},
       "artists": instructor[]->name,
       difficulty,
-      difficulty_string,
+      ${difficultyStringField()},
       length_in_seconds,
       published_on,
       "type": _type,
@@ -961,9 +963,9 @@ export async function fetchLessonContent(railContentId, { addParent = false } =
     ${parentQuery}
     ...select(
       defined(live_event_start_time) => {
-        "live_event_start_time": live_event_start_time,
-        "live_event_end_time": live_event_end_time,
-        "live_event_stream_id": live_event_stream_id,
+        live_event_start_time,
+        live_event_end_time,
+        live_event_stream_id,
         "vimeo_live_event_id": vimeo_live_event_id,
         "videoId": coalesce(live_event_stream_id, video.external_id),
         "live_event_is_global": live_global_event == true
@@ -1096,7 +1098,7 @@ export async function fetchSiblingContent(railContentId, brand = null) {
   }).buildFilter()
 
   const brandString = brand ? ` && brand == "${brand}"` : ''
-  const queryFields = `_id, "id":railcontent_id, published_on, "instructor": instructor[0]->name, title, "thumbnail":thumbnail.asset->url, length_in_seconds, status, "type": _type, difficulty, difficulty_string, artist->, "permission_id": permission_v2, "genre": genre[]->name, "parent_id": parent_content_data[0].id`
+  const queryFields = `_id, "id":railcontent_id, published_on, "instructor": instructor[0]->name, title, "thumbnail":thumbnail.asset->url, length_in_seconds, status, "type": _type, difficulty, ${difficultyStringField()}, artist->, "permission_id": permission_v2, "genre": genre[]->name, "parent_id": parent_content_data[0].id`
 
   const query = `*[railcontent_id == ${railContentId}${brandString}]{
    _type, parent_type, 'parent_id': parent_content_data[0].id, railcontent_id,
@@ -1143,7 +1145,7 @@ export async function fetchRelatedLessons(railContentId) {
     { showMembershipRestrictedContent: true }
   ).buildFilter()
 
-  const queryFields = `_id, "id":railcontent_id, published_on, "instructor": instructor[0]->name, title, "thumbnail":thumbnail.asset->url, length_in_seconds, status, "type": _type, difficulty, difficulty_string, railcontent_id, artist->,"permission_id": permission_v2,_type, "genre": genre[]->name`
+  const queryFields = `_id, "id":railcontent_id, published_on, "instructor": instructor[0]->name, title, "thumbnail":thumbnail.asset->url, length_in_seconds, status, "type": _type, difficulty, ${difficultyStringField()}, railcontent_id, artist->,"permission_id": permission_v2,_type, "genre": genre[]->name`
 
   const query = `*[railcontent_id == ${railContentId} && (!defined(permission) || references(*[_type=='permission']._id))]{
    _type, parent_type, railcontent_id,
@@ -1184,50 +1186,21 @@ export async function fetchLiveEvent(brand, forcedContentId = null) {
   )
   endDateTemp = new Date(endDateTemp.setMinutes(endDateTemp.getMinutes() - LIVE_EXTRA_MINUTES))
 
-  // See LiveStreamEventService.getCurrentOrNextLiveEvent for some nice complicated logic which I don't think is actually importart
-  // this has some +- on times
-  // But this query just finds the first scheduled event (sorted by start_time) that ends after now()
-  const query =
+  const liveEventFields = liveFields + `, 'event_coach_calendar_id': coalesce(calendar_id, '${defaultCalendarID}')`
+
+  const baseFilter =
     forcedContentId !== null
-      ? `*[railcontent_id == ${forcedContentId} ]{
-      'slug': slug.current,
-      'id': railcontent_id,
-      live_event_start_time,
-      live_event_end_time,
-      live_event_stream_id,
-      vimeo_live_event_id,
-      railcontent_id,
-      published_on,
-      'event_coach_url' : instructor[0]->web_url_path,
-      'event_coach_calendar_id': coalesce(calendar_id, '${defaultCalendarID}'),
-      title,
-      "thumbnail": thumbnail.asset->url,
-      ${artistOrInstructorName()},
-      difficulty_string,
-      "instructors": ${instructorField},
-      'videoId': coalesce(live_event_stream_id, video.external_id),
-    } | order(live_event_start_time)[0...1]`
-      : `*[status == 'scheduled' && brand == '${brand}' && defined(live_event_start_time) && live_event_start_time <= '${getSanityDate(startDateTemp, false)}' && live_event_end_time >= '${getSanityDate(endDateTemp, false)}']{
-      'slug': slug.current,
-      'id': railcontent_id,
-      live_event_start_time,
-      live_event_end_time,
-      live_event_stream_id,
-      vimeo_live_event_id,
-      railcontent_id,
-      published_on,
-      'event_coach_url' : instructor[0]->web_url_path,
-      'event_coach_calendar_id': coalesce(calendar_id, '${defaultCalendarID}'),
-      title,
-      "thumbnail": thumbnail.asset->url,
-      ${artistOrInstructorName()},
-      difficulty_string,
-      "instructors": instructor[]->{
-            name,
-            web_url_path,
-          },
-      'videoId': coalesce(live_event_stream_id, video.external_id),
-    } | order(live_event_start_time)[0...1]`
+      ? `railcontent_id == ${forcedContentId}`
+      : `status == 'scheduled'
+      && (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)}'`
+
+  const filter = await new FilterBuilder(baseFilter, {bypassPermissions: true}).buildFilter()
+
+  // This query finds the first scheduled event (sorted by start_time) that ends after now()
+  const query = `*[${filter}]{${liveEventFields}} | order(live_event_start_time)[0...1]`
 
   return await fetchSanity(query, false, { processNeedAccess: false })
 }
@@ -2001,7 +1974,7 @@ export async function fetchScheduledAndNewReleases(
       ${artistOrInstructorName()},
       "artists": instructor[]->name,
       difficulty,
-      difficulty_string,
+      ${difficultyStringField()},
       length_in_seconds,
       published_on,
       "type": _type,

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

package/src/services/user/account.ts

@@ -4,6 +4,7 @@
 import { HttpClient } from '../../infrastructure/http/HttpClient'
 import { HttpError } from '../../infrastructure/http/interfaces/HttpError'
 import { globalConfig } from '../config.js'
+import { clearAllCachedData } from '../dataContext.js'
 import { Onboarding } from './onboarding'
 import { AuthResponse } from './types'
 
@@ -149,7 +150,10 @@ export async function confirmEmailChange(token: string): Promise<void> {
 export async function deleteAccount(userId: number): Promise<void> {
   const apiUrl = `/api/user-management-system/v1/users/${userId}`
   const httpClient = new HttpClient(globalConfig.baseUrl, globalConfig.sessionConfig.token)
-  return httpClient.delete(apiUrl)
+  await httpClient.delete(apiUrl)
+
+  // Clear all locally cached data to prevent data leakage between users
+  await clearAllCachedData()
 }
 
 /**