musora-content-services 2.21.0 → 2.21.2

package/CHANGELOG.md

@@ -2,6 +2,21 @@
 
 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.21.2](https://github.com/railroadmedia/musora-content-services/compare/v2.21.1...v2.21.2) (2025-07-14)
+
+
+### Bug Fixes
+
+* **systest:** patch contentAggregator ([#342](https://github.com/railroadmedia/musora-content-services/issues/342)) ([4a1906e](https://github.com/railroadmedia/musora-content-services/commit/4a1906ed8e5cfc3cebf3e044d4eb35213d18ebe1))
+
+### [2.21.1](https://github.com/railroadmedia/musora-content-services/compare/v2.21.0...v2.21.1) (2025-07-14)
+
+
+### Bug Fixes
+
+* track correct amount of video watch time ([07d31c8](https://github.com/railroadmedia/musora-content-services/commit/07d31c802164b0625b5e72ce78e618fc5d12ecaf))
+* track correct amount of video watch time ([41a0d0b](https://github.com/railroadmedia/musora-content-services/commit/41a0d0b82d73183c52db7b510d00bbf7838554d0))
+
 ## [2.21.0](https://github.com/railroadmedia/musora-content-services/compare/v2.20.0...v2.21.0) (2025-07-12)
 
 

package/package.json

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

package/src/services/contentAggregator.js

@@ -33,15 +33,14 @@ export async function addContextToContent(dataPromise, ...dataArgs)
   if(!data) return false
 
   let items = []
-  let dataMap = []
 
   if (dataField && (data?.[dataField] || iterateDataFieldOnEachArrayElement)) {
     if (iterateDataFieldOnEachArrayElement && Array.isArray(data)) {
       for(const parent of data) {
-        ids = [...ids, ...parent[dataField].map(item => item?.id).filter(Boolean)]
+        items = [...items, ...parent[dataField]]
       }
     } else {
-      ids = data[dataField].map(item => item?.id).filter(Boolean);
+      items = data[dataField]
     }
   } else if (Array.isArray(data)) {
     items = data;
@@ -51,19 +50,6 @@ export async function addContextToContent(dataPromise, ...dataArgs)
 
   const ids = items.map(item => item?.id).filter(Boolean)
 
-  //create data structure for common use by functions
-  if (addNextLesson) {
-    items.forEach((item) => {
-      if (item?.id) {
-        dataMap.push({
-          'children': item.children?.map(child => child.id) ?? [],
-          'type': item.type,
-          'id': item.id,
-        })
-      }
-    })
-  }
-
   if(ids.length === 0) return false
 
   const [progressPercentageData, progressStatusData, isLikedData, resumeTimeData, lastInteractedChildData, nextLessonData] = await Promise.all([
@@ -72,7 +58,7 @@ export async function addContextToContent(dataPromise, ...dataArgs)
     addIsLiked ? isContentLikedByIds(ids) : Promise.resolve(null),
     addResumeTimeSeconds ? getResumeTimeSecondsByIds(ids) : Promise.resolve(null),
     addLastInteractedChild ? fetchLastInteractedChild(ids)  : Promise.resolve(null),
-    (addNextLesson || addLastInteractedParent) ? getNextLesson(dataMap) : Promise.resolve(null),
+    (addNextLesson || addLastInteractedParent) ? getNextLesson(items) : Promise.resolve(null),
   ])
 
   const addContext = async (item) => ({

package/src/services/contentProgress.js

@@ -18,6 +18,8 @@ const DATA_KEY_LAST_UPDATED_TIME = 'u'
 
 export let dataContext = new DataContext(ContentProgressVersionKey, fetchContentProgress)
 
+let sessionData = []
+
 export async function getProgressPercentage(contentId) {
   return getById(contentId, DATA_KEY_PROGRESS, 0)
 }
@@ -42,12 +44,12 @@ export async function getResumeTimeSecondsByIds(contentIds) {
   return getByIds(contentIds, DATA_KEY_RESUME_TIME, 0)
 }
 
-export async function getNextLesson(dataMap)
+export async function getNextLesson(data)
 {
   let nextLessonData = {}
 
-  for (const content of dataMap) {
-
+  for (const content of data) {
+    const children = content.children?.map(child => child.id) ?? []
     //only calculate nextLesson if needed, based on content type
     if (!getNextLessonLessonParentTypes.includes(content.type)) {
       nextLessonData[content.id] = null
@@ -56,15 +58,15 @@ export async function getNextLesson(dataMap)
       //return first child if parent-content is complete or no progress
       const contentState = await getProgressState(content.id)
       if (contentState !== STATE_STARTED) {
-        nextLessonData[content.id] = content.children[0]
+        nextLessonData[content.id] = children[0]
 
       } else {
         //if content in progress
 
-        const childrenStates = await getProgressStateByIds(content.children)
+        const childrenStates = await getProgressStateByIds(children)
 
         //calculate last_engaged
-        const lastInteracted = await getLastInteractedOf(content.children)
+        const lastInteracted = await getLastInteractedOf(children)
         const lastInteractedStatus = childrenStates[lastInteracted]
 
         //different nextLesson behaviour for different content types
@@ -383,10 +385,14 @@ export async function recordWatchSession(
   }
 
   try {
-      await recordUserPractice({ content_id: contentId, duration_seconds: Math.ceil(secondsPlayed)  })
+    //TODO: Good enough for Alpha, Refine in reliability improvements
+    sessionData[sessionId] = sessionData[sessionId] || {}
+    const secondsSinceLastUpdate = Math.ceil(secondsPlayed - (sessionData[sessionId][contentId] ?? 0))
+    await recordUserPractice({ content_id: contentId, duration_seconds: secondsSinceLastUpdate })
   } catch (error) {
       console.error('Failed to record user practice:', error)
   }
+  sessionData[sessionId][contentId] = secondsPlayed
 
   await dataContext.update(
     async function (localContext) {

package/.claude/settings.local.json

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