musora-content-services 2.155.7 → 2.155.9

package/.agent/decisions/2026-04-21-tma-239-mcs-sanity-add-a-v2-query-para.md

@@ -0,0 +1,26 @@
+---
+date: 2026-04-21
+pr: railroadmedia/musora-content-services#933
+branch: TMA-239-mcs-sanity-add-a-v2-query-parameter-to-all-sanity-
+status: open
+tags: [[jira]], [[bug-fix]], [[sanity]], [[cache]]
+components: [[fetchSanity]]
+---
+
+# Add v=2 query parameter to all Sanity requests to force cache refresh
+
+## Context
+All Sanity API requests from musora-content-services were being served with cached responses. Adding a `v=2` query parameter forces a cache refresh, ensuring clients receive up-to-date content.
+
+## Decision
+Appended `&v=2` to the `baseUrl` string inside `fetchSanity()` in `src/services/sanity.js`. This is the single location where all Sanity request URLs are constructed, so one targeted change covers every request made through the library.
+
+## Alternatives Considered
+- Adding the parameter per call-site: There are dozens of call sites and they all funnel through `fetchSanity`, so modifying the base URL there is cleaner and less error-prone.
+- Making it configurable via `sanityConfig`: The ticket does not ask for configurability — it asks for the parameter to be added to all requests unconditionally.
+
+## Process Notes
+The `fetchSanity` function at line 1477 of `src/services/sanity.js` is the sole entry point for all Sanity API calls. It builds `baseUrl` on line 1488 and then appends `&query=...` for GET requests or uses it as the POST URL. Appending `&v=2` to `baseUrl` ensures the parameter is present in both cases.
+
+## Consequences
+All future Sanity requests from this library will include `v=2`, bypassing any CDN or server-side cache and ensuring fresh content is returned.

package/.github/workflows/automated-testing.yml

@@ -19,6 +19,9 @@ jobs:
       - name: Run unit tests
         run: npm test -- --coverage
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v4
+        uses: codecov/codecov-action@v5
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
+          slug: railroadmedia/musora-content-services
+          flags: unit
+          fail_ci_if_error: true

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.155.9](https://github.com/railroadmedia/musora-content-services/compare/v2.155.8...v2.155.9) (2026-04-28)
+
+### [2.155.8](https://github.com/railroadmedia/musora-content-services/compare/v2.155.7...v2.155.8) (2026-04-28)
+
+
+### Bug Fixes
+
+* revert activity timestamp changes ([#942](https://github.com/railroadmedia/musora-content-services/issues/942)) ([bd9f97d](https://github.com/railroadmedia/musora-content-services/commit/bd9f97d6547409b7f2856bf716c90d6723306c36))
+* **TMA-239:** MCS - Sanity - Add a v=2 query parameter to all sanity requests to force a cache refresh ([#933](https://github.com/railroadmedia/musora-content-services/issues/933)) ([eac5a2c](https://github.com/railroadmedia/musora-content-services/commit/eac5a2c6848aee80c462ba0ccbeba52a92652fa9))
+
 ### [2.155.7](https://github.com/railroadmedia/musora-content-services/compare/v2.155.6...v2.155.7) (2026-04-23)
 
 

package/codecov.yml

@@ -1,5 +1,11 @@
-# codecov.yml
 comment:
   layout: "reach,diff,flags,tree"
   behavior: default
   require_changes: false
+
+coverage:
+  status:
+    patch:
+      default:
+        target: 70%
+        threshold: 0%

package/package.json

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

package/src/services/offline/activities.ts

@@ -14,13 +14,16 @@ interface Activity {
 
 /**
  * @param offlineTimestamp - Minimum `updated_at` epoch ms to include
+ * @param page
+ * @param limit
+ * @param tabName
  * @param options.page - Page number (default 1)
  * @param options.limit - Results per page (default 5)
  * @param options.tabName - Restrict to `'lessons'`, `'songs'`, or both when `null`
- * @returns `{ currentPage, totalPages, data }` where `data` is a page of `Activity` records
+ * @returns {Promise<{currentPage: number, totalPages: number, data: Activity[]}>}
  */
 export async function getRecentActivityOffline(
-  _offlineTimestamp: number,
+  offlineTimestamp: number,
   {
     page = 1,
     limit = 5,
@@ -34,7 +37,7 @@ export async function getRecentActivityOffline(
   // because setting up watermelon user activities table is extremely complicated.
   // Note: this implementation does not persist "activities" beyond when the corresponding record is deleted. That's ok right now.
 
-  const clauses = getClauses(tabName)
+  const clauses = getClauses(offlineTimestamp, tabName)
 
   const query = await db.contentProgress.queryAll(...clauses)
   const progress = query.data
@@ -54,8 +57,9 @@ export async function getRecentActivityOffline(
   }
 }
 
-function getClauses(tabName: string|null) {
+function getClauses(offlineTimestamp: number, tabName: string|null) {
   let clauses: Q.Clause[] = [
+    Q.where('updated_at', Q.gte(offlineTimestamp)),
     Q.sortBy('created_at', 'desc'),
   ]
 

package/src/services/offline/practices.ts

@@ -6,12 +6,13 @@ import { calculateLongestStreaks } from '../userActivity.js'
 
 /**
  * @param offlineTimestamp - Minimum `updated_at` epoch ms to include
+ * @param day
  * @param options.day - Date in YYYY-MM-DD format, defaults to today
- * @returns `{ data: { practices, practiceDuration } }` where `practiceDuration` is total seconds
+ * @returns {Promise<{data: {practices: object[], practiceDuration: number}}>}
  */
 export async function getPracticeSessionsOffline(
-  offlineTimestamp: number,
-  { day = dayjs().format('YYYY-MM-DD') }: { day?: string } = {}
+  offlineTimestamp: number, {
+    day = dayjs().format('YYYY-MM-DD') }: { day?: string } = {}
 ) {
 
   const query = await db.practices.queryAll(

package/src/services/sanity.js

@@ -1296,8 +1296,8 @@ export async function fetchTopLevelParentId(railcontentId) {
  * Ignores learning-path-v2 parents.
  * ex: if railcontentId is of type 'skill-pack-lesson', return the corresponding 'skill-pack' railcontent_id
  *
- * @param {int[]} railcontentId
- * @returns {Promise<Record<[railcontentId: int],[topLevelParentId: int]>|null>}
+ * @param {int[]} railcontentIds
+ * @returns {Promise<Object.<number, object>|null>}
  */
 async function fetchTopLevelParentIds(railcontentIds) {
   const idsString = railcontentIds.join(',')
@@ -1460,7 +1460,7 @@ async function fetchALaCarteHierarchyData(railcontentId) {
 /**
  * returns a map of railcontentId to hierarchy data.
  * @param {int[]} railcontentIds
- * @returns {Promise<Record<[topLevelParentId: int],object>|null>}
+ * @returns {Promise<Object.<number, object>|null>}
  */
 async function fetchALaCarteHierarchyDataForIds(railcontentIds) {
   const topLevelIds = await fetchTopLevelParentIds(railcontentIds)
@@ -1567,7 +1567,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}?perspective=${perspective}`
+  const baseUrl = `https://sanity.musora.com/${globalConfig.sanityConfig.projectId}/${api}/v${globalConfig.sanityConfig.version}/${globalConfig.sanityConfig.dataset}?perspective=${perspective}&v=2`
 
   try {
     const encodedQuery = encodeURIComponent(query)

package/test/unit/{HttpClient.test.js → HttpClient.test.ts}

@@ -1,11 +1,9 @@
-import { HttpClient } from '../../src/infrastructure/http/HttpClient.ts'
-import { HeaderProvider } from '../../src/infrastructure/http/interfaces/HeaderProvider.ts'
-import { RequestExecutor } from '../../src/infrastructure/http/interfaces/RequestExecutor.ts'
+import { HeaderProvider, HttpClient, RequestExecutor } from '../../src/infrastructure/http'
 
 describe('HttpClient', () => {
-  let httpClient
-  let mockHeaderProvider
-  let mockRequestExecutor
+  let httpClient: HttpClient
+  let mockHeaderProvider: jest.Mocked<HeaderProvider>
+  let mockRequestExecutor: jest.Mocked<RequestExecutor>
   const baseUrl = 'https://api.example.com'
   const token = 'test-token'
   const headers = { 'Content-Type': 'application/json', Accept: 'application/json' }
@@ -190,23 +188,21 @@ describe('HttpClient', () => {
     })
 
     test('should not add Data-Version header when not provided', async () => {
-      // Log what's happening for debugging
-      console.log('Starting test: should not add Data-Version header when not provided')
 
       const url = '/test'
 
       // Make sure we're using exact null here, not undefined
-      const dataVersion = null
+      const dataVersion: string | null = null
 
       // Create separate mocks for this test to avoid state bleeding
-      const testHeaderProvider = {
+      const testHeaderProvider: jest.Mocked<HeaderProvider> = {
         getHeaders: jest.fn().mockReturnValue({
           'Content-Type': 'application/json',
           Accept: 'application/json',
         }),
       }
 
-      const testRequestExecutor = {
+      const testRequestExecutor: jest.Mocked<RequestExecutor> = {
         execute: jest.fn().mockResolvedValue(responseData),
       }
 
@@ -215,8 +211,6 @@ describe('HttpClient', () => {
 
       await testClient.get(url, { dataVersion })
 
-      console.log('Headers used in request:', testRequestExecutor.execute.mock.calls[0][1].headers)
-
       // Direct check on the mock to validate Data-Version absence
       const actualHeaders = testRequestExecutor.execute.mock.calls[0][1].headers
       const hasDataVersion = Object.prototype.hasOwnProperty.call(actualHeaders, 'Data-Version')

package/test/unit/awards/{award-alacarte-observer.test.js → award-alacarte-observer.test.ts}

@@ -1,9 +1,9 @@
 import { contentProgressObserver } from '../../../src/services/awards/internal/content-progress-observer.js'
 import { awardEvents } from '../../../src/services/awards/internal/award-events.js'
 import { mockAwardDefinitions, getAwardByContentId } from '../../mockData/award-definitions.js'
-import { setupDefaultMocks, setupAwardEventListeners } from './helpers/index.js'
-import { mockCompletionStates, mockAllCompleted } from './helpers/completion-mock.js'
-import { COLLECTION_TYPE, emitAlaCarteProgress, emitProgress, waitForDebounce } from './helpers/progress-emitter.js'
+import { setupDefaultMocks, setupAwardEventListeners } from './helpers/index'
+import { mockCompletionStates, mockAllCompleted } from './helpers/completion-mock'
+import { COLLECTION_TYPE, emitAlaCarteProgress, emitProgress, waitForDebounce } from './helpers/progress-emitter'
 
 jest.mock('../../../src/services/sanity.js', () => ({
   ...jest.requireActual('../../../src/services/sanity'),
@@ -32,9 +32,11 @@ jest.mock('../../../src/services/sync/repository-proxy.ts', () => {
 })
 
 import sanityClient, { fetchSanity } from '../../../src/services/sanity.js'
-import db from '../../../src/services/sync/repository-proxy.ts'
+import db from '../../../src/services/sync/repository-proxy'
 import { awardDefinitions } from '../../../src/services/awards/internal/award-definitions.js'
 
+const mockDb = db as jest.MockedObjectDeep<typeof db>
+
 describe('Award Observer - A La Carte Progress (null collection)', () => {
   let listeners
 
@@ -43,7 +45,7 @@ describe('Award Observer - A La Carte Progress (null collection)', () => {
     awardEvents.removeAllListeners()
 
     sanityClient.fetch = jest.fn().mockResolvedValue(mockAwardDefinitions)
-    setupDefaultMocks(db, fetchSanity)
+    setupDefaultMocks(mockDb, fetchSanity)
 
     await awardDefinitions.refresh()
 
@@ -71,7 +73,7 @@ describe('Award Observer - A La Carte Progress (null collection)', () => {
     })
 
     test('emits awardProgress for partial completion with null collection', async () => {
-      mockCompletionStates(db, [417045])
+      mockCompletionStates(mockDb, [417045])
 
       emitAlaCarteProgress(417045)
       await waitForDebounce()
@@ -114,18 +116,18 @@ describe('Award Observer - A La Carte Progress (null collection)', () => {
     test('finds all awards containing the child content id', async () => {
       const sharedChildId = 418003
 
-      mockAllCompleted(db)
+      mockAllCompleted(mockDb)
 
       emitAlaCarteProgress(sharedChildId)
       await waitForDebounce()
 
-      expect(db.userAwardProgress.recordAwardProgress).toHaveBeenCalled()
+      expect(mockDb.userAwardProgress.recordAwardProgress).toHaveBeenCalled()
     })
   })
 
   describe('A la carte debouncing', () => {
     beforeEach(() => {
-      mockCompletionStates(db, [])
+      mockCompletionStates(mockDb, [])
     })
 
     test('debounces multiple rapid a la carte updates', async () => {
@@ -135,7 +137,7 @@ describe('Award Observer - A La Carte Progress (null collection)', () => {
 
       await waitForDebounce()
 
-      expect(db.userAwardProgress.recordAwardProgress).toHaveBeenCalledTimes(1)
+      expect(mockDb.userAwardProgress.recordAwardProgress).toHaveBeenCalledTimes(1)
     })
   })
 
@@ -151,7 +153,7 @@ describe('Award Observer - A La Carte Progress (null collection)', () => {
 
   describe('A la carte already completed award', () => {
     beforeEach(() => {
-      db.userAwardProgress.hasCompletedAward.mockResolvedValue(true)
+      mockDb.userAwardProgress.hasCompletedAward.mockResolvedValue(true)
     })
 
     test('does not re-grant already completed award', async () => {

package/test/unit/awards/{award-certificate-display.test.js → award-certificate-display.test.ts}

@@ -25,7 +25,8 @@ jest.mock('../../../src/services/sync/repository-proxy.ts', () => {
 
 import sanityClient, { fetchSanity } from '../../../src/services/sanity.js'
 import { getUserData } from '../../../src/services/user/management.js'
-import db from '../../../src/services/sync/repository-proxy.ts'
+import db_ from '../../../src/services/sync/repository-proxy'
+const db = db_ as any
 import { awardDefinitions } from '../../../src/services/awards/internal/award-definitions.js'
 
 describe('Award Certificate Display - E2E Scenarios', () => {

package/test/unit/awards/{award-collection-edge-cases.test.js → award-collection-edge-cases.test.ts}

@@ -1,8 +1,8 @@
 import { contentProgressObserver } from '../../../src/services/awards/internal/content-progress-observer.js'
 import { awardEvents } from '../../../src/services/awards/internal/award-events.js'
 import { mockAwardDefinitions } from '../../mockData/award-definitions.js'
-import { setupDefaultMocks, setupAwardEventListeners } from './helpers/index.js'
-import { COLLECTION_TYPE, emitProgress, waitForDebounce } from './helpers/progress-emitter.js'
+import { setupDefaultMocks, setupAwardEventListeners } from './helpers/index'
+import { COLLECTION_TYPE, emitProgress, waitForDebounce } from './helpers/progress-emitter'
 
 jest.mock('../../../src/services/sanity.js', () => ({
   ...jest.requireActual('../../../src/services/sanity'),
@@ -31,7 +31,8 @@ jest.mock('../../../src/services/sync/repository-proxy.ts', () => {
 })
 
 import sanityClient, { fetchSanity } from '../../../src/services/sanity.js'
-import db from '../../../src/services/sync/repository-proxy.ts'
+import db_ from '../../../src/services/sync/repository-proxy'
+const db = db_ as any
 import { awardDefinitions } from '../../../src/services/awards/internal/award-definitions.js'
 
 describe('Award Collection Filtering - Edge Cases', () => {

package/test/unit/awards/{award-collection-filtering.test.js → award-collection-filtering.test.ts}

@@ -1,8 +1,8 @@
 import { contentProgressObserver } from '../../../src/services/awards/internal/content-progress-observer.js'
 import { awardEvents } from '../../../src/services/awards/internal/award-events.js'
 import { mockAwardDefinitions } from '../../mockData/award-definitions.js'
-import { setupDefaultMocks, setupAwardEventListeners } from './helpers/index.js'
-import { COLLECTION_TYPE, emitProgress, waitForDebounce } from './helpers/progress-emitter.js'
+import { setupDefaultMocks, setupAwardEventListeners } from './helpers/index'
+import { COLLECTION_TYPE, emitProgress, waitForDebounce } from './helpers/progress-emitter'
 
 jest.mock('../../../src/services/sanity.js', () => ({
   ...jest.requireActual('../../../src/services/sanity'),
@@ -31,7 +31,8 @@ jest.mock('../../../src/services/sync/repository-proxy.ts', () => {
 })
 
 import sanityClient, { fetchSanity } from '../../../src/services/sanity.js'
-import db from '../../../src/services/sync/repository-proxy.ts'
+import db_ from '../../../src/services/sync/repository-proxy'
+const db = db_ as any
 import { awardDefinitions } from '../../../src/services/awards/internal/award-definitions.js'
 
 describe('Award Collection Filtering', () => {

package/test/unit/awards/{award-completion-flow.test.js → award-completion-flow.test.ts}

@@ -1,8 +1,8 @@
 import { awardManager } from '../../../src/services/awards/internal/award-manager.js'
 import { awardEvents } from '../../../src/services/awards/internal/award-events.js'
 import { mockAwardDefinitions, getAwardByContentId } from '../../mockData/award-definitions.js'
-import { setupDefaultMocks, setupAwardEventListeners } from './helpers/index.js'
-import { mockCompletionStates, mockAllCompleted } from './helpers/completion-mock.js'
+import { setupDefaultMocks, setupAwardEventListeners } from './helpers/index'
+import { mockCompletionStates, mockAllCompleted } from './helpers/completion-mock'
 
 jest.mock('../../../src/services/sanity.js', () => ({
   ...jest.requireActual('../../../src/services/sanity'),
@@ -31,7 +31,8 @@ jest.mock('../../../src/services/sync/repository-proxy.ts', () => {
 })
 
 import sanityClient, { fetchSanity } from '../../../src/services/sanity.js'
-import db from '../../../src/services/sync/repository-proxy.ts'
+import db_ from '../../../src/services/sync/repository-proxy'
+const db = db_ as any
 import { awardDefinitions } from '../../../src/services/awards/internal/award-definitions.js'
 
 describe('Award Completion Flow - E2E Scenarios', () => {

package/test/unit/awards/{award-exclusion-handling.test.js → award-exclusion-handling.test.ts}

@@ -3,8 +3,8 @@ import { awardEvents } from '../../../src/services/awards/internal/award-events.
 import { mockAwardDefinitions, getAwardByContentId } from '../../mockData/award-definitions.js'
 import { globalConfig } from '../../../src/services/config.js'
 import { LocalStorageMock } from '../../localStorageMock.js'
-import { setupDefaultMocks, setupAwardEventListeners } from './helpers/index.js'
-import { mockCompletionStates, mockAllCompleted, mockNoneCompleted } from './helpers/completion-mock.js'
+import { setupDefaultMocks, setupAwardEventListeners } from './helpers/index'
+import { mockCompletionStates, mockAllCompleted, mockNoneCompleted } from './helpers/completion-mock'
 
 jest.mock('../../../src/services/sanity.js', () => ({
   ...jest.requireActual('../../../src/services/sanity'),
@@ -39,7 +39,8 @@ jest.mock('../../../src/services/sync/repository-proxy.ts', () => {
 })
 
 import sanityClient, { fetchSanity } from '../../../src/services/sanity.js'
-import db from '../../../src/services/sync/repository-proxy.ts'
+import db_ from '../../../src/services/sync/repository-proxy'
+const db = db_ as any
 import { awardDefinitions } from '../../../src/services/awards/internal/award-definitions.js'
 
 describe('Award Content Exclusion Handling - E2E Scenarios', () => {

package/test/unit/awards/{award-multi-lesson.test.js → award-multi-lesson.test.ts}

@@ -1,8 +1,8 @@
 import { awardManager } from '../../../src/services/awards/internal/award-manager.js'
 import { awardEvents } from '../../../src/services/awards/internal/award-events.js'
 import { mockAwardDefinitions, getAwardByContentId } from '../../mockData/award-definitions.js'
-import { setupDefaultMocks, setupAwardEventListeners } from './helpers/index.js'
-import { mockCompletionStates, mockAllCompleted, mockNoneCompleted } from './helpers/completion-mock.js'
+import { setupDefaultMocks, setupAwardEventListeners } from './helpers/index'
+import { mockCompletionStates, mockAllCompleted, mockNoneCompleted } from './helpers/completion-mock'
 
 jest.mock('../../../src/services/sanity.js', () => ({
   ...jest.requireActual('../../../src/services/sanity'),
@@ -31,7 +31,8 @@ jest.mock('../../../src/services/sync/repository-proxy.ts', () => {
 })
 
 import sanityClient, { fetchSanity } from '../../../src/services/sanity.js'
-import db from '../../../src/services/sync/repository-proxy.ts'
+import db_ from '../../../src/services/sync/repository-proxy'
+const db = db_ as any
 import { awardDefinitions } from '../../../src/services/awards/internal/award-definitions.js'
 
 describe('Award Progress Calculation', () => {

package/test/unit/awards/{award-observer-integration.test.js → award-observer-integration.test.ts}

@@ -2,9 +2,9 @@ import { contentProgressObserver } from '../../../src/services/awards/internal/c
 import { awardEvents } from '../../../src/services/awards/internal/award-events.js'
 import { emitProgressSaved } from '../../../src/services/progress-events.js'
 import { mockAwardDefinitions, getAwardByContentId } from '../../mockData/award-definitions.js'
-import { setupDefaultMocks, setupAwardEventListeners } from './helpers/index.js'
-import { mockCompletionStates } from './helpers/completion-mock.js'
-import { COLLECTION_TYPE, waitForDebounce } from './helpers/progress-emitter.js'
+import { setupDefaultMocks, setupAwardEventListeners } from './helpers/index'
+import { mockCompletionStates } from './helpers/completion-mock'
+import { COLLECTION_TYPE, waitForDebounce } from './helpers/progress-emitter'
 
 jest.mock('../../../src/services/sanity.js', () => ({
   ...jest.requireActual('../../../src/services/sanity'),
@@ -33,7 +33,8 @@ jest.mock('../../../src/services/sync/repository-proxy.ts', () => {
 })
 
 import sanityClient, { fetchSanity } from '../../../src/services/sanity.js'
-import db from '../../../src/services/sync/repository-proxy.ts'
+import db_ from '../../../src/services/sync/repository-proxy'
+const db = db_ as any
 import { awardDefinitions } from '../../../src/services/awards/internal/award-definitions.js'
 
 describe('Award Observer Integration - E2E Scenarios', () => {

package/test/unit/awards/{award-query-messages.test.js → award-query-messages.test.ts}

@@ -21,7 +21,8 @@ jest.mock('../../../src/services/sync/repository-proxy.ts', () => {
 })
 
 import sanityClient, { fetchSanity } from '../../../src/services/sanity.js'
-import db from '../../../src/services/sync/repository-proxy.ts'
+import db_ from '../../../src/services/sync/repository-proxy'
+const db = db_ as any
 import { awardDefinitions } from '../../../src/services/awards/internal/award-definitions.js'
 import { getCompletedAwards, getContentAwards, getInProgressAwards } from '../../../src/services/awards/award-query.js'
 

package/test/unit/awards/{award-user-collection.test.js → award-user-collection.test.ts}

@@ -20,7 +20,8 @@ jest.mock('../../../src/services/sync/repository-proxy.ts', () => {
 })
 
 import sanityClient, { fetchSanity } from '../../../src/services/sanity.js'
-import db from '../../../src/services/sync/repository-proxy.ts'
+import db_ from '../../../src/services/sync/repository-proxy'
+const db = db_ as any
 import { awardDefinitions } from '../../../src/services/awards/internal/award-definitions.js'
 import { getCompletedAwards, getInProgressAwards, getAwardStatistics } from '../../../src/services/awards/award-query.js'
 

package/test/unit/awards/{duplicate-prevention.test.js → duplicate-prevention.test.ts}

@@ -1,7 +1,7 @@
 import { mockAwardDefinitions, getAwardByContentId } from '../../mockData/award-definitions.js'
-import { setupDefaultMocks, setupAwardEventListeners } from './helpers/index.js'
-import { COLLECTION_TYPE, emitLearningPathProgress, emitAlaCarteProgress, waitForDebounce } from './helpers/progress-emitter.js'
-import { mockCollectionAwareCompletion } from './helpers/completion-mock.js'
+import { setupDefaultMocks, setupAwardEventListeners } from './helpers/index'
+import { COLLECTION_TYPE, emitLearningPathProgress, emitAlaCarteProgress, waitForDebounce } from './helpers/progress-emitter'
+import { mockCollectionAwareCompletion } from './helpers/completion-mock'
 
 jest.mock('../../../src/services/sanity.js', () => ({
   ...jest.requireActual('../../../src/services/sanity'),
@@ -30,7 +30,8 @@ jest.mock('../../../src/services/sync/repository-proxy.ts', () => {
 })
 
 import sanityClient, { fetchSanity } from '../../../src/services/sanity.js'
-import db from '../../../src/services/sync/repository-proxy.ts'
+import db_ from '../../../src/services/sync/repository-proxy'
+const db = db_ as any
 import { awardDefinitions } from '../../../src/services/awards/internal/award-definitions.js'
 import { awardEvents } from '../../../src/services/awards/internal/award-events.js'
 import { contentProgressObserver } from '../../../src/services/awards/internal/content-progress-observer.js'

package/test/unit/awards/helpers/{completion-mock.js → completion-mock.ts}

@@ -1,5 +1,7 @@
-export const mockCompletionStates = (db, completedIds = [], collection = null) => {
-  db.contentProgress.getSomeProgressByContentIds.mockImplementation((contentIds, requestedCollection) => {
+type Collection = { type: string; id: number } | null
+
+export const mockCompletionStates = (db: any, completedIds: number[] = [], collection: Collection = null) => {
+  db.contentProgress.getSomeProgressByContentIds.mockImplementation((contentIds: number[], requestedCollection: Collection) => {
     const collectionMatches = !collection || (
       requestedCollection?.type === collection.type &&
       requestedCollection?.id === collection.id
@@ -17,8 +19,8 @@ export const mockCompletionStates = (db, completedIds = [], collection = null) =
   })
 }
 
-export const mockAllCompleted = (db) => {
-  db.contentProgress.getSomeProgressByContentIds.mockImplementation((contentIds) => {
+export const mockAllCompleted = (db: any) => {
+  db.contentProgress.getSomeProgressByContentIds.mockImplementation((contentIds: number[]) => {
     const completedRecords = contentIds.map(id => ({
       content_id: id,
       state: 'completed',
@@ -29,12 +31,12 @@ export const mockAllCompleted = (db) => {
   })
 }
 
-export const mockNoneCompleted = (db) => {
+export const mockNoneCompleted = (db: any) => {
   db.contentProgress.getSomeProgressByContentIds.mockResolvedValue({ data: [] })
 }
 
-export const mockCollectionAwareCompletion = (db, completionMap) => {
-  db.contentProgress.getSomeProgressByContentIds.mockImplementation((contentIds, collection) => {
+export const mockCollectionAwareCompletion = (db: any, completionMap: Record<string, boolean>) => {
+  db.contentProgress.getSomeProgressByContentIds.mockImplementation((contentIds: number[], collection: Collection) => {
     const completedRecords = contentIds
       .filter(id => {
         const key = collection

package/test/unit/awards/helpers/index.ts

@@ -0,0 +1,3 @@
+export * from './mock-setup'
+export * from './progress-emitter'
+export * from './completion-mock'

package/test/unit/awards/helpers/{mock-setup.js → mock-setup.ts}

@@ -1,5 +1,7 @@
 import { mockAwardDefinitions } from '../../../mockData/award-definitions.js'
 
+export type RepositoryProxyMock = ReturnType<typeof createRepositoryProxyMock>
+
 export const createRepositoryProxyMock = () => ({
   contentProgress: {
     getOneProgressByContentId: jest.fn(),
@@ -19,7 +21,15 @@ export const createRepositoryProxyMock = () => ({
   }
 })
 
-export const setupDefaultMocks = (db, fetchSanity, options = {}) => {
+export const setupDefaultMocks = (
+  db: any,
+  fetchSanity: jest.Mock,
+  options: {
+    definitions?: typeof mockAwardDefinitions,
+    practiceMinutes?: number,
+    hasCompleted?: boolean
+  } = {}
+) => {
   const {
     definitions = mockAwardDefinitions,
     practiceMinutes = 200,
@@ -56,7 +66,7 @@ export const setupDefaultMocks = (db, fetchSanity, options = {}) => {
   })
 }
 
-export const setupAwardEventListeners = (awardEvents) => {
+export const setupAwardEventListeners = (awardEvents: any) => {
   const listeners = {
     progress: jest.fn(),
     granted: jest.fn()

package/test/unit/awards/helpers/{progress-emitter.js → progress-emitter.ts}

@@ -1,5 +1,5 @@
 import { emitProgressSaved } from '../../../../src/services/progress-events.js'
-import { COLLECTION_TYPE } from '../../../../src/services/sync/models/ContentProgress.ts'
+import { COLLECTION_TYPE } from '../../../../src/services/sync/models/ContentProgress'
 
 export { COLLECTION_TYPE }
 
@@ -9,6 +9,12 @@ export const emitProgress = ({
   collectionId = null,
   progressPercent = 100,
   userId = 123
+}: {
+  contentId: number
+  collectionType?: string | null
+  collectionId?: number | null
+  progressPercent?: number
+  userId?: number
 }) => {
   emitProgressSaved({
     userId,
@@ -23,7 +29,7 @@ export const emitProgress = ({
   })
 }
 
-export const emitLearningPathProgress = (contentId, learningPathId, progressPercent = 100) => {
+export const emitLearningPathProgress = (contentId: number, learningPathId: number, progressPercent = 100) => {
   emitProgress({
     contentId,
     collectionType: COLLECTION_TYPE.LEARNING_PATH,
@@ -32,8 +38,8 @@ export const emitLearningPathProgress = (contentId, learningPathId, progressPerc
   })
 }
 
-export const emitAlaCarteProgress = (contentId, progressPercent = 100) => {
+export const emitAlaCarteProgress = (contentId: number, progressPercent = 100) => {
   emitProgress({ contentId, progressPercent })
 }
 
-export const waitForDebounce = (ms = 100) => new Promise(resolve => setTimeout(resolve, ms))
+export const waitForDebounce = (ms = 100): Promise<void> => new Promise(resolve => setTimeout(resolve, ms))

package/test/unit/{contentLikes.test.js → contentLikes.test.ts}

@@ -5,7 +5,7 @@ import {
 } from '../../src/services/contentLikes.js'
 import { initializeTestService } from '../initializeTests.js'
 
-let mockLikedIds = new Set()
+let mockLikedIds: Set<number> = new Set()
 
 jest.mock('../../src/services/sync/repository-proxy.ts', () => {
   const mockFns = {

package/test/unit/{contentProgress.test.js → contentProgress.test.ts}

@@ -1,7 +1,13 @@
 import { initializeTestService } from '../initializeTests.js'
-import { getAllStarted, getAllStartedOrCompleted, getProgressState } from '../../src/index.js'
+import { getAllStarted, getAllStartedOrCompleted, getProgressState } from '../../src/services/contentProgress.js'
 
-let mockProgressRecords = []
+let mockProgressRecords: {
+  content_id: number;
+  state: string;
+  progress_percent: number;
+  updated_at: number;
+  last_interacted_a_la_carte?: number
+}[] = []
 
 jest.mock('../../src/services/sync/repository-proxy', () => {
   const mockFns = {

package/test/unit/{dataContext.test.js → dataContext.test.ts}

@@ -2,7 +2,7 @@ import { initializeTestService } from '../initializeTests.js'
 import { DataContext, verifyLocalDataContext } from '../../src/services/dataContext.js'
 
 describe('dataContext', function () {
-  let mock = null
+  let mock: jest.SpyInstance
   let testVersion = 1
   const dataVersionKey = 1
   const dataContext = new DataContext(dataVersionKey, null)

package/test/unit/{dateUtils.test.js → dateUtils.test.ts}

@@ -8,7 +8,7 @@ import {
   getToday,
 } from '../../src/services/dateUtils.js'
 
-const mockTimezone = (tz) => {
+const mockTimezone = (tz: string): void => {
   const RealDateTimeFormat = Intl.DateTimeFormat
   jest.spyOn(Intl, 'DateTimeFormat').mockImplementation((...args) => {
     const instance = new RealDateTimeFormat(...args)
@@ -16,7 +16,7 @@ const mockTimezone = (tz) => {
       format: instance.format.bind(instance),
       formatToParts: instance.formatToParts.bind(instance),
       resolvedOptions: () => ({ ...instance.resolvedOptions(), timeZone: tz }),
-    }
+    } as unknown as Intl.DateTimeFormat
   })
 }
 

package/test/unit/{imageSRCBuilder.test.js → imageSRCBuilder.test.ts}

@@ -1,4 +1,4 @@
-const { buildImageSRC, applySanityTransformations } = require('../../src/services/imageSRCBuilder.js')
+import { buildImageSRC, applySanityTransformations }  from '../../src/services/imageSRCBuilder.js'
 
 describe('imageSRCBuilder', function () {
   beforeEach(() => {})

package/test/unit/{imageSRCVerify.test.js → imageSRCVerify.test.ts}

@@ -1,4 +1,3 @@
-// Mock console.warn to avoid cluttering test output and to verify warnings
 import { extractSanityUrl, isBucketUrl, verifyImageSRC } from '../../src/services/imageSRCVerify.js'
 
 const originalConsoleWarn = console.warn
@@ -6,20 +5,16 @@ const originalConsoleError = console.error
 const originalNodeEnv = process.env.NODE_ENV
 
 describe('Image URL Verification', () => {
-  let consoleWarnMock
+  let consoleWarnMock: any
 
   beforeEach(() => {
-    // Mock console.warn and console.error
     consoleWarnMock = jest.fn()
     console.warn = consoleWarnMock
     console.error = jest.fn()
-
-    // Set NODE_ENV to development for all tests
     process.env.NODE_ENV = 'development'
   })
 
   afterEach(() => {
-    // Restore the original console methods and NODE_ENV
     console.warn = originalConsoleWarn
     console.error = originalConsoleError
     process.env.NODE_ENV = originalNodeEnv

package/test/unit/{notifications.test.js → notifications.test.ts}

@@ -22,16 +22,13 @@ jest.mock('../../src/services/eventsAPI.js', () => ({
   }
 }))
 
-const { GET, PUT, DELETE } = require('../../src/infrastructure/http/HttpClient.ts')
+import { GET, PUT, DELETE } from '../../src/infrastructure/http/HttpClient'
 
 const baseUrl = `/api/notifications`
 
 describe('UserNotifications module', function () {
   beforeEach(() => {
     initializeTestService()
-    GET.mockReset()
-    PUT.mockReset()
-    DELETE.mockReset()
   })
 
   describe('fetchNotifications', () => {

package/test/unit/{progressRows.test.js → progressRows.test.ts}

@@ -81,22 +81,28 @@ describe('getProgressRows', () => {
       },
     ];
 
-    fetchUserPlaylists.mockResolvedValue({ data: mockPlaylists });
-    fetchByRailContentIds.mockResolvedValue(mockPlaylistContents);
-    getAllStartedOrCompleted.mockResolvedValue([201]);
-    getProgressStateByIds.mockResolvedValue({ '201': 'in_progress' });
+    fetchUserPlaylists.mockResolvedValue({ data: mockPlaylists })
+    fetchByRailContentIds.mockResolvedValue(mockPlaylistContents)
+    getAllStartedOrCompleted.mockResolvedValue([201])
+    getProgressStateByIds.mockResolvedValue({ '201': 'in_progress' })
 
-    const result = await getProgressRows({ brand: 'brand1', limit: 8 });
+    const result = await getProgressRows({ brand: 'brand1', limit: 8 })
 
-    expect(result).toHaveProperty('type', 'progress_rows');
+    expect(result).toHaveProperty('type', 'progress_rows')
     expect(result).toHaveProperty('data');
-    expect(Array.isArray(result.data)).toBe(true);
-    expect(result.data.length).toBe(2);
-    expect(result.data[0]).toHaveProperty('id', 'progressType', 'header', 'body', 'cta');
-    expect(result.data[0].progressType).toBe('playlist');
-    expect(result.data[0].body).toHaveProperty('first_items_thumbnail_url', 'title', 'subtitle');
-    expect(result.data[0].cta).toHaveProperty('text');
-    expect(result.data[0].cta).toHaveProperty('action');
+    expect(Array.isArray(result.data)).toBe(true)
+    expect(result.data.length).toBe(2)
+    expect(result.data[0]).toHaveProperty('id')
+    expect(result.data[0]).toHaveProperty('progressType')
+    expect(result.data[0]).toHaveProperty('header')
+    expect(result.data[0]).toHaveProperty('body')
+    expect(result.data[0]).toHaveProperty('cta')
+    expect(result.data[0].progressType).toBe('playlist')
+    expect(result.data[0].body).toHaveProperty('first_items_thumbnail_url')
+    expect(result.data[0].body).toHaveProperty('title')
+    expect(result.data[0].body).toHaveProperty('subtitle')
+    expect(result.data[0].cta).toHaveProperty('text')
+    expect(result.data[0].cta).toHaveProperty('action')
 
   });
 

package/test/unit/{sanityQueryService.test.js → sanityQueryService.test.ts}

@@ -1,11 +1,7 @@
 import { initializeTestService } from '../initializeTests.js'
-import { log } from '../log.js'
-import {
-  getSortOrder
-} from '../../src/index.js'
+import { getSortOrder } from '../../src/services/sanity.js'
 import { processMetadata } from '../../src/contentMetaData.js'
-
-const { FilterBuilder } = require('../../src/filterBuilder.js')
+import { FilterBuilder } from '../../src/filterBuilder.js'
 
 jest.mock('../../src/services/permissions/index.ts', () => ({
   ...jest.requireActual('../../src/services/permissions/index.ts'),
@@ -137,7 +133,11 @@ describe('Filter Builder', function() {
     expect(clauses[3].operator).toBe('>=')
   })
 
-  function spliceFilterForAnds(filter) {
+  function spliceFilterForAnds(filter: string): {
+    phrase: string;
+    field: string;
+    operator: string;
+    condition: string }[] {
     // this will not correctly split complex filters with && and || conditions.
     let phrases = filter.split(' && ')
     let clauses = []
@@ -152,7 +152,6 @@ describe('Filter Builder', function() {
     })
     return clauses
   }
-
 })
 
 describe('Sanity Queries', function() {

package/test/unit/{streakMessage.test.js → streakMessage.test.ts}

@@ -1,11 +1,9 @@
 import { initializeTestService } from '../initializeTests.js'
 import {getUserWeeklyStats, userActivityContext} from '../../src/services/userActivity.js'
-import { streakCalculator } from '../../src/services/user/streakCalculator.ts'
+import { streakCalculator } from '../../src/services/user/streakCalculator'
 import {log} from '../log.js'
 
-import path from 'path';
-
-let mockPracticeData = []
+let mockPracticeData: { date: string; duration_seconds: number }[] = []
 
 jest.mock('../../src/services/sync/repository-proxy.ts', () => {
   const mockFns = {
@@ -200,15 +198,14 @@ describe('Streak Messages', function () {
   })
 })
 
-function incrementFakeDate(nDays = 1){
+function incrementFakeDate(nDays = 1) {
   let today = new Date();
   today.setFullYear(today.getFullYear(), today.getMonth(), (today.getDate() + nDays));
   jest.useFakeTimers();
   jest.setSystemTime(today);
 }
 
-function sliceExampleData(startDate, nDays, includeToday, activeDays)
-{
+function sliceExampleData(startDate, nDays, includeToday, activeDays) {
   if (nDays === 0 && !includeToday) {
     return []
   }

package/test/unit/{userActivity.test.js → userActivity.test.ts}

@@ -1,7 +1,10 @@
 import { initializeTestService } from '../initializeTests.js'
 import { getUserMonthlyStats, getUserWeeklyStats, recordUserPractice } from '../../src/services/userActivity.js'
 
-let mockPracticesData = []
+let mockPracticesData: {
+  date: string;
+  duration_seconds: number
+}[] = []
 
 jest.mock('../../src/services/sync/repository-proxy.ts', () => {
   const mockFns = {
@@ -33,7 +36,7 @@ jest.mock('../../src/services/railcontent.js', () => ({
   fetchUserPermissionsData: jest.fn(() => ({ permissions: [78, 91, 92], isAdmin: false }))
 }))
 
-const repositoryProxy = require('../../src/services/sync/repository-proxy.ts')
+const repositoryProxy: any = require('../../src/services/sync/repository-proxy.ts')
 
 describe('User Activity API Tests', function () {
   beforeEach(() => {

package/test/unit/awards/helpers/index.js

@@ -1,3 +0,0 @@
-export * from './mock-setup.js'
-export * from './progress-emitter.js'
-export * from './completion-mock.js'