musora-content-services 2.102.2 → 2.103.3

package/.claude/settings.local.json

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

package/CHANGELOG.md

@@ -2,6 +2,31 @@
 
 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.103.3](https://github.com/railroadmedia/musora-content-services/compare/v2.103.2...v2.103.3) (2025-12-11)
+
+### [2.103.2](https://github.com/railroadmedia/musora-content-services/compare/v2.103.1...v2.103.2) (2025-12-11)
+
+### [2.103.1](https://github.com/railroadmedia/musora-content-services/compare/v2.103.0...v2.103.1) (2025-12-11)
+
+## [2.103.0](https://github.com/railroadmedia/musora-content-services/compare/v2.102.3...v2.103.0) (2025-12-11)
+
+
+### Features
+
+* add isCompleted and field name updates in award callback([#648](https://github.com/railroadmedia/musora-content-services/issues/648)) ([c250d61](https://github.com/railroadmedia/musora-content-services/commit/c250d61b90bc29504827e8fa368a78b34a3f0c08))
+
+
+### Bug Fixes
+
+* lp lesson upserting ([#645](https://github.com/railroadmedia/musora-content-services/issues/645)) ([1a3094d](https://github.com/railroadmedia/musora-content-services/commit/1a3094d569bb868d62844755b876cee8bc63a365))
+
+### [2.102.3](https://github.com/railroadmedia/musora-content-services/compare/v2.102.2...v2.102.3) (2025-12-11)
+
+
+### Bug Fixes
+
+* **agi:** rollback total on fetchAGILessons ([a02be05](https://github.com/railroadmedia/musora-content-services/commit/a02be0592dd8b195da7971f13ea062674510c8bb))
+
 ### [2.102.2](https://github.com/railroadmedia/musora-content-services/compare/v2.102.1...v2.102.2) (2025-12-11)
 
 

package/package.json

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

package/src/index.d.ts

@@ -104,9 +104,9 @@ import {
 
 import {
 	contentStatusCompleted,
+	contentStatusCompletedMany,
 	contentStatusReset,
 	contentStatusStarted,
-	contentsStatusCompleted,
 	getAllCompleted,
 	getAllCompletedByIds,
 	getAllStarted,
@@ -396,6 +396,7 @@ import {
 
 import {
 	login,
+	loginWithAuthKey,
 	logout
 } from './services/user/sessions.js';
 
@@ -447,9 +448,9 @@ declare module 'musora-content-services' {
 		completeMethodIntroVideo,
 		confirmEmailChange,
 		contentStatusCompleted,
+		contentStatusCompletedMany,
 		contentStatusReset,
 		contentStatusStarted,
-		contentsStatusCompleted,
 		convertToTimeZone,
 		createComment,
 		createForumCategory,
@@ -646,6 +647,7 @@ declare module 'musora-content-services' {
 		likePost,
 		lockThread,
 		login,
+		loginWithAuthKey,
 		logout,
 		mapContentToParent,
 		markAllNotificationsAsRead,

package/src/index.js

@@ -108,9 +108,9 @@ import {
 
 import {
 	contentStatusCompleted,
+	contentStatusCompletedMany,
 	contentStatusReset,
 	contentStatusStarted,
-	contentsStatusCompleted,
 	getAllCompleted,
 	getAllCompletedByIds,
 	getAllStarted,
@@ -400,6 +400,7 @@ import {
 
 import {
 	login,
+	loginWithAuthKey,
 	logout
 } from './services/user/sessions.js';
 
@@ -446,9 +447,9 @@ export {
 	completeMethodIntroVideo,
 	confirmEmailChange,
 	contentStatusCompleted,
+	contentStatusCompletedMany,
 	contentStatusReset,
 	contentStatusStarted,
-	contentsStatusCompleted,
 	convertToTimeZone,
 	createComment,
 	createForumCategory,
@@ -645,6 +646,7 @@ export {
 	likePost,
 	lockThread,
 	login,
+	loginWithAuthKey,
 	logout,
 	mapContentToParent,
 	markAllNotificationsAsRead,

package/src/services/awards/award-callbacks.js

@@ -22,6 +22,7 @@ let progressUpdateCallback = null
  * - `name` - Display name of the award
  * - `badge` - URL to badge image
  * - `completed_at` - ISO timestamp
+ * - `isCompleted` - Boolean indicating the award is completed (always true for granted awards)
  * - `completion_data.message` - Pre-generated congratulations message
  * - `completion_data.practice_minutes` - Total practice time
  * - `completion_data.days_user_practiced` - Days spent practicing
@@ -72,13 +73,14 @@ export function registerAwardCallback(callback) {
       name: definition.name,
       badge: definition.badge,
       completed_at: completionData.completed_at,
-      completion_data: {
+      isCompleted: true,
+      completionData: {
         completed_at: completionData.completed_at,
         days_user_practiced: completionData.days_user_practiced,
         message: popupMessage,
         practice_minutes: completionData.practice_minutes,
-        content_title: completionData.content_title
-      }
+        content_title: completionData.content_title,
+      },
     }
 
     callback(award)
@@ -148,7 +150,7 @@ export function registerProgressCallback(callback) {
   progressUpdateCallback = (payload) => {
     callback({
       awardId: payload.awardId,
-      progressPercentage: payload.progressPercentage
+      progressPercentage: payload.progressPercentage,
     })
   }
 

package/src/services/awards/types.d.ts

@@ -66,6 +66,7 @@ export interface AwardCallbackPayload {
   name: string
   badge: string
   completed_at: string
+  isCompleted: boolean
   completion_data: AwardCompletionData
 }
 

package/src/services/content/genre.ts

@@ -149,7 +149,7 @@ export async function fetchGenreLessons(
     f.referencesIDWithFilter(f.combine(f.type('genre'), f.slug(slug)))
   )
 
-  const q = query()
+  const data = query()
     .and(f.brand(brand))
     .and(f.searchMatch('title', searchTerm))
     .and(f.includedFields(includedFields))
@@ -160,5 +160,12 @@ export async function fetchGenreLessons(
     .select(getFieldsForContentType(contentType) as string)
     .build()
 
+  const total = query().and(restrictions).build()
+
+  const q = `{
+    "data": ${data},
+    "total": count(${total})
+  }`
+
   return fetchSanity(q, true, { processNeedAccess: false, processPageType: false })
 }

package/src/services/content/instructor.ts

@@ -148,7 +148,7 @@ export async function fetchInstructorLessons(
     f.referencesIDWithFilter(f.combine(f.type('instructor'), f.slug(slug)))
   )
 
-  const q = query()
+  const data = query()
     .and(f.brand(brand))
     .and(f.searchMatch('title', searchTerm))
     .and(f.includedFields(includedFields))
@@ -158,5 +158,12 @@ export async function fetchInstructorLessons(
     .select(getFieldsForContentType() as string)
     .build()
 
+  const total = query().and(restrictions).build()
+
+  const q = `{
+    "data": ${data},
+    "total": count(${total})
+  }`
+
   return fetchSanity(q, true, { processNeedAccess: false, processPageType: false })
 }

package/src/services/content-org/learning-paths.ts

@@ -7,7 +7,7 @@ import { fetchByRailContentId, fetchByRailContentIds, fetchMethodV2Structure } f
 import { addContextToLearningPaths } from '../contentAggregator.js'
 import {
   contentStatusCompleted,
-  contentsStatusCompleted,
+  contentStatusCompletedMany,
   contentStatusReset,
   getAllCompletedByIds,
   getProgressState,
@@ -367,7 +367,7 @@ export async function completeLearningPathIntroVideo(
     response.learning_path_reset_response = await resetIfPossible(learningPathId, collection)
 
   } else {
-    response.lesson_import_response = await contentsStatusCompleted(lessonsToImport, collection)
+    response.lesson_import_response = await contentStatusCompletedMany(lessonsToImport, collection)
   }
 
   return response

package/src/services/contentProgress.js

@@ -270,7 +270,7 @@ export async function getProgressDataByIdsAndCollections(tuples) {
     collection: {},
   }]))
 
-  await db.contentProgress.getSomeProgressByContentIdsAndCollection(tuples).then(r => {
+  await db.contentProgress.getSomeProgressByContentIdsAndCollections(tuples).then(r => {
     r.data.forEach(p => {
       progress[p.content_id] = {
         last_update: p.updated_at,
@@ -307,7 +307,7 @@ async function getByIdsAndCollections(tuples, dataKey, defaultValue) {
   tuples = tuples.map(t => ({contentId: normalizeContentId(t.contentId), collection: normalizeCollection(t.collection)}))
   const progress = Object.fromEntries(tuples.map(tuple => [tuple.contentId, defaultValue]))
 
-  await db.contentProgress.getSomeProgressByContentIdsAndCollection(tuples).then(r => {
+  await db.contentProgress.getSomeProgressByContentIdsAndCollections(tuples).then(r => {
     r.data.forEach(p => {
       progress[p.content_id] = p[dataKey] ?? defaultValue
     })
@@ -441,8 +441,8 @@ export async function contentStatusCompleted(contentId, collection = null) {
   )
 }
 
-export async function contentsStatusCompleted(contentIds, collection = null) {
-  return setStartedOrCompletedStatuses(
+export async function contentStatusCompletedMany(contentIds, collection = null) {
+  return setStartedOrCompletedStatusMany(
     normalizeContentIds(contentIds),
     normalizeCollection(collection),
     true
@@ -475,7 +475,8 @@ async function saveContentProgress(contentId, collection, progress, currentSecon
   const hierarchy = await getHierarchy(contentId, collection)
 
   const bubbledProgresses = await bubbleProgress(hierarchy, contentId, collection)
-  await db.contentProgress.recordProgressesTentative(bubbledProgresses, collection)
+  // BE bubbling/trickling currently does not work, so we utilize non-tentative pushing when learning path collection
+  await db.contentProgress.recordProgressMany(bubbledProgresses, collection, collection?.type !== COLLECTION_TYPE.LEARNING_PATH)
 
   if (collection && collection.type === COLLECTION_TYPE.LEARNING_PATH) {
     let exportIds = bubbledProgresses
@@ -499,19 +500,20 @@ async function setStartedOrCompletedStatus(contentId, collection, isCompleted) {
 
   const hierarchy = await getHierarchy(contentId, collection)
 
-  let ids = {
+  let progresses = {
     ...trickleProgress(hierarchy, contentId, collection, progress),
     ...await bubbleProgress(hierarchy, contentId, collection)
   }
-  await db.contentProgress.recordProgressesTentative(ids, collection)
+  // BE bubbling/trickling currently does not work, so we utilize non-tentative pushing when learning path collection
+  await db.contentProgress.recordProgressMany(progresses, collection, collection?.type !== COLLECTION_TYPE.LEARNING_PATH)
 
   if (collection && collection.type === COLLECTION_TYPE.LEARNING_PATH) {
-    let exportIds = ids
-    exportIds[contentId] = progress
-    await duplicateLearningPathProgressToExternalContents(exportIds, collection, hierarchy)
+    let exportProgresses = progresses
+    exportProgresses[contentId] = progress
+    await duplicateLearningPathProgressToExternalContents(exportProgresses, collection, hierarchy)
   }
 
-  for (const [id, progress] of Object.entries(ids)) {
+  for (const [id, progress] of Object.entries(progresses)) {
     if (progress === 100) {
       emitContentCompleted(Number(id), collection)
     }
@@ -520,6 +522,8 @@ async function setStartedOrCompletedStatus(contentId, collection, isCompleted) {
   return response
 }
 
+// we cannot simply pass LP id with self collection, because we do not have a-la-carte LP's set up yet,
+//   and we need each lesson to bubble to its parent outside of LP
 async function duplicateLearningPathProgressToExternalContents(ids, collection, hierarchy) {
   // filter out LPs. we dont want to duplicate to LP's while we dont have a-la-cart LP's set up.
   let filteredIds = Object.fromEntries(
@@ -552,29 +556,31 @@ async function getHierarchy(contentId, collection) {
   }
 }
 
-async function setStartedOrCompletedStatuses(contentIds, collection, isCompleted) {
+async function setStartedOrCompletedStatusMany(contentIds, collection, isCompleted) {
   const progress = isCompleted ? 100 : 0
-  const response = await db.contentProgress.recordProgresses(contentIds, collection, progress)
+  const contents = Object.fromEntries(contentIds.map((id) => [id, progress]))
+  const response = await db.contentProgress.recordProgressMany(contents, collection, true)
 
   // we assume this is used only for contents within the same hierarchy
   const hierarchy = await getHierarchy(collection.id, collection)
 
-  let ids = {}
+  let progresses = {}
   for (const contentId of contentIds) {
-    ids = {
-      ...ids,
+    progresses = {
+      ...progresses,
       ...trickleProgress(hierarchy, contentId, collection, progress),
       ...(await bubbleProgress(hierarchy, contentId, collection)),
     }
   }
-  await db.contentProgress.recordProgressesTentative(ids, collection)
+  // BE bubbling/trickling currently does not work, so we utilize non-tentative pushing when learning path collection
+  await db.contentProgress.recordProgressMany(progresses, collection, collection?.type !== COLLECTION_TYPE.LEARNING_PATH)
 
   if (collection && collection.type === COLLECTION_TYPE.LEARNING_PATH) {
-    let exportIds = ids
+    let exportProgresses = progresses
     for (const contentId of contentIds){
-      exportIds[contentId] = progress
+      exportProgresses[contentId] = progress
     }
-    await duplicateLearningPathProgressToExternalContents(exportIds, collection, hierarchy)
+    await duplicateLearningPathProgressToExternalContents(exportProgresses, collection, hierarchy)
   }
 
   return response
@@ -585,15 +591,16 @@ async function resetStatus(contentId, collection = null) {
   const response = await db.contentProgress.eraseProgress(contentId, collection)
   const hierarchy = await getHierarchy(contentId, collection)
 
-  let ids = {
+  let progresses = {
     ...trickleProgress(hierarchy, contentId, collection, progress),
     ...await bubbleProgress(hierarchy, contentId, collection)
   }
-  await db.contentProgress.recordProgressesTentative(ids, collection)
+  // BE bubbling/trickling currently does not work, so we utilize non-tentative pushing when learning path collection
+  await db.contentProgress.recordProgressMany(progresses, collection, collection?.type !== COLLECTION_TYPE.LEARNING_PATH)
 
   if (collection && collection.type === COLLECTION_TYPE.LEARNING_PATH) {
-    ids[contentId] = progress
-    await duplicateLearningPathProgressToExternalContents(ids, collection, hierarchy)
+    progresses[contentId] = progress
+    await duplicateLearningPathProgressToExternalContents(progresses, collection, hierarchy)
   }
 
   return response

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

@@ -122,7 +122,7 @@ export default class ProgressRepository extends SyncRepository<ContentProgress>
     return await this.queryAll(...clauses)
   }
 
-  async getSomeProgressByContentIdsAndCollection(tuples: ContentIdCollectionTuple[]) {
+  async getSomeProgressByContentIdsAndCollections(tuples: ContentIdCollectionTuple[]) {
     const clauses = []
 
     clauses.push(...tuples.map(tuple => Q.and(...tupleClauses(tuple))))
@@ -179,32 +179,12 @@ export default class ProgressRepository extends SyncRepository<ContentProgress>
     return result
   }
 
-  recordProgresses(
-    contentIds: number[],
+  recordProgressMany(
+    contentProgresses: Record<string, number>, // Accept plain object
     collection: CollectionParameter | null,
-    progressPct: number
+    tentative: boolean
   ) {
-    return this.upsertSome(
-      Object.fromEntries(
-        contentIds.map((contentId) => [
-          ProgressRepository.generateId(contentId, collection),
-          (r: ContentProgress) => {
-            r.content_id = contentId
-            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
-          },
-        ])
-      )
-    )
-  }
 
-  recordProgressesTentative(
-    contentProgresses: Record<string, number>, // Accept plain object
-    collection: CollectionParameter | null
-  ) {
     const data = Object.fromEntries(
       Object.entries(contentProgresses).map(([contentId, progressPct]) => [
         ProgressRepository.generateId(+contentId, collection),
@@ -218,7 +198,11 @@ export default class ProgressRepository extends SyncRepository<ContentProgress>
         },
       ])
     )
-    return this.upsertSomeTentative(data)
+    return tentative
+      ? this.upsertSomeTentative(data)
+      : this.upsertSome(data)
+
+    //todo add event emitting for bulk updates?
   }
 
   eraseProgress(contentId: number, collection: CollectionParameter | null) {