musora-content-services 2.10.0 → 2.11.1

package/CHANGELOG.md

@@ -2,6 +2,23 @@
 
 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.11.1](https://github.com/railroadmedia/musora-content-services/compare/v2.11.0...v2.11.1) (2025-06-24)
+
+## [2.11.0](https://github.com/railroadmedia/musora-content-services/compare/v2.10.0...v2.11.0) (2025-06-24)
+
+
+### Features
+
+* **MU2-698:** change extra minutes from 15 to 30 ([ccb1a96](https://github.com/railroadmedia/musora-content-services/commit/ccb1a9682c0d75a61743645434fb1ae5398ca509))
+* **MU2-712:** Add live_event_start_time and live_event_end_time on fetchUpcomingEvents ([0de3f8e](https://github.com/railroadmedia/musora-content-services/commit/0de3f8ea68a2a8d29d122f6adf2d893669d3bd25))
+
+
+### Bug Fixes
+
+* Duplicate practice per day in cache ([d44e0f6](https://github.com/railroadmedia/musora-content-services/commit/d44e0f6a384e78b5d515bcafc99cba30b24a535d))
+* **MU2-693:** Fix cache(data versioning) on user practices ([ddc0d3b](https://github.com/railroadmedia/musora-content-services/commit/ddc0d3b3bd180c0f51241112ce7ba2094ff71c8c))
+* User practice cache generation after one practice is restored ([dfb9e27](https://github.com/railroadmedia/musora-content-services/commit/dfb9e271e9efcb18b1d866935e0eb4acb7317b4b))
+
 ## [2.10.0](https://github.com/railroadmedia/musora-content-services/compare/v2.9.5...v2.10.0) (2025-06-23)
 
 

package/README.md

@@ -6,7 +6,6 @@ allowing you to easily retrieve, filter, and manipulate content for use in vario
 
 ## Setup
 To set up the Musora Content Services project for local development, follow these steps:
-- Pull the latest railenvironment `php-8-3-upgrade` branch changes
 - In the railenvironment directory, start up the container with the `./rrr.sh` command
 - Run `r setup musora-content-services`
 - Run `npm install --save-dev jest`
@@ -94,4 +93,4 @@ and having jest installed (`npm install --save-dev jest`). To run the full test
 npm test
 ```
 You can also filter down to specific tests with the `-- -t="..."` option. e.g. you can run the userContext test suite 
-with `npm test -- -t="userContext"` or just the contentLiked test with `npm test -- -t="contentLiked"`
+with `npm test -- -t="userContext"` or just the contentLiked test with `npm test -- -t="contentLiked"`

package/package.json

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

package/src/contentTypeConfig.js

@@ -416,7 +416,7 @@ export let contentTypeConfig = {
       '"lesson_count": coalesce(count(child[]->.child[]->), 0)',
       'xp',
       `"description": ${descriptionField}`,
-      '"instructors": instructor[]->name',
+      '"instructors": instructor[]->{ "id": railcontent_id, name, "thumbnail_url": thumbnail_url.asset->url }',
       '"logo_image_url": logo_image_url.asset->url',
       'total_xp',
       `"children": child[]->{

package/src/services/railcontent.js

@@ -755,7 +755,7 @@ export async function reportComment(commentId, issue) {
   return await postDataHandler(url, data)
 }
 
-export async function fetchUserPractices({ currentVersion, userId } = {}) {
+export async function fetchUserPractices(currentVersion = 0, { userId } = {}) {
   const params = new URLSearchParams();
   if (userId) params.append('user_id', userId);
   const query = params.toString() ? `?${params.toString()}` : '';
@@ -763,6 +763,9 @@ export async function fetchUserPractices({ currentVersion, userId } = {}) {
   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;
 

package/src/services/sanity.js

@@ -405,6 +405,8 @@ export async function fetchUpcomingEvents(brand, { page = 1, limit = 10 } = {})
         "type": _type,
         web_url_path,
         "permission_id": permission[]->railcontent_id,
+        live_event_start_time,
+        live_event_end_time,
          "isLive": live_event_start_time <= '${now}' && live_event_end_time >= '${now}'`
   const query = buildRawQuery(
     `defined(live_event_start_time) && (!defined(live_event_end_time) || live_event_end_time >= '${now}' ) && brand == '${brand}' && published_on > '${now}' && status == 'scheduled'`,
@@ -510,7 +512,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) {
   if (!ids) {
     return []
   }
@@ -1318,7 +1320,7 @@ export async function fetchLessonContent(railContentId) {
   })
   const chapterProcess = (result) => {
     const now = getSanityDate(new Date(), false)
-    if(result.live_event_start_time && result.live_event_start_time){
+    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 ?? []
@@ -1334,15 +1336,23 @@ export async function fetchLessonContent(railContentId) {
 }
 
 /**
+ * Returns a list of recommended content based on the provided railContentId.
+ * If no recommendations found in recsys, falls back to fetching related lessons.
  *
  * @param railContentId
  * @param brand
  * @param count
- * @returns {Promise<Array<Object>|null>}
+ * @returns {Promise<Array<Object>>}
  */
 export async function fetchRelatedRecommendedContent(railContentId, brand, count = 10) {
   const recommendedItems = await fetchSimilarItems(railContentId, brand, count)
-  return fetchByRailContentIds(recommendedItems)
+  if (recommendedItems && recommendedItems.length > 0) {
+    return fetchByRailContentIds(recommendedItems)
+  }
+
+  return await fetchRelatedLessons(railContentId, brand).then((result) =>
+    result.related_lessons?.splice(0, count)
+  )
 }
 
 /**
@@ -1412,18 +1422,20 @@ async function fetchRelatedByLicense(railcontentId, brand, onlyUseSongTypes, cou
  */
 export async function fetchRelatedLessons(railContentId, brand) {
   const filterSameTypeAndSortOrder = await new FilterBuilder(
-    `_type==^._type &&  _type in ${JSON.stringify(typeWithSortOrder)} && brand == "${brand}" && railcontent_id !=${railContentId}`,
+    `_type==^._type &&  _type in ${JSON.stringify(typeWithSortOrder)} && brand == "${brand}" && railcontent_id !=${railContentId}`
   ).buildFilter()
   const filterSameType = await new FilterBuilder(
-    `_type==^._type && !(_type in ${JSON.stringify(typeWithSortOrder)}) && !(defined(parent_type)) && brand == "${brand}" && railcontent_id !=${railContentId}`,
+    `_type==^._type && !(_type in ${JSON.stringify(typeWithSortOrder)}) && !(defined(parent_type)) && brand == "${brand}" && railcontent_id !=${railContentId}`
   ).buildFilter()
   const filterSongSameArtist = await new FilterBuilder(
-    `_type=="song" && _type==^._type && brand == "${brand}" && references(^.artist->_id) && railcontent_id !=${railContentId}`,
+    `_type=="song" && _type==^._type && brand == "${brand}" && references(^.artist->_id) && railcontent_id !=${railContentId}`
   ).buildFilter()
   const filterSongSameGenre = await new FilterBuilder(
-    `_type=="song" && _type==^._type && brand == "${brand}" && references(^.genre[]->_id) && railcontent_id !=${railContentId}`,
+    `_type=="song" && _type==^._type && brand == "${brand}" && references(^.genre[]->_id) && railcontent_id !=${railContentId}`
   ).buildFilter()
-  const filterNeighbouringSiblings = await new FilterBuilder(`references(^._id)`, {pullFutureContent: true}).buildFilter()
+  const filterNeighbouringSiblings = await new FilterBuilder(`references(^._id)`, {
+    pullFutureContent: true,
+  }).buildFilter()
   const childrenFilter = await new FilterBuilder(``, { isChildrenFilter: true }).buildFilter()
   const queryFields = `_id, "id":railcontent_id, published_on, "instructor": instructor[0]->name, title, "thumbnail":thumbnail.asset->url, length_in_seconds, web_url_path, "type": _type, difficulty, difficulty_string, railcontent_id, artist->,"permission_id": permission[]->railcontent_id,_type, "genre": genre[]->name`
   const queryFieldsWithSort = queryFields + ', sort'
@@ -1444,15 +1456,15 @@ export async function fetchRelatedLessons(railContentId, brand) {
   let result = await fetchSanity(query, false)
 
   //there's no way in sanity to retrieve the index of an array, so we must calculate after fetch
-  if (result['for-calculations']['parents-list']) {
+  if (result['for-calculations'] && result['for-calculations']['parents-list']) {
     const calc = result['for-calculations']
     const parentCount = calc['parents-list'].length
-    const currentParent = (calc['parents-list'].indexOf(result['parent_id']) + 1)
+    const currentParent = calc['parents-list'].indexOf(result['parent_id']) + 1
     const siblingCount = calc['siblings-list'].length
-    const currentSibling = (calc['siblings-list'].indexOf(result['railcontent_id']) + 1)
+    const currentSibling = calc['siblings-list'].indexOf(result['railcontent_id']) + 1
 
     delete result['for-calculations']
-    result = {...result, parentCount, currentParent, siblingCount, currentSibling}
+    result = { ...result, parentCount, currentParent, siblingCount, currentSibling }
     return result
   } else {
     delete result['for-calculations']
@@ -1502,6 +1514,7 @@ export async function fetchPackAll(railcontentId, type = 'pack') {
 }
 
 export async function fetchLiveEvent(brand, forcedContentId = null) {
+  const LIVE_EXTRA_MINUTES = 30
   //calendarIDs taken from addevent.php
   // TODO import instructor calendars to Sanity
   let defaultCalendarID = ''
@@ -1523,8 +1536,11 @@ export async function fetchLiveEvent(brand, forcedContentId = null) {
   }
   let startDateTemp = new Date()
   let endDateTemp = new Date()
-  startDateTemp = new Date(startDateTemp.setMinutes(startDateTemp.getMinutes() + 15))
-  endDateTemp = new Date(endDateTemp.setMinutes(endDateTemp.getMinutes() - 15))
+
+  startDateTemp = new Date(
+    startDateTemp.setMinutes(startDateTemp.getMinutes() + LIVE_EXTRA_MINUTES)
+  )
+  endDateTemp = new Date(endDateTemp.setMinutes(endDateTemp.getMinutes() - LIVE_EXTRA_MINUTES))
 
   // See LiveStreamEventService.getCurrentOrNextLiveEvent for some nice complicated logic which I don't think is actually importart
   // this has some +- on times
@@ -2390,17 +2406,13 @@ export async function fetchScheduledAndNewReleases(
   return fetchSanity(query, true)
 }
 
-export async function fetchShows(
-  brand,
-  type,
-  sort = 'sort'
-) {
+export async function fetchShows(brand, type, sort = 'sort') {
   const sortOrder = getSortOrder(sort, brand)
   const filter = `_type == '${type}'  && brand == '${brand}'`
   const filterParams = {}
 
   const query = await buildQuery(filter, filterParams, getFieldsForContentType(type), {
-    sortOrder: sortOrder
+    sortOrder: sortOrder,
   })
   return fetchSanity(query, true)
 }

package/src/services/userActivity.js

@@ -55,7 +55,7 @@ function getIndefiniteArticle(streak) {
 
 export async function getUserPractices(userId = globalConfig.sessionConfig.userId) {
   if (userId !== globalConfig.sessionConfig.userId) {
-    let data = await fetchUserPractices({ userId })
+    let data = await fetchUserPractices(0, { userId: userId })
     return data?.['data']?.[DATA_KEY_PRACTICES] ?? {}
   } else {
     let data = await userActivityContext.getData()
@@ -376,20 +376,30 @@ export async function removeUserPractice(id) {
 export async function restoreUserPractice(id) {
   let url = `/api/user/practices/v1/practices/restore${buildQueryString([id])}`
   const response = await fetchHandler(url, 'put')
-  if (response?.data) {
-    await userActivityContext.updateLocal(async function (localContext) {
-      const restoredPractice = response.data
-      const { date } = restoredPractice
-      if (!localContext.data[DATA_KEY_PRACTICES][date]) {
-        localContext.data[DATA_KEY_PRACTICES][date] = []
-      }
-      localContext.data[DATA_KEY_PRACTICES][date].push({
-        id: restoredPractice.id,
-        duration_seconds: restoredPractice.duration_seconds,
+  if (response?.data?.length) {
+    const restoredPractice = response.data.find((p) => p.id === id)
+    if (restoredPractice) {
+      await userActivityContext.updateLocal(async function (localContext) {
+        const userTimeZone = Intl.DateTimeFormat().resolvedOptions().timeZone
+        const utcDate = new Date(restoredPractice.day)
+        const localDate = convertToTimeZone(utcDate, userTimeZone)
+        const date =
+          localDate.getFullYear() + '-' +
+          String(localDate.getMonth() + 1).padStart(2, '0') + '-' +
+          String(localDate.getDate()).padStart(2, '0')
+        if (localContext.data[DATA_KEY_PRACTICES][date]) {
+          localContext.data[DATA_KEY_PRACTICES][date] = []
+        }
+        response.data.forEach((restoredPractice) => {
+          localContext.data[DATA_KEY_PRACTICES][date].push({
+            id: restoredPractice.id,
+            duration_seconds: restoredPractice.duration_seconds,
+          })
+        })
       })
-    })
+    }
   }
-  const formattedMeta = await formatPracticeMeta(response.data)
+  const formattedMeta = await formatPracticeMeta(response.data || [])
   const practiceDuration = formattedMeta.reduce(
     (total, practice) => total + (practice.duration || 0),
     0
@@ -603,7 +613,7 @@ function getStreaksAndMessage(practices) {
 async function getUserPracticeIds(day = new Date().toISOString().split('T')[0], userId = null) {
   let practices = {}
   if (userId !== globalConfig.sessionConfig.userId) {
-    let data = await fetchUserPractices({ userId })
+    let data = await fetchUserPractices(0, { userId: userId })
     practices = data?.['data']?.[DATA_KEY_PRACTICES] ?? {}
   } else {
     let data = await userActivityContext.getData()