musora-content-services 2.83.0 → 2.85.0

package/src/services/railcontent.js

@@ -381,31 +381,43 @@ export async function fetchUserBadges(brand = null) {
 /**
  * complete a content's progress for a given user
  * @param contentId
+ * @param collection {object|null} - the collection context of the progress. null is normal content progress
+ * @param collection.type - the type of collection. options: ["learning-path"]
+ * @param collection.id - the content_id of collection.
  * @returns {Promise<any|string|null>}
  */
-export async function postContentComplete(contentId) {
+export async function postContentComplete(contentId, collection = null) {
   let url = `/api/content/v1/user/progress/complete/${contentId}`
-  return postDataHandler(url)
+  const body = {collection: collection}
+  return postDataHandler(url, body)
 }
 
 /**
  * start the user's progress on a content
  * @param contentId
+ * @param collection {object|null} - the collection context of the progress. null is normal content progress
+ * @param collection.type - the type of collection. options: ["learning-path"]
+ * @param collection.id - the content_id of collection.
  * @returns {Promise<any|string|null>}
  */
-export async function postContentStart(contentId) {
+export async function postContentStart(contentId, collection = null) {
   let url = `/api/content/v1/user/progress/start/${contentId}`
-  return postDataHandler(url)
+  const body = {collection: collection}
+  return postDataHandler(url, body)
 }
 
 /**
  * resets the user's progress on a content
  * @param contentId
+ * @param collection {object|null} - the collection context of the progress. null is normal content progress
+ * @param collection.type - the type of collection. options: ["learning-path"]
+ * @param collection.id - the content_id of collection.
  * @returns {Promise<any|string|null>}
  */
-export async function postContentReset(contentId) {
+export async function postContentReset(contentId, collection = null) {
   let url = `/api/content/v1/user/progress/reset/${contentId}`
-  return postDataHandler(url)
+  const body = {collection: collection}
+  return postDataHandler(url, body)
 }
 
 /**

package/src/services/sanity.js

@@ -478,7 +478,6 @@ export async function fetchByRailContentIds(
     live_event_end_time,
   }`
 
-  console.log('ids query', query)
   const customPostProcess = (results) => {
     const now = getSanityDate(new Date(), false)
     const liveProcess = (result) => {
@@ -2165,7 +2164,7 @@ export async function fetchMethodV2Structure(brand) {
   const _type = 'method-v2'
   const query = `*[_type == '${_type}' && brand == '${brand}'][0...1]{
     'sanity_id': _id,
-    'learningPaths': child[]->{
+    'learning_paths': child[]->{
       'id': railcontent_id,
       'children': child[]->railcontent_id
     }
@@ -2173,6 +2172,23 @@ export async function fetchMethodV2Structure(brand) {
   return await fetchSanity(query, false)
 }
 
+/**
+ * Fetch the structure (just ids) of the Method of a given learning path or learning path lesson.
+ * @param contentId
+ * @returns {Promise<*|null>}
+ */
+export async function fetchMethodV2StructureFromId(contentId) {
+  const _type = "method-v2";
+  const query = `*[_type == '${_type}' && brand == *[railcontent_id == ${contentId}][0].brand][0...1]{
+    'sanity_id': _id,
+    'learning_paths': child[]->{
+      'id': railcontent_id,
+      'children': child[]->railcontent_id
+    }
+  }`
+  return await fetchSanity(query, false);
+}
+
 /**
  * Fetch content owned by the user (excluding membership content).
  * Shows only content accessible through purchases/entitlements, not through membership.

package/src/services/userActivity.js

@@ -986,7 +986,7 @@ async function extractPinnedItemsAndSortAllItems(
   return mergeAndSortItems(combined, limit)
 }
 
-function generateContentsMap(contents, playlistsContents, methodProgressContents) {
+function generateContentsMap(contents, playlistsContents) {
   const excludedTypes = new Set(['pack-bundle', 'guided-course-part'])
   const existingShows = new Set()
   const contentsMap = new Map()
@@ -1027,15 +1027,6 @@ function generateContentsMap(contents, playlistsContents, methodProgressContents
       parentIds.forEach((id) => contentsMap.delete(id))
     }
   }
-  //TODO:: remove method cards from progress rows
-  // if (methodProgressContents && Object.keys(methodProgressContents).length) {
-  //   for (const item of methodProgressContents) {
-  //     const contentId = item.id
-  //     contentsMap.delete(contentId)
-  //     const parentIds = item.parent_content_data || []
-  //     parentIds.forEach((id) => contentsMap.delete(id))
-  //   }
-  // }
 
   return contentsMap
 }
@@ -1075,23 +1066,21 @@ export async function getProgressRows({ brand = 'drumeo', limit = 8 } = {}) {
   }
   //need to update addContextToContent to accept collection info
   const [playlistsContents, contents] = await Promise.all([
-    playlistEngagedOnContents
+    (playlistEngagedOnContents.length > 0)
       ? addContextToContent(fetchByRailContentIds, playlistEngagedOnContents, 'progress-tracker', {
-          addNextLesson: true,
           addNavigateTo: true,
           addProgressStatus: true,
           addProgressPercentage: true,
           addProgressTimestamp: true,
         })
       : Promise.resolve([]),
-    nonPlaylistContentIds
+    (nonPlaylistContentIds.length > 0)
       ? addContextToContent(
           fetchByRailContentIds,
           nonPlaylistContentIds,
           'progress-tracker',
           brand,
           {
-            addNextLesson: true,
             addNavigateTo: true,
             addProgressStatus: true,
             addProgressPercentage: true,