musora-content-services 1.0.40 → 1.0.42

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.42](https://github.com/railroadmedia/musora-content-services/compare/v1.0.41...v1.0.42) (2024-08-20)
+
+### [1.0.41](https://github.com/railroadmedia/musora-content-services/compare/v1.0.40...v1.0.41) (2024-08-20)
+
 ### [1.0.40](https://github.com/railroadmedia/musora-content-services/compare/v1.0.39...v1.0.40) (2024-08-20)
 
 ### [1.0.39](https://github.com/railroadmedia/musora-content-services/compare/v1.0.37...v1.0.39) (2024-08-20)

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 Tue Aug 20 2024 14:36:28 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 Tue Aug 20 2024 20:28:18 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

@@ -110,7 +110,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 Tue Aug 20 2024 14:36:28 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 Tue Aug 20 2024 20:28:18 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 Tue Aug 20 2024 14:36:28 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 Tue Aug 20 2024 20:28:18 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

@@ -783,7 +783,7 @@
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.3</a> on Tue Aug 20 2024 14:36:28 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 Tue Aug 20 2024 20:28:18 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#line465">line 465</a>
+        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line414">line 414</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#line607">line 607</a>
+        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line556">line 556</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#line398">line 398</a>
+        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line347">line 347</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#line424">line 424</a>
+        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line373">line 373</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#line650">line 650</a>
+        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line596">line 596</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#line822">line 822</a>
+        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line768">line 768</a>
     </li></ul></dd>
     
 
@@ -2219,7 +2219,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#line728">line 728</a>
+        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line674">line 674</a>
     </li></ul></dd>
     
 
@@ -2384,7 +2384,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#line692">line 692</a>
+        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line638">line 638</a>
     </li></ul></dd>
     
 
@@ -2542,7 +2542,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#line671">line 671</a>
+        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line617">line 617</a>
     </li></ul></dd>
     
 
@@ -2700,7 +2700,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#line322">line 322</a>
+        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line271">line 271</a>
     </li></ul></dd>
     
 
@@ -2858,7 +2858,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#line702">line 702</a>
+        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line648">line 648</a>
     </li></ul></dd>
     
 
@@ -3016,7 +3016,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#line782">line 782</a>
+        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line728">line 728</a>
     </li></ul></dd>
     
 
@@ -3174,7 +3174,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#line808">line 808</a>
+        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line754">line 754</a>
     </li></ul></dd>
     
 
@@ -3339,7 +3339,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#line761">line 761</a>
+        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line707">line 707</a>
     </li></ul></dd>
     
 
@@ -3710,7 +3710,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#line863">line 863</a>
+        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line809">line 809</a>
     </li></ul></dd>
     
 
@@ -4546,7 +4546,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#line359">line 359</a>
+        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line308">line 308</a>
     </li></ul></dd>
     
 
@@ -4713,7 +4713,7 @@ It also includes completion status and progress percentage for each workout by f
     
     <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#line250">line 250</a>
+        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line249">line 249</a>
     </li></ul></dd>
     
 
@@ -4877,7 +4877,7 @@ It also includes completion status and progress percentage for each workout by f
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.3</a> on Tue Aug 20 2024 14:36:28 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 Tue Aug 20 2024 20:28:18 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

@@ -201,7 +201,7 @@ export async function fetchContentInProgress(type="all", brand) {
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.3</a> on Tue Aug 20 2024 14:36:28 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 Tue Aug 20 2024 20:28:18 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

@@ -293,74 +293,23 @@ export async function fetchSongCount(brand) {
  *   .then(workouts => console.log(workouts))
  *   .catch(error => console.error(error));
  */
-
 export async function fetchWorkouts(brand) {
-    const query = `*[_type == 'workout' && brand == '${brand}'] [0...5] {
-          "id": railcontent_id,
-          title,
-          "image": thumbnail.asset->url,
-          "artist_name": instructor[0]->name,
-          "artists": instructor[]->name,
-          difficulty,
-          difficulty_string,
-          length_in_seconds,
-          published_on,
-          "type": _type,
-          web_url_path,
-        } | order(published_on desc)[0...5]`;
-  
-    try {
-      // Fetch the workouts
-      const workouts = await fetchSanity(query, true);
-  
-      if (!workouts || workouts.length === 0) {
-        return [];
-      }
-  
-      // Extract content IDs
-      const contentIds = workouts.map(workout => workout.id);
-  
-      // Fetch completion states using the existing function
-      const completedStatesObject = await fetchAllCompletedStates(contentIds);
-  
-      // Check if completedStatesObject is an object and convert to array if necessary
-      if (typeof completedStatesObject !== 'object' || completedStatesObject === null) {
-        console.error('Completed states are not an object:', completedStatesObject);
-        return workouts;
-      }
-  
-      // Convert object to array and create a map for fast lookup
-      const completedStatesArray = Object.entries(completedStatesObject).map(([content_id, state]) => ({
-        content_id: parseInt(content_id, 10), // Convert key to integer if necessary
-        ...state
-      }));
-  
-      const completedStatesMap = completedStatesArray.reduce((map, state) => {
-        map[state.content_id] = state;
-        return map;
-      }, {});
-  
-      // Add completion status and progress percentage to each workout
-      return workouts.map(workout => {
-        const state = completedStatesMap[workout.id];
-        if (state) {
-          workout.completed = state.state !== "not started";
-          workout.progress_percent = state.percent.toString();
-        } else {
-          workout.completed = false;
-          workout.progress_percent = "0";
-        }
-        //console.log(workout)
-        return workout;
-      });
-  
-    } catch (error) {
-      console.error('Error fetching workouts with completion:', error);
-      return [];
-    }
+  const query = `*[_type == 'workout' && brand == '${brand}'] [0...5] {
+        "id": railcontent_id,
+        title,
+        "image": thumbnail.asset->url,
+        "artist_name": instructor[0]->name,
+        "artists": instructor[]->name,
+        difficulty,
+        difficulty_string,
+        length_in_seconds,
+        published_on,
+        "type": _type,
+        web_url_path,
+      } | order(published_on desc)[0...5]`
+  return fetchSanity(query, true);
 }
 
-
 /**
 * Fetch the latest new releases for a specific brand.
 * @param {string} brand - The brand for which to fetch new releases.
@@ -659,34 +608,31 @@ export async function fetchAllFilterOptions(
     contentType,
     term
 ) {
-    const query = `
-        {  
-          "meta": {
-            "totalResults": count(*[_type == '${contentType}' && brand == "${brand}" && ${style ? `'${style}' in genre[]->name` : `artist->name == '${artist}'`} ${filters}
-              ${term ? `&& (title match "${term}" || album match "${term}" || artist->name match "${term}" || genre[]->name match "${term}")` : ''}]),
-            "filterOptions": {
-              "difficulty": [
-                  {"type": "Introductory", "count": count(*[_type == '${contentType}' && brand == '${brand}' && ${style ? `'${style}' in genre[]->name` : `artist->name == '${artist}'`} && difficulty_string == "Introductory" ${filters}])},
-                  {"type": "Beginner", "count": count(*[_type == '${contentType}' && brand == '${brand}' && ${style ? `'${style}' in genre[]->name` : `artist->name == '${artist}'`} && difficulty_string == "Beginner" ${filters}])},
-                  {"type": "Intermediate", "count": count(*[_type == '${contentType}' && brand == '${brand}' && ${style ? `'${style}' in genre[]->name` : `artist->name == '${artist}'`} && difficulty_string == "Intermediate" ${filters}])},
-                  {"type": "Advanced", "count": count(*[_type == '${contentType}' && brand == '${brand}' && ${style ? `'${style}' in genre[]->name` : `artist->name == '${artist}'`} && difficulty_string == "Advanced" ${filters}])},
-                  {"type": "Expert", "count": count(*[_type == '${contentType}' && brand == '${brand}' && ${style ? `'${style}' in genre[]->name` : `artist->name == '${artist}'`} && difficulty_string == "Expert" ${filters}])}
-              ][count > 0],
-              "instrumentless": [
-                  {"type": "Full Song Only", "count": count(*[_type == '${contentType}' && brand == '${brand}' && ${style ? `'${style}' in genre[]->name` : `artist->name == '${artist}'`} && instrumentless == false ${filters}])},
-                  {"type": "Instrument Removed", "count": count(*[_type == '${contentType}' && brand == '${brand}' && ${style ? `'${style}' in genre[]->name` : `artist->name == '${artist}'`} && instrumentless == true ${filters}])}
-              ][count > 0],
-              "genre": *[_type == 'genre' && '${contentType}' in filter_types] {
-                "type": name,
-                "count": count(*[_type == '${contentType}' && brand == "${brand}" && ${style ? `'${style}' in genre[]->name` : `artist->name == '${artist}'`} && references(^._id)])
-              }[count > 0]
-            }
-          }
+  const query = `
+    {
+      "meta": {
+        "totalResults": count(*[_type == '${contentType}' && brand == "${brand}"${style ? ` && '${style}' in genre[]->name` : ''}${artist ? ` && artist->name == '${artist}'` : ''}${filters}
+          ${term ? ` && (title match "${term}" || album match "${term}" || artist->name match "${term}" || genre[]->name match "${term}")` : ''}]),
+        "filterOptions": {
+          "difficulty": [
+            {"type": "Introductory", "count": count(*[_type == '${contentType}' && brand == '${brand}'${style ? ` && '${style}' in genre[]->name` : ''}${artist ? ` && artist->name == '${artist}'` : ''} && difficulty_string == "Introductory"${filters}])},
+            {"type": "Beginner", "count": count(*[_type == '${contentType}' && brand == '${brand}'${style ? ` && '${style}' in genre[]->name` : ''}${artist ? ` && artist->name == '${artist}'` : ''} && difficulty_string == "Beginner"${filters}])},
+            {"type": "Intermediate", "count": count(*[_type == '${contentType}' && brand == '${brand}'${style ? ` && '${style}' in genre[]->name` : ''}${artist ? ` && artist->name == '${artist}'` : ''} && difficulty_string == "Intermediate"${filters}])},
+            {"type": "Advanced", "count": count(*[_type == '${contentType}' && brand == '${brand}'${style ? ` && '${style}' in genre[]->name` : ''}${artist ? ` && artist->name == '${artist}'` : ''} && difficulty_string == "Advanced"${filters}])},
+            {"type": "Expert", "count": count(*[_type == '${contentType}' && brand == '${brand}'${style ? ` && '${style}' in genre[]->name` : ''}${artist ? ` && artist->name == '${artist}'` : ''} && difficulty_string == "Expert"${filters}])}
+          ][count > 0],
+          "instrumentless": [
+            {"type": "Full Song Only", "count": count(*[_type == '${contentType}' && brand == '${brand}'${style ? ` && '${style}' in genre[]->name` : ''}${artist ? ` && artist->name == '${artist}'` : ''} && instrumentless == false${filters}])},
+            {"type": "Instrument Removed", "count": count(*[_type == '${contentType}' && brand == '${brand}'${style ? ` && '${style}' in genre[]->name` : ''}${artist ? ` && artist->name == '${artist}'` : ''} && instrumentless == true${filters}])}
+          ][count > 0],
+          "genre": *[_type == 'genre' && '${contentType}' in filter_types] {
+            "type": name,
+            "count": count(*[_type == '${contentType}' && brand == "${brand}"${style ? ` && '${style}' in genre[]->name` : ''}${artist ? ` && artist->name == '${artist}'` : ''} && references(^._id)])
+          }[count > 0]
         }
-    }
-  `;
-
-    return fetchSanity(query, false);
+      }
+    }`;
+  return fetchSanity(query, true);
 }
 
 /**
@@ -989,7 +935,7 @@ function checkSanityConfig(config) {
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.3</a> on Tue Aug 20 2024 14:36:28 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 Tue Aug 20 2024 20:28:18 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.40",
+  "version": "1.0.42",
   "description": "A package for Musoras content services ",
   "main": "src/index.js",
   "scripts": {

package/src/services/sanity.js

@@ -246,74 +246,23 @@ export async function fetchSongCount(brand) {
  *   .then(workouts => console.log(workouts))
  *   .catch(error => console.error(error));
  */
-
 export async function fetchWorkouts(brand) {
-    const query = `*[_type == 'workout' && brand == '${brand}'] [0...5] {
-          "id": railcontent_id,
-          title,
-          "image": thumbnail.asset->url,
-          "artist_name": instructor[0]->name,
-          "artists": instructor[]->name,
-          difficulty,
-          difficulty_string,
-          length_in_seconds,
-          published_on,
-          "type": _type,
-          web_url_path,
-        } | order(published_on desc)[0...5]`;
-  
-    try {
-      // Fetch the workouts
-      const workouts = await fetchSanity(query, true);
-  
-      if (!workouts || workouts.length === 0) {
-        return [];
-      }
-  
-      // Extract content IDs
-      const contentIds = workouts.map(workout => workout.id);
-  
-      // Fetch completion states using the existing function
-      const completedStatesObject = await fetchAllCompletedStates(contentIds);
-  
-      // Check if completedStatesObject is an object and convert to array if necessary
-      if (typeof completedStatesObject !== 'object' || completedStatesObject === null) {
-        console.error('Completed states are not an object:', completedStatesObject);
-        return workouts;
-      }
-  
-      // Convert object to array and create a map for fast lookup
-      const completedStatesArray = Object.entries(completedStatesObject).map(([content_id, state]) => ({
-        content_id: parseInt(content_id, 10), // Convert key to integer if necessary
-        ...state
-      }));
-  
-      const completedStatesMap = completedStatesArray.reduce((map, state) => {
-        map[state.content_id] = state;
-        return map;
-      }, {});
-  
-      // Add completion status and progress percentage to each workout
-      return workouts.map(workout => {
-        const state = completedStatesMap[workout.id];
-        if (state) {
-          workout.completed = state.state !== "not started";
-          workout.progress_percent = state.percent.toString();
-        } else {
-          workout.completed = false;
-          workout.progress_percent = "0";
-        }
-        //console.log(workout)
-        return workout;
-      });
-  
-    } catch (error) {
-      console.error('Error fetching workouts with completion:', error);
-      return [];
-    }
+  const query = `*[_type == 'workout' && brand == '${brand}'] [0...5] {
+        "id": railcontent_id,
+        title,
+        "image": thumbnail.asset->url,
+        "artist_name": instructor[0]->name,
+        "artists": instructor[]->name,
+        difficulty,
+        difficulty_string,
+        length_in_seconds,
+        published_on,
+        "type": _type,
+        web_url_path,
+      } | order(published_on desc)[0...5]`
+  return fetchSanity(query, true);
 }
 
-
 /**
 * Fetch the latest new releases for a specific brand.
 * @param {string} brand - The brand for which to fetch new releases.
@@ -612,34 +561,31 @@ export async function fetchAllFilterOptions(
     contentType,
     term
 ) {
-    const query = `
-        {  
-          "meta": {
-            "totalResults": count(*[_type == '${contentType}' && brand == "${brand}" && ${style ? `'${style}' in genre[]->name` : `artist->name == '${artist}'`} ${filters}
-              ${term ? `&& (title match "${term}" || album match "${term}" || artist->name match "${term}" || genre[]->name match "${term}")` : ''}]),
-            "filterOptions": {
-              "difficulty": [
-                  {"type": "Introductory", "count": count(*[_type == '${contentType}' && brand == '${brand}' && ${style ? `'${style}' in genre[]->name` : `artist->name == '${artist}'`} && difficulty_string == "Introductory" ${filters}])},
-                  {"type": "Beginner", "count": count(*[_type == '${contentType}' && brand == '${brand}' && ${style ? `'${style}' in genre[]->name` : `artist->name == '${artist}'`} && difficulty_string == "Beginner" ${filters}])},
-                  {"type": "Intermediate", "count": count(*[_type == '${contentType}' && brand == '${brand}' && ${style ? `'${style}' in genre[]->name` : `artist->name == '${artist}'`} && difficulty_string == "Intermediate" ${filters}])},
-                  {"type": "Advanced", "count": count(*[_type == '${contentType}' && brand == '${brand}' && ${style ? `'${style}' in genre[]->name` : `artist->name == '${artist}'`} && difficulty_string == "Advanced" ${filters}])},
-                  {"type": "Expert", "count": count(*[_type == '${contentType}' && brand == '${brand}' && ${style ? `'${style}' in genre[]->name` : `artist->name == '${artist}'`} && difficulty_string == "Expert" ${filters}])}
-              ][count > 0],
-              "instrumentless": [
-                  {"type": "Full Song Only", "count": count(*[_type == '${contentType}' && brand == '${brand}' && ${style ? `'${style}' in genre[]->name` : `artist->name == '${artist}'`} && instrumentless == false ${filters}])},
-                  {"type": "Instrument Removed", "count": count(*[_type == '${contentType}' && brand == '${brand}' && ${style ? `'${style}' in genre[]->name` : `artist->name == '${artist}'`} && instrumentless == true ${filters}])}
-              ][count > 0],
-              "genre": *[_type == 'genre' && '${contentType}' in filter_types] {
-                "type": name,
-                "count": count(*[_type == '${contentType}' && brand == "${brand}" && ${style ? `'${style}' in genre[]->name` : `artist->name == '${artist}'`} && references(^._id)])
-              }[count > 0]
-            }
-          }
+  const query = `
+    {
+      "meta": {
+        "totalResults": count(*[_type == '${contentType}' && brand == "${brand}"${style ? ` && '${style}' in genre[]->name` : ''}${artist ? ` && artist->name == '${artist}'` : ''}${filters}
+          ${term ? ` && (title match "${term}" || album match "${term}" || artist->name match "${term}" || genre[]->name match "${term}")` : ''}]),
+        "filterOptions": {
+          "difficulty": [
+            {"type": "Introductory", "count": count(*[_type == '${contentType}' && brand == '${brand}'${style ? ` && '${style}' in genre[]->name` : ''}${artist ? ` && artist->name == '${artist}'` : ''} && difficulty_string == "Introductory"${filters}])},
+            {"type": "Beginner", "count": count(*[_type == '${contentType}' && brand == '${brand}'${style ? ` && '${style}' in genre[]->name` : ''}${artist ? ` && artist->name == '${artist}'` : ''} && difficulty_string == "Beginner"${filters}])},
+            {"type": "Intermediate", "count": count(*[_type == '${contentType}' && brand == '${brand}'${style ? ` && '${style}' in genre[]->name` : ''}${artist ? ` && artist->name == '${artist}'` : ''} && difficulty_string == "Intermediate"${filters}])},
+            {"type": "Advanced", "count": count(*[_type == '${contentType}' && brand == '${brand}'${style ? ` && '${style}' in genre[]->name` : ''}${artist ? ` && artist->name == '${artist}'` : ''} && difficulty_string == "Advanced"${filters}])},
+            {"type": "Expert", "count": count(*[_type == '${contentType}' && brand == '${brand}'${style ? ` && '${style}' in genre[]->name` : ''}${artist ? ` && artist->name == '${artist}'` : ''} && difficulty_string == "Expert"${filters}])}
+          ][count > 0],
+          "instrumentless": [
+            {"type": "Full Song Only", "count": count(*[_type == '${contentType}' && brand == '${brand}'${style ? ` && '${style}' in genre[]->name` : ''}${artist ? ` && artist->name == '${artist}'` : ''} && instrumentless == false${filters}])},
+            {"type": "Instrument Removed", "count": count(*[_type == '${contentType}' && brand == '${brand}'${style ? ` && '${style}' in genre[]->name` : ''}${artist ? ` && artist->name == '${artist}'` : ''} && instrumentless == true${filters}])}
+          ][count > 0],
+          "genre": *[_type == 'genre' && '${contentType}' in filter_types] {
+            "type": name,
+            "count": count(*[_type == '${contentType}' && brand == "${brand}"${style ? ` && '${style}' in genre[]->name` : ''}${artist ? ` && artist->name == '${artist}'` : ''} && references(^._id)])
+          }[count > 0]
         }
-    }
-  `;
-
-    return fetchSanity(query, false);
+      }
+    }`;
+  return fetchSanity(query, true);
 }
 
 /**