musora-content-services 1.0.86 → 1.0.88

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.88](https://github.com/railroadmedia/musora-content-services/compare/v1.0.87...v1.0.88) (2024-09-11)
+
+### [1.0.87](https://github.com/railroadmedia/musora-content-services/compare/v1.0.86...v1.0.87) (2024-09-09)
+
 ### [1.0.86](https://github.com/railroadmedia/musora-content-services/compare/v1.0.85...v1.0.86) (2024-09-09)
 
 ### [1.0.85](https://github.com/railroadmedia/musora-content-services/compare/v1.0.84...v1.0.85) (2024-09-06)

package/package.json

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

package/src/index.js

@@ -34,6 +34,7 @@ import {
   fetchLiveEvent,
   fetchChallengeOverview,
   fetchCoachLessons,
+  fetchByReference,
 } from './services/sanity.js';
 
 import { 
@@ -85,4 +86,5 @@ export {
     fetchVimeoData,
     fetchContentPageUserData,
     fetchCoachLessons,
+    fetchByReference,
 }

package/src/services/config.js

@@ -22,6 +22,8 @@ let globalConfig = {
  * @param {Object} config.railcontentConfig - Configuration for user services.
  * @param {string} config.railcontentConfig.token - The token for authenticating user-specific requests.
  * @param {string} config.railcontentConfig.userId - The user ID for fetching user-specific data.
+ * @param {string} config.railcontentConfig.baseUrl - The url for the enviroment.
+
  *
  * @example
  * // Initialize the service in your app.js
@@ -36,7 +38,8 @@ let globalConfig = {
  *   },
  *   railcontentConfig: {
  *     token: 'your-user-api-token',
- *     userId: 'current-user-id'
+ *     userId: 'current-user-id',
+ *     baseUrl: 'https://web-staging-one.musora.com'
  *   }
  * });
  */

package/src/services/railcontent.js

@@ -24,7 +24,7 @@ export async function fetchCompletedState(content_id) {
     };
 
     try {
-        const response = await fetch(url, { headers });
+        const response = await fetchAbsolute(url, { headers });
         const result = await response.json();
 
         if (result && result[content_id]) {            return result[content_id];  // Return the correct object
@@ -56,7 +56,7 @@ export async function fetchVimeoData(vimeo_id) {
     };
 
     try {
-        const response = await fetch(url, { headers });
+        const response = await fetchAbsolute(url, { headers });
         const result = await response.json();
 
         if (result) {
@@ -91,7 +91,7 @@ export async function fetchAllCompletedStates(contentIds) {
     };
 
     try {
-        const response = await fetch(url, { headers });
+        const response = await fetchAbsolute(url, { headers });
         const result = await response.json();
         if(result){
             return result;
@@ -123,7 +123,7 @@ export async function fetchSongsInProgress(brand) {
     };
 
     try {
-        const response = await fetch(url, { headers });
+        const response = await fetchAbsolute(url, { headers });
         const result = await response.json();
         if(result){
             console.log('fetchSongsInProgress', result);
@@ -160,7 +160,7 @@ export async function fetchContentInProgress(type="all", brand) {
         'X-CSRF-TOKEN': globalConfig.railcontentConfig.token
     };
     try {
-        const response = await fetch(url, { headers });
+        const response = await fetchAbsolute(url, { headers });
         const result = await response.json();
         if(result){
             console.log('contentInProgress', result);
@@ -191,8 +191,9 @@ export async function fetchContentPageUserData(contentId) {
         'Content-Type': 'application/json',
         'X-CSRF-TOKEN': globalConfig.railcontentConfig.token
     };
+
     try {
-        const response = await fetch(url, { headers });
+        const response = await fetchAbsolute(url, { headers });
         const result = await response.json();
         if(result){
             console.log('fetchContentPageUserData', result);
@@ -204,4 +205,12 @@ export async function fetchContentPageUserData(contentId) {
         console.error('Fetch error:', error);
         return null;
     }
+}
+
+function fetchAbsolute(url, params) {  
+    if (url.startsWith('/')) {
+        return fetch(globalConfig.railcontentConfig.baseUrl + url, params)
+    } else {
+        return fetch(url, params);
+    }   
 }

package/src/services/sanity.js

@@ -224,7 +224,7 @@ export async function fetchSongFilterOptions(brand) {
 */
 export async function fetchSongCount(brand) {
   const query = `count(*[_type == 'song' && brand == "${brand}"])`;
-  return fetchSanity(query, false);
+  return fetchSanity(query, true);
 }
 
 /**
@@ -812,7 +812,9 @@ export async function fetchLessonContent(railContentId) {
           "instructors":instructor[]->name,
           instructor[]->,
           ${assignmentsField}
-         video}`
+          video,
+          length_in_seconds
+        }`
   return fetchSanity(query, false);
 }
 
@@ -820,17 +822,20 @@ export async function fetchLessonContent(railContentId) {
 * Fetch related lessons for a specific lesson by RailContent ID and type.
 * @param {string} railContentId - The RailContent ID of the current lesson.
 * @param {string} brand - The current brand.
-* @param {string} contentType - name of the contentype to pull
 * @returns {Promise<Array<Object>|null>} - The fetched related lessons data or null if not found.
 */
-export async function fetchRelatedLessons(railContentId, brand, contentType) {
-  let typeQuery = contentType ? `_type=="${contentType}" &&` : ""; 
-  
+export async function fetchRelatedLessons(railContentId, brand) {
+  // let sort = 'published_on'
+  // if (type == 'rhythmic-adventures-of-captain-carson' ||
+  //     type == 'diy-drum-experiments' ||
+  //     type == 'in-rhythm') {
+  //     sort = 'sort';
+  // }
   //TODO: Implement $this->contentService->getFiltered
   const query = `*[railcontent_id == ${railContentId} && brand == "${brand}" && references(*[_type=='permission']._id)]{
               "related_lessons" : array::unique([
-                _...(*[${typeQuery} brand == "${brand}" && references(^.artist->_id)]{_id, "id":railcontent_id, published_on, title, "thumbnail_url":thumbnail.asset->url, difficulty_string, railcontent_id, artist->}[0...11]),
-                ...(*[${typeQuery} brand == "${brand}" && references(^.genre[]->_id)]{_id, "id":railcontent_id, published_on, title, "thumbnail_url":thumbnail.asset->url, difficulty_string, railcontent_id, artist->}[0...11])
+                ...(*[_type=="song" && brand == "${brand}" && references(^.artist->_id)]{_id, "id":railcontent_id, published_on, title, "thumbnail_url":thumbnail.asset->url, difficulty_string, railcontent_id, artist->}[0...11]),
+                ...(*[_type=="song" && brand == "${brand}" && references(^.genre[]->_id)]{_id, "id":railcontent_id, published_on, title, "thumbnail_url":thumbnail.asset->url, difficulty_string, railcontent_id, artist->}[0...11])
                 ])|order(published_on, railcontent_id)[0...11]}`;
   return fetchSanity(query, false);
 }
@@ -1021,6 +1026,43 @@ export async function fetchCourseOverview(id) {
   return fetchSanity(query, false);
 }
 
+/**
+ * Fetch the data needed for the coach screen.
+ * @param {string} id - The Railcontent ID of the coach
+ * 
+ * @returns {Promise<Object|null>} - The lessons for the instructor or null if not found.
+ *
+ * @example
+ * fetchCoachLessons('coach123')
+ *   .then(lessons => console.log(lessons))
+ *   .catch(error => console.error(error));
+ */
+export async function fetchByReference(brand, {
+  sortOrder = '-published_on',
+  searchTerm = '',
+  page = 1,
+  limit = 20,
+  includedFields = [],
+} = {}) {
+  const fieldsString = DEFAULT_FIELDS.join(',');
+  const start = (page - 1) * limit;
+  const end = start + limit;
+  const searchFilter = searchTerm ? `&& title match "${searchTerm}*"`: '';
+  const includedFieldsFilter = includedFields.length > 0
+        ? includedFields.join(' && ')
+        : "";
+
+  const query = `{
+      "entity": *[brand == '${brand}' ${searchFilter} && references(*[${includedFieldsFilter}]._id)] | order(${sortOrder}) [${start}...${end}]
+        {
+          ${fieldsString}
+        },
+      "total": count(*[brand == '${brand}' && references(*[${includedFieldsFilter}]._id)])
+    }`;
+  return fetchSanity(query, true);
+}
+
+
 /**
  * Fetch data from the Sanity API based on a provided query.
  *

package/test/sanityQueryService.test.js

@@ -31,6 +31,7 @@ const {
     fetchAllPacks,
     fetchPacksAll,
     fetchCoachLessons,
+    fetchByReference,
 } = require('../src/services/sanity.js');
 
 describe('Sanity Queries', function () {
@@ -158,7 +159,7 @@ describe('Sanity Queries', function () {
         const id = 380094;
         const document = await fetchByRailContentId(id);
         let artist = document.artist.name;
-        const response = await fetchRelatedLessons(id, 'singeo', 'song');
+        const response = await fetchRelatedLessons(id, 'singeo');
         let relatedDoc = await fetchByRailContentId(response.related_lessons[0].id);
         // match on artist or any genre
         let isMatch = artist === relatedDoc.artist.name;
@@ -270,6 +271,7 @@ describe('Sanity Queries', function () {
         response = await fetchAllPacks('drumeo', 'slug', 'Creative Control');
         expect(response[0].id).toBe(212899);
     });
+
     test('fetchCoachLessons', async () => {
         const response = await fetchCoachLessons('drumeo',233797);
         expect(response.entity.length).toBeGreaterThan(0);
@@ -277,6 +279,11 @@ describe('Sanity Queries', function () {
 
     test('fetchAll-IncludedFields', async () => {
         let response = await fetchAll('drumeo', 'instructor',{includedFields: ['is_active']});
-        console.log('---------------------------------------',response);
+        expect(response.entity.length).toBeGreaterThan(0);
+    });
+
+    test('fetchByReference', async () => {
+        const response = await fetchByReference('drumeo', { includedFields: ['is_featured'] });
+        expect(response.entity.length).toBeGreaterThan(0);
     });
 });