musora-content-services 2.15.1 → 2.17.0

package/src/services/content-org/guided-courses.ts

@@ -24,3 +24,23 @@ export async function fetchEnrollmentPageMetadata(guidedCourse) {
   const url: string = `${BASE_PATH}/v1/user/guided-courses/enrollment/${guidedCourse}`
   return await fetchHandler(url, 'GET')
 }
+
+export async function pinGuidedCourse(guidedCourse) {
+  const url: string = `${BASE_PATH}/v1/user/guided-courses/pin/${guidedCourse}`
+  return await fetchHandler(url, 'POST')
+}
+
+export async function unPinGuidedCourse(guidedCourse) {
+  const url: string = `${BASE_PATH}/v1/user/guided-courses/unpin/${guidedCourse}`
+  return await fetchHandler(url, 'POST')
+}
+
+export async function guidedCourses() {
+  const url: string = `${BASE_PATH}/v1/user/guided-courses/`
+  return await fetchHandler(url, 'GET')
+}
+
+export async function pinnedGuidedCourses() {
+  const url: string = `${BASE_PATH}/v1/user/guided-courses/pinned`
+  return await fetchHandler(url, 'GET')
+}

package/src/services/contentAggregator.js

@@ -43,8 +43,7 @@ export async function addContextToContent(dataPromise, ...dataArgs)
     addResumeTimeSeconds ? getResumeTimeSecondsByIds(ids) : Promise.resolve(null),
     addLastInteractedChild ? fetchLastInteractedChild(ids)  : Promise.resolve(null),
   ])
-  console.log('ids', ids)
-  console.log('lastInteractedChildData', lastInteractedChildData)
+  
   const addContext = async (item) => ({
     ...item,
     ...(addProgressPercentage ? { progressPercentage: progressPercentageData?.[item.id] } : {}),
@@ -54,6 +53,7 @@ export async function addContextToContent(dataPromise, ...dataArgs)
     ...(addResumeTimeSeconds ? { resumeTime: resumeTimeData?.[item.id] } : {}),
     ...(addLastInteractedChild ? { lastInteractedChild: lastInteractedChildData?.[item.id] } : {}),
   })
+  
   if (dataField) {
     data[dataField] = Array.isArray(data[dataField])
         ? await Promise.all(data[dataField].map(addContext))

package/src/services/contentProgress.js

@@ -361,7 +361,7 @@ function getMediaTypeId(mediaType, mediaCategory) {
     case 'practice_play-alongs':
       return 4
     case 'video_soundslice':
-      return 6
+      return 3
     default:
       return 5
   }

package/src/services/railcontent.js

@@ -755,6 +755,23 @@ export async function reportComment(commentId, issue) {
   return await postDataHandler(url, data)
 }
 
+/**
+ * Fetches a single comment by its ID.
+ *
+ * @param {number|string} commentId - The ID of the comment to fetch.
+ * @returns {Promise<Object|null>} - A promise that resolves to the comment object if found, otherwise null.
+ *
+ * @example
+ * fetchComment(123)
+ *   .then(comment => console.log(comment))
+ *   .catch(error => console.error(error));
+ */
+export async function fetchComment(commentId) {
+  const url = `/api/content/v1/comments/${commentId}`
+  const comment = await fetchHandler(url)
+  return comment.parent ? comment.parent : comment
+}
+
 export async function fetchUserPractices(currentVersion = 0, { userId } = {}) {
   const params = new URLSearchParams();
   if (userId) params.append('user_id', userId);

package/src/services/sanity.js

@@ -17,7 +17,7 @@ import {
   getChildFieldsForContentType,
   SONG_TYPES,
 } from '../contentTypeConfig.js'
-import { fetchSimilarItems } from './recommendations.js'
+import {fetchSimilarItems, recommendations} from './recommendations.js'
 import { processMetadata, typeWithSortOrder } from '../contentMetaData.js'
 
 import { globalConfig } from './config.js'
@@ -903,7 +903,7 @@ async function getProgressFilter(progress, progressIds) {
 export function getSortOrder(sort = '-published_on', brand, groupBy) {
   // Determine the sort order
   let sortOrder = ''
-  const isDesc = sort.startsWith('-')
+  let isDesc = sort.startsWith('-')
   sort = isDesc ? sort.substring(1) : sort
   switch (sort) {
     case 'slug':
@@ -919,6 +919,10 @@ export function getSortOrder(sort = '-published_on', brand, groupBy) {
         sortOrder = isDesc ? 'coalesce(popularity, -1)' : 'popularity'
       }
       break
+    case 'recommended':
+      sortOrder = 'published_on'
+      isDesc = true
+      break
     case 'published_on':
     default:
       sortOrder = 'published_on'
@@ -2337,6 +2341,10 @@ export async function fetchTabData(
 
   // 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;
+  }
 
   let fields = DEFAULT_FIELDS
   let fieldsString = fields.join(',')
@@ -2369,7 +2377,7 @@ export async function fetchTabData(
 
   let results = await fetchSanity(query, true);
 
-  if (['recent', 'incomplete', 'completed'].includes(progress) && results.entity.length > 1) {
+  if ((['recent', 'incomplete', 'completed'].includes(progress) || sort == "recommended" )&& 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

@@ -16,7 +16,6 @@ const NotificationChannels = {
  * Fetches notifications for a given brand with optional filters for unread status and limit.
  *
  * @param {Object} [options={}] - Options for fetching notifications.
- * @param {string} options.brand - The brand to filter notifications by. (Required)
  * @param {number} [options.limit=10] - The maximum number of notifications to fetch.
  * @param {number} [options.page=1] - The page number for pagination.
  * @param {boolean} [options.onlyUnread=false] - Whether to fetch only unread notifications. If true, adds `unread=1` to the query.
@@ -26,17 +25,13 @@ const NotificationChannels = {
  * @throws {Error} - Throws an error if the brand is not provided.
  *
  * @example
- * fetchNotifications({ brand: 'drumeo', limit: 5, onlyUnread: true,  page: 2  })
+ * fetchNotifications({ limit: 5, onlyUnread: true,  page: 2  })
  *   .then(notifications => console.log(notifications))
  *   .catch(error => console.error(error));
  */
-export async function fetchNotifications({ brand = null, limit = 10, onlyUnread = false, page = 1 } = {}) {
-  if (!brand) {
-    throw new Error('brand is required')
-  }
-
+export async function fetchNotifications({ limit = 10, onlyUnread = false, page = 1 } = {}) {
   const unreadParam = onlyUnread ? '&unread=1' : ''
-  const url = `${baseUrl}/v1?brand=${brand}${unreadParam}&limit=${limit}&page=${page}`
+  const url = `${baseUrl}/v1?limit=${limit}&page=${page}${unreadParam}`
   return fetchHandler(url, 'get')
 }
 
@@ -66,8 +61,6 @@ export async function markNotificationAsRead(notificationId) {
 /**
  * Marks all notifications as read for a specific brand.
  *
- * @param {string} brand - The brand to filter notifications by.
- *
  * @returns {Promise<any>} - A promise that resolves when all notifications are marked as read.
  *
  * @example
@@ -75,8 +68,8 @@ export async function markNotificationAsRead(notificationId) {
  *   .then(response => console.log(response))
  *   .catch(error => console.error(error));
  */
-export async function markAllNotificationsAsRead(brand) {
-  const url = `${baseUrl}/v1/read?brand=${brand}`
+export async function markAllNotificationsAsRead() {
+  const url = `${baseUrl}/v1/read`
   return fetchHandler(url, 'put')
 }
 
@@ -141,10 +134,7 @@ export async function deleteNotification(notificationId) {
  *   .catch(error => console.error(error));
  */
 export async function fetchUnreadCount({ brand = null} = {}) {
-  if (!brand) {
-    throw new Error('brand is required')
-  }
-  const url = `${baseUrl}/v1/unread-count?brand=${brand}`
+  const url = `${baseUrl}/v1/unread-count`
   return fetchHandler(url, 'get')
 }
 

package/src/services/userActivity.js

@@ -1030,7 +1030,7 @@ async function processContentItem(item) {
   let ctaText = 'Continue';
   if (contentType === 'transcription' || contentType === 'play-along' || contentType === 'jam-track') ctaText = 'Replay Song';
   if (contentType === 'lesson') ctaText = status === 'completed' ? 'Revisit Lesson' : 'Continue';
-  if ((contentType === 'guided course' || contentType === 'song tutorial' || collectionLessonTypes.includes(contentType)) &&  status === 'completed') ctaText = 'Revisit Lessons' ;
+  if (collectionLessonTypes.includes(contentType) &&  status === 'completed') ctaText = 'Revisit Lessons' ;
   if (contentType === 'pack' && status === 'completed') {
     ctaText = 'View Lessons';
   }
@@ -1064,15 +1064,6 @@ async function processContentItem(item) {
       const nextLesson = lessons.find(lesson => lesson.id === nextId)
       data.first_incomplete_child = nextLesson?.parent ?? nextLesson
       data.second_incomplete_child = (nextLesson?.parent) ? nextLesson : null
-      if(data.type === 'challenge' && nextByProgress !== undefined ){
-        const challenge = await fetchChallengeLessonData(nextByProgress)
-        if(challenge.lesson.is_locked) {
-          const timeRemaining = getTimeRemainingUntilLocal(challenge.lesson.unlock_date, {withTotalSeconds:true})
-          data.is_locked = true
-          data.time_remaining_seconds = timeRemaining.totalSeconds
-          ctaText =  'Next lesson in ' + timeRemaining.formatted
-        }
-      }
     }
   }
 
@@ -1250,7 +1241,7 @@ function mergeAndSortItems(items, limit) {
 
 function findIncompleteLesson(progressOnItems, currentContentId, contentType) {
   const ids = Object.keys(progressOnItems).map(Number);
-  if (contentType === 'challenge') {
+  if (contentType === 'guided-course') {
     // Return first incomplete lesson
     return ids.find(id => progressOnItems[id] !== 'completed') || ids.at(0);
   }
@@ -1283,10 +1274,11 @@ function findIncompleteLesson(progressOnItems, currentContentId, contentType) {
  *   .catch(error => console.error(error));
  */
 export async function pinProgressRow(brand, id, progressType) {
+  if (!(brand && id && progressType)) throw new Error(`undefined parameter progressType: ${progressType} brand: ${brand} or id: ${id}`)
   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) {
-    await updatePinnedProgressRow(brand, {
+  if (response && !response.error && response['action'] === 'update_user_pin') {
+    await updateUserPinnedProgressRow(brand, {
       id,
       progressType,
       pinnedAt: new Date().toISOString(),
@@ -1298,23 +1290,25 @@ export async function pinProgressRow(brand, id, progressType) {
  * Unpins the current pinned progress row for a user, scoped by brand.
  *
  * @param {string} brand - The brand context for the unpin action.
+ * @param {string} id - The content or playlist id to unpin.
  * @returns {Promise<Object>} - A promise resolving to the response from the unpin API.
  *
  * @example
- * unpinProgressRow('drumeo')
+ * unpinProgressRow('drumeo', 123456)
  *   .then(response => console.log(response))
  *   .catch(error => console.error(error));
  */
-export async function unpinProgressRow(brand) {
-  const url = `/api/user-management-system/v1/progress/unpin?brand=${brand}`
+export async function unpinProgressRow(brand, id) {
+  if (!(brand && id)) throw new Error(`undefined parameter brand: ${brand} or id: ${id}`)
+  const url = `/api/user-management-system/v1/progress/unpin?brand=${brand}&id=${id}`
   const response = await fetchHandler(url, 'PUT', null)
-  if (response && !response.error) {
-    await updatePinnedProgressRow(brand, null)
+  if (response && !response.error && response['action'] === 'clear_user_pin') {
+    await updateUserPinnedProgressRow(brand, null)
   }
   return response
 }
 
-async function updatePinnedProgressRow(brand, pinnedData) {
+async function updateUserPinnedProgressRow(brand, pinnedData) {
   const userRaw = await globalConfig.localStorage.getItem('user');
   const user = userRaw ? JSON.parse(userRaw) : {};
   user.brand_pinned_progress = user.brand_pinned_progress || {}

package/test/notifications.test.js

@@ -16,22 +16,17 @@ describe('UserNotifications module', function () {
   })
 
   describe('fetchNotifications', () => {
-    it('throws if brand not provided', async () => {
-      await expect(UserNotifications.fetchNotifications()).rejects.toThrow('brand is required')
-    })
-
     it('calls fetchHandler with correct url and method', async () => {
       fetchHandler.mockResolvedValueOnce([{ id: 1 }])
 
       const result = await UserNotifications.fetchNotifications({
-        brand: 'drumeo',
         limit: 5,
         onlyUnread: true,
         page: 2,
       })
 
       expect(fetchHandler).toHaveBeenCalledWith(
-        `${baseUrl}/v1?brand=drumeo&unread=1&limit=5&page=2`,
+        `${baseUrl}/v1?limit=5&page=2&unread=1`,
         'get'
       )
       expect(result).toEqual([{ id: 1 }])
@@ -91,15 +86,11 @@ describe('UserNotifications module', function () {
   })
 
   describe('fetchUnreadCount', () => {
-    it('throws if brand not provided', async () => {
-      await expect(UserNotifications.fetchUnreadCount()).rejects.toThrow('brand is required')
-    })
-
     it('calls fetchHandler with correct url and method', async () => {
       fetchHandler.mockResolvedValueOnce({ unread_count: 42 })
 
-      const result = await UserNotifications.fetchUnreadCount({ brand: 'drumeo' })
-      expect(fetchHandler).toHaveBeenCalledWith(`${baseUrl}/v1/unread-count?brand=drumeo`, 'get')
+      const result = await UserNotifications.fetchUnreadCount()
+      expect(fetchHandler).toHaveBeenCalledWith(`${baseUrl}/v1/unread-count`, 'get')
       expect(result).toEqual({ unread_count: 42 })
     })
   })