musora-content-services 2.16.0 → 2.17.0

package/src/index.d.ts

@@ -118,6 +118,7 @@ import {
 	fetchChallengeLessonData,
 	fetchChallengeMetadata,
 	fetchChallengeUserActiveChallenges,
+	fetchComment,
 	fetchCommentRelies,
 	fetchComments,
 	fetchCompletedChallenges,
@@ -342,6 +343,7 @@ declare module 'musora-content-services' {
 		fetchChatSettings,
 		fetchCoachLessons,
 		fetchComingSoon,
+		fetchComment,
 		fetchCommentModContentData,
 		fetchCommentRelies,
 		fetchComments,

package/src/index.js

@@ -118,6 +118,7 @@ import {
 	fetchChallengeLessonData,
 	fetchChallengeMetadata,
 	fetchChallengeUserActiveChallenges,
+	fetchComment,
 	fetchCommentRelies,
 	fetchComments,
 	fetchCompletedChallenges,
@@ -341,6 +342,7 @@ export {
 	fetchChatSettings,
 	fetchCoachLessons,
 	fetchComingSoon,
+	fetchComment,
 	fetchCommentModContentData,
 	fetchCommentRelies,
 	fetchComments,

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/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 })
     })
   })