musora-content-services 2.30.5 → 2.31.0

package/src/services/contentAggregator.js

@@ -77,12 +77,13 @@ export async function addContextToContent(dataPromise, ...dataArgs)
   const dataParam = lastArg === options ? dataArgs.slice(0, -1) : dataArgs
 
   let data = await dataPromise(...dataParam)
-  if(!data) return false
   const isDataAnArray = Array.isArray(data)
-  const items = extractItemsFromData(data, dataField, isDataAnArray, dataField_includeParent)
-  const ids = items.map(item => item?.id).filter(Boolean)
+  if(isDataAnArray && data.length === 0) return data
+  if(!data) return false
 
-  if(ids.length === 0) return false
+  const items = extractItemsFromData(data, dataField, isDataAnArray, dataField_includeParent) ?? []
+  const ids = items.map(item => item?.id).filter(Boolean)
+  if(ids.length === 0) return data
 
   const [progressData, isLikedData, resumeTimeData, lastInteractedChildData, nextLessonData, navigateToData] = await Promise.all([
     addProgressPercentage || addProgressStatus || addProgressTimestamp ? getProgressDateByIds(ids) : Promise.resolve(null),

package/src/services/railcontent.js

@@ -378,16 +378,36 @@ export async function fetchUserBadges(brand = null) {
   return await fetchHandler(url, 'get')
 }
 
+/**
+ * complete a content's progress for a given user
+ * @param contentId
+ * @returns {Promise<any|string|null>}
+ */
 export async function postContentComplete(contentId) {
   let url = `/api/content/v1/user/progress/complete/${contentId}`
   return postDataHandler(url)
 }
 
+/**
+ * resets the user's progress on a content
+ * @param contentId
+ * @returns {Promise<any|string|null>}
+ */
 export async function postContentReset(contentId) {
   let url = `/api/content/v1/user/progress/reset/${contentId}`
   return postDataHandler(url)
 }
 
+/**
+ * restores the user's progress on a content
+ * @param contentId
+ * @returns {Promise<any|string|null>}
+ */
+export async function postContentRestore(contentId) {
+  let url = `/api/content/v1/user/progress/restore/${contentId}`
+  return postDataHandler(url)
+}
+
 /**
  * Set a user's StudentView Flag
  *

package/src/services/sanity.js

@@ -476,7 +476,7 @@ export async function fetchByRailContentId(id, contentType) {
  *   .then(contents => console.log(contents))
  *   .catch(error => console.error(error));
  */
-export async function fetchByRailContentIds(ids, contentType = undefined, brand = undefined) {
+export async function fetchByRailContentIds(ids, contentType = undefined, brand = undefined, includePermissionsAndStatusFilter = false) {
   if (!ids?.length) {
     return []
   }
@@ -485,8 +485,10 @@ export async function fetchByRailContentIds(ids, contentType = undefined, brand
   const brandFilter = brand ? ` && brand == "${brand}"` : ''
   const lessonCountFilter = await new FilterBuilder(`_id in ^.child[]._ref`, {pullFutureContent: true}).buildFilter()
   const fields = await getFieldsForContentTypeWithFilteredChildren(contentType, true)
+  const baseFilter = `railcontent_id in [${idsString}]${brandFilter}`
+  const finalFilter = includePermissionsAndStatusFilter ? await new FilterBuilder(baseFilter).buildFilter() : baseFilter
   const query = `*[
-    railcontent_id in [${idsString}]${brandFilter}
+    ${finalFilter}
   ]{
     ${fields}
     'lesson_count': coalesce(count(*[${lessonCountFilter}]), 0),
@@ -535,7 +537,9 @@ export async function fetchContentRows(brand, pageName, contentRowSlug)
     name,
     'slug': slug.current,
     'content': content[${childFilter}]->{
-        'children': child[${childFilter}]->{ 'id': railcontent_id, 'children': child[${childFilter}]->{'id': railcontent_id}, },
+        'children': child[${childFilter}]->{ 'id': railcontent_id,
+          'type': _type, brand, 'thumbnail': thumbnail.asset->url,
+          'children': child[${childFilter}]->{'id': railcontent_id}, },
         ${getFieldsForContentType('tab-data')}
         'lesson_count': coalesce(count(*[${lessonCountFilter}]), 0),
     },
@@ -749,7 +753,7 @@ export function getSortOrder(sort = '-published_on', brand, groupBy) {
   sort = isDesc ? sort.substring(1) : sort
   switch (sort) {
     case 'slug':
-      sortOrder = groupBy ? 'name' : 'title'
+      sortOrder = groupBy ? 'name' : '!defined(title), lower(title)'
       break
     case 'name':
       sortOrder = sort
@@ -1089,6 +1093,7 @@ export async function jumpToContinueContent(railcontentId) {
 /**
  * Fetch the page data for a specific lesson by Railcontent ID.
  * @param {string} railContentId - The Railcontent ID of the current lesson.
+ * @parent {boolean} addParent - Whether to include parent content data in the response.
  * @returns {Promise<Object|null>} - The fetched page data or null if found.
  *
  * @example
@@ -1096,44 +1101,51 @@ export async function jumpToContinueContent(railcontentId) {
  *   .then(data => console.log(data))
  *   .catch(error => console.error(error));
  */
-export async function fetchLessonContent(railContentId) {
+export async function fetchLessonContent(railContentId, { addParent = false } = {}) {
   const filterParams = { isSingle: true, pullFutureContent: true }
 
+  const parentQuery = addParent
+    ? `"parent_content_data": *[railcontent_id in [...(^.parent_content_data[].id)]]{
+      "id": railcontent_id,
+      title,
+      slug,
+      "type": _type,
+      "logo" : logo_image_url.asset->url,
+      "dark_mode_logo": dark_mode_logo_url.asset->url,
+      "light_mode_logo": light_mode_logo_url.asset->url,
+      "badge": badge[0]->badge.asset->url,
+    },`
+    : ''
+
   const fields = `${getFieldsForContentType()}
-          "resources": ${resourcesField},
-          soundslice,
-          instrumentless,
-          soundslice_slug,
-          "description": ${descriptionField},
-          "chapters": ${chapterField},
-          "instructors":instructor[]->name,
-          "instructor": ${instructorField},
-          ${assignmentsField}
-          video,
-          length_in_seconds,
-          mp3_no_drums_no_click_url,
-          mp3_no_drums_yes_click_url,
-          mp3_yes_drums_no_click_url,
-          mp3_yes_drums_yes_click_url,
-          "permission_id": permission[]->railcontent_id,
-          "parent_content_data": parent_content_data[]{
-            "id": id,
-            "title": *[railcontent_id == ^.id][0].title,
-            "slug":*[railcontent_id == ^.id][0].slug,
-            "type": *[railcontent_id == ^.id][0]._type,
-            "logo" : *[railcontent_id == ^.id][0].logo_image_url.asset->url,
-            "dark_mode_logo": *[railcontent_id == ^.id][0].dark_mode_logo_url.asset->url,
-            "light_mode_logo": *[railcontent_id == ^.id][0].light_mode_logo_url.asset->url,
-          },
-          ...select(
-                defined(live_event_start_time) => {
-                  "live_event_start_time": live_event_start_time,
-                  "live_event_end_time": live_event_end_time,
-                  "live_event_youtube_id": live_event_youtube_id,
-                  "videoId": coalesce(live_event_youtube_id, video.external_id),
-                  "live_event_is_global": live_global_event == true
-                }
-              )`
+    "resources": ${resourcesField},
+    soundslice,
+    instrumentless,
+    soundslice_slug,
+    "description": ${descriptionField},
+    "chapters": ${chapterField},
+    "instructors":instructor[]->name,
+    "instructor": ${instructorField},
+    ${assignmentsField}
+    video,
+    length_in_seconds,
+    mp3_no_drums_no_click_url,
+    mp3_no_drums_yes_click_url,
+    mp3_yes_drums_no_click_url,
+    mp3_yes_drums_yes_click_url,
+    "permission_id": permission[]->railcontent_id,
+    ${parentQuery}
+    ...select(
+      defined(live_event_start_time) => {
+        "live_event_start_time": live_event_start_time,
+        "live_event_end_time": live_event_end_time,
+        "live_event_youtube_id": live_event_youtube_id,
+        "videoId": coalesce(live_event_youtube_id, video.external_id),
+        "live_event_is_global": live_global_event == true
+      }
+    )
+  `
+
   const query = await buildQuery(`railcontent_id == ${railContentId}`, filterParams, fields, {
     isSingle: true,
   })
@@ -1166,7 +1178,7 @@ export async function fetchLessonContent(railContentId) {
 export async function fetchRelatedRecommendedContent(railContentId, brand, count = 10) {
   const recommendedItems = await fetchSimilarItems(railContentId, brand, count)
   if (recommendedItems && recommendedItems.length > 0) {
-    return fetchByRailContentIds(recommendedItems)
+    return fetchByRailContentIds(recommendedItems, 'tab-data', brand, true)
   }
 
   return await fetchRelatedLessons(railContentId, brand).then((result) =>
@@ -1239,20 +1251,26 @@ async function fetchRelatedByLicense(railcontentId, brand, onlyUseSongTypes, cou
  * @param {string} brand - The current brand.
  * @returns {Promise<Array<Object>|null>} - The fetched related lessons data or null if not found.
  */
-export async function fetchSiblingContent(railContentId, brand)
+export async function fetchSiblingContent(railContentId, brand= null)
 {
   const filterGetParent = await new FilterBuilder(`references(^._id) && _type == ^.parent_type`, {
+    pullFutureContent: true
+  }).buildFilter()
+  const filterForParentList = await new FilterBuilder(`references(^._id) && _type == ^.parent_type`, {
     pullFutureContent: true,
+    isParentFilter: true,
   }).buildFilter()
+
   const childrenFilter = await new FilterBuilder(``, { isChildrenFilter: true }).buildFilter()
 
+  const brandString = brand ? ` && brand == "${brand}"` : ''
   const queryFields = `_id, "id":railcontent_id, published_on, "instructor": instructor[0]->name, title, "thumbnail":thumbnail.asset->url, length_in_seconds, status, "type": _type, difficulty, difficulty_string, artist->, "permission_id": permission[]->railcontent_id, "genre": genre[]->name, "parent_id": parent_content_data[0].id`
 
-  const query = `*[railcontent_id == ${railContentId} && brand == "${brand}"]{
+  const query = `*[railcontent_id == ${railContentId}${brandString}]{
    _type, parent_type, 'parent_id': parent_content_data[0].id, railcontent_id,
    'for-calculations': *[${filterGetParent}][0]{
     'siblings-list': child[]->railcontent_id,
-    'parents-list': *[${filterGetParent}][0].child[]->railcontent_id
+    'parents-list': *[${filterForParentList}][0].child[]->railcontent_id
     },
     "related_lessons" : *[${filterGetParent}][0].child[${childrenFilter}]->{${queryFields}}
   }`
@@ -2157,7 +2175,6 @@ export async function fetchTabData(
 ) {
   const start = (page - 1) * limit
   const end = start + limit
-  let withoutPagination = false
   // Construct the included fields filter, replacing 'difficulty' with 'difficulty_string'
   const includedFieldsFilter =
     includedFields.length > 0 ? filtersToGroq(includedFields, [], pageName) : ''
@@ -2168,27 +2185,19 @@ export async function fetchTabData(
     case 'recent':
       progressIds = await getAllStartedOrCompleted({ brand, onlyIds: true });
       sortOrder = null;
-      withoutPagination = true;
       break;
     case 'incomplete':
       progressIds = await getAllStarted();
       sortOrder = null;
-      withoutPagination = true;
       break;
     case 'completed':
       progressIds = await getAllCompleted();
       sortOrder = null;
-      withoutPagination = true;
       break;
   }
 
   // limits the results to supplied progressIds for started & completed filters
   const progressFilter = await getProgressFilter(progress, progressIds)
-  if (sort === "recommended"){
-    progressIds = await recommendations(brand);
-    withoutPagination = true;
-  }
-
   const fieldsString = getFieldsForContentType('tab-data');
   const now = getSanityDate(new Date())
 
@@ -2202,7 +2211,7 @@ export async function fetchTabData(
   const lessonCountFilter = await new FilterBuilder(`_id in ^.child[]._ref`).buildFilter()
   entityFieldsString =
     ` ${fieldsString}
-    'children': child[${childrenFilter}]->{'id': railcontent_id},
+    'children': child[${childrenFilter}]->{'id': railcontent_id, 'type': _type, brand, 'thumbnail': thumbnail.asset->url},
     'isLive': live_event_start_time <= "${now}" && live_event_end_time >= "${now}",
     'lesson_count': coalesce(count(*[${lessonCountFilter}]), 0),
     'length_in_seconds': coalesce(
@@ -2217,13 +2226,12 @@ export async function fetchTabData(
   query = buildEntityAndTotalQuery(filterWithRestrictions, entityFieldsString, {
     sortOrder: sortOrder,
     start: start,
-    end: end,
-    withoutPagination: withoutPagination,
+    end: end
   })
 
   let results = await fetchSanity(query, true);
 
-  if ((['recent', 'incomplete', 'completed'].includes(progress) || sort == "recommended" )&& results.entity.length > 1) {
+  if (['recent', 'incomplete', 'completed'].includes(progress) && results.entity.length > 1) {
     const orderMap = new Map(progressIds.map((id, index) => [id, index]))
     results.entity = results.entity
       .sort((a, b) => {

package/src/services/user/notifications.js

@@ -114,11 +114,33 @@ export async function deleteNotification(notificationId) {
   if (!notificationId) {
     throw new Error('notificationId is required')
   }
-
   const url = `${baseUrl}/v1/${notificationId}`
   return fetchHandler(url, 'delete')
 }
 
+/**
+ * Restores a specific notification.
+ *
+ * @param {number} notificationId - The ID of the notification to restore.
+ *
+ * @returns {Promise<any>} - A promise that resolves when the notification is successfully restored.
+ *
+ * @throws {Error} - Throws an error if notificationId is not provided.
+ *
+ * @example
+ * restoreNotification(123)
+ *   .then(response => console.log(response))
+ *   .catch(error => console.error(error));
+ */
+export async function restoreNotification(notificationId) {
+  if (!notificationId) {
+    throw new Error('notificationId is required')
+  }
+
+  const url = `${baseUrl}/v1/${notificationId}`
+  return fetchHandler(url, 'put')
+}
+
 /**
  * Fetches the count of unread notifications for the current user in a given brand context.
  *
@@ -140,7 +162,7 @@ export async function deleteNotification(notificationId) {
 export async function fetchUnreadCount({ brand = 'drumeo'} = {}) {
   const url = `${baseUrl}/v1/unread-count`
   const notifUnread =  await fetchHandler(url, 'get')
-  if (notifUnread.data > 0) {
+  if (notifUnread && notifUnread.data > 0) {
     return notifUnread// Return early if unread notifications exist
   }
   const liveEventPollingState = await fetchLiveEventPollingState()
@@ -148,7 +170,7 @@ export async function fetchUnreadCount({ brand = 'drumeo'} = {}) {
     const liveEvent = await fetchLiveEvent(brand)
     return { data: liveEvent ? 1 : 0}
   }
-  return notifUnread
+  return { data: 0}
 }
 
 /**

package/src/services/userActivity.js

@@ -11,7 +11,7 @@ import {
   fetchRecentUserActivities,
 } from './railcontent'
 import { DataContext, UserActivityVersionKey } from './dataContext.js'
-import { fetchByRailContentIds, fetchShows } from './sanity'
+import { fetchByRailContentId, fetchByRailContentIds, fetchShows } from './sanity'
 import { fetchPlaylist, fetchUserPlaylists } from './content-org/playlists'
 import { pinnedGuidedCourses } from './content-org/guided-courses'
 import {
@@ -930,6 +930,22 @@ export async function deleteUserActivity(id) {
   return await fetchHandler(url, 'DELETE')
 }
 
+/**
+ * Restores a specific user activity by its ID.
+ *
+ * @param {number|string} id - The ID of the user activity to restore.
+ * @returns {Promise<Object>} - A promise that resolves to the API response after restoration.
+ *
+ * @example
+ * restoreUserActivity(789)
+ *   .then(response => console.log('Restored:', response))
+ *   .catch(error => console.error(error));
+ */
+export async function restoreUserActivity(id) {
+  const url = `/api/user-management-system/v1/activities/${id}`
+  return await fetchHandler(url, 'POST')
+}
+
 async function extractPinnedItemsAndSortAllItems(
   userPinnedItem,
   contentsMap,
@@ -1149,24 +1165,21 @@ async function processContentItem(content) {
   }
 
   return {
-    id: content.id,
-    progressType: 'content',
-    header: contentType,
-    pinned: content.pinned ?? false,
-    content: content,
-    body: {
+    id:                content.id,
+    progressType:      'content',
+    header:            contentType,
+    pinned:            content.pinned ?? false,
+    content:           content,
+    body:              {
       progressPercent: isLive ? undefined : content.progressPercentage,
-      thumbnail: content.thumbnail,
-      title: content.title,
-      isLive: isLive,
-      badge: content.badge ?? null,
-      isLocked: content.is_locked ?? false,
-      subtitle:
-        !content.child_count || content.lesson_count === 1
-          ? contentType === 'lesson' && isLive === false
-            ? `${content.progressPercentage}% Complete`
-            : `${content.difficulty_string} • ${content.artist_name}`
-          : `${content.completed_children} of ${content.lesson_count ?? content.child_count} Lessons Complete`,
+      thumbnail:       content.thumbnail,
+      title:           content.title,
+      isLive:          isLive,
+      badge:           content.badge ?? null,
+      isLocked:        content.is_locked ?? false,
+      subtitle:        collectionLessonTypes.includes(content.type) || content.lesson_count > 1
+        ? `${content.completed_children} of ${content.lesson_count ?? content.child_count} Lessons Complete`
+        : (contentType === 'lesson' && isLive === false) ? `${content.progressPercentage}% Complete`: `${content.difficulty_string} • ${content.artist_name}`
     },
     cta: {
       text: ctaText,