musora-content-services 2.158.0 → 2.158.1

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.158.1](https://github.com/railroadmedia/musora-content-services/compare/v2.158.0...v2.158.1) (2026-05-07)
+
+
+### Bug Fixes
+
+* increment sanity url version ([#953](https://github.com/railroadmedia/musora-content-services/issues/953)) ([61c36c9](https://github.com/railroadmedia/musora-content-services/commit/61c36c962473294e6dfe67d3d688105649e3d79f))
+* pass collection to getProgressDataByIds ([#957](https://github.com/railroadmedia/musora-content-services/issues/957)) ([2ad1620](https://github.com/railroadmedia/musora-content-services/commit/2ad162085f45b35f617c0ba4d2cc32e7be4a3708))
+* Revert "add resolver condition to ensure seen records always get marked sync" ([#956](https://github.com/railroadmedia/musora-content-services/issues/956)) ([56741d3](https://github.com/railroadmedia/musora-content-services/commit/56741d3f49c97e4034e7841deb4aef1f938168c5))
+* update sanity url to v4 ([c567d22](https://github.com/railroadmedia/musora-content-services/commit/c567d227a4f3bdb9f2f1c95364d423e67b1b214f))
+
 ## [2.158.0](https://github.com/railroadmedia/musora-content-services/compare/v2.153.0...v2.158.0) (2026-05-05)
 
 

package/package.json

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

package/src/services/contentAggregator.js

@@ -65,6 +65,7 @@ export async function addContextToContent(dataPromise, ...dataArgs) {
 
   // todo: merge addProgressData with addResumeTimeSeconds to one watermelon call
   const {
+    collection = null, // MA/FE still use this function for LP lessons, so we need this here.
     dataField = null,
     dataField_includeParent = false,
     addProgressPercentage = false,
@@ -98,7 +99,7 @@ export async function addContextToContent(dataPromise, ...dataArgs) {
     awards,
   ] = await Promise.all([
     addProgressPercentage || addProgressStatus || addProgressTimestamp
-      ? getProgressDataByIds(ids) : Promise.resolve(null),
+      ? getProgressDataByIds(ids, collection) : Promise.resolve(null),
     addIsLiked ? isContentLikedByIds(ids) : Promise.resolve(null),
     addResumeTimeSeconds ? getResumeTimeSecondsByIds(ids) : Promise.resolve(null),
     addNavigateTo ? getNavigateTo(items) : Promise.resolve(null),

package/src/services/sanity.js

@@ -1148,7 +1148,7 @@ export async function fetchRelatedLessons(railContentId) {
   const defaultFilterFields = `_type==^._type && brand == ^.brand && railcontent_id != ${railContentId}`
   const params = {
     showMembershipRestrictedContent: true,
-    availableContentStatuses: ['published']
+    availableContentStatuses: ['published'],
   }
   const filterSameArtist = await new FilterBuilder(
     `${defaultFilterFields} && references(^.artist->_id)`,
@@ -1589,7 +1589,7 @@ export async function fetchSanity(
   }
   const perspective = globalConfig.sanityConfig.perspective ?? 'published'
   const api = globalConfig.sanityConfig.useCachedAPI ? 'apicdn' : 'api'
-  const baseUrl = `https://sanity.musora.com/${globalConfig.sanityConfig.projectId}/${api}/v${globalConfig.sanityConfig.version}/${globalConfig.sanityConfig.dataset}/v2?perspective=${perspective}`
+  const baseUrl = `https://sanity.musora.com/${globalConfig.sanityConfig.projectId}/${api}/v${globalConfig.sanityConfig.version}/${globalConfig.sanityConfig.dataset}/v4?perspective=${perspective}`
 
   try {
     const encodedQuery = encodeURIComponent(query)

package/src/services/sync/resolver.ts

@@ -7,7 +7,6 @@ export type SyncResolution = {
   tuplesForUpdate: [BaseModel, SyncEntry][]
   tuplesForRestore: [BaseModel, SyncEntry][]
   idsForDestroy: RecordId[]
-  recordsForSynced: BaseModel[]
 }
 
 export type SyncResolverComparator<T extends BaseModel = BaseModel> = (serverEntry: SyncEntryNonDeleted<T>, localModel: T) => 'SERVER' | 'LOCAL'
@@ -25,8 +24,7 @@ export default class SyncResolver {
       entriesForCreate: [],
       tuplesForUpdate: [],
       tuplesForRestore: [],
-      idsForDestroy: [],
-      recordsForSynced: []
+      idsForDestroy: []
     }
   }
 
@@ -60,9 +58,6 @@ export default class SyncResolver {
     } else if (this.comparator(server as SyncEntryNonDeleted<BaseModel>, local) !== 'LOCAL') {
       // local is older, so update it with server's
       this.resolution.tuplesForUpdate.push([local, server])
-    } else {
-      // server is older - can happen with clock skew - just mark as synced
-      this.resolution.recordsForSynced.push(local)
     }
   }
 
@@ -74,9 +69,6 @@ export default class SyncResolver {
     } else if (this.comparator(server as SyncEntryNonDeleted<BaseModel>, local) !== 'LOCAL') {
       // local is older, so update it with server's
       this.resolution.tuplesForUpdate.push([local, server])
-    } else {
-      // server is older - can happen with clock skew - just mark as synced
-      this.resolution.recordsForSynced.push(local)
     }
   }
 

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

@@ -958,15 +958,9 @@ export default class SyncStore<TModel extends BaseModel = BaseModel> {
         r._raw._changed = ''
       })
     })
-    const syncedBuilds = result.recordsForSynced.map((record) => {
-      return record.prepareUpdate((r) => {
-        r._raw._status = 'synced'
-        r._raw._changed = ''
-      })
-    })
 
     return [
-      [...destroyedBuilds, ...createdBuilds, ...updatedBuilds, ...restoreDestroyBuilds, ...syncedBuilds],
+      [...destroyedBuilds, ...createdBuilds, ...updatedBuilds, ...restoreDestroyBuilds],
       [...restoreCreateBuilds],
     ]
   }

package/test/unit/sync/resolver.test.ts

@@ -65,11 +65,10 @@ describe('againstNone', () => {
     const resolver = new SyncResolver()
     resolver.againstNone(makeEntry('rec-1', { deletedAt: T }))
 
-    const { entriesForCreate, tuplesForUpdate, idsForDestroy, recordsForSynced } = resolver.result
+    const { entriesForCreate, tuplesForUpdate, idsForDestroy } = resolver.result
     expect(entriesForCreate).toHaveLength(0)
     expect(tuplesForUpdate).toHaveLength(0)
     expect(idsForDestroy).toHaveLength(0)
-    expect(recordsForSynced).toHaveLength(0)
   })
 })
 
@@ -101,10 +100,9 @@ describe('againstSynced', () => {
     const resolver = new SyncResolver()
     resolver.againstSynced(makeLocal('rec-1', T + 1), makeEntry('rec-1', { updatedAt: T }))
 
-    const { tuplesForUpdate, idsForDestroy, recordsForSynced } = resolver.result
+    const { tuplesForUpdate, idsForDestroy } = resolver.result
     expect(tuplesForUpdate).toHaveLength(0)
     expect(idsForDestroy).toHaveLength(0)
-    expect(recordsForSynced).toHaveLength(0)
   })
 })
 
@@ -129,14 +127,14 @@ describe('againstCreated', () => {
     expect(resolver.result.tuplesForUpdate[0][1]).toBe(server)
   })
 
-  test('server older (clock skew) → recordsForSynced', () => {
+  test('server older (clock skew) → no action (record stays dirty)', () => {
     const resolver = new SyncResolver()
     const local = makeLocal('rec-1', T + 1)
 
     resolver.againstCreated(local, makeEntry('rec-1', { updatedAt: T }))
 
-    expect(resolver.result.recordsForSynced).toContain(local)
     expect(resolver.result.tuplesForUpdate).toHaveLength(0)
+    expect(resolver.result.idsForDestroy).toHaveLength(0)
   })
 })
 
@@ -160,14 +158,14 @@ describe('againstUpdated', () => {
     expect(resolver.result.tuplesForUpdate).toHaveLength(1)
   })
 
-  test('server older (clock skew) → recordsForSynced', () => {
+  test('server older (clock skew) → no action (record stays dirty)', () => {
     const resolver = new SyncResolver()
     const local = makeLocal('rec-1', T + 1)
 
     resolver.againstUpdated(local, makeEntry('rec-1', { updatedAt: T }))
 
-    expect(resolver.result.recordsForSynced).toContain(local)
     expect(resolver.result.tuplesForUpdate).toHaveLength(0)
+    expect(resolver.result.idsForDestroy).toHaveLength(0)
   })
 })
 
@@ -214,7 +212,6 @@ describe('custom comparator', () => {
     resolver.againstSynced(local, server)
 
     expect(resolver.result.tuplesForUpdate).toHaveLength(0)
-    expect(resolver.result.recordsForSynced).toHaveLength(0)
     expect(resolver.result.idsForDestroy).toHaveLength(0)
   })
 

package/.claude/settings.local.json

@@ -1,22 +0,0 @@
-{
-  "permissions": {
-    "allow": [
-      "Bash(tree:*)",
-      "Bash(find:*)",
-      "Bash(docker exec:*)",
-      "Bash(node:*)",
-      "Bash(npm run build-index:*)",
-      "Bash(npm run link_mcs:*)",
-      "Bash(./link_mcs.sh:*)",
-      "Bash(curl:*)",
-      "Bash(php artisan:*)",
-      "Bash(git checkout:*)",
-      "Bash(source .env)",
-      "Bash(echo:*)",
-      "Bash(grep:*)",
-      "Bash(gh api repos/railroadmedia/musora-platform-backend/commits/1f9878a5e681bf1e2233c0d59a618d477b118c49 --jq '.commit.message' 2>/dev/null || echo \"no access\")",
-      "WebFetch(domain:github.com)",
-      "Read(//app/**)"
-    ]
-  }
-}