musora-content-services 2.9.6 → 2.11.0

package/.github/workflows/conventional-commits.yaml

@@ -0,0 +1,16 @@
+name: PR Conventional Commit Validation
+
+on:
+  pull_request:
+    types: [opened, synchronize, reopened, edited]
+
+jobs:
+  validate-pr-title:
+    runs-on: ubuntu-latest
+    steps:
+      - name: PR Conventional Commit Validation
+        uses:  ytanikin/pr-conventional-commits@1.4.1
+        with:
+          task_types: '["feat","fix","docs","test","ci","refactor","perf","chore","revert"]'
+          custom_labels: '{"feat": "feature", "fix": "fix", "docs": "documentation", "test": "test", "ci": "CI/CD", "refactor": "refactor", "perf": "performance", "chore": "chore", "revert": "revert", "wip": "WIP"}'
+          add_scope_label: 'false'

package/.yarnrc.yml

@@ -0,0 +1 @@
+nodeLinker: node-modules

package/CHANGELOG.md

@@ -2,6 +2,36 @@
 
 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.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)
+
+
+### Features
+
+* add media type id ([2690e2c](https://github.com/railroadmedia/musora-content-services/commit/2690e2ccbe07474e51327bd6e5919da7fb96ad47))
+* Any content type should be displayed in “Live Streams” Section if marked as livestream ([285dde9](https://github.com/railroadmedia/musora-content-services/commit/285dde92e74ee606410ff1e1b6981ec81d3e524c))
+* MU2-712 Any content type should be displayed in “Live Streams” Section ([3229950](https://github.com/railroadmedia/musora-content-services/commit/3229950fdeea36e67fcdf8b352d0c3d53219821f))
+
+
+### Bug Fixes
+
+* **BEH-547:** collection modules updates ([#300](https://github.com/railroadmedia/musora-content-services/issues/300)) ([d07002b](https://github.com/railroadmedia/musora-content-services/commit/d07002b32946d3d03dc9b8f3469863a34d2696b5))
+* null check for buildImageSRC ([f841b46](https://github.com/railroadmedia/musora-content-services/commit/f841b460bd41e0405caf7f2c06dd0c057a5f9aa1))
+
 ### [2.9.6](https://github.com/railroadmedia/musora-content-services/compare/v2.9.5...v2.9.6) (2025-06-18)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "musora-content-services",
-  "version": "2.9.6",
+  "version": "2.11.0",
   "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/contentProgress.js

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

package/src/services/imageSRCBuilder.js

@@ -43,6 +43,8 @@ export function buildImageSRC(url, options = {}) {
   // Process Sanity URL first if applicable
   if (url.includes('cdn.sanity.io')) {
     url = applySanityTransformations(url, options)
+  } else if (url.includes('imagedelivery.net')) {
+    return url
   }
 
   // Then apply Cloudflare transformations

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

@@ -388,8 +388,6 @@ export async function fetchNewReleases(
  *   .catch(error => console.error(error));
  */
 export async function fetchUpcomingEvents(brand, { page = 1, limit = 10 } = {}) {
-  const liveTypes = getUpcomingEventsTypes(brand)
-  const typesString = arrayToStringRepresentation(liveTypes)
   const now = getSanityDate(new Date())
   const start = (page - 1) * limit
   const end = start + limit
@@ -407,9 +405,11 @@ 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(
-    `_type in ${typesString} && brand == '${brand}' && published_on > '${now}' && status == 'scheduled'`,
+    `defined(live_event_start_time) && (!defined(live_event_end_time) || live_event_end_time >= '${now}' ) && brand == '${brand}' && published_on > '${now}' && status == 'scheduled'`,
     fields,
     {
       sortOrder: 'published_on asc',
@@ -443,7 +443,7 @@ export async function fetchScheduledReleases(brand, { page = 1, limit = 10 }) {
   const now = getSanityDate(new Date())
   const start = (page - 1) * limit
   const end = start + limit
-  const query = `*[_type in [${typesString}] && brand == '${brand}' && status in ['published','scheduled'] && published_on > '${now}']{
+  const query = `*[_type in [${typesString}] && brand == '${brand}' && status in ['published','scheduled'] && (!defined(live_event_end_time) || live_event_end_time < '${now}' ) && published_on > '${now}']{
       "id": railcontent_id,
       title,
       "image": thumbnail.asset->url,
@@ -1504,6 +1504,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 = ''
@@ -1525,8 +1526,9 @@ 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

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()