musora-content-services 1.0.87 → 1.0.89

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.89](https://github.com/railroadmedia/musora-content-services/compare/v1.0.88...v1.0.89) (2024-09-11)
+
+### [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)

package/package.json

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

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);
 }
 
 /**
@@ -672,6 +672,7 @@ export async function fetchMethodChildren(railcontentId) {
     "description": ${descriptionField},
     title,
     xp,
+    total_xp,
     'children': child[]->{
         ${getFieldsForContentType('method')}
     },
@@ -812,7 +813,9 @@ export async function fetchLessonContent(railContentId) {
           "instructors":instructor[]->name,
           instructor[]->,
           ${assignmentsField}
-         video}`
+          video,
+          length_in_seconds
+        }`
   return fetchSanity(query, false);
 }
 
@@ -838,6 +841,22 @@ export async function fetchRelatedLessons(railContentId, brand) {
   return fetchSanity(query, false);
 }
 
+/**
+* Fetch all packs.
+* @param {string} brand - The brand for which to fetch packs.
+* @param {string} [searchTerm=""] - The search term to filter packs.
+* @param {string} [sort="-published_on"] - The field to sort the packs by.
+* @returns {Promise<Array<Object>|null>} - The fetched pack content data or null if not found.
+*/
+export async function fetchAllPacks(brand, sort = "-published_on", searchTerm = "") {
+  const sortOrder = getSortOrder(sort);
+
+  const query = `*[_type == 'pack' && brand == '${brand}' && title match "${searchTerm}*"]{
+      ${getFieldsForContentType('pack')}
+    } | order(${sortOrder})`
+  return fetchSanity(query, true);
+}
+
 /**
 * Fetch all content for a specific pack by Railcontent ID.
 * @param {string} railcontentId - The Railcontent ID of the pack.
@@ -846,18 +865,9 @@ export async function fetchRelatedLessons(railContentId, brand) {
 export async function fetchPackAll(railcontentId) {
   //TODO: Implement getPacks
   const query = `*[railcontent_id == ${railcontentId}]{
-        railcontent_id,
-        "id": railcontent_id,
-        title,
-        "image": thumbnail.asset->url,
-        "artist_name": artist->name,
-        artist,
-        difficulty,
-        difficulty_string,
-        web_url_path,
-        published_on
-      } | order(published_on asc)[0...5]`
-  return fetchSanity(query, true);
+    ${getFieldsForContentType('pack')}
+  } | order(published_on asc)[0...1]`
+  return fetchSanity(query, false);
 }
 
 export async function fetchLiveEvent(brand) {