musora-content-services 2.28.6 → 2.30.0

package/src/services/railcontent.js

@@ -3,7 +3,6 @@
  */
 import { globalConfig } from './config.js'
 import { fetchJSONHandler } from '../lib/httpHelper.js'
-import { convertToTimeZone } from './dateUtils.js';
 
 /**
  * Exported functions that are excluded from index generation.
@@ -285,7 +284,7 @@ async function postDataHandler(url, data) {
 }
 
 async function patchDataHandler_depreciated(url, data) {
-  throw Error("PATCH verb throws a CORS error on the FEW. Use PATCH instead")
+  throw Error('PATCH verb throws a CORS error on the FEW. Use PATCH instead')
 }
 
 async function putDataHandler(url, data) {
@@ -296,8 +295,8 @@ async function deleteDataHandler(url, data) {
   return fetchHandler(url, 'delete')
 }
 
-export async function fetchLikeCount(contendId){
-  const url  = `/api/content/v1/content/like_count/${contendId}`
+export async function fetchLikeCount(contendId) {
+  const url = `/api/content/v1/content/like_count/${contendId}`
   return await fetchDataHandler(url)
 }
 
@@ -584,40 +583,36 @@ export async function fetchComment(commentId) {
 }
 
 export async function fetchUserPractices(currentVersion = 0, { userId } = {}) {
-  const params = new URLSearchParams();
-  if (userId) params.append('user_id', userId);
-  const query = params.toString() ? `?${params.toString()}` : '';
-  const url = `/api/user/practices/v1/practices${query}`;
-  const response = await fetchDataHandler(url, currentVersion);
-  const { data, version } = response;
-  const userPractices = data;
-  if(!userPractices ) {
-    return { data: { practices: {} }, version };
+  const params = new URLSearchParams()
+  if (userId) params.append('user_id', userId)
+  const query = params.toString() ? `?${params.toString()}` : ''
+  const url = `/api/user/practices/v1/practices${query}`
+  const response = await fetchDataHandler(url, currentVersion)
+  const { data, version } = response
+  const userPractices = data
+  if (!userPractices) {
+    return { data: { practices: {} }, version }
   }
 
-  const userTimeZone = Intl.DateTimeFormat().resolvedOptions().timeZone;
-
   const formattedPractices = userPractices.reduce((acc, practice) => {
-    // Convert UTC date to user's local date (still a Date object)
-    const userTimeZoneDay = convertToTimeZone(practice.day, userTimeZone);
-    if (!acc[userTimeZoneDay]) {
-      acc[userTimeZoneDay] = [];
+    if (!acc[practice.day]) {
+      acc[practice.day] = []
     }
 
-    acc[userTimeZoneDay].push({
+    acc[practice.day].push({
       id: practice.id,
       duration_seconds: practice.duration_seconds,
-    });
+    })
 
-    return acc;
-  }, {});
+    return acc
+  }, {})
 
   return {
     data: {
       practices: formattedPractices,
     },
     version,
-  };
+  }
 }
 
 export async function logUserPractice(practiceDetails) {
@@ -628,11 +623,11 @@ export async function fetchUserPracticeMeta(practiceIds, userId = null) {
   if (practiceIds.length == 0) {
     return []
   }
-  const params = new URLSearchParams();
-  practiceIds.forEach(id => params.append('practice_ids[]', id));
+  const params = new URLSearchParams()
+  practiceIds.forEach((id) => params.append('practice_ids[]', id))
 
   if (userId !== null) {
-    params.append('user_id', userId);
+    params.append('user_id', userId)
   }
   const url = `/api/user/practices/v1/practices?${params.toString()}`
   return await fetchHandler(url, 'GET', null)
@@ -653,7 +648,6 @@ export async function fetchUserPracticeNotes(date) {
   return await fetchHandler(url, 'GET', null)
 }
 
-
 /**
  * Get the id and slug of last interacted child. Only valid for certain content types
  *
@@ -674,8 +668,8 @@ export async function fetchUserPracticeNotes(date) {
  * }
  */
 export async function fetchLastInteractedChild(content_ids) {
-  const params = new URLSearchParams();
-  content_ids.forEach(id => params.append('content_ids[]', id));
+  const params = new URLSearchParams()
+  content_ids.forEach((id) => params.append('content_ids[]', id))
   const url = `/api/content/v1/user/last_interacted_child?${params.toString()}`
   return await fetchHandler(url, 'GET', null)
 }
@@ -708,18 +702,13 @@ export async function fetchLastInteractedChild(content_ids) {
  *   .then(activities => console.log(activities))
  *   .catch(error => console.error(error));
  */
-export async function fetchRecentUserActivities({
-  page = 1,
-  limit = 5,
-  tabName = null
-} = {}) {
+export async function fetchRecentUserActivities({ page = 1, limit = 5, tabName = null } = {}) {
   let pageAndLimit = `?page=${page}&limit=${limit}`
   let tabParam = tabName ? `&tabName=${tabName}` : ''
   const url = `/api/user-management-system/v1/activities/all${pageAndLimit}${tabParam}`
   return await fetchHandler(url, 'GET', null)
 }
 
-
 function fetchAbsolute(url, params) {
   if (globalConfig.sessionConfig.authToken) {
     params.headers['Authorization'] = `Bearer ${globalConfig.sessionConfig.authToken}`

package/src/services/recommendations.js

@@ -12,6 +12,8 @@ import { HttpClient } from '../infrastructure/http/HttpClient'
  */
 const excludeFromGeneratedIndex = []
 
+const baseURL = 'https://recommender.musora.com'
+
 /**
  * Fetches similar content to the provided content id
  *
@@ -36,10 +38,7 @@ export async function fetchSimilarItems(content_id, brand, count = 10) {
   }
   const url = `/similar_items/`
   try {
-    const httpClient = new HttpClient(
-      globalConfig.recommendationsConfig.baseUrl,
-      globalConfig.recommendationsConfig.token
-    )
+    const httpClient = new HttpClient(baseURL)
     const response = await httpClient.post(url, data)
     // we requested count + 1 then filtered out the extra potential value, so we need slice to the correct size if necessary
     return response['similar_items'].filter((item) => item !== content_id).slice(0, count)
@@ -75,23 +74,29 @@ export async function rankCategories(brand, categories) {
   }
   const url = `/rank_each_list/`
   try {
-    const httpClient = new HttpClient(
-      globalConfig.recommendationsConfig.baseUrl,
-      globalConfig.recommendationsConfig.token
-    )
+    const httpClient = new HttpClient(baseURL)
     const response = await httpClient.post(url, data)
     let rankedCategories = []
 
     for (const rankedPlaylist of response['ranked_playlists']) {
       rankedCategories.push({
-        'slug': rankedPlaylist.playlist_id,
-        'items': rankedPlaylist.ranked_items
+        slug: rankedPlaylist.playlist_id,
+        items: rankedPlaylist.ranked_items,
       })
     }
     return rankedCategories
   } catch (error) {
-    console.error('Fetch error:', error)
-    return null
+    console.error('RankCategories fetch error:', error)
+    const defaultSorting = []
+    for (const slug in categories) {
+      defaultSorting.push(
+        {
+          slug: slug,
+          items: categories[slug],
+        }
+      )
+    }
+    return defaultSorting
   }
 }
 
@@ -117,15 +122,12 @@ export async function rankItems(brand, content_ids) {
   }
   const url = `/rank_items/`
   try {
-    const httpClient = new HttpClient(
-      globalConfig.recommendationsConfig.baseUrl,
-      globalConfig.recommendationsConfig.token
-    )
+    const httpClient = new HttpClient(baseURL)
     const response = await httpClient.post(url, data)
     return response['ranked_content_ids']
   } catch (error) {
-    console.error('Fetch error:', error)
-    return null
+    console.error('rankItems fetch error:', error)
+    return content_ids
   }
 }
 

package/src/services/sanity.js

@@ -16,6 +16,7 @@ import {
   showsTypes,
   getNewReleasesTypes,
   coachLessonsTypes,
+  getFieldsForContentTypeWithFilteredChildren,
   getChildFieldsForContentType,
   SONG_TYPES,
 } from '../contentTypeConfig.js'
@@ -75,7 +76,7 @@ export async function fetchSongById(documentId) {
  */
 export async function fetchLeaving(brand, { pageNumber = 1, contentPerPage = 20 } = {}) {
   const today = new Date()
-  const isoDateOnly = today.toISOString().split('T')[0]
+  const isoDateOnly = getDateOnly(today)
   const filterString = `brand == '${brand}' && quarter_removed > '${isoDateOnly}'`
   const startEndOrder = getQueryFromPage(pageNumber, contentPerPage)
   const sortOrder = {
@@ -102,7 +103,7 @@ export async function fetchLeaving(brand, { pageNumber = 1, contentPerPage = 20
  */
 export async function fetchReturning(brand, { pageNumber = 1, contentPerPage = 20 } = {}) {
   const today = new Date()
-  const isoDateOnly = today.toISOString().split('T')[0]
+  const isoDateOnly = getDateOnly(today)
   const filterString = `brand == '${brand}' && quarter_published >= '${isoDateOnly}'`
   const startEndOrder = getQueryFromPage(pageNumber, contentPerPage)
   const sortOrder = {
@@ -159,41 +160,6 @@ function getQueryFromPage(pageNumber, contentPerPage) {
   return result
 }
 
-/**
- * returns array of next and previous quarter dates as strings
- *
- * @returns {string[]}
- */
-function getNextAndPreviousQuarterDates() {
-  const january = 1
-  const april = 4
-  const july = 7
-  const october = 10
-  const month = new Date().getMonth()
-  let year = new Date().getFullYear()
-  let nextQuarter = ''
-  let prevQuarter = ''
-  if (month < april) {
-    nextQuarter = `${year}-0${april}-01`
-    prevQuarter = `${year}-0${january}-01`
-  } else if (month < july) {
-    nextQuarter = `${year}-0${july}-01`
-    prevQuarter = `${year}-0${april}-01`
-  } else if (month < october) {
-    nextQuarter = `${year}-${october}-01`
-    prevQuarter = `${year}-0${july}-01`
-  } else {
-    prevQuarter = `${year}-${october}-01`
-    year++
-    nextQuarter = `${year}-0${january}-01`
-  }
-
-  let result = []
-  result['next'] = nextQuarter
-  result['previous'] = prevQuarter
-  return result
-}
-
 /**
  * Fetch all artists with lessons available for a specific brand.
  *
@@ -350,8 +316,8 @@ export async function fetchNewReleases(
   const start = (page - 1) * limit
   const end = start + limit
   const sortOrder = getSortOrder(sort, brand)
-  const nextQuarter = getNextAndPreviousQuarterDates()['next']
-  const filter = `_type in ${typesString} && brand == '${brand}' && status == 'published' && show_in_new_feed == true && (!defined(quarter_published) ||  quarter_published != '${nextQuarter}')`
+  const now = getDateOnly()
+  const filter = `_type in ${typesString} && brand == '${brand}' && (status == 'published' && show_in_new_feed == true && published_on <= '${now}')`
   const fields = `
      "id": railcontent_id,
       title,
@@ -367,12 +333,7 @@ export async function fetchNewReleases(
       web_url_path,
       "permission_id": permission[]->railcontent_id,
       `
-  const filterParams = { allowsPullSongsContent: false }
-  const query = await buildQuery(filter, filterParams, fields, {
-    sortOrder: sortOrder,
-    start,
-    end: end,
-  })
+  const query = buildRawQuery(filter, fields, {sortOrder: sortOrder, start, end: end})
   return fetchSanity(query, true)
 }
 
@@ -477,12 +438,12 @@ export async function fetchScheduledReleases(brand, { page = 1, limit = 10 }) {
  *   .catch(error => console.error(error));
  */
 export async function fetchByRailContentId(id, contentType) {
-  const fields = getFieldsForContentType(contentType)
-  const childFields = getChildFieldsForContentType(contentType)
+  const fields = await getFieldsForContentTypeWithFilteredChildren(contentType)
+  const lessonFields = getChildFieldsForContentType(contentType)
   const childrenFilter = await new FilterBuilder(``, { isChildrenFilter: true }).buildFilter()
   const entityFieldsString = ` ${fields}
                                     'child_count': coalesce(count(child[${childrenFilter}]->), 0) ,
-                                    "lessons": child[${childrenFilter}]->{${childFields}},
+                                    "lessons": child[${childrenFilter}]->{${lessonFields}},
                                     'length_in_seconds': coalesce(
       math::sum(
         select(
@@ -519,17 +480,19 @@ export async function fetchByRailContentIds(ids, contentType = undefined, brand
   if (!ids?.length) {
     return []
   }
+  ids = [...new Set(ids.filter(item => item !== null && item !== undefined))];
   const idsString = ids.join(',')
   const brandFilter = brand ? ` && brand == "${brand}"` : ''
-  const now = getSanityDate(new Date())
+  const lessonCountFilter = await new FilterBuilder(`_id in ^.child[]._ref`, {pullFutureContent: true}).buildFilter()
+  const fields = await getFieldsForContentTypeWithFilteredChildren(contentType, true)
   const query = `*[
     railcontent_id in [${idsString}]${brandFilter}
   ]{
-    ${getFieldsForContentType(contentType)}
+    ${fields}
+    'lesson_count': coalesce(count(*[${lessonCountFilter}]), 0),
     live_event_start_time,
     live_event_end_time,
   }`
-
   const customPostProcess = (results) => {
     const now = getSanityDate(new Date(), false);
     const liveProcess = (result) => {
@@ -555,7 +518,7 @@ export async function fetchByRailContentIds(ids, contentType = undefined, brand
   }
 
   // Sort results to match the order of the input IDs
-  const sortedResults = results.sort(sortFuction)
+  const sortedResults = results?.sort(sortFuction) ?? null
 
   return sortedResults
 }
@@ -565,6 +528,7 @@ export async function fetchContentRows(brand, pageName, contentRowSlug)
   if (pageName === 'lessons') pageName = 'lesson'
   if (pageName === 'songs') pageName = 'song'
   const rowString = contentRowSlug ? ` && slug.current == "${contentRowSlug.toLowerCase()}"` : ''
+  const lessonCountFilter = await new FilterBuilder(`_id in ^.child[]._ref`, {pullFutureContent: true}).buildFilter()
   const childFilter = await new FilterBuilder('', {isChildrenFilter: true}).buildFilter()
   const query = `*[_type == 'recommended-content-row' && brand == '${brand}' && type == '${pageName}'${rowString}]{
     brand,
@@ -573,6 +537,7 @@ export async function fetchContentRows(brand, pageName, contentRowSlug)
     'content': content[${childFilter}]->{
         'children': child[${childFilter}]->{ 'id': railcontent_id, 'children': child[${childFilter}]->{'id': railcontent_id}, },
         ${getFieldsForContentType('tab-data')}
+        'lesson_count': coalesce(count(*[${lessonCountFilter}]), 0),
     },
   }`
   return fetchSanity(query, true)
@@ -1172,19 +1137,17 @@ export async function fetchLessonContent(railContentId) {
   const query = await buildQuery(`railcontent_id == ${railContentId}`, filterParams, fields, {
     isSingle: true,
   })
-  console.log('query', query)
   const chapterProcess = (result) => {
     const now = getSanityDate(new Date(), false)
     if (result.live_event_start_time && result.live_event_end_time) {
       result.isLive = result.live_event_start_time <= now && result.live_event_end_time >= now
     }
     const chapters = result.chapters ?? []
-    if (chapters.length == 0) return result
+    if (chapters.length === 0) return result
     result.chapters = chapters.map((chapter, index) => ({
       ...chapter,
       chapter_thumbnail_url: `https://musora-web-platform.s3.amazonaws.com/chapters/${result.brand}/Chapter${index + 1}.jpg`,
     }))
-    console.log('result', result)
     return result
   }
 
@@ -1474,7 +1437,7 @@ export async function fetchLiveEvent(brand, forcedContentId = null) {
  */
 export async function fetchPackData(id) {
   const query = `*[railcontent_id == ${id}]{
-    ${getFieldsForContentType('pack')}
+    ${await getFieldsForContentTypeWithFilteredChildren('pack')}
   } [0...1]`
   return fetchSanity(query, false)
 }
@@ -2013,6 +1976,10 @@ function getSanityDate(date, roundToHourForCaching = true) {
   return date.toISOString()
 }
 
+function getDateOnly(date = new Date()) {
+  return date.toISOString().split('T')[0]
+}
+
 const merge = (a, b, predicate = (a, b) => a === b) => {
   const c = [...a] // copy to avoid side effects
   // add all items from B to copy C if they're not already present
@@ -2230,11 +2197,12 @@ export async function fetchTabData(
 
   filter = `brand == "${brand}" ${includedFieldsFilter} ${progressFilter}`
   const childrenFilter = await new FilterBuilder(``, { isChildrenFilter: true }).buildFilter()
+  const lessonCountFilter = await new FilterBuilder(`_id in ^.child[]._ref`).buildFilter()
   entityFieldsString =
     ` ${fieldsString}
     'children': child[${childrenFilter}]->{'id': railcontent_id},
     'isLive': live_event_start_time <= "${now}" && live_event_end_time >= "${now}",
-    'lesson_count': coalesce(count(child[${childrenFilter}]->), 0),
+    'lesson_count': coalesce(count(*[${lessonCountFilter}]), 0),
     'length_in_seconds': coalesce(
       math::sum(
         select(
@@ -2305,6 +2273,7 @@ export async function fetchScheduledAndNewReleases(
       "id": railcontent_id,
       title,
       "image": thumbnail.asset->url,
+      "thumbnail": thumbnail.asset->url,
       ${artistOrInstructorName()},
       "artists": instructor[]->name,
       difficulty,
@@ -2327,6 +2296,7 @@ export async function fetchShows(brand, type, sort = 'sort') {
 
   const query = await buildQuery(filter, filterParams, getFieldsForContentType(type), {
     sortOrder: sortOrder,
+    end: 100, // Adrian: added for homepage progress rows, this should be handled gracefully
   })
   return fetchSanity(query, true)
 }

package/src/services/types.js

@@ -29,20 +29,12 @@
  * @property {string} authToken - The bearer authorization token.
  */
 
-/**
- * @typedef {object} RecommendationsConfig - Configuration for recommendation services.
- *
- * @property {string} token - The token for authenticating recommendation requests.
- * @property {string} baseUrl - The url for the recommendation server.
- */
-
 /**
  * @typedef {object} Config
  *
  * @property {SanityConfig} sanityConfig
  * @property {RailcontentConfig} railcontentConfig - DEPRECATED use sessionConfig and baseUrl instead.
  * @property {SessionConfig} sessionConfig
- * @property {RecommendationsConfig} recommendationsConfig
  * @property {string} baseUrl - The url for the environment.
  * @property {Object} localStorage - Cache to use for localStorage
  * @property {boolean} isMA - Variable that tells if the library is used by MA or FEW