musora-content-services 1.0.236 → 1.0.238

package/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 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.
 
+### [1.0.238](https://github.com/railroadmedia/musora-content-services/compare/v1.0.237...v1.0.238) (2024-12-16)
+
+### [1.0.237](https://github.com/railroadmedia/musora-content-services/compare/v1.0.236...v1.0.237) (2024-12-14)
+
 ### [1.0.236](https://github.com/railroadmedia/musora-content-services/compare/v1.0.235...v1.0.236) (2024-12-13)
 
 ### [1.0.235](https://github.com/railroadmedia/musora-content-services/compare/v1.0.234...v1.0.235) (2024-12-13)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "musora-content-services",
-  "version": "1.0.236",
+  "version": "1.0.238",
   "description": "A package for Musoras content services ",
   "main": "src/index.js",
   "scripts": {

package/src/index.d.ts

@@ -95,6 +95,7 @@ import {
 	fetchByReference,
 	fetchCatalogMetadata,
 	fetchChallengeOverview,
+	fetchChatAndLiveEnvent,
 	fetchChildren,
 	fetchCoachLessons,
 	fetchCommentModContentData,
@@ -172,6 +173,7 @@ declare module 'musora-content-services' {
 		fetchChallengeMetadata,
 		fetchChallengeOverview,
 		fetchChallengeUserActiveChallenges,
+		fetchChatAndLiveEnvent,
 		fetchChildren,
 		fetchCoachLessons,
 		fetchCommentModContentData,

package/src/index.js

@@ -95,6 +95,7 @@ import {
 	fetchByReference,
 	fetchCatalogMetadata,
 	fetchChallengeOverview,
+	fetchChatAndLiveEnvent,
 	fetchChildren,
 	fetchCoachLessons,
 	fetchCommentModContentData,
@@ -171,6 +172,7 @@ export {
 	fetchChallengeMetadata,
 	fetchChallengeOverview,
 	fetchChallengeUserActiveChallenges,
+	fetchChatAndLiveEnvent,
 	fetchChildren,
 	fetchCoachLessons,
 	fetchCommentModContentData,

package/src/services/railcontent.js

@@ -617,14 +617,17 @@ export async function postChallengesHideCompletedBanner(contentId) {
  *   .then(playlists => console.log(playlists))
  *   .catch(error => console.error(error));
  */
-export async function fetchUserPlaylists(brand, {page, limit, sort, searchTerm, content_id} = {}) {
+export async function fetchUserPlaylists(brand, {page, limit, sort, searchTerm, content_id, categories} = {}) {
     let url;
     const limitString = limit ? `&limit=${limit}` : '';
     const pageString = page ? `&page=${page}` : '';
     const sortString = sort ? `&sort=${sort}` : '';
     const searchFilter = searchTerm ? `&term=${searchTerm}` : '';
     const content = content_id ? `&content_id=${content_id}` : '';
-    url = `/playlists/all?brand=${brand}${limitString}${pageString}${sortString}${searchFilter}${content}`;
+    const categoryString = categories && categories.length
+        ? categories.map(cat => `categories[]=${cat}`).join('&')
+        : '';
+    url = `/playlists/all?brand=${brand}${limitString}${pageString}${sortString}${searchFilter}${content}${categoryString ? `&${categoryString}` : ''}`;
     return await fetchHandler(url);
 }
 
@@ -1166,4 +1169,4 @@ function fetchAbsolute(url, params) {
         }
     }
     return fetch(url, params);
-}
+}

package/src/services/sanity.js

@@ -28,7 +28,8 @@ import {
     fetchCompletedChallenges,
     fetchCurrentSongComplete,
     fetchOwnedChallenges,
-    fetchNextContentDataForParent
+    fetchNextContentDataForParent,
+    fetchHandler,
 } from './railcontent.js';
 import {arrayToStringRepresentation, FilterBuilder} from "../filterBuilder";
 import {fetchUserPermissions} from "./userPermissions";
@@ -522,12 +523,12 @@ export async function fetchAll(brand, type, {
     // Construct the type filter
     let typeFilter;
 
-    if( type === 'archives' ) {
+    if (type === 'archives') {
         typeFilter = `&& status == "archived"`;
         bypassStatusAndPublishedValidation = true;
     } else {
         typeFilter = type ? `&& _type == '${type}'` : "";
-    } 
+    }
 
     // Construct the search filter
     const searchFilter = searchTerm
@@ -836,13 +837,13 @@ export async function fetchAllFilterOptions(
     const constructCommonFilter = (excludeFilter) => {
         const filterWithoutOption = excludeFilter ? filtersToGroq(filters, excludeFilter) : includedFieldsFilter;
         const statusFilter = ' && status == "published"';
-        const includeStatusFilter = !isAdmin && !['instructor','artist','genre'].includes(contentType);
+        const includeStatusFilter = !isAdmin && !['instructor', 'artist', 'genre'].includes(contentType);
 
         return coachId
             ? `brand == '${brand}' && status == "published" && references(*[_type=='instructor' && railcontent_id == ${coachId}]._id) ${filterWithoutOption || ''} ${term ? ` && (title match "${term}" || album match "${term}" || artist->name match "${term}" || genre[]->name match "${term}")` : ''}`
             : `_type == '${contentType}' && brand == "${brand}"${includeStatusFilter ? statusFilter : ''}${style && excludeFilter !== "style" ? ` && '${style}' in genre[]->name` : ''}${artist && excludeFilter !== "artist" ? ` && artist->name == '${artist}'` : ''} ${progressFilter} ${filterWithoutOption || ''} ${term ? ` && (title match "${term}" || album match "${term}" || artist->name match "${term}" || genre[]->name match "${term}")` : ''}`;
     };
-    
+
     const metaData = processMetadata(brand, contentType, true);
     const allowableFilters = metaData?.allowableFilters || [];
     const tabs = metaData?.tabs || [];
@@ -1303,17 +1304,20 @@ export async function fetchLiveEvent(brand) {
         default:
             break;
     }
-    let dateTemp = new Date();
-    dateTemp.setDate(dateTemp.getDate() - 1);
+    let startDateTemp = new Date();
+    let endDateTemp = new Date();
+    startDateTemp=  new Date (startDateTemp.setMinutes(startDateTemp.getMinutes() + 15));
+    endDateTemp = new Date(endDateTemp.setMinutes(endDateTemp.getMinutes() - 15));
 
     // See LiveStreamEventService.getCurrentOrNextLiveEvent for some nice complicated logic which I don't think is actually importart
     // this has some +- on times
     // But this query just finds the first scheduled event (sorted by start_time) that ends after now()
-    const query = `*[status == 'scheduled' && defined(live_event_start_time) && published_on > '${getSanityDate(dateTemp, false)}' && live_event_end_time >= '${getSanityDate(new Date(), false)}']{
+    const query = `*[status == 'scheduled' && defined(live_event_start_time) && live_event_start_time <= '${getSanityDate(startDateTemp, false)}' && live_event_end_time >= '${getSanityDate(endDateTemp, false)}']{
       'slug': slug.current,
       'id': railcontent_id,
       live_event_start_time,
       live_event_end_time,
+      live_event_youtube_id,
       railcontent_id,
       published_on,
       'event_coach_url' : instructor[0]->web_url_path,
@@ -1326,7 +1330,7 @@ export async function fetchLiveEvent(brand) {
           },
       'videoId': coalesce(live_event_youtube_id, video.external_id),
     } | order(live_event_start_time)[0...1]`;
-    return await fetchSanity(query, false);
+    return await fetchSanity(query, false, {processNeedAccess: false});
 }
 
 /**
@@ -1604,15 +1608,17 @@ export async function fetchGenreLessons(brand, name, contentType, {
 }
 
 export async function fetchTopLevelParentId(railcontentId) {
+    const statusFilter = "&& status in ['scheduled', 'published', 'archived', 'unlisted']";
+
     const query = `*[railcontent_id == ${railcontentId}]{
       railcontent_id,
-      'parents': *[^._id in child[]._ref && !(_id in path('drafts.**'))]{
+      'parents': *[^._id in child[]._ref ${statusFilter}]{
         railcontent_id,
-          'parents': *[^._id in child[]._ref && !(_id in path('drafts.**'))]{
+          'parents': *[^._id in child[]._ref ${statusFilter}]{
             railcontent_id,
-            'parents': *[^._id in child[]._ref && !(_id in path('drafts.**'))]{
+            'parents': *[^._id in child[]._ref ${statusFilter}]{
               railcontent_id,
-               'parents': *[^._id in child[]._ref && !(_id in path('drafts.**'))]{
+               'parents': *[^._id in child[]._ref ${statusFilter}]{
                   railcontent_id,               
             } 
           }
@@ -1656,6 +1662,7 @@ export async function fetchHierarchy(railcontentId) {
     let response = await fetchSanity(query, false, {processNeedAccess: false});
     if (!response) return null;
     let data = {
+        topLevelId: topLevelId,
         parents: {},
         children: {}
     };
@@ -1926,6 +1933,17 @@ export async function fetchMetadata(brand, type) {
     return processedData ? processedData : {};
 }
 
+export async function fetchChatAndLiveEnvent(brand, forcedId = null) {
+    const liveEvent = (forcedId !== null) ? await fetchByRailContentIds([forcedId]): [await fetchLiveEvent(brand)];
+    if (liveEvent.length === 0 || (liveEvent.length === 1 && liveEvent[0] === undefined)) {
+        return null;
+    }
+    let url = `/content/live-chat?brand=${brand}`;
+    const chatData = await fetchHandler(url);
+    const mergedData = { ...chatData, ...liveEvent[0] };
+    return mergedData;
+}
+
 
 //Helper Functions
 function arrayJoinWithQuotes(array, delimiter = ',') {
@@ -2041,6 +2059,7 @@ function getFilterOptions(option, commonFilter, contentType, brand) {
         case "difficulty":
             filterGroq = ` 
                 "difficulty": [
+        {"type": "All", "count": count(*[${commonFilter} && difficulty_string == "All"])},
         {"type": "Introductory", "count": count(*[${commonFilter} && difficulty_string == "Introductory"])},
         {"type": "Beginner", "count": count(*[${commonFilter} && difficulty_string == "Beginner"])},
         {"type": "Intermediate", "count": count(*[${commonFilter} && difficulty_string == "Intermediate" ])},
@@ -2049,7 +2068,9 @@ function getFilterOptions(option, commonFilter, contentType, brand) {
         ][count > 0],`;
             break;
         case "type":
-            const typesString = types.map(t => {return `{"type": "${t}"}`}).join(', ');
+            const typesString = types.map(t => {
+                return `{"type": "${t}"}`
+            }).join(', ');
             filterGroq = `"type": [${typesString}]{type, 'count': count(*[_type == ^.type && ${commonFilter}])}[count > 0],`;
             break;
         case "genre":

package/test/sanityQueryService.test.js

@@ -668,6 +668,11 @@ describe('Sanity Queries', function () {
         expect(hierarchy.children[243085]).toStrictEqual([243170, 243171, 243172, 243174, 243176]);
     });
 
+    test('fetchTopLeveldrafts', async () => {
+        let id = await fetchTopLevelParentId(413955);
+        expect(id).toBe(413955);
+    });
+
     test('fetchCommentData', async()=>{
         let data = await fetchCommentModContentData([241251,241252, 211153]);
         expect(data[241251].title).toBe("Setting Up Your Space");