musora-content-services 2.35.0 → 2.36.3

package/src/services/userActivity.js

@@ -13,7 +13,7 @@ import {
 import { DataContext, UserActivityVersionKey } from './dataContext.js'
 import { fetchByRailContentId, fetchByRailContentIds, fetchShows } from './sanity'
 import { fetchPlaylist, fetchUserPlaylists } from './content-org/playlists'
-import {guidedCourses, pinnedGuidedCourses} from './content-org/guided-courses'
+import {guidedCourses} from './content-org/guided-courses'
 import {
   getMonday,
   getWeekNumber,
@@ -950,7 +950,6 @@ async function extractPinnedItemsAndSortAllItems(
   userPinnedItem,
   contentsMap,
   eligiblePlaylistItems,
-  pinnedGuidedCourse,
   limit
 ) {
   let pinnedItem = await popPinnedItemFromContentsOrPlaylistMap(
@@ -959,22 +958,8 @@ async function extractPinnedItemsAndSortAllItems(
     eligiblePlaylistItems
   )
 
-  const guidedCourseID = pinnedGuidedCourse?.content_id
   let combined = []
-  if (pinnedGuidedCourse) {
-    const guidedCourseContent =
-      contentsMap.get(guidedCourseID) ??
-      (await addContextToContent(fetchByRailContentId, guidedCourseID, 'guided-course', {
-        addNextLesson: true,
-        addNavigateTo: true,
-        addProgressStatus: true,
-        addProgressPercentage: true,
-        addProgressTimestamp: true,
-      }))
-    contentsMap = popContentAndRemoveChildrenFromContentsMap(guidedCourseContent, contentsMap)
-    guidedCourseContent.pinned = true
-    combined.push(guidedCourseContent)
-  }
+
   if (pinnedItem) {
     pinnedItem.pinned = true
     combined.push(pinnedItem)
@@ -1052,20 +1037,15 @@ function generateContentsMap(contents, playlistsContents) {
 export async function getProgressRows({ brand = null, limit = 8 } = {}) {
   // TODO slice progress to a reasonable number, say 100
 
-  const [recentPlaylists, progressContents, allPinnedGuidedCourse, userPinnedItem, enrolledGuidedCourses] =
+  const [recentPlaylists, progressContents, userPinnedItem, enrolledGuidedCourses] =
     await Promise.all([
       fetchUserPlaylists(brand, { sort: '-last_progress', limit: limit }),
       getAllStartedOrCompleted({ onlyIds: false, brand: brand }),
-      pinnedGuidedCourses(brand),
       getUserPinnedItem(brand),
       guidedCourses()
     ])
 
   const enrolledGuidedCoursesIds = enrolledGuidedCourses.map(course => String(course.content_id));
-
-  const mergedGuidedCourses = 1 //get all cuigded courses, incl no progress.
-  let pinnedGuidedCourse = allPinnedGuidedCourse?.[0] ?? null
-
   const playlists = recentPlaylists?.data || []
   const eligiblePlaylistItems = await getEligiblePlaylistItems(playlists)
   const playlistEngagedOnContents = eligiblePlaylistItems.map(
@@ -1079,8 +1059,6 @@ export async function getProgressRows({ brand = null, limit = 8 } = {}) {
   if (userPinnedItem?.progressType === 'content') {
     nonPlaylistContentIds.push(userPinnedItem.id)
   }
-console.log("nonPlaylistContentIds",nonPlaylistContentIds)
-
 
   const [playlistsContents, contents] = await Promise.all([
     playlistEngagedOnContents ? addContextToContent(fetchByRailContentIds, playlistEngagedOnContents, 'progress-tracker', {
@@ -1103,7 +1081,6 @@ console.log("nonPlaylistContentIds",nonPlaylistContentIds)
     userPinnedItem,
     contentsMap,
     eligiblePlaylistItems,
-    pinnedGuidedCourse,
     limit
   )
   const results = await Promise.all(
@@ -1361,8 +1338,10 @@ export function findIncompleteLesson(progressOnItems, currentContentId, contentT
 
 async function popPinnedItemFromContentsOrPlaylistMap(pinned, contentsMap, playlistItems) {
   if (!pinned) return null
-  const { id, progressType, pinnedAt } = pinned
+  const { id, pinnedAt } = pinned
   let item = null
+  const progressType = pinned.progressType ?? pinned.type;
+
   if (progressType === 'content') {
     const pinnedId = parseInt(id)
     if (contentsMap.has(pinnedId)) {
@@ -1399,15 +1378,19 @@ async function popPinnedItemFromContentsOrPlaylistMap(pinned, contentsMap, playl
 }
 
 function popContentAndRemoveChildrenFromContentsMap(content, contentsMap) {
-  const children = content.children.map((child) => child.id)
-  if (contentsMap.has(content.id)) {
-    contentsMap.delete(content.id)
-  }
-  children.forEach((child) => {
-    if (contentsMap.has(child)) {
-      contentsMap.delete(child)
+  if (!content.children || content.children.length === 0){
+    console.warn(`content ${content.id} has no children`, content);
+  } else {
+    const children = content.children.map((child) => child.id)
+    if (contentsMap.has(content.id)) {
+      contentsMap.delete(content.id)
     }
-  })
+    children.forEach((child) => {
+      if (contentsMap.has(child)) {
+        contentsMap.delete(child)
+      }
+    })
+  }
   return contentsMap
 }
 
@@ -1427,7 +1410,7 @@ function popContentAndRemoveChildrenFromContentsMap(content, contentsMap) {
 export async function pinProgressRow(brand, id, progressType) {
   const url = `/api/user-management-system/v1/progress/pin?brand=${brand}&id=${id}&progressType=${progressType}`
   const response = await fetchHandler(url, 'PUT', null)
-  if (response && !response.error && response['action'] === 'update_user_pin') {
+  if (response && !response.error) {
     await updateUserPinnedProgressRow(brand, {
       id,
       progressType,