musora-content-services 1.0.39 → 1.0.40

package/CHANGELOG.md

@@ -2,6 +2,8 @@
 
 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.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)
 
 ### [1.0.37](https://github.com/railroadmedia/musora-content-services/compare/v1.0.35...v1.0.37) (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 12:50:34 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 14:36:28 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 12:50:34 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 14:36:28 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 12:50:34 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 14:36:28 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 12:50:34 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 14:36:28 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#line412">line 412</a>
+        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line465">line 465</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#line554">line 554</a>
+        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line607">line 607</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#line345">line 345</a>
+        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line398">line 398</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#line371">line 371</a>
+        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line424">line 424</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#line597">line 597</a>
+        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line650">line 650</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#line769">line 769</a>
+        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line822">line 822</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#line675">line 675</a>
+        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line728">line 728</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#line639">line 639</a>
+        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line692">line 692</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#line618">line 618</a>
+        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line671">line 671</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#line269">line 269</a>
+        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line322">line 322</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#line649">line 649</a>
+        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line702">line 702</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#line729">line 729</a>
+        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line782">line 782</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#line755">line 755</a>
+        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line808">line 808</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#line708">line 708</a>
+        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line761">line 761</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#line810">line 810</a>
+        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line863">line 863</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#line306">line 306</a>
+        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line359">line 359</a>
     </li></ul></dd>
     
 
@@ -4705,14 +4705,15 @@ fetchSanity(query, true)
 <dl class="details">
     
     <dt class="tag-description">Description:</dt>
-    <dd class="tag-description"><ul class="dummy"><li>Fetch the latest workouts for the home page of a specific brand.
-This function retrieves the latest workout content for a given brand, fetching up to five workouts. The workouts are sorted in descending order by their publication date.</li></ul></dd>
+    <dd class="tag-description"><ul class="dummy"><li>Fetch the latest workouts for a specific brand, including completion status and progress.
+This function retrieves up to five of the latest workout content for a given brand, sorted in descending order by their publication date.
+It also includes completion status and progress percentage for each workout by fetching additional data about user progress.</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#line247">line 247</a>
+        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line250">line 250</a>
     </li></ul></dd>
     
 
@@ -4834,7 +4835,7 @@ This function retrieves the latest workout content for a given brand, fetching u
 
         
 <div class="param-desc">
-    - A promise that resolves to an array of workout data objects or null if no workouts are found.
+    - A promise that resolves to an array of workout data objects with additional properties for completion status and progress percentage, or null if no workouts are found.
 </div>
 
 
@@ -4876,7 +4877,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 Tue Aug 20 2024 12:50:34 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 14:36:28 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 12:50:34 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 14:36:28 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

@@ -281,33 +281,86 @@ export async function fetchSongCount(brand) {
 }
 
 /**
-* Fetch the latest workouts for the home page of a specific brand.
-* This function retrieves the latest workout content for a given brand, fetching up to five workouts. The workouts are sorted in descending order by their publication date.
-* @param {string} brand - The brand for which to fetch workouts (e.g., 'drumeo', 'pianote').
-* @returns {Promise<Array<Object>|null>} - A promise that resolves to an array of workout data objects or null if no workouts are found.
-*
-* @example
-* fetchWorkouts('drumeo')
-*   .then(workouts => console.log(workouts))
-*   .catch(error => console.error(error));
-*/
+ * Fetch the latest workouts for a specific brand, including completion status and progress.
+ * This function retrieves up to five of the latest workout content for a given brand, sorted in descending order by their publication date.
+ * It also includes completion status and progress percentage for each workout by fetching additional data about user progress.
+ * 
+ * @param {string} brand - The brand for which to fetch workouts (e.g., 'drumeo', 'pianote').
+ * @returns {Promise<Array<Object>|null>} - A promise that resolves to an array of workout data objects with additional properties for completion status and progress percentage, or null if no workouts are found.
+ * 
+ * @example
+ * fetchWorkouts('drumeo')
+ *   .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]`
-  return fetchSanity(query, true);
+    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 [];
+    }
 }
 
+
 /**
 * Fetch the latest new releases for a specific brand.
 * @param {string} brand - The brand for which to fetch new releases.
@@ -470,44 +523,44 @@ export async function fetchAll(brand, type, {
     const start = (page - 1) * limit;
     const end = start + limit;
 
-  // Construct the search filter
-  const searchFilter = searchTerm
-      ? `&& (artist->name match "${searchTerm}*" || title match "${searchTerm}*")`
-      : "";
-
-  // Construct the included fields filter, replacing 'difficulty' with 'difficulty_string'
-  const includedFieldsFilter = includedFields.length > 0
-      ? includedFields.map(field => {
-          let [key, value] = field.split(',');
-          if (key === 'difficulty') {
-              key = 'difficulty_string';
-          }
-          return `&& ${key} == "${value}"`;
-      }).join(' ')
-      : "";
-
-  // Determine the sort order
-  let sortOrder;
-  switch (sort) {
-      case "slug":
-          sortOrder = "artist->name asc";
-          break;
-      case "published_on":
-          sortOrder = "published_on asc";
-          break;
-      case "-published_on":
-          sortOrder = "published_on desc";
-          break;
-      case "-slug":
-          sortOrder = "artist->name desc";
-          break;
-      case "-popularity":
-          sortOrder = "popularity desc";
-          break;
-      default:
-          sortOrder = "published_on asc";
-          break;
-  }
+    // Construct the search filter
+    const searchFilter = searchTerm
+        ? `&& (artist->name match "${searchTerm}*" || title match "${searchTerm}*")`
+        : "";
+
+    // Construct the included fields filter, replacing 'difficulty' with 'difficulty_string'
+    const includedFieldsFilter = includedFields.length > 0
+        ? includedFields.map(field => {
+            let [key, value] = field.split(',');
+            if (key === 'difficulty') {
+                key = 'difficulty_string';
+            }
+            return `&& ${key} == "${value}"`;
+        }).join(' ')
+        : "";
+
+    // Determine the sort order
+    let sortOrder;
+    switch (sort) {
+        case "slug":
+            sortOrder = "artist->name asc";
+            break;
+        case "published_on":
+            sortOrder = "published_on asc";
+            break;
+        case "-published_on":
+            sortOrder = "published_on desc";
+            break;
+        case "-slug":
+            sortOrder = "artist->name desc";
+            break;
+        case "-popularity":
+            sortOrder = "popularity desc";
+            break;
+        default:
+            sortOrder = "published_on asc";
+            break;
+    }
 
     let defaultFields = [
         '"id": railcontent_id',
@@ -936,7 +989,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 12:50:34 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 14:36:28 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.39",
+  "version": "1.0.40",
   "description": "A package for Musoras content services ",
   "main": "src/index.js",
   "scripts": {

package/src/services/sanity.js

@@ -234,33 +234,86 @@ export async function fetchSongCount(brand) {
 }
 
 /**
-* Fetch the latest workouts for the home page of a specific brand.
-* This function retrieves the latest workout content for a given brand, fetching up to five workouts. The workouts are sorted in descending order by their publication date.
-* @param {string} brand - The brand for which to fetch workouts (e.g., 'drumeo', 'pianote').
-* @returns {Promise<Array<Object>|null>} - A promise that resolves to an array of workout data objects or null if no workouts are found.
-*
-* @example
-* fetchWorkouts('drumeo')
-*   .then(workouts => console.log(workouts))
-*   .catch(error => console.error(error));
-*/
+ * Fetch the latest workouts for a specific brand, including completion status and progress.
+ * This function retrieves up to five of the latest workout content for a given brand, sorted in descending order by their publication date.
+ * It also includes completion status and progress percentage for each workout by fetching additional data about user progress.
+ * 
+ * @param {string} brand - The brand for which to fetch workouts (e.g., 'drumeo', 'pianote').
+ * @returns {Promise<Array<Object>|null>} - A promise that resolves to an array of workout data objects with additional properties for completion status and progress percentage, or null if no workouts are found.
+ * 
+ * @example
+ * fetchWorkouts('drumeo')
+ *   .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]`
-  return fetchSanity(query, true);
+    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 [];
+    }
 }
 
+
 /**
 * Fetch the latest new releases for a specific brand.
 * @param {string} brand - The brand for which to fetch new releases.
@@ -423,44 +476,44 @@ export async function fetchAll(brand, type, {
     const start = (page - 1) * limit;
     const end = start + limit;
 
-  // Construct the search filter
-  const searchFilter = searchTerm
-      ? `&& (artist->name match "${searchTerm}*" || title match "${searchTerm}*")`
-      : "";
-
-  // Construct the included fields filter, replacing 'difficulty' with 'difficulty_string'
-  const includedFieldsFilter = includedFields.length > 0
-      ? includedFields.map(field => {
-          let [key, value] = field.split(',');
-          if (key === 'difficulty') {
-              key = 'difficulty_string';
-          }
-          return `&& ${key} == "${value}"`;
-      }).join(' ')
-      : "";
-
-  // Determine the sort order
-  let sortOrder;
-  switch (sort) {
-      case "slug":
-          sortOrder = "artist->name asc";
-          break;
-      case "published_on":
-          sortOrder = "published_on asc";
-          break;
-      case "-published_on":
-          sortOrder = "published_on desc";
-          break;
-      case "-slug":
-          sortOrder = "artist->name desc";
-          break;
-      case "-popularity":
-          sortOrder = "popularity desc";
-          break;
-      default:
-          sortOrder = "published_on asc";
-          break;
-  }
+    // Construct the search filter
+    const searchFilter = searchTerm
+        ? `&& (artist->name match "${searchTerm}*" || title match "${searchTerm}*")`
+        : "";
+
+    // Construct the included fields filter, replacing 'difficulty' with 'difficulty_string'
+    const includedFieldsFilter = includedFields.length > 0
+        ? includedFields.map(field => {
+            let [key, value] = field.split(',');
+            if (key === 'difficulty') {
+                key = 'difficulty_string';
+            }
+            return `&& ${key} == "${value}"`;
+        }).join(' ')
+        : "";
+
+    // Determine the sort order
+    let sortOrder;
+    switch (sort) {
+        case "slug":
+            sortOrder = "artist->name asc";
+            break;
+        case "published_on":
+            sortOrder = "published_on asc";
+            break;
+        case "-published_on":
+            sortOrder = "published_on desc";
+            break;
+        case "-slug":
+            sortOrder = "artist->name desc";
+            break;
+        case "-popularity":
+            sortOrder = "popularity desc";
+            break;
+        default:
+            sortOrder = "published_on asc";
+            break;
+    }
 
     let defaultFields = [
         '"id": railcontent_id',