musora-content-services 2.30.9 → 2.31.1

package/CHANGELOG.md

@@ -2,6 +2,27 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [2.31.1](https://github.com/railroadmedia/musora-content-services/compare/v2.31.0...v2.31.1) (2025-08-14)
+
+
+### Bug Fixes
+
+* **MU-922:** uses BE for fetching recent content items ([#411](https://github.com/railroadmedia/musora-content-services/issues/411)) ([e85fe88](https://github.com/railroadmedia/musora-content-services/commit/e85fe881d382aadbe8fc902e959cfad2cbc98576))
+
+## [2.31.0](https://github.com/railroadmedia/musora-content-services/compare/v2.30.9...v2.31.0) (2025-08-14)
+
+
+### Features
+
+* T3PS-458: Add Jam Tracks pill on Songs Overview page ([7351760](https://github.com/railroadmedia/musora-content-services/commit/7351760f3c4a92997036c860fadb6ef2602fc505))
+
+
+### Bug Fixes
+
+* MU2-914: prevent null access error in fetchUnreadCount ([1813999](https://github.com/railroadmedia/musora-content-services/commit/1813999872466f970aa20c936d702b6a4ecc7b91))
+* prevent null access error in fetchUnreadCount ([df39ccf](https://github.com/railroadmedia/musora-content-services/commit/df39ccfaf972214d08827e5a60f91653d491504e))
+* T3PS-732 Filter sorting by name ([a25792c](https://github.com/railroadmedia/musora-content-services/commit/a25792cfce9163b8124c3f000569fd24541a7b33))
+
 ### [2.30.9](https://github.com/railroadmedia/musora-content-services/compare/v2.30.5...v2.30.9) (2025-08-13)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "musora-content-services",
-  "version": "2.30.9",
+  "version": "2.31.1",
   "description": "A package for Musoras content services ",
   "main": "src/index.js",
   "type": "module",

package/src/contentMetaData.js

@@ -39,6 +39,7 @@ export class Tabs {
   static Tutorials = { name: 'Tutorials', short_name: 'Tutorials', value: 'type,tutorials', cardType: 'big' }
   static Transcriptions = { name: 'Transcriptions', short_name: 'Transcriptions', value: 'type,transcription', cardType: 'small' }
   static PlayAlongs = { name: 'Play-Alongs', short_name: 'Play-Alongs', value:'type,play along', cardType: 'small' }
+  static JamTracks = { name: 'Jam Tracks', short_name: 'Jam Tracks', value:'type,jam-track', cardType: 'small' }
   static RecentAll = { name: 'All', short_name: 'All' }
   static RecentIncomplete = { name: 'Incomplete', short_name: 'Incomplete' }
   static RecentCompleted = { name: 'Completed', short_name: 'Completed' }
@@ -220,6 +221,7 @@ const commonMetadata = {
       Tabs.Tutorials,
       Tabs.Transcriptions,
       Tabs.PlayAlongs,
+      Tabs.JamTracks,
       Tabs.ExploreAll
     ],
   },
@@ -359,6 +361,7 @@ const contentMetadata = {
         Tabs.Tutorials,
         Tabs.Transcriptions,
         Tabs.PlayAlongs,
+        Tabs.JamTracks,
         Tabs.ExploreAll
       ],
     },
@@ -400,6 +403,7 @@ const contentMetadata = {
         Tabs.Tutorials,
         Tabs.Transcriptions,
         Tabs.PlayAlongs,
+        Tabs.JamTracks,
         Tabs.ExploreAll
       ],
     },
@@ -451,6 +455,7 @@ const contentMetadata = {
         Tabs.Tutorials,
         Tabs.Transcriptions,
         Tabs.PlayAlongs,
+        Tabs.JamTracks,
         Tabs.ExploreAll
       ],
     },
@@ -491,6 +496,7 @@ const contentMetadata = {
         Tabs.Tutorials,
         Tabs.Transcriptions,
         Tabs.PlayAlongs,
+        Tabs.JamTracks,
         Tabs.ExploreAll
       ],
     },

package/src/contentTypeConfig.js

@@ -174,6 +174,7 @@ export const studentArchivesLessonTypes = ['student-review', 'student-focus','st
 export const tutorialsLessonTypes = ['song-tutorial'];
 export const transcriptionsLessonTypes = ['song'];
 export const playAlongLessonTypes = ['play-along'];
+export const jamTrackLessonTypes = ['jam-track'];
 
 export const individualLessonsTypes = [
   ...singleLessonTypes,
@@ -207,7 +208,7 @@ export const lessonTypesMapping = {
   'tabs': transcriptionsLessonTypes,
   'sheet music': transcriptionsLessonTypes,
   'play-alongs': playAlongLessonTypes,
-  'jam tracks': ['jam-track'],
+  'jam tracks': jamTrackLessonTypes,
 };
 
 export const getNextLessonLessonParentTypes = ['course', 'guided-course', 'pack', 'pack-bundle', 'song-tutorial'];
@@ -222,7 +223,7 @@ export const progressTypesMapping = {
   'guided course': ['guided-course'],
   'pack': ['pack', 'semester-pack'],
   'method': ['learning-path'],
-  'jam track': ['jam-track'],
+  'jam track': jamTrackLessonTypes,
   'course video': ['course-part'],
 };
 
@@ -235,7 +236,7 @@ export const songs = {
 
 export const filterTypes = {
   lessons: [...individualLessonsTypes, ...collectionLessonTypes],
-  songs: [...tutorialsLessonTypes, ...transcriptionsLessonTypes, ...playAlongLessonTypes, 'jam-track'],
+  songs: [...tutorialsLessonTypes, ...transcriptionsLessonTypes, ...playAlongLessonTypes, ...jamTrackLessonTypes],
 }
 
 export const recentTypes = {
@@ -670,6 +671,12 @@ export function getUpcomingEventsTypes(brand) {
   }
 }
 
+export function getRecentTypesForPage(pageType) {
+  const types = recentTypes[pageType]
+  // defensive copy with de-duplication to avoid accidental mutation and redundant query params
+  return Array.isArray(types) ? [...new Set(types)] : []
+}
+
 export function artistOrInstructorName(key = 'artist_name') {
   return `'${key}': coalesce(artist->name, instructor[0]->name)`
 }
@@ -802,6 +809,9 @@ export function filtersToGroq(filters, selectedFilters = [], pageName = '') {
             } else if(value.toLowerCase() === Tabs.PlayAlongs.name.toLowerCase()){
               const conditions = playAlongLessonTypes.map(lessonType => `_type == '${lessonType}'`).join(' || ');
               return ` (${conditions})`;
+            } else if(value.toLowerCase() === Tabs.JamTracks.name.toLowerCase()){
+              const conditions = jamTrackLessonTypes.map(lessonType => `_type == '${lessonType}'`).join(' || ');
+              return ` (${conditions})`;
             } else if(value.toLowerCase() === Tabs.ExploreAll.name.toLowerCase()){
               var allLessons = filterTypes[pageName] || [];
               const conditions = allLessons.map(lessonType => `_type == '${lessonType}'`).join(' || ');

package/src/index.d.ts

@@ -38,6 +38,7 @@ import {
 	getLessonContentRows,
 	getNewAndUpcoming,
 	getRecent,
+	getRecentForTab,
 	getRecommendedForYou,
 	getScheduleContentRows,
 	getTabResults
@@ -129,6 +130,7 @@ import {
 	fetchLastInteractedChild,
 	fetchLikeCount,
 	fetchNextContentDataForParent,
+	fetchRecent,
 	fetchRecentUserActivities,
 	fetchSongsInProgress,
 	fetchTopComment,
@@ -197,7 +199,6 @@ import {
 	fetchPackData,
 	fetchParentForDownload,
 	fetchPlayAlongsCount,
-	fetchRecent,
 	fetchRelatedLessons,
 	fetchRelatedRecommendedContent,
 	fetchRelatedSongs,
@@ -442,6 +443,7 @@ declare module 'musora-content-services' {
 		getProgressStateByIds,
 		getRecent,
 		getRecentActivity,
+		getRecentForTab,
 		getRecommendedForYou,
 		getResumeTimeSeconds,
 		getResumeTimeSecondsByIds,

package/src/index.js

@@ -38,6 +38,7 @@ import {
 	getLessonContentRows,
 	getNewAndUpcoming,
 	getRecent,
+	getRecentForTab,
 	getRecommendedForYou,
 	getScheduleContentRows,
 	getTabResults
@@ -129,6 +130,7 @@ import {
 	fetchLastInteractedChild,
 	fetchLikeCount,
 	fetchNextContentDataForParent,
+	fetchRecent,
 	fetchRecentUserActivities,
 	fetchSongsInProgress,
 	fetchTopComment,
@@ -197,7 +199,6 @@ import {
 	fetchPackData,
 	fetchParentForDownload,
 	fetchPlayAlongsCount,
-	fetchRecent,
 	fetchRelatedLessons,
 	fetchRelatedRecommendedContent,
 	fetchRelatedSongs,
@@ -441,6 +442,7 @@ export {
 	getProgressStateByIds,
 	getRecent,
 	getRecentActivity,
+	getRecentForTab,
 	getRecommendedForYou,
 	getResumeTimeSeconds,
 	getResumeTimeSecondsByIds,

package/src/services/content.js

@@ -5,7 +5,6 @@
 import {
   fetchByRailContentIds,
   fetchMetadata,
-  fetchRecent,
   fetchTabData,
   fetchNewReleases,
   fetchUpcomingEvents,
@@ -13,16 +12,18 @@ import {
   fetchReturning,
   fetchLeaving, fetchScheduledAndNewReleases, fetchContentRows
 } from './sanity.js'
+import {getRecentTypesForPage} from '../contentTypeConfig.js'
 import {TabResponseType, Tabs, capitalizeFirstLetter} from '../contentMetaData.js'
-import {fetchHandler} from "./railcontent";
+import {fetchRecent} from "./railcontent";
 import {recommendations, rankCategories, rankItems} from "./recommendations";
 import {addContextToContent} from "./contentAggregator.js";
 
+export async function getLessonContentRows(brand, pageName) {
+  const [recentContentIds, contentRows] = await Promise.all([
+    fetchRecent(brand, { types: getRecentTypesForPage(pageName) }, { limit: 10 }),
+    getContentRows(brand, pageName)
+  ])
 
-export async function getLessonContentRows (brand='drumeo', pageName = 'lessons') {
-  let recentContentIds = await fetchRecent(brand, pageName, { progress: 'recent', limit: 10 });
-
-  let contentRows = await getContentRows(brand, pageName);
   contentRows = Array.isArray(contentRows) ? contentRows : [];
   contentRows.unshift({
     id: 'recent',
@@ -66,13 +67,8 @@ export async function getTabResults(brand, pageName, tabName, {
   sort = 'recommended',
   selectedFilters = []
 } = {}) {
-  // Extract and handle 'progress' filter separately
-  const progressFilter = selectedFilters.find(f => f.startsWith('progress,')) || 'progress,all';
-  const progressValue = progressFilter.split(',')[1].toLowerCase();
-  const filteredSelectedFilters = selectedFilters.filter(f => !f.startsWith('progress,'));
-
   // Prepare included fields
-  const mergedIncludedFields = [...filteredSelectedFilters, `tab,${tabName.toLowerCase()}`];
+  const mergedIncludedFields = [...selectedFilters, `tab,${tabName.toLowerCase()}`];
 
   // Fetch data
   let results
@@ -85,7 +81,7 @@ export async function getTabResults(brand, pageName, tabName, {
       addProgressStatus: true
     })
   } else {
-    let temp = await fetchTabData(brand, pageName, { page, limit, sort, includedFields: mergedIncludedFields, progress: progressValue });
+    let temp = await fetchTabData(brand, pageName, { page, limit, sort, includedFields: mergedIncludedFields });
 
     const [ranking, contextResults] = await Promise.all([
       sort === 'recommended' ? rankItems(brand, temp.entity.map(e => e.railcontent_id)) : [],
@@ -104,7 +100,6 @@ export async function getTabResults(brand, pageName, tabName, {
     })
   }
 
-
   // Fetch metadata
   const metaData = await fetchMetadata(brand, pageName);
 
@@ -115,8 +110,7 @@ export async function getTabResults(brand, pageName, tabName, {
       const value = item.value.split(',')[1];
       return {
         ...item,
-        selected: selectedFilters.includes(`${filter.key},${value}`) ||
-                      (filter.key === 'progress' && value === 'all' && !selectedFilters.some(f => f.startsWith('progress,')))
+        selected: selectedFilters.includes(`${filter.key},${value}`)
       };
     })
   }));
@@ -151,7 +145,7 @@ export async function getTabResults(brand, pageName, tabName, {
  * @returns {Promise<Object>} - The fetched content data.
  *
  * @example
- * getRecent('drumeo', 'lessons', 'all', {
+ * getRecent('drumeo', { status: 'completed', types: ['lessons'] }, {
  *   page: 2,
  *   limit: 15,
  *   sort: '-popularity'
@@ -159,14 +153,43 @@ export async function getTabResults(brand, pageName, tabName, {
  *   .then(content => console.log(content))
  *   .catch(error => console.error(error));
  */
-export async function getRecent(brand, pageName, tabName = 'all', {
+export async function getRecent(brand, { status, types } = {}, {
   page = 1,
-  limit = 10,
-  sort = '-published_on',
+  limit = 10
 } = {}) {
-  const progress = tabName.toLowerCase() == 'all' ? 'recent':tabName.toLowerCase();
-  const recentContentIds = await fetchRecent(brand, pageName, { page:page, limit:limit, progress: progress });
-  const metaData = await fetchMetadata(brand, 'recent');
+  return await fetchRecent(brand, { status, types }, { page, limit });
+}
+
+/**
+ * Fetches recent content for a given brand and page with pagination.
+ *
+ * @param {string} brand - The brand for which to fetch data.
+ * @param {string} pageName - The page name (e.g., 'all', 'incomplete', 'completed').
+ * @param {string} [tabName='all'] - The tab name (defaults to 'all' for recent content).
+ * @param {Object} params - Parameters for pagination and sorting.
+ * @param {number} [params.page=1] - The page number for pagination.
+ * @param {number} [params.limit=10] - The number of items per page.
+ * @param {string} [params.sort="-published_on"] - The field to sort the data by.
+ * @returns {Promise<Object>} - The fetched content data.
+ *
+ * @example
+ * getRecent('drumeo', 'lessons', 'all', {
+ *   page: 2,
+ *   limit: 15,
+ *   sort: '-popularity'
+ * })
+ *   .then(content => console.log(content))
+ *   .catch(error => console.error(error));
+ */
+export async function getRecentForTab(brand, pageType, tabName, { page = 1, limit = 10 } = {}) {
+  const types = getRecentTypesForPage(pageType)
+  const status = tabName === Tabs.RecentCompleted.name ? 'completed' : tabName === Tabs.RecentIncomplete.name ? 'incomplete' : null
+
+  const [recentContentIds, metaData] = await Promise.all([
+    fetchRecent(brand, { status, types }, { page, limit }),
+    fetchMetadata(brand, 'recent')
+  ])
+
   return {
     type: TabResponseType.CATALOG,
     data: recentContentIds,

package/src/services/railcontent.js

@@ -668,6 +668,25 @@ export async function fetchUserPracticeNotes(date) {
   return await fetchHandler(url, 'GET', null)
 }
 
+export async function fetchRecent(brand, { status, types } = {}, {
+  page = 1,
+  limit = 10
+} = {}) {
+  const query = new URLSearchParams()
+  query.append('brand', brand)
+  if (status) query.append('status', status)
+  if (types) {
+    types.forEach((type) => query.append('types[]', type))
+  }
+
+  query.append('page', page)
+  query.append('limit', limit)
+
+  const url = `/api/content-org/v1/user/recent?${query.toString()}`
+  const response = await fetchHandler(url, 'GET', null)
+  return response ? response.result : []
+}
+
 /**
  * Get the id and slug of last interacted child. Only valid for certain content types
  *

package/src/services/sanity.js

@@ -19,6 +19,7 @@ import {
   getFieldsForContentTypeWithFilteredChildren,
   getChildFieldsForContentType,
   SONG_TYPES,
+  recentTypes
 } from '../contentTypeConfig.js'
 import {fetchSimilarItems, recommendations} from './recommendations.js'
 import { processMetadata, typeWithSortOrder } from '../contentMetaData.js'
@@ -753,7 +754,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
@@ -2051,10 +2052,10 @@ async function buildQuery(
 function buildEntityAndTotalQuery(
   filter = '',
   fields = '...',
-  { sortOrder = 'published_on desc', start = 0, end = 10, isSingle = false, withoutPagination = false }
+  { sortOrder = 'published_on desc', start = 0, end = 10, isSingle = false }
 ) {
   const sortString = sortOrder ? ` | order(${sortOrder})` : ''
-  const countString = isSingle ? '[0...1]' : (withoutPagination ? ``: `[${start}...${end}]`)
+  const countString = isSingle ? '[0...1]' : `[${start}...${end}]`
   const query = `{
       "entity": *[${filter}]  ${sortString}${countString}
       {
@@ -2168,9 +2169,7 @@ export async function fetchTabData(
     page = 1,
     limit = 10,
     sort = '-published_on',
-    includedFields = [],
-    progressIds = undefined,
-    progress = 'all',
+    includedFields = []
   } = {}
 ) {
   const start = (page - 1) * limit
@@ -2181,23 +2180,6 @@ export async function fetchTabData(
 
   let sortOrder = getSortOrder(sort, brand, '')
 
-  switch (progress) {
-    case 'recent':
-      progressIds = await getAllStartedOrCompleted({ brand, onlyIds: true });
-      sortOrder = null;
-      break;
-    case 'incomplete':
-      progressIds = await getAllStarted();
-      sortOrder = null;
-      break;
-    case 'completed':
-      progressIds = await getAllCompleted();
-      sortOrder = null;
-      break;
-  }
-
-  // limits the results to supplied progressIds for started & completed filters
-  const progressFilter = await getProgressFilter(progress, progressIds)
   const fieldsString = getFieldsForContentType('tab-data');
   const now = getSanityDate(new Date())
 
@@ -2206,7 +2188,7 @@ export async function fetchTabData(
   let entityFieldsString = ''
   let filter = ''
 
-  filter = `brand == "${brand}" ${includedFieldsFilter} ${progressFilter}`
+  filter = `brand == "${brand}" ${includedFieldsFilter}`
   const childrenFilter = await new FilterBuilder(``, { isChildrenFilter: true }).buildFilter()
   const lessonCountFilter = await new FilterBuilder(`_id in ^.child[]._ref`).buildFilter()
   entityFieldsString =
@@ -2231,36 +2213,9 @@ export async function fetchTabData(
 
   let results = await fetchSanity(query, true);
 
-  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) => {
-        const aIdx = orderMap.get(a.id) ?? Number.MAX_SAFE_INTEGER;
-        const bIdx = orderMap.get(b.id) ?? Number.MAX_SAFE_INTEGER;
-        return aIdx - bIdx || new Date(b.published_on) - new Date(a.published_on);
-      })
-      .slice(start, end);
-  }
-
   return results;
 }
 
-export async function fetchRecent(
-  brand,
-  pageName,
-  { page = 1, limit = 10, sort = '-published_on', includedFields = [], progress = 'recent' } = {}
-) {
-  const mergedIncludedFields = [...includedFields, `tab,all`]
-  const results = await fetchTabData(brand, pageName, {
-    page,
-    limit,
-    sort,
-    includedFields: mergedIncludedFields,
-    progress: progress.toLowerCase(),
-  })
-  return results.entity
-}
-
 export async function fetchScheduledAndNewReleases(
   brand,
   { page = 1, limit = 20, sort = '-published_on' } = {}

package/src/services/user/notifications.js

@@ -162,7 +162,7 @@ export async function restoreNotification(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()
@@ -170,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/test/contentProgress.test.js

@@ -15,7 +15,6 @@ import {
 } from '../src/services/contentProgress'
 import { initializeTestService } from './initializeTests'
 import {getLessonContentRows, postContentComplete} from '../src'
-import {fetchRecent} from "../src/services/sanity";
 import {getRecent, getTabResults} from "../src/services/content";
 import {individualLessonsTypes, playAlongLessonTypes, transcriptionsLessonTypes, tutorialsLessonTypes} from "../src/contentTypeConfig";
 
@@ -258,21 +257,21 @@ describe('contentProgressDataContext', function () {
   //
   // });
   test('getRecentLessons', async () => {
-    let result = await getRecent('drumeo','lessons', 'all',{page:1, limit:10})
+    let result = await getRecent('drumeo', {})
     console.log(result);
     expect(result.data[0].id).toStrictEqual(412986)
     expect(individualLessonsTypes).toContain(result.data[0].type)
   })
 
   test('getRecentLessons-Incomplete', async () => {
-    let result = await getRecent('drumeo','lessons','Incomplete')
+    let result = await getRecent('drumeo', {status: 'incomplete'})
     console.log(result);
     expect(result.data[0].id).toStrictEqual(407665)
     expect(individualLessonsTypes).toContain(result.data[0].type)
   })
 
   test('getRecentLessons-Completed', async () => {
-    let result = await getRecent('drumeo','lessons','Completed')
+    let result = await getRecent('drumeo', {status: 'completed'})
     console.log(result);
     expect(result.data[0].id).toStrictEqual(412986)
     expect(individualLessonsTypes).toContain(result.data[0].type)