musora-content-services 2.95.5 → 2.96.1

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

@@ -1,12 +1,12 @@
 import SyncRepository, { Q } from './base'
-import ContentProgress, { COLLECTION_TYPE, STATE } from '../models/ContentProgress'
+import ContentProgress, { COLLECTION_TYPE, COLLECTION_ID_SELF, STATE } from '../models/ContentProgress'
 
 export default class ProgressRepository extends SyncRepository<ContentProgress> {
   // null collection only
   async startedIds(limit?: number) {
     return this.queryAllIds(...[
-      Q.where('collection_type', null),
-      Q.where('collection_id', null),
+      Q.where('collection_type', COLLECTION_TYPE.SELF),
+      Q.where('collection_id', COLLECTION_ID_SELF),
 
       Q.where('state', STATE.STARTED),
       Q.sortBy('updated_at', 'desc'),
@@ -18,8 +18,8 @@ export default class ProgressRepository extends SyncRepository<ContentProgress>
   // null collection only
   async completedIds(limit?: number) {
     return this.queryAllIds(...[
-      Q.where('collection_type', null),
-      Q.where('collection_id', null),
+      Q.where('collection_type', COLLECTION_TYPE.SELF),
+      Q.where('collection_id', COLLECTION_ID_SELF),
 
       Q.where('state', STATE.COMPLETED),
       Q.sortBy('updated_at', 'desc'),
@@ -55,8 +55,8 @@ export default class ProgressRepository extends SyncRepository<ContentProgress>
     } = {}
   ) {
     const clauses: Q.Clause[] = [
-      Q.where('collection_type', null),
-      Q.where('collection_id', null),
+      Q.where('collection_type', COLLECTION_TYPE.SELF),
+      Q.where('collection_id', COLLECTION_ID_SELF),
 
       Q.or(Q.where('state', STATE.STARTED), Q.where('state', STATE.COMPLETED)),
       Q.sortBy('updated_at', 'desc'),
@@ -80,8 +80,8 @@ export default class ProgressRepository extends SyncRepository<ContentProgress>
   async mostRecentlyUpdatedId(contentIds: number[], collection: { type: COLLECTION_TYPE; id: number } | null = null) {
     return this.queryOneId(
       Q.where('content_id', Q.oneOf(contentIds)),
-      Q.where('collection_type', collection?.type ?? null),
-      Q.where('collection_id', collection?.id ?? null),
+      Q.where('collection_type', collection?.type ?? COLLECTION_TYPE.SELF),
+      Q.where('collection_id', collection?.id ?? COLLECTION_ID_SELF),
 
       Q.sortBy('updated_at', 'desc')
     )
@@ -93,8 +93,8 @@ export default class ProgressRepository extends SyncRepository<ContentProgress>
   ) {
     const clauses = [
       Q.where('content_id', contentId),
-      Q.where('collection_type', collection?.type ?? null),
-      Q.where('collection_id', collection?.id ?? null),
+      Q.where('collection_type', collection?.type ?? COLLECTION_TYPE.SELF),
+      Q.where('collection_id', collection?.id ?? COLLECTION_ID_SELF),
     ]
 
     return await this.queryOne(...clauses)
@@ -106,8 +106,8 @@ export default class ProgressRepository extends SyncRepository<ContentProgress>
   ) {
     const clauses = [
       Q.where('content_id', Q.oneOf(contentIds)),
-      Q.where('collection_type', collection?.type ?? null),
-      Q.where('collection_id', collection?.id ?? null),
+      Q.where('collection_type', collection?.type ?? COLLECTION_TYPE.SELF),
+      Q.where('collection_id', collection?.id ?? COLLECTION_ID_SELF),
     ]
 
     return await this.queryAll(...clauses)
@@ -118,8 +118,8 @@ export default class ProgressRepository extends SyncRepository<ContentProgress>
 
     const result = this.upsertOne(id, (r) => {
       r.content_id = contentId
-      r.collection_type = collection?.type ?? null
-      r.collection_id = collection?.id ?? null
+      r.collection_type = collection?.type ?? COLLECTION_TYPE.SELF
+      r.collection_id = collection?.id ?? COLLECTION_ID_SELF
 
       r.state = progressPct === 100 ? STATE.COMPLETED : STATE.STARTED
       r.progress_percent = progressPct
@@ -142,8 +142,8 @@ export default class ProgressRepository extends SyncRepository<ContentProgress>
         progressPercent: progressPct,
         progressStatus: progressPct === 100 ? STATE.COMPLETED : STATE.STARTED,
         bubble: true,
-        collectionType: collection?.type ?? null,
-        collectionId: collection?.id ?? null,
+        collectionType: collection?.type ?? COLLECTION_TYPE.SELF,
+        collectionId: collection?.id ?? COLLECTION_ID_SELF,
         resumeTimeSeconds: resumeTime ?? null,
         timestamp: Date.now()
       })
@@ -165,8 +165,8 @@ export default class ProgressRepository extends SyncRepository<ContentProgress>
           ProgressRepository.generateId(contentId, collection),
           (r: ContentProgress) => {
             r.content_id = contentId
-            r.collection_type = collection?.type ?? null
-            r.collection_id = collection?.id ?? null
+            r.collection_type = collection?.type ?? COLLECTION_TYPE.SELF
+            r.collection_id = collection?.id ?? COLLECTION_ID_SELF
 
             r.state = progressPct === 100 ? STATE.COMPLETED : STATE.STARTED
             r.progress_percent = progressPct
@@ -185,8 +185,8 @@ export default class ProgressRepository extends SyncRepository<ContentProgress>
         ProgressRepository.generateId(+contentId, collection),
         (r: ContentProgress) => {
           r.content_id = +contentId
-          r.collection_type = collection?.type ?? null
-          r.collection_id = collection?.id ?? null
+          r.collection_type = collection?.type ?? COLLECTION_TYPE.SELF
+          r.collection_id = collection?.id ?? COLLECTION_ID_SELF
 
           r.state = progressPct === 100 ? STATE.COMPLETED : STATE.STARTED
           r.progress_percent = progressPct
@@ -204,10 +204,6 @@ export default class ProgressRepository extends SyncRepository<ContentProgress>
     contentId: number,
     collection: { type: COLLECTION_TYPE; id: number } | null
   ) {
-    if (collection) {
-      return `${contentId}:${collection.type}:${collection.id}`
-    } else {
-      return `${contentId}`
-    }
+    return `${contentId}:${collection?.type || COLLECTION_TYPE.SELF}:${collection?.id || COLLECTION_ID_SELF}`
   }
 }

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

@@ -270,7 +270,7 @@ export default class SyncStore<TModel extends BaseModel = BaseModel> {
           if (recreate) {
             return this.collection.prepareCreate(record => {
               record._raw.id = id
-              record._raw.created_at = recreate.created_at
+              record._raw.created_at = recreate.created_at as EpochMs
               record._raw.updated_at = this.generateTimestamp()
               record._raw._status = 'created'
               builder(record)

package/test/initializeTests.js

@@ -1,5 +1,6 @@
 import { globalConfig, initializeService } from '../src'
 import { LocalStorageMock } from './localStorageMock'
+import { initializeSyncManager } from './sync/initialize-sync-manager'
 const railContentModule = require('../src/services/railcontent.js')
 let token = null
 let userId = process.env.RAILCONTENT_USER_ID ?? null
@@ -43,7 +44,7 @@ export async function initializeTestService(useLive = false, isAdmin = false) {
       baseUrl: process.env.RAILCONTENT_BASE_URL || 'https://test.musora.com',
       token: token,
       userId: userId,
-      authToken: token
+      authToken: token,
     },
     sessionConfig: { token: token, userId: userId, authToken: token },
     baseUrl: process.env.RAILCONTENT_BASE_URL,
@@ -51,9 +52,10 @@ export async function initializeTestService(useLive = false, isAdmin = false) {
     isMA: true,
   }
   initializeService(config)
-
   // Mock user permissions
   let permissionsMock = jest.spyOn(railContentModule, 'fetchUserPermissionsData')
   let permissionsData = { permissions: [108, 91, 92], isAdmin: isAdmin }
   permissionsMock.mockImplementation(() => permissionsData)
+
+  initializeSyncManager(userId)
 }

package/test/learningPaths.test.js

@@ -1,21 +1,70 @@
 import { initializeTestService } from './initializeTests.js'
 import {
   fetchLearningPathLessons,
-  getLearningPath,
+  getEnrichedLearningPath,
+  startLearningPath,
+  resetAllLearningPaths,
+  getActivePath,
 } from '../src/services/content-org/learning-paths.ts'
-import { contentStatusCompleted } from '../src/services/contentProgress.js'
+import {
+  contentStatusCompleted,
+  contentStatusReset,
+  getProgressDataByIds,
+} from '../src/services/contentProgress.js'
 describe('learning-paths', function () {
   beforeEach(async () => {
     await initializeTestService(true)
   })
 
-  test('getLearningPathsV2Test', async () => {
-    const results = await getLearningPath(417140)
-  })
-  test('getlearningPathLessonsTestNew', async () => {
-    await contentStatusCompleted(417105)
-    const userDate = new Date('2025-10-31')
-    const results = await fetchLearningPathLessons(422533, 'drumeo', userDate)
-    console.log(results)
+  afterEach(async () => {
+    // Flush all pending promises
+    await new Promise((resolve) => setImmediate(resolve))
   })
+
+  // test('getLearningPathsV2Test', async () => {
+  //   const results = await getEnrichedLearningPath(417140)
+  // })
+  // test('getlearningPathLessonsTestNew', async () => {
+  //   await contentStatusCompleted(417105)
+  //   const userDate = new Date('2025-10-31')
+  //   const results = await fetchLearningPathLessons(422533, 'drumeo', userDate)
+  //   console.log(results)
+  // })
+  // test('getlearningPathLessonsTestNew', async () => {
+  //   await contentStatusCompleted(417105)
+  //   const userDate = new Date('2025-10-31')
+  //   const results = await fetchLearningPathLessons(422533, 'drumeo', userDate)
+  //   console.log(results)
+  // })
+
+  test('learningPathCompletion', async () => {
+    const learningPathId = 435527
+    await contentStatusReset(learningPathId)
+    await resetAllLearningPaths()
+    await startLearningPath('drumeo', learningPathId)
+    const collection = { type: 'learning-path-v2', id: learningPathId }
+    const learningPath = await getEnrichedLearningPath(learningPathId)
+
+    // Complete each child one by one
+    for (const child of learningPath.children) {
+      await contentStatusReset(child.id)
+      await contentStatusCompleted(child.id, collection)
+
+      // Check child status
+      const childProgress = await getProgressDataByIds([child.id], collection)
+
+      // Check parent status after each child
+      const parentProgress = await getProgressDataByIds([learningPathId], collection)
+    }
+
+    // Final check - parent should be completed
+    const finalParentProgress = await getProgressDataByIds([learningPathId], collection)
+    console.log('\n--- Final parent progress:', finalParentProgress)
+    expect(finalParentProgress[learningPathId]?.status).toBe('completed')
+
+    await new Promise((resolve) => setTimeout(resolve, 5000))
+
+    const activePath = await getActivePath('drumeo')
+    expect(activePath.active_learning_path_id).toBe(435563)
+  }, 15000)
 })

package/test/sync/adapter.ts

@@ -0,0 +1,41 @@
+import adapterFactory from '../../src/services/sync/adapters/factory'
+import LokiJSAdapter from '../../src/services/sync/adapters/lokijs'
+import EventEmitter from '../../src/services/sync/utils/event-emitter'
+
+export default function syncStoreAdapter(userId: string, bus: SyncAdapterEventBus) {
+  return adapterFactory(LokiJSAdapter, `user:${userId}`, {
+    useWebWorker: false,
+    useIncrementalIndexedDB: true,
+    extraLokiOptions: {
+      autosave: true,
+      autosaveInterval: 300, // increase for better performance at cost of potential data loss on tab close/crash
+    },
+    onQuotaExceededError: () => {
+      // Browser ran out of disk space or possibly in incognito mode
+      // called ONLY at startup
+      // ideal place to trigger banner (?) to user when also offline?
+      // (so that the non-customizable browser default onbeforeunload confirmation (in offline-unload-warning.ts) has context and makes sense)
+      bus.emit('quotaExceededError')
+    },
+    onSetUpError: () => {
+      // TODO - Database failed to load -- offer the user to reload the app or log out
+    },
+    extraIncrementalIDBOptions: {
+      lazyCollections: ['content_like'],
+      onDidOverwrite: () => {
+        // Called when this adapter is forced to overwrite contents of IndexedDB.
+        // This happens if there's another open tab of the same app that's making changes.
+        // this scenario is handled-ish in `idb-clobber-avoidance`
+      },
+      onversionchange: () => {
+        // no-op
+        // indexeddb was deleted in another browser tab (user logged out), so we must make sure we delete
+        // in-memory db in this tab as well,
+        // but we rely on sync manager setup/teardown to `unsafeResetDatabase` and redirect for this,
+        // though reloading the page might be useful as well
+      },
+    },
+  })
+}
+
+export class SyncAdapterEventBus extends EventEmitter<{ quotaExceededError: [] }> {}

package/test/sync/initialize-sync-manager.js

@@ -0,0 +1,104 @@
+import { SyncManager, SyncContext } from '../../src/services/sync/index'
+import {
+  BaseSessionProvider,
+  BaseConnectivityProvider,
+  BaseDurabilityProvider,
+  BaseTabsProvider,
+  BaseVisibilityProvider,
+} from '../../src/services/sync/context/providers/'
+import adapterFactory from '../../src/services/sync/adapters/factory'
+import LokiJSAdapter from '../../src/services/sync/adapters/lokijs'
+import EventEmitter from '../../src/services/sync/utils/event-emitter'
+import { InitialStrategy, PollingStrategy } from '../../src/services/sync/strategies/index'
+import { SyncTelemetry, SentryLike } from '../../src/services/sync/telemetry/index'
+import {
+  ContentLike,
+  ContentProgress,
+  Practice,
+  PracticeDayNote,
+} from '../../src/services/sync/models/index'
+import syncDatabaseFactory from '../../src/services/sync/database/factory'
+
+import syncAdapter, { SyncAdapterEventBus } from './adapter'
+
+export function initializeSyncManager(userId) {
+  if (SyncManager.getInstanceOrNull()) {
+    return
+  }
+  const dummySentry = {
+    captureException: () => '',
+    addBreadcrumb: () => {},
+    startSpan: (options, callback) => {
+      // Return a mock span object with the properties Sentry expects
+      const mockSpan = {
+        _spanId: 'mock-span-id',
+        end: () => {},
+        setStatus: () => {},
+        setData: () => {},
+        setAttribute: () => {},
+      }
+
+      if (callback) {
+        return callback(mockSpan)
+      }
+      return mockSpan
+    },
+  }
+
+  SyncTelemetry.setInstance(new SyncTelemetry(userId, { Sentry: dummySentry }))
+
+  const adapterBus = new SyncAdapterEventBus()
+  const adapter = syncAdapter(userId, adapterBus)
+  const db = syncDatabaseFactory(adapter)
+
+  const context = new SyncContext({
+    session: {
+      getClientId: () => 'test-client-id',
+      getSessionId: () => null,
+      start: () => {},
+      stop: () => {},
+    },
+    connectivity: {
+      getValue: () => true,
+      subscribe: () => () => {},
+      notifyListeners: () => {},
+      start: () => {},
+      stop: () => {},
+    },
+    visibility: {
+      getValue: () => true,
+      subscribe: () => () => {},
+      notifyListeners: () => {},
+      start: () => {},
+      stop: () => {},
+    },
+    tabs: {
+      hasOtherTabs: () => false,
+      broadcast: () => {},
+      subscribe: () => () => {},
+      start: () => {},
+      stop: () => {},
+    },
+    durability: {
+      getValue: () => true,
+      start: () => {},
+      stop: () => {},
+    },
+  })
+  const manager = new SyncManager(context, db)
+
+  const initialStrategy = manager.createStrategy(InitialStrategy)
+  const aggressivePollingStrategy = manager.createStrategy(PollingStrategy, 3600_000)
+
+  manager.syncStoresWithStrategies(
+    manager.storesForModels([ContentLike, ContentProgress, Practice, PracticeDayNote]),
+    [initialStrategy, aggressivePollingStrategy]
+  )
+
+  manager.protectStores(
+    manager.storesForModels([ContentLike, ContentProgress, Practice, PracticeDayNote]),
+    []
+  )
+
+  SyncManager.assignAndSetupInstance(manager)
+}