musora-content-services 2.96.2 → 2.98.0

package/.claude/settings.local.json

@@ -1,9 +1,14 @@
 {
   "permissions": {
     "allow": [
-      "Bash(rg:*)",
-      "Bash(npm run lint:*)"
+      "Read(//app/musora-platform-backend/**)",
+      "Read(//app/musora-platform-frontend/**)",
+      "Bash(find:*)",
+      "Bash(sed:*)",
+      "Read(//app/**)",
+      "Bash(cat:*)"
     ],
-    "deny": []
+    "deny": [],
+    "ask": []
   }
 }

package/.yarnrc.yml

@@ -0,0 +1 @@
+nodeLinker: node-modules

package/CHANGELOG.md

@@ -2,6 +2,37 @@
 
 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.98.0](https://github.com/railroadmedia/musora-content-services/compare/v2.94.7...v2.98.0) (2025-12-09)
+
+
+### Features
+
+* **BEH-1195:** Awards System ([#606](https://github.com/railroadmedia/musora-content-services/issues/606)) ([a6ffd92](https://github.com/railroadmedia/musora-content-services/commit/a6ffd92ae518c8e530d4ef743f2649725fddb285))
+* **BEH-1458:** method addcontexttocontent ([#633](https://github.com/railroadmedia/musora-content-services/issues/633)) ([95a2b0a](https://github.com/railroadmedia/musora-content-services/commit/95a2b0ae3f011e17f92b78ad4fcd1ebe7a2342ca))
+* handle learning path complete logic ([#628](https://github.com/railroadmedia/musora-content-services/issues/628)) ([e5266d2](https://github.com/railroadmedia/musora-content-services/commit/e5266d2219597fc295dab97cec7b7ce8ac80a705))
+* **MU2E2-219:** New method for membership upgrade ([0548f25](https://github.com/railroadmedia/musora-content-services/commit/0548f2531dd67abda63c0768ae0005448a27c163))
+* **MU2E2-219:** New method for membership upgrade ([42f2cd8](https://github.com/railroadmedia/musora-content-services/commit/42f2cd825e70a9afeb9f13bd09a0709c003b3c26))
+
+
+### Bug Fixes
+
+* **agi:** interface return types ([cc0cfae](https://github.com/railroadmedia/musora-content-services/commit/cc0cfae1282266567ac46a6eb072f76ffde7032e))
+* **BR-330:** Wraps artists name in double quotes where its interpolated in the query ([8787399](https://github.com/railroadmedia/musora-content-services/commit/8787399e032d3522e5126ea9506f28cc5cdac22a))
+* collection type check ([#619](https://github.com/railroadmedia/musora-content-services/issues/619)) ([df520a4](https://github.com/railroadmedia/musora-content-services/commit/df520a497c24091b41d207992a8a71daf0fc98e5))
+* duplicate awards from wrong collection type handling ([#627](https://github.com/railroadmedia/musora-content-services/issues/627)) ([f6dfbf7](https://github.com/railroadmedia/musora-content-services/commit/f6dfbf778ad8e7d37d8e0f66ecd1aa5bec323330))
+* make agi responses standard ([#630](https://github.com/railroadmedia/musora-content-services/issues/630)) ([0301133](https://github.com/railroadmedia/musora-content-services/commit/03011331cb835412af80111a97e6ae83fd6e56d5))
+* method progress card cta ([#622](https://github.com/railroadmedia/musora-content-services/issues/622)) ([6788b48](https://github.com/railroadmedia/musora-content-services/commit/6788b48353d4122e1ca674a5fdd32abbfa8bb642))
+* **onboarding:** update hard-coded data ([e33f309](https://github.com/railroadmedia/musora-content-services/commit/e33f309d0b051829e58f631f4b1368501bafc72b))
+* show next learning path lesson logic for fetch learning path lessons ([#626](https://github.com/railroadmedia/musora-content-services/issues/626)) ([2925a5b](https://github.com/railroadmedia/musora-content-services/commit/2925a5be42715af7f77720209ef78f118ae95bf4))
+* watermelon fixes round [#4](https://github.com/railroadmedia/musora-content-services/issues/4) ([#621](https://github.com/railroadmedia/musora-content-services/issues/621)) ([aa1e834](https://github.com/railroadmedia/musora-content-services/commit/aa1e834dbb287e4b581b67690038e086eb7a4d55))
+
+## [2.97.0](https://github.com/railroadmedia/musora-content-services/compare/v2.96.2...v2.97.0) (2025-12-09)
+
+
+### Features
+
+* **BEH-1458:** method addcontexttocontent ([#633](https://github.com/railroadmedia/musora-content-services/issues/633)) ([95a2b0a](https://github.com/railroadmedia/musora-content-services/commit/95a2b0ae3f011e17f92b78ad4fcd1ebe7a2342ca))
+
 ### [2.96.2](https://github.com/railroadmedia/musora-content-services/compare/v2.96.1...v2.96.2) (2025-12-09)
 
 ### [2.96.1](https://github.com/railroadmedia/musora-content-services/compare/v2.96.0...v2.96.1) (2025-12-09)

package/package.json

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

package/src/index.d.ts

@@ -90,6 +90,7 @@ import {
 
 import {
 	addContextToContent,
+	addContextToLearningPaths,
 	getNavigateToForPlaylists
 } from './services/contentAggregator.js';
 
@@ -111,10 +112,13 @@ import {
 	getAllStartedOrCompleted,
 	getLastInteractedOf,
 	getNavigateTo,
+	getNavigateToForMethod,
 	getProgressDataByIds,
+	getProgressDataByIdsAndCollections,
 	getProgressState,
 	getProgressStateByIds,
 	getResumeTimeSecondsByIds,
+	getResumeTimeSecondsByIdsAndCollections,
 	getStartedOrCompletedProgressOnly,
 	recordWatchSession
 } from './services/contentProgress.js';
@@ -348,6 +352,7 @@ import {
 import {
 	fetchMemberships,
 	fetchRechargeTokens,
+	getUpgradePrice,
 	restorePurchases,
 	upgradeSubscription
 } from './services/user/memberships.ts';
@@ -426,6 +431,7 @@ import {
 declare module 'musora-content-services' {
 	export {
 		addContextToContent,
+		addContextToLearningPaths,
 		addItemToPlaylist,
 		applyCloudflareWrapper,
 		applySanityTransformations,
@@ -590,6 +596,7 @@ declare module 'musora-content-services' {
 		getMethodCard,
 		getMonday,
 		getNavigateTo,
+		getNavigateToForMethod,
 		getNavigateToForPlaylists,
 		getNewAndUpcoming,
 		getOnboardingRecommendedContent,
@@ -597,6 +604,7 @@ declare module 'musora-content-services' {
 		getPracticeNotes,
 		getPracticeSessions,
 		getProgressDataByIds,
+		getProgressDataByIdsAndCollections,
 		getProgressRows,
 		getProgressState,
 		getProgressStateByIds,
@@ -605,6 +613,7 @@ declare module 'musora-content-services' {
 		getRecommendedForYou,
 		getReportIssueOptions,
 		getResumeTimeSecondsByIds,
+		getResumeTimeSecondsByIdsAndCollections,
 		getSanityDate,
 		getScheduleContentRows,
 		getSortOrder,
@@ -612,6 +621,7 @@ declare module 'musora-content-services' {
 		getTabResults,
 		getTimeRemainingUntilLocal,
 		getToday,
+		getUpgradePrice,
 		getUserData,
 		getUserMonthlyStats,
 		getUserSignature,

package/src/index.js

@@ -94,6 +94,7 @@ import {
 
 import {
 	addContextToContent,
+	addContextToLearningPaths,
 	getNavigateToForPlaylists
 } from './services/contentAggregator.js';
 
@@ -115,10 +116,13 @@ import {
 	getAllStartedOrCompleted,
 	getLastInteractedOf,
 	getNavigateTo,
+	getNavigateToForMethod,
 	getProgressDataByIds,
+	getProgressDataByIdsAndCollections,
 	getProgressState,
 	getProgressStateByIds,
 	getResumeTimeSecondsByIds,
+	getResumeTimeSecondsByIdsAndCollections,
 	getStartedOrCompletedProgressOnly,
 	recordWatchSession
 } from './services/contentProgress.js';
@@ -352,6 +356,7 @@ import {
 import {
 	fetchMemberships,
 	fetchRechargeTokens,
+	getUpgradePrice,
 	restorePurchases,
 	upgradeSubscription
 } from './services/user/memberships.ts';
@@ -425,6 +430,7 @@ import {
 
 export {
 	addContextToContent,
+	addContextToLearningPaths,
 	addItemToPlaylist,
 	applyCloudflareWrapper,
 	applySanityTransformations,
@@ -589,6 +595,7 @@ export {
 	getMethodCard,
 	getMonday,
 	getNavigateTo,
+	getNavigateToForMethod,
 	getNavigateToForPlaylists,
 	getNewAndUpcoming,
 	getOnboardingRecommendedContent,
@@ -596,6 +603,7 @@ export {
 	getPracticeNotes,
 	getPracticeSessions,
 	getProgressDataByIds,
+	getProgressDataByIdsAndCollections,
 	getProgressRows,
 	getProgressState,
 	getProgressStateByIds,
@@ -604,6 +612,7 @@ export {
 	getRecommendedForYou,
 	getReportIssueOptions,
 	getResumeTimeSecondsByIds,
+	getResumeTimeSecondsByIdsAndCollections,
 	getSanityDate,
 	getScheduleContentRows,
 	getSortOrder,
@@ -611,6 +620,7 @@ export {
 	getTabResults,
 	getTimeRemainingUntilLocal,
 	getToday,
+	getUpgradePrice,
 	getUserData,
 	getUserMonthlyStats,
 	getUserSignature,

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

@@ -15,6 +15,7 @@ import {
 import { COLLECTION_TYPE, STATE } from '../sync/models/ContentProgress'
 import { SyncWriteDTO } from '../sync'
 import { ContentProgress } from '../sync/models'
+import { CollectionParameter } from '../sync/repositories/content-progress'
 
 const BASE_PATH: string = `/api/content-org`
 const LEARNING_PATHS_PATH = `${BASE_PATH}/v1/user/learning-paths`
@@ -39,6 +40,11 @@ interface DailySession {
   learning_path_id: number
 }
 
+interface CollectionObject {
+  id: number
+  type: COLLECTION_TYPE.LEARNING_PATH
+}
+
 /**
  * Gets today's daily session for the user.
  * @param brand
@@ -308,10 +314,11 @@ export async function completeLearningPathIntroVideo(
 
   response.intro_video_response = await completeIfNotCompleted(introVideoId)
 
-  const collection = { id: learningPathId, type: COLLECTION_TYPE.LEARNING_PATH }
+  const collection: CollectionObject = { id: learningPathId, type: COLLECTION_TYPE.LEARNING_PATH }
 
   if (!lessonsToImport) {
-    response.learning_path_reset_response = await contentStatusReset(learningPathId, collection)
+    response.learning_path_reset_response = await resetIfPossible(learningPathId, collection)
+
   } else {
     response.lesson_import_response = await contentsStatusCompleted(lessonsToImport, collection)
   }
@@ -327,6 +334,12 @@ async function completeIfNotCompleted(
   return introVideoStatus !== 'completed' ? await contentStatusCompleted(contentId) : null
 }
 
+async function resetIfPossible(contentId: number, collection: CollectionParameter = null): Promise<SyncWriteDTO<ContentProgress, any> | null> {
+  const status = await getProgressState(contentId, collection)
+
+  return status !== '' ? await contentStatusReset(contentId, collection) : null
+}
+
 export async function onContentCompletedLearningPathListener(event) {
   console.log('if')
   if (event?.collection?.type !== 'learning-path-v2') return

package/src/services/contentAggregator.js

@@ -1,11 +1,15 @@
 import {
   getNavigateTo,
+  getNavigateToForMethod,
   getProgressDataByIds,
+  getProgressDataByIdsAndCollections,
   getProgressStateByIds,
   getResumeTimeSecondsByIds,
+  getResumeTimeSecondsByIdsAndCollections,
 } from './contentProgress'
 import { isContentLikedByIds } from './contentLikes'
 import { fetchLastInteractedChild, fetchLikeCount } from './railcontent'
+import {COLLECTION_TYPE} from "./sync/models/ContentProgress";
 
 /**
  * Combine sanity data with BE contextual data.
@@ -54,12 +58,11 @@ import { fetchLastInteractedChild, fetchLikeCount } from './railcontent'
  *
  */
 
-// need to add method support.
-// this means returning collection_type and collection_id
 export async function addContextToContent(dataPromise, ...dataArgs) {
   const lastArg = dataArgs[dataArgs.length - 1]
   const options = typeof lastArg === 'object' && !Array.isArray(lastArg) ? lastArg : {}
 
+  // todo: merge addProgressData with addResumeTimeSeconds to one watermelon call
   const {
     collection = null, // this is needed for different collection types like learning paths. has .id and .type
     dataField = null,
@@ -115,6 +118,121 @@ export async function addContextToContent(dataPromise, ...dataArgs) {
   return await processItems(data, addContext, dataField, isDataAnArray, dataField_includeParent)
 }
 
+/**
+ * Enriches method content (learning paths) with contextual data.
+ *
+ * Key behaviors:
+ * 1. Enriches all learning paths in a method structure
+ * 2. Auto-sets collection for learning-path-v2 items when no collection specified
+ * 3. Enriches intro videos when dataField_includeIntroVideo is true
+ *
+ * @param dataPromise - promise or method that provides sanity data
+ * @param dataArgs - Arguments to pass to the dataPromise
+ * @param options - Same as addContextToContent, plus:
+ * @param options.dataField_includeIntroVideo - If true, adds progress to intro_video field where it exists
+ *
+ * @returns {Promise<Object | false>} - Enriched data or false if no data found
+ *
+ * @example
+ * // Enrich method structure with all learning paths
+ * const method = await addContextToMethodContent(fetchMethodV2Structure, brand, {
+ *   dataField: 'learningPaths',
+ *   dataField_includeIntroVideo: true,
+ *   addProgressStatus: true,
+ *   addProgressPercentage: true,
+ * })
+ *
+ * @example
+ * // Enrich single learning path with intro video
+ * const lp = await addContextToMethodContent(fetchByRailContentId, lpId, 'learning-path-v2', {
+ *   collection: { id: lpId, type: 'learning-path-v2' },
+ *   dataField: 'children',
+ *   dataField_includeParent: true,
+ *   dataField_includeIntroVideo: true,
+ *   addProgressStatus: true,
+ * })
+ */
+export async function addContextToLearningPaths(dataPromise, ...dataArgs) {
+  const lastArg = dataArgs[dataArgs.length - 1]
+  const options = typeof lastArg === 'object' && !Array.isArray(lastArg) ? lastArg : {}
+
+  // todo: merge addProgressData with addResumeTimeSeconds to one watermelon call
+  const {
+    dataField = null,
+    dataField_includeParent = false,
+    dataField_includeIntroVideo = false,
+    addProgressPercentage = false,
+    addProgressStatus = false,
+    addProgressTimestamp = false,
+    addIsLiked = false,
+    addLikeCount = false,
+    addResumeTimeSeconds = false,
+    addNavigateTo = false,
+  } = options
+
+  const dataParam = lastArg === options ? dataArgs.slice(0, -1) : dataArgs
+
+  let data = await dataPromise(...dataParam)
+  const isDataAnArray = Array.isArray(data)
+  if (isDataAnArray && data.length === 0) return data
+  if (!data) return false
+
+  let items = extractItemsWithCollectionFromMethodData(data, dataField, isDataAnArray, dataField_includeParent, dataField_includeIntroVideo) ?? []
+  if (items.length === 0) return data
+
+  let ids = items.map((item) => (
+    {
+      contentId: item.content?.id,
+      collection: item.collection
+    })
+  ).filter(obj => obj.contentId)
+
+  const justIds = ids.map(obj => obj.contentId)
+
+  const [
+    progressData,
+    isLikedData,
+    resumeTimeData,
+    navigateToData,
+  ] = await Promise.all([
+    addProgressPercentage || addProgressStatus || addProgressTimestamp
+      ? getProgressDataByIdsAndCollections(ids) : Promise.resolve(null),
+    addIsLiked ? isContentLikedByIds(justIds) : Promise.resolve(null),
+    addResumeTimeSeconds ? getResumeTimeSecondsByIdsAndCollections(ids) : Promise.resolve(null),
+    addNavigateTo ? getNavigateToForMethod(items) : Promise.resolve(null),
+  ])
+
+  const addContext = async (item) => {
+    const itemId = item.id || 0
+    const enrichedItem = {
+      ...item,
+      ...(addProgressPercentage ? { progressPercentage: progressData?.[itemId]?.progress } : {}),
+      ...(addProgressStatus ? { progressStatus: progressData?.[itemId]?.status } : {}),
+      ...(addProgressTimestamp ? { progressTimestamp: progressData?.[itemId]?.last_update } : {}),
+      ...(addIsLiked ? { isLiked: isLikedData?.[itemId] } : {}),
+      ...(addLikeCount && ids.length === 1 ? { likeCount: await fetchLikeCount(itemId) } : {}),
+      ...(addResumeTimeSeconds ? { resumeTime: resumeTimeData?.[itemId] } : {}),
+      ...(addNavigateTo ? { navigateTo: navigateToData?.[itemId] } : {}),
+    }
+
+    // Enrich intro_video if it exists and flag is set
+    if (dataField_includeIntroVideo && item?.intro_video?.id) {
+      enrichedItem.intro_video = {
+        ...item.intro_video,
+        ...(addProgressPercentage ? { progressPercentage: progressData?.[item.intro_video.id]?.progress } : {}),
+        ...(addProgressStatus ? { progressStatus: progressData?.[item.intro_video.id]?.status } : {}),
+        ...(addProgressTimestamp ? { progressTimestamp: progressData?.[item.intro_video.id]?.last_update } : {}),
+        ...(addIsLiked ? { isLiked: isLikedData?.[item.intro_video.id] } : {}),
+        ...(addResumeTimeSeconds ? { resumeTime: resumeTimeData?.[item.intro_video.id] } : {}),
+      }
+    }
+
+    return enrichedItem
+  }
+
+  return await processItems(data, addContext, dataField, isDataAnArray, dataField_includeParent)
+}
+
 export async function getNavigateToForPlaylists(data, { dataField = null } = {}) {
   let playlists = extractItemsFromData(data, dataField, false, false)
   let allIds = []
@@ -191,6 +309,47 @@ function extractItemsFromData(data, dataField, isParentArray, includeParent) {
   return items
 }
 
+function extractItemsWithCollectionFromMethodData(data, dataField, isDataAnArray, includeParent, includeIntroVideo) {
+  let items = [] // array of tuples {}
+
+  const extractLearningPathItems = (item) => {
+    if (item.type === COLLECTION_TYPE.LEARNING_PATH) {
+      const c = {type: COLLECTION_TYPE.LEARNING_PATH, id: item.id}
+
+      if (!dataField || (dataField && includeParent)) {
+        items.push(...getDataTuple([item], c))
+      }
+      if (includeIntroVideo) {
+        items.push(...getDataTuple([item.intro_video], null))
+      }
+      if (dataField) {
+        items.push(...getDataTuple(item[dataField], c))
+      }
+    } else { // is a lesson id, cant determine which collection it belongs to
+      // do not add it as we cant determine collection
+      // items.push(...getDataTuple([data], collection))
+    }
+  }
+
+  if (isDataAnArray) {
+    for (const item of data) {
+      extractLearningPathItems(item)
+    }
+  } else {
+    extractLearningPathItems(data)
+  }
+  return items
+
+  function getDataTuple(data, collection) {
+    const tuples = []
+    for (const item of data) {
+      const coll = collection || null
+      tuples.push({content: item, collection: coll})
+    }
+    return tuples
+  }
+}
+
 async function processItems(data, addContext, dataField, isParentArray, includeParent) {
   if (dataField) {
     if (isParentArray) {