musora-content-services 2.151.1 → 2.153.0

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

@@ -19,6 +19,10 @@ export default class SyncRepository<TModel extends BaseModel> {
     this.store = store
   }
 
+  async getAll() {
+    return this.readAll()
+  }
+
   protected async readOne(id: RecordId) {
     return this._respondToRead(() => this.store.readOne(id))
   }

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

@@ -23,7 +23,7 @@ export default class ProgressRepository extends SyncRepository<ContentProgress>
       Q.sortBy('updated_at', 'desc'),
 
       ...(limit ? [Q.take(limit)] : []),
-    ])
+    ].filter(Boolean) as Q.Clause[])
 
     return opts.onlyIds
         ? results.data.map((r) => r.content_id)
@@ -44,7 +44,7 @@ export default class ProgressRepository extends SyncRepository<ContentProgress>
       Q.sortBy('updated_at', 'desc'),
 
       ...(limit ? [Q.take(limit)] : []),
-    ])
+    ].filter(Boolean) as Q.Clause[])
 
     return opts.onlyIds
       ? results.data.map((r) => r.content_id)
@@ -78,7 +78,7 @@ export default class ProgressRepository extends SyncRepository<ContentProgress>
 
       Q.or(Q.where('state', STATE.STARTED), Q.where('state', STATE.COMPLETED)),
       Q.sortBy('updated_at', 'desc'),
-    ]
+    ].filter(Boolean) as Q.Clause[]
 
     if (opts.updatedAfter) {
       clauses.push(Q.where('updated_at', Q.gte(opts.updatedAfter)))

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

@@ -892,7 +892,7 @@ export default class SyncStore<TModel extends BaseModel = BaseModel> {
 
           default:
             this.telemetry.error(`[store:${this.model.table}] Unknown record status`, {
-              status: existing._raw._status,
+              extra: { status: existing._raw._status },
             })
         }
       } else {
@@ -999,6 +999,11 @@ export default class SyncStore<TModel extends BaseModel = BaseModel> {
         }, 'sync.cleanup')
       })
     }, SyncStore.CLEANUP_INTERVAL)
+
+    // in tests in node env, prevents the timer from keeping the process alive
+    if (typeof (this.cleanupTimer as any).unref === 'function') {
+      (this.cleanupTimer as any).unref()
+    }
   }
 
   private stopCleanupTimer() {

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

@@ -4,7 +4,7 @@ import SyncStore from "../store";
 
 type SyncCallback = (reason: string) => void
 
-type SyncCallbacks = {
+export type SyncCallbacks = {
   callback: SyncCallback
   requestSync: SyncCallback
   requestPull: SyncCallback

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

@@ -10,7 +10,7 @@ export type SentryLike = {
   captureMessage: typeof InjectedSentry.captureMessage
   addBreadcrumb: typeof InjectedSentry.addBreadcrumb
   startSpan: typeof InjectedSentry.startSpan
-  logger: typeof InjectedSentry.logger
+  logger: { debug: (...args: any[]) => void; info: (...args: any[]) => void }
 }
 
 export type StartSpanOptions = Parameters<typeof InjectedSentry.startSpan>[0]

package/src/services/urlBuilder.ts

@@ -38,6 +38,7 @@ export interface ContentUrlParams {
   /** Navigation target (optional) */
   navigateTo?: {
     id: number
+    child?: { id: number }
   }
   /** Brand (drumeo, pianote, guitareo, singeo, playbass) */
   brand?: Brand

package/src/services/user/streakCalculator.ts

@@ -43,7 +43,7 @@ class StreakCalculator {
   }
 
   private async fetchAllPractices(): Promise<PracticeData> {
-    const query = await db.practices.queryAll()
+    const query = await db.practices.getAll()
 
     return query.data.reduce((acc, practice) => {
       acc[practice.date] = acc[practice.date] || []

package/test/SKIPPED_TESTS.md

@@ -0,0 +1,151 @@
+# Skipped Tests Reference
+
+This document tracks all skipped tests and why they are skipped. Tests are divided into two categories:
+
+1. **Skipped for CI** — were passing but depend on live external services; skipped to enable clean CI runs
+2. **Previously skipped — failing or unknown** — were already skipped before CI work; many confirmed failing
+
+The goal is to eventually move all Category 1 tests into a dedicated integration/live test suite, and to triage Category 2 tests as either fixable or retired.
+
+---
+
+## Category 1: Skipped for CI (were passing, have external dependencies)
+
+### `test/sanityQueryService.test.js` — Sanity CMS
+
+All tests in this file call real Sanity GROQ queries via `initializeTestService(true)`.
+
+| Test | Dependency |
+|---|---|
+| fetchSongById | Sanity |
+| fetchReturning | Sanity |
+| fetchLeaving | Sanity |
+| fetchComingSoon | Sanity |
+| fetchSanity-WithPostProcess | Sanity |
+| fetchSanityPostProcess | Sanity |
+| fetchByRailContentIds | Sanity |
+| fetchByRailContentIds_Order | Sanity |
+| fetchUpcomingNewReleases | Sanity |
+| fetchLessonContent | Sanity |
+| fetchAllSongsInProgress | Sanity |
+| fetchNewReleases | Sanity |
+| fetchAllWorkouts | Sanity |
+| fetchAllInstructorField | Sanity |
+| fetchAllInstructors | Sanity |
+| fetchAll-CustomFields | Sanity |
+| fetchRelatedLessons | Sanity |
+| fetchRelatedLessons-quick-tips | Sanity |
+| fetchRelatedLessons-in-rhythm | Sanity |
+| getSortOrder | Sanity (describe block requires live auth) |
+| fetchAll-WithProgress | Sanity |
+| fetchAllFilterOptions-WithProgress | Sanity |
+| fetchAll-IncludedFields | Sanity |
+| fetchAll-IncludedFields-rudiment-multiple-gear | Sanity |
+| fetchByReference | Sanity |
+| fetchScheduledReleases | Sanity |
+| fetchAll-GroupBy-Artists | Sanity |
+| fetchAll-GroupBy-Instructors | Sanity |
+| fetchMetadata | Sanity |
+| fetchMetadata-Coach-Lessons | Sanity |
+| invalidContentType | Sanity (describe block requires live auth) |
+| metaDataForLessons | Sanity |
+| metaDataForSongs | Sanity |
+| fetchAllFilterOptionsLessons | Sanity |
+| fetchAllFilterOptionsSongs | Sanity |
+| fetchLiveEvent | Sanity |
+| fetchRelatedLessons-pack-bundle-lessons | Sanity |
+| fetchRelatedLessons-course-parts | Sanity |
+| fetchRelatedLessons-song-tutorial-children | Sanity |
+| fetchMetadata (second) | Sanity |
+
+### `test/content.test.js` — Sanity CMS + Railcontent API
+
+| Test | Dependency |
+|---|---|
+| getTabResults-Singles | Sanity + Railcontent |
+| getTabResults-Courses | Sanity + Railcontent |
+| getTabResults-Type-Explore-All | Sanity + Railcontent |
+
+### `test/user/permissions.test.js` — Railcontent API
+
+| Test | Dependency |
+|---|---|
+| fetchUserPermissions | Railcontent `fetchUserPermissionsData` |
+
+---
+
+## Category 2: Previously Skipped — Failing or Unknown State
+
+These were already skipped before CI work. Status is noted where confirmed.
+
+### `test/sanityQueryService.test.js`
+
+| Test | Status | Failure Reason |
+|---|---|---|
+| fetchSongArtistCount | Unknown | — |
+| fetchUpcomingEvents | Unknown | — |
+| fetchLessonContent-PlayAlong-containts-array-of-videos | Unknown | — |
+| fetchAllSortField | Unknown | — |
+| fetchRelatedLessons-child | Unknown | — |
+| fetchPackAll | Unknown | — |
+| fetchAllPacks | Unknown | — |
+| fetchAll-IncludedFields-multiple | Unknown | — |
+| fetchAll-IncludedFields-playalong-multiple | Unknown | — |
+| fetchAll-IncludedFields-coaches-multiple-focus | Unknown | — |
+| fetchAll-IncludedFields-songs-multiple-instrumentless | Unknown | — |
+| fetchAll-GroupBy-Genre | Unknown | — |
+| fetchShowsData | Unknown | — |
+| fetchShowsData-OddTimes | Unknown | — |
+| fetchTopLevelParentId | Unknown | — |
+| fetchHierarchy | Unknown | — |
+| fetchTopLeveldrafts | Failing | Timeout (>5s) |
+| fetchCommentData | Failing | `null.forEach` — Sanity returns null for content IDs |
+| baseConstructor | Unknown | — |
+| withOnlyFilterAvailableStatuses | Unknown | — |
+| withContentStatusAndFutureScheduledContent | Unknown | — |
+| withUserPermissions | Unknown | — |
+| withUserPermissionsForPlusUser | Unknown | — |
+| withPermissionBypass | Unknown | — |
+| withPublishOnRestrictions | Unknown | — |
+| fetchAllFilterOptions | Unknown | — |
+| fetchAllFilterOptions-Rudiment | Unknown | — |
+| fetchAllFilterOptions-PlayAlong | Unknown | — |
+| fetchAllFilterOptions-Coaches | Unknown | — |
+| fetchAllFilterOptions-filter-selected | Failing | `null.meta` — API returns null for filter combination |
+| customBrandTypeExists | Unknown | — |
+| withCommon | Unknown | — |
+| fetchOtherSongVersions | Failing | 0 results — content is drafted/admin-only |
+| fetchLessonsFeaturingThisContent | Failing | 0 results — content is drafted/admin-only |
+| getRecommendedForYou | Failing | `SyncError: Intended user ID does not match` |
+| getRecommendedForYou-SeeAll | Failing | `SyncError: Intended user ID does not match` |
+
+### `test/content.test.js`
+
+| Test | Status | Failure Reason |
+|---|---|---|
+| getTabResults-Filters | Failing | Timeout (>5s) |
+| getTabResults-Type-Filter | Failing | `TypeError: null.entity` — Sanity returns null |
+| getContentRows | Unknown |Sanity & pw-recommender  |
+| getNewAndUpcoming | Failing | Timeout (>5s) |
+| getScheduleContentRows | Failing | Timeout (>5s) |
+| getSpecificScheduleContentRow | Failing | Timeout (>5s) |
+
+### `test/contentProgress.test.js`
+
+| Test | Status | Failure Reason |
+|---|---|---|
+| get-Songs-Tutorials | Unknown | Live Sanity call |
+| get-Songs-Transcriptions | Unknown | Live Sanity call |
+| get-Songs-Play-Alongs | Unknown | Live Sanity call |
+
+### `test/progressRows.test.js`
+
+| Test | Status | Failure Reason |
+|---|---|---|
+| check progress rows logic | Failing | Stale mock data — not a live API issue; mock data no longer reflects current data shape |
+
+### `test/learningPaths.test.js`
+
+| Test | Status | Failure Reason |
+|---|---|---|
+| learningPathCompletion | Unknown | Uses `initializeTestService(true)` — live API |

package/test/initializeTests.js

@@ -1,7 +1,7 @@
 import { globalConfig, initializeService } from '../src'
 import { LocalStorageMock } from './localStorageMock'
-import { initializeSyncManager } from './sync/initialize-sync-manager'
 const railContentModule = require('../src/services/railcontent.js')
+const awardDefsModule = require('../src/services/awards/internal/award-definitions.js')
 let token = null
 let userId = process.env.RAILCONTENT_USER_ID ?? null
 
@@ -51,11 +51,10 @@ export async function initializeTestService(useLive = false, isAdmin = false) {
     localStorage: new LocalStorageMock(),
     isMA: true,
   }
+  jest.spyOn(awardDefsModule.awardDefinitions, 'initialize').mockResolvedValue()
   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/{content.test.js → integration/content.test.js}

@@ -1,35 +1,19 @@
-import { initializeTestService } from './initializeTests.js'
-import {getContentRows, getNewAndUpcoming, getScheduleContentRows, getTabResults} from '../src/services/content.js'
+import { initializeTestService } from '../initializeTests.js'
+import {getContentRows, getNewAndUpcoming, getScheduleContentRows, getTabResults} from '../../src/index.js'
 
 // Mock fetchContentProgress before other modules load
-jest.mock('../src/services/railcontent.js', () => ({
-  ...jest.requireActual('../src/services/railcontent.js'),
+jest.mock('../../src/services/railcontent.js', () => ({
+  ...jest.requireActual('../../src/services/railcontent.js'),
   fetchContentProgress: jest.fn().mockResolvedValue({ version: 1, data: {} })
 }))
 
-const railContentModule = require('../src/services/railcontent.js')
+const railContentModule = require('../../src/services/railcontent.js')
 
 describe('content', function () {
-  beforeEach(() => {
-    initializeTestService()
+  beforeAll(async () => {
+    await initializeTestService(true)
   })
 
-//   test('getLessonContentRows', async () => {
-//     const results = await getLessonContentRows()
-//     console.log(results)
-//   })
-
-//   test('getTabResults-For-You', async () => {
-//     const results = await getTabResults('drumeo','lessons','For You')
-//     console.log(results)
-//     expect(results.type).toBeDefined()
-//     expect(results.type).toBe('sections')
-//     expect(results.data).toBeDefined()
-//     expect(results.meta).toBeDefined()
-//     expect(results.meta.filters).toBeDefined()
-//     expect(results.meta.sort).toBeDefined()
-//   })
-
   test('getTabResults-Singles', async () => {
     const results = await getTabResults('drumeo','lessons','Individuals', {selectedFilters:['difficulty,All','difficulty,Beginner'], sort:'-published_on'})
     console.log(results)

package/test/integration/contentProgress.test.js

@@ -0,0 +1,73 @@
+import { initializeTestService } from '../initializeTests.js'
+import {getTabResults} from '../../src/index.js';
+import {tutorialsLessonTypes, transcriptionsLessonTypes, playAlongLessonTypes} from "../../src/contentTypeConfig.js";
+
+let mockProgressRecords = []
+
+jest.mock('../../src/services/sync/repository-proxy.ts', () => {
+  const mockFns = {
+    contentProgress: {
+      getOneProgressByContentId: jest.fn().mockImplementation((contentId) => {
+        const record = mockProgressRecords.find(r => r.content_id === contentId)
+        return Promise.resolve({ data: record || null })
+      }),
+      getSomeProgressByContentIds: jest.fn().mockImplementation((contentIds) => {
+        const records = mockProgressRecords.filter(r => contentIds.includes(r.content_id))
+        return Promise.resolve({ data: records })
+      }),
+      started: jest.fn().mockImplementation((limit, opts) => {
+        const startedIds = mockProgressRecords
+          .filter(r => r.state === 'started')
+          .sort((a, b) => b.updated_at - a.updated_at)
+          .map(r => r.content_id)
+        const result = limit ? startedIds.slice(0, limit) : startedIds
+        return Promise.resolve(opts?.onlyIds !== false ? result : result.map(id => ({ content_id: id })))
+      }),
+      startedOrCompleted: jest.fn().mockImplementation(() => {
+        const records = mockProgressRecords
+          .filter(r => r.state === 'started' || r.state === 'completed')
+          .sort((a, b) => b.updated_at - a.updated_at)
+        return Promise.resolve({ data: records })
+      }),
+    },
+    practices: {
+      queryAll: jest.fn().mockResolvedValue({ data: [] }),
+      getAll: jest.fn().mockResolvedValue({ data: [] }),
+    },
+  }
+  return { default: mockFns, ...mockFns }
+})
+
+describe('contentProgressDataContext', function () {
+  beforeEach(() => {
+    initializeTestService()
+    mockProgressRecords = [
+      { content_id: 234191, state: 'started',   progress_percent: 6,   updated_at: 1731108082, last_interacted_a_la_carte: 1731108082 },
+      { content_id: 233955, state: 'started',   progress_percent: 1,   updated_at: 1731108083 },
+      { content_id: 259426, state: 'completed', progress_percent: 100, updated_at: 1731108085 },
+      { content_id: 190417, state: 'started',   progress_percent: 6,   updated_at: 1731108082 },
+      { content_id: 407665, state: 'started',   progress_percent: 6,   updated_at: 1740120139 },
+      { content_id: 412986, state: 'completed', progress_percent: 100, updated_at: 1731108085 },
+    ]
+  })
+
+  test.skip('get-Songs-Tutorials', async () => {
+    const result = await getTabResults('pianote', 'songs', 'Tutorials')
+    expect(result.type).toStrictEqual('catalog')
+    expect(result.data).toBeDefined()
+    expect(tutorialsLessonTypes).toContain(result.data[0].type)
+  })
+
+  test.skip('get-Songs-Transcriptions', async () => {
+    const result = await getTabResults('pianote', 'songs', 'Transcriptions')
+    expect(result.type).toStrictEqual('catalog')
+    expect(result.data).toBeDefined()
+    expect(transcriptionsLessonTypes).toContain(result.data[0].type)
+  })
+
+  test.skip('get-Songs-Play-Alongs', async () => {
+    const result = await getTabResults('drumeo', 'songs', 'Play-Alongs', { selectedFilters: ['difficulty,Expert'] })
+    expect(playAlongLessonTypes).toContain(result.data[0].type)
+    expect(result.data[0].difficulty_string).toStrictEqual('Expert')
+  })
+})

package/test/{forum.test.js → integration/forum.test.js}

@@ -1,6 +1,5 @@
-import { initializeTestService } from './initializeTests.js'
-import { getLessonContentRows, getTabResults } from '../src/services/content.js'
-import {getActiveDiscussions} from "../src/services/forums/forums";
+import { initializeTestService } from '../initializeTests.js'
+import {getActiveDiscussions} from "../../src/services/forums/forums.ts";
 
 describe('forum', function () {
   beforeEach(() => {
@@ -14,5 +13,4 @@ describe('forum', function () {
     expect(results.meta).toBeDefined()
   })
 
-
 })