musora-content-services 2.101.1 → 2.102.1

package/CHANGELOG.md

@@ -2,6 +2,20 @@
 
 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.102.1](https://github.com/railroadmedia/musora-content-services/compare/v2.102.0...v2.102.1) (2025-12-10)
+
+
+### Bug Fixes
+
+* **agi:** offset default and slug clause on artistBySlug ([10cc6d0](https://github.com/railroadmedia/musora-content-services/commit/10cc6d0390a12715aeba01c5dc72ecdb53d0f236))
+
+## [2.102.0](https://github.com/railroadmedia/musora-content-services/compare/v2.101.1...v2.102.0) (2025-12-10)
+
+
+### Features
+
+* **BEH-1457:** method progress duplication ([#617](https://github.com/railroadmedia/musora-content-services/issues/617)) ([917cb9d](https://github.com/railroadmedia/musora-content-services/commit/917cb9dedce2a21c64af4e39eef013a30b236e77))
+
 ### [2.101.1](https://github.com/railroadmedia/musora-content-services/compare/v2.101.0...v2.101.1) (2025-12-10)
 
 

package/package.json

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

package/src/services/content/artist.ts

@@ -89,7 +89,7 @@ export async function fetchArtistBySlug(
 
   const q = query()
     .and(`_type == "artist"`)
-    .and(`&& slug.current == '${slug}'`)
+    .and(`slug.current == '${slug}'`)
     .select(
       'name',
       `"slug": slug.current`,
@@ -139,7 +139,7 @@ export async function fetchArtistLessons(
   {
     sort = '-published_on',
     searchTerm = '',
-    offset = 1,
+    offset = 0,
     limit = 10,
     includedFields = [],
     progressIds = [],

package/src/services/content/genre.ts

@@ -138,7 +138,7 @@ export async function fetchGenreLessons(
   {
     sort = '-published_on',
     searchTerm = '',
-    offset = 1,
+    offset = 0,
     limit = 10,
     includedFields = [],
     progressIds = [],

package/src/services/content/instructor.ts

@@ -138,7 +138,7 @@ export async function fetchInstructorLessons(
   {
     sort = '-published_on',
     searchTerm = '',
-    offset = 1,
+    offset = 0,
     limit = 20,
     includedFields = [],
   }: InstructorLessonsOptions = {}

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

@@ -388,30 +388,29 @@ async function resetIfPossible(contentId: number, collection: CollectionParamete
 }
 
 export async function onContentCompletedLearningPathListener(event) {
-  console.log('if')
-  if (event?.collection?.type !== 'learning-path-v2') return
+  if (event?.collection?.type !== COLLECTION_TYPE.LEARNING_PATH) return
   if (event.contentId !== event?.collection?.id) return
+
   const learningPathId = event.contentId
   const learningPath = await getEnrichedLearningPath(learningPathId)
-  console.log('LP', learningPath)
+
   const brand = learningPath.brand
   const activeLearningPath = await getActivePath(brand)
-  console.log('Active LP', activeLearningPath)
+
   if (activeLearningPath.active_learning_path_id !== learningPathId) return
   const method = await fetchMethodV2Structure(brand)
-  console.log('Method', method)
+
   const currentIndex = method.learning_paths.findIndex((lp) => lp.id === learningPathId)
   if (currentIndex === -1) {
     return
   }
   const nextLearningPath = method.learning_paths[currentIndex + 1]
-  console.log('Next LP', nextLearningPath)
   if (!nextLearningPath) {
     return
   }
 
   await startLearningPath(brand, nextLearningPath.id)
   const nextLearningPathData = await getEnrichedLearningPath(nextLearningPath.id)
-  console.log('Next LP Data', nextLearningPathData)
+
   await contentStatusReset(nextLearningPathData.intro_video.id)
 }

package/src/services/contentProgress.js

@@ -12,7 +12,7 @@ const STATE_COMPLETED = STATE.COMPLETED
 const MAX_DEPTH = 3
 
 export async function getProgressState(contentId, collection = null) {
-  return getById(contentId, collection, 'state', '')
+  return getById(normalizeContentId(contentId), normalizeCollection(collection), 'state', '')
 }
 
 export async function getProgressStateByIds(contentIds, collection = null) {
@@ -472,13 +472,17 @@ async function saveContentProgress(contentId, collection, progress, currentSecon
   // note - previous implementation explicitly did not trickle progress to children here
   // (only to siblings/parents via le bubbles)
 
-  const bubbledProgresses = await bubbleProgress(
-    await getHierarchy(contentId, collection),
-    contentId,
-    collection
-  )
+  const hierarchy = await getHierarchy(contentId, collection)
+
+  const bubbledProgresses = await bubbleProgress(hierarchy, contentId, collection)
   await db.contentProgress.recordProgressesTentative(bubbledProgresses, collection)
 
+  if (collection && collection.type === COLLECTION_TYPE.LEARNING_PATH) {
+    let exportIds = bubbledProgresses
+    exportIds[contentId] = progress
+    await duplicateLearningPathProgressToExternalContents(exportIds, collection, hierarchy)
+  }
+
   for (const [bubbledContentId, bubbledProgress] of Object.entries(bubbledProgresses)) {
     if (bubbledProgress === 100) {
       emitContentCompleted(Number(bubbledContentId), collection)
@@ -490,25 +494,56 @@ async function saveContentProgress(contentId, collection, progress, currentSecon
 async function setStartedOrCompletedStatus(contentId, collection, isCompleted) {
   const progress = isCompleted ? 100 : 0
   const response = await db.contentProgress.recordProgress(contentId, collection, progress)
+
   if (progress === 100) emitContentCompleted(contentId, collection)
+
   const hierarchy = await getHierarchy(contentId, collection)
-  await Promise.all([
-    db.contentProgress.recordProgressesTentative(
-      trickleProgress(hierarchy, contentId, collection, progress),
-      collection
-    ),
-    bubbleProgress(hierarchy, contentId, collection).then(async (bubbledProgresses) => {
-      await db.contentProgress.recordProgressesTentative(bubbledProgresses, collection)
-      for (const [bubbledContentId, bubbledProgress] of Object.entries(bubbledProgresses)) {
-        if (bubbledProgress === 100) {
-          emitContentCompleted(Number(bubbledContentId), collection)
-        }
-      }
-    }),
-  ])
+
+  let ids = {
+    ...trickleProgress(hierarchy, contentId, collection, progress),
+    ...await bubbleProgress(hierarchy, contentId, collection)
+  }
+  await db.contentProgress.recordProgressesTentative(ids, collection)
+
+  if (collection && collection.type === COLLECTION_TYPE.LEARNING_PATH) {
+    let exportIds = ids
+    exportIds[contentId] = progress
+    await duplicateLearningPathProgressToExternalContents(exportIds, collection, hierarchy)
+  }
+
+  for (const [id, progress] of Object.entries(ids)) {
+    if (progress === 100) {
+      emitContentCompleted(Number(id), collection)
+    }
+  }
+
   return response
 }
 
+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(
+    Object.entries(ids).filter((id) => {
+      return hierarchy.parents[parseInt(id)] !== null
+    })
+  )
+
+  const extProgresses = await getProgressDataByIds(Object.keys(filteredIds), null)
+
+  // overwrite if LP progress greater, unless LP progress was reset to 0
+  filteredIds = Object.entries(filteredIds).filter(([id, pct]) => {
+    const extPct = extProgresses[id]?.progress
+    return (pct !== 0)
+      ? pct > extPct
+      : false
+  })
+
+  // each handles its own bubbling.
+  filteredIds.forEach(([id, pct]) => {
+    saveContentProgress(parseInt(id), null, pct)
+  })
+}
+
 async function getHierarchy(contentId, collection) {
   if (collection && collection.type === COLLECTION_TYPE.LEARNING_PATH) {
     return await fetchLearningPathHierarchy(contentId, collection)
@@ -519,13 +554,10 @@ async function getHierarchy(contentId, collection) {
 
 async function setStartedOrCompletedStatuses(contentIds, collection, isCompleted) {
   const progress = isCompleted ? 100 : 0
-  // we explicitly pessimistically await a remote push here
-  // because awards may be generated (on server) on completion
-  // which we would want to toast the user about *in band*
   const response = await db.contentProgress.recordProgresses(contentIds, collection, progress)
 
   // we assume this is used only for contents within the same hierarchy
-  const hierarchy = await getHierarchy(contentIds[0], collection)
+  const hierarchy = await getHierarchy(collection.id, collection)
 
   let ids = {}
   for (const contentId of contentIds) {
@@ -535,25 +567,34 @@ async function setStartedOrCompletedStatuses(contentIds, collection, isCompleted
       ...(await bubbleProgress(hierarchy, contentId, collection)),
     }
   }
+  await db.contentProgress.recordProgressesTentative(ids, collection)
 
-  await Promise.all([db.contentProgress.recordProgressesTentative(ids, collection)])
+  if (collection && collection.type === COLLECTION_TYPE.LEARNING_PATH) {
+    let exportIds = ids
+    for (const contentId of contentIds){
+      exportIds[contentId] = progress
+    }
+    await duplicateLearningPathProgressToExternalContents(exportIds, collection, hierarchy)
+  }
 
   return response
 }
 
 async function resetStatus(contentId, collection = null) {
+  const progress = 0
   const response = await db.contentProgress.eraseProgress(contentId, collection)
   const hierarchy = await getHierarchy(contentId, collection)
 
-  await Promise.all([
-    db.contentProgress.recordProgressesTentative(
-      trickleProgress(hierarchy, contentId, collection, 0),
-      collection
-    ),
-    bubbleProgress(hierarchy, contentId, collection).then((bubbledProgresses) =>
-      db.contentProgress.recordProgressesTentative(bubbledProgresses, collection)
-    ),
-  ])
+  let ids = {
+    ...trickleProgress(hierarchy, contentId, collection, progress),
+    ...await bubbleProgress(hierarchy, contentId, collection)
+  }
+  await db.contentProgress.recordProgressesTentative(ids, collection)
+
+  if (collection && collection.type === COLLECTION_TYPE.LEARNING_PATH) {
+    ids[contentId] = progress
+    await duplicateLearningPathProgressToExternalContents(ids, collection, hierarchy)
+  }
 
   return response
 }