musora-content-services 1.0.29 → 1.0.31

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.31](https://github.com/railroadmedia/musora-content-services/compare/v1.0.30...v1.0.31) (2024-08-14)
+
+### [1.0.30](https://github.com/railroadmedia/musora-content-services/compare/v1.0.29...v1.0.30) (2024-08-14)
+
 ### [1.0.29](https://github.com/railroadmedia/musora-content-services/compare/v1.0.28...v1.0.29) (2024-08-14)
 
 ### [1.0.28](https://github.com/railroadmedia/musora-content-services/compare/v1.0.27...v1.0.28) (2024-08-14)

package/docs/config.js.html

@@ -111,7 +111,7 @@ module.exports = {
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.3</a> on Wed Aug 14 2024 03:19:48 GMT+0000 (Coordinated Universal Time) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.3</a> on Wed Aug 14 2024 17:42:41 GMT+0000 (Coordinated Universal Time) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/index.html

@@ -103,7 +103,7 @@ Run the following to execute the tests</p>
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.3</a> on Wed Aug 14 2024 03:19:48 GMT+0000 (Coordinated Universal Time) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.3</a> on Wed Aug 14 2024 17:42:41 GMT+0000 (Coordinated Universal Time) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/module-Config.html

@@ -656,7 +656,7 @@ initializeService({
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.3</a> on Wed Aug 14 2024 03:19:48 GMT+0000 (Coordinated Universal Time) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.3</a> on Wed Aug 14 2024 17:42:41 GMT+0000 (Coordinated Universal Time) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/module-Railcontent-Services.html

@@ -100,7 +100,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="railcontent.js.html">railcontent.js</a>, <a href="railcontent.js.html#line51">line 51</a>
+        <a href="railcontent.js.html">railcontent.js</a>, <a href="railcontent.js.html#line57">line 57</a>
     </li></ul></dd>
     
 
@@ -526,7 +526,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="railcontent.js.html">railcontent.js</a>, <a href="railcontent.js.html#line85">line 85</a>
+        <a href="railcontent.js.html">railcontent.js</a>, <a href="railcontent.js.html#line91">line 91</a>
     </li></ul></dd>
     
 
@@ -738,7 +738,7 @@
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.3</a> on Wed Aug 14 2024 03:19:48 GMT+0000 (Coordinated Universal Time) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.3</a> on Wed Aug 14 2024 17:42:41 GMT+0000 (Coordinated Universal Time) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/module-Sanity-Services.html

@@ -100,7 +100,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line498">line 498</a>
+        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line461">line 461</a>
     </li></ul></dd>
     
 
@@ -593,7 +593,7 @@ The filter options are dynamically generated based on the provided filters, styl
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line637">line 637</a>
+        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line600">line 600</a>
     </li></ul></dd>
     
 
@@ -935,7 +935,7 @@ fetchAllFilterOptions('myBrand', '', 'Rock', 'John Doe', 'song', 'Love')
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line213">line 213</a>
+        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line176">line 176</a>
     </li></ul></dd>
     
 
@@ -1401,7 +1401,7 @@ fetchAllFilterOptions('myBrand', '', 'Rock', 'John Doe', 'song', 'Love')
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line64">line 64</a>
+        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line52">line 52</a>
     </li></ul></dd>
     
 
@@ -1566,7 +1566,7 @@ fetchAllFilterOptions('myBrand', '', 'Rock', 'John Doe', 'song', 'Love')
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line431">line 431</a>
+        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line394">line 394</a>
     </li></ul></dd>
     
 
@@ -1731,7 +1731,7 @@ fetchAllFilterOptions('myBrand', '', 'Rock', 'John Doe', 'song', 'Love')
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line457">line 457</a>
+        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line420">line 420</a>
     </li></ul></dd>
     
 
@@ -1896,7 +1896,7 @@ fetchAllFilterOptions('myBrand', '', 'Rock', 'John Doe', 'song', 'Love')
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line680">line 680</a>
+        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line643">line 643</a>
     </li></ul></dd>
     
 
@@ -2054,7 +2054,7 @@ fetchAllFilterOptions('myBrand', '', 'Rock', 'John Doe', 'song', 'Love')
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line758">line 758</a>
+        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line721">line 721</a>
     </li></ul></dd>
     
 
@@ -2223,7 +2223,7 @@ ongoing based on the event's duration (`length_in_seconds`).</li></ul></dd>
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line345">line 345</a>
+        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line308">line 308</a>
     </li></ul></dd>
     
 
@@ -2389,7 +2389,7 @@ fetchLiveEvent('drumeo')
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line722">line 722</a>
+        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line685">line 685</a>
     </li></ul></dd>
     
 
@@ -2547,7 +2547,7 @@ fetchLiveEvent('drumeo')
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line701">line 701</a>
+        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line664">line 664</a>
     </li></ul></dd>
     
 
@@ -2705,7 +2705,7 @@ fetchLiveEvent('drumeo')
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line302">line 302</a>
+        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line265">line 265</a>
     </li></ul></dd>
     
 
@@ -2863,7 +2863,7 @@ fetchLiveEvent('drumeo')
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line732">line 732</a>
+        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line695">line 695</a>
     </li></ul></dd>
     
 
@@ -3021,7 +3021,7 @@ fetchLiveEvent('drumeo')
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line812">line 812</a>
+        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line775">line 775</a>
     </li></ul></dd>
     
 
@@ -3179,7 +3179,7 @@ fetchLiveEvent('drumeo')
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line838">line 838</a>
+        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line801">line 801</a>
     </li></ul></dd>
     
 
@@ -3344,7 +3344,7 @@ fetchLiveEvent('drumeo')
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line791">line 791</a>
+        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line754">line 754</a>
     </li></ul></dd>
     
 
@@ -3526,7 +3526,7 @@ fetchLiveEvent('drumeo')
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line95">line 95</a>
+        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line83">line 83</a>
     </li></ul></dd>
     
 
@@ -3715,7 +3715,7 @@ fetchLiveEvent('drumeo')
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line855">line 855</a>
+        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line818">line 818</a>
     </li></ul></dd>
     
 
@@ -3905,7 +3905,7 @@ fetchSanity(query, true)
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line78">line 78</a>
+        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line66">line 66</a>
     </li></ul></dd>
     
 
@@ -4228,7 +4228,7 @@ fetchSanity(query, true)
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line264">line 264</a>
+        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line227">line 227</a>
     </li></ul></dd>
     
 
@@ -4386,7 +4386,7 @@ fetchSanity(query, true)
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line235">line 235</a>
+        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line198">line 198</a>
     </li></ul></dd>
     
 
@@ -4551,7 +4551,7 @@ fetchSanity(query, true)
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line392">line 392</a>
+        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line355">line 355</a>
     </li></ul></dd>
     
 
@@ -4717,7 +4717,7 @@ This function retrieves the latest workout content for a given brand, fetching u
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line280">line 280</a>
+        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line243">line 243</a>
     </li></ul></dd>
     
 
@@ -4881,7 +4881,7 @@ This function retrieves the latest workout content for a given brand, fetching u
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.3</a> on Wed Aug 14 2024 03:19:48 GMT+0000 (Coordinated Universal Time) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.3</a> on Wed Aug 14 2024 17:42:41 GMT+0000 (Coordinated Universal Time) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/railcontent.js.html

@@ -74,8 +74,13 @@ export async function fetchCurrentSongComplete(content_id) {
     try {
         const response = await fetch(url, { headers });
         const result = await response.json();
-        if(result){
-            return result[globalConfig.railcontentConfig.userId];
+
+        if (result && result[content_id]) {
+            console.log('result', result[content_id]);
+            return result[content_id];  // Return the correct object
+        } else {
+            console.log('Invalid result structure', result);
+            return null;  // Handle unexpected structure
         }
     } catch (error) {
         console.error('Fetch error:', error);
@@ -83,6 +88,7 @@ export async function fetchCurrentSongComplete(content_id) {
     }
 }
 
+
 /**
  * Fetches the completion status for multiple songs for the current user.
  *
@@ -165,7 +171,7 @@ export async function fetchSongsInProgress(brand) {
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.3</a> on Wed Aug 14 2024 03:19:48 GMT+0000 (Coordinated Universal Time) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.3</a> on Wed Aug 14 2024 17:42:41 GMT+0000 (Coordinated Universal Time) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/sanity.js.html

@@ -65,36 +65,24 @@ import { fetchAllCompletedStates, fetchCurrentSongComplete } from './railcontent
 *   .then(song => console.log(song))
 *   .catch(error => console.error(error));
 */
-export async function fetchSongById(songId) {
-    const query = `
-    *[_type == "song" && railcontent_id == ${songId}]{
-      title,
-      "thumbnail_url": thumbnail.asset->url,
-      "style": genre[0]->name,
-      "artist": artist->name,
-      album,
-      instrumentless,
-      soundslice,
-      railcontent_id,
-      "resources": resource[]{resource_url, resource_name},
-    }`;
-  
-    const songData = await fetchSanity(query, false);
-  
-    // Check if the necessary user information is available in globalConfig
-    if (!songData || !globalConfig.railcontentConfig.userId || !globalConfig.railcontentConfig.token) {
-      return songData;
-    }
+export async function fetchSongById(documentId) {
+    const fields = [
+      'title',
+      '"thumbnail_url": thumbnail.asset->url',
+      '"style": genre[0]->name',
+      '"artist": artist->name',
+      'album',
+      'instrumentless',
+      'soundslice',
+      '"resources": resource[]{resource_url, resource_name}',
+    ];
   
-    // Fetch the completion state for the current song
-    const currentSongComplete = await fetchCurrentSongComplete(songId);
-  
-    if (currentSongComplete) {
-      songData.completed = currentSongComplete.state !== "not started";
-      songData.progress_percent = currentSongComplete.percent.toString();
-    }
-  
-    return songData;
+    const query = `
+        *[_type == "song" && railcontent_id == ${documentId}]{
+            ${fields.join(', ')}
+        }`;
+
+    return fetchSanity(query, false);
 }
 
 /**
@@ -205,32 +193,7 @@ export async function fetchRelatedSongs(brand, songId) {
     }`;
   
     // Fetch the related songs data
-    const relatedSongsData = await fetchSanity(query, true);
-  
-    if (!relatedSongsData || !userId || !token) {
-        return relatedSongsData;
-    }
-  
-    // Extract the IDs of related lessons
-    const relatedLessonIds = relatedSongsData.data.map(lesson => lesson.id);
-  
-    // Fetch the completion states for the related lessons
-    const relatedLessonsCompletionStates = await fetchAllCompletedStates(relatedLessonIds);
-  
-    // Map the completion states to the related lessons
-    relatedSongsData.data = relatedSongsData.data.map(lesson => {
-        const lessonCompletionState = relatedLessonsCompletionStates[lesson.id];
-        if (lessonCompletionState) {
-            return {
-                ...lesson,
-                completed: lessonCompletionState.state !== "not started",
-                lesson_progress: lessonCompletionState.percent.toString()
-            };
-        }
-        return lesson;
-    });
-  
-    return relatedSongsData;
+    return fetchSanity(query, false);
 }
   
 /**
@@ -981,7 +944,7 @@ function checkSanityConfig(config) {
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.3</a> on Wed Aug 14 2024 03:19:48 GMT+0000 (Coordinated Universal Time) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.3</a> on Wed Aug 14 2024 17:42:41 GMT+0000 (Coordinated Universal Time) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/package.json

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

package/src/services/sanity.js

@@ -35,7 +35,7 @@ export async function fetchSongById(documentId) {
             ${fields.join(', ')}
         }`;
 
-    return fetchSanity(query, true);
+    return fetchSanity(query, false);
 }
 
 /**
@@ -146,7 +146,7 @@ export async function fetchRelatedSongs(brand, songId) {
     }`;
   
     // Fetch the related songs data
-    return fetchSanity(query, true);
+    return fetchSanity(query, false);
 }
   
 /**