musora-content-services 1.0.48 → 1.0.50

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.50](https://github.com/railroadmedia/musora-content-services/compare/v1.0.49...v1.0.50) (2024-08-23)
+
+### [1.0.49](https://github.com/railroadmedia/musora-content-services/compare/v1.0.48...v1.0.49) (2024-08-23)
+
 ### [1.0.48](https://github.com/railroadmedia/musora-content-services/compare/v1.0.47...v1.0.48) (2024-08-22)
 
 ### [1.0.47](https://github.com/railroadmedia/musora-content-services/compare/v1.0.46...v1.0.47) (2024-08-22)

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 Thu Aug 22 2024 21:43:24 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 Fri Aug 23 2024 16:23:38 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

@@ -111,7 +111,7 @@ You may need to install jest (npm install --save-dev jest)</p>
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.3</a> on Thu Aug 22 2024 21:43:24 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 Fri Aug 23 2024 16:23:38 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 Thu Aug 22 2024 21:43:24 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 Fri Aug 23 2024 16:23:38 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 Thu Aug 22 2024 21:43:24 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 Fri Aug 23 2024 16:23:38 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

@@ -713,7 +713,7 @@ fetchAllFilterOptions('myBrand', '', 'Rock', 'John Doe', 'song', 'Love')
             <td class="type">
             
                 
-<span class="param-type">string</span>
+<span class="param-type">Array.&lt;string></span>
 
 
 
@@ -732,7 +732,7 @@ fetchAllFilterOptions('myBrand', '', 'Rock', 'John Doe', 'song', 'Love')
 
             
 
-            <td class="description last">Additional filters to apply to the query, typically in the format of Sanity GROQ queries.</td>
+            <td class="description last">Additional filters to apply to the query in the format of a key,value array. eg. ['difficulty,Intermediate', 'genre,rock']</td>
         </tr>
 
     
@@ -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#line608">line 608</a>
+        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line616">line 616</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#line809">line 809</a>
+        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line818">line 818</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#line715">line 715</a>
+        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line724">line 724</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#line679">line 679</a>
+        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line688">line 688</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#line658">line 658</a>
+        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line667">line 667</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#line629">line 629</a>
+        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line637">line 637</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#line689">line 689</a>
+        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line698">line 698</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#line769">line 769</a>
+        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line778">line 778</a>
     </li></ul></dd>
     
 
@@ -3332,7 +3332,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#line795">line 795</a>
+        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line804">line 804</a>
     </li></ul></dd>
     
 
@@ -3497,7 +3497,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#line748">line 748</a>
+        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line757">line 757</a>
     </li></ul></dd>
     
 
@@ -3868,7 +3868,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#line850">line 850</a>
+        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line859">line 859</a>
     </li></ul></dd>
     
 
@@ -5035,7 +5035,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 Thu Aug 22 2024 21:43:24 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 Fri Aug 23 2024 16:23:38 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 Thu Aug 22 2024 21:43:24 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 Fri Aug 23 2024 16:23:38 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

@@ -596,7 +596,7 @@ export async function fetchAll(brand, type, {
 * The filter options are dynamically generated based on the provided filters, style, artist, and content type.
 *
 * @param {string} brand - The brand for which to fetch the filter options.
-* @param {string} filters - Additional filters to apply to the query, typically in the format of Sanity GROQ queries.
+* @param {string[]} filters - Additional filters to apply to the query in the format of a key,value array. eg. ['difficulty,Intermediate', 'genre,rock']
 * @param {string} [style] - Optional style or genre to filter the results. If provided, the query will check if the style exists in the genre array.
 * @param {string} [artist] - Optional artist name to filter the results. If provided, the query will check if the artist's name matches.
 * @param {string} contentType - The content type to fetch (e.g., 'song', 'lesson').
@@ -618,7 +618,16 @@ export async function fetchAllFilterOptions(
     contentType,
     term
 ) {
-    const commonFilter = `_type == '${contentType}' && brand == "${brand}"${style ? ` && '${style}' in genre[]->name` : ''}${artist ? ` && artist->name == '${artist}'` : ''} ${filters ? filters : ''}`;
+    const filtersToGroq = filters?.length > 0 ? filters.map(field => {
+            let [key, value] = field.split(',');
+            if (key === 'difficulty') {
+                key = 'difficulty_string';
+            }
+            return `&& ${key} == "${value}"`;
+        }).join(' ')
+        : undefined;
+    
+    const commonFilter = `_type == '${contentType}' && brand == "${brand}"${style ? ` && '${style}' in genre[]->name` : ''}${artist ? ` && artist->name == '${artist}'` : ''} ${filtersToGroq ? filtersToGroq : ''}`;
     const query = `
         {  
           "meta": {
@@ -642,8 +651,7 @@ export async function fetchAllFilterOptions(
               }[count > 0]
             }
         }
-      }
-    }`;
+      }`;
   return fetchSanity(query, true);
 }
 
@@ -688,6 +696,7 @@ export async function fetchMethods(brand) {
       "slug": slug.current,
       status,
       "thumbnail": thumbnail.asset->url,
+      "thumbnail_logo": logo_image_url.asset->url,
       title,
       total_xp,
       "type": _type,
@@ -976,7 +985,7 @@ function checkSanityConfig(config) {
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.3</a> on Thu Aug 22 2024 21:43:24 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 Fri Aug 23 2024 16:23:38 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.48",
+  "version": "1.0.50",
   "description": "A package for Musoras content services ",
   "main": "src/index.js",
   "scripts": {

package/src/services/sanity.js

@@ -549,7 +549,7 @@ export async function fetchAll(brand, type, {
 * The filter options are dynamically generated based on the provided filters, style, artist, and content type.
 *
 * @param {string} brand - The brand for which to fetch the filter options.
-* @param {string} filters - Additional filters to apply to the query, typically in the format of Sanity GROQ queries.
+* @param {string[]} filters - Additional filters to apply to the query in the format of a key,value array. eg. ['difficulty,Intermediate', 'genre,rock']
 * @param {string} [style] - Optional style or genre to filter the results. If provided, the query will check if the style exists in the genre array.
 * @param {string} [artist] - Optional artist name to filter the results. If provided, the query will check if the artist's name matches.
 * @param {string} contentType - The content type to fetch (e.g., 'song', 'lesson').
@@ -571,7 +571,16 @@ export async function fetchAllFilterOptions(
     contentType,
     term
 ) {
-    const commonFilter = `_type == '${contentType}' && brand == "${brand}"${style ? ` && '${style}' in genre[]->name` : ''}${artist ? ` && artist->name == '${artist}'` : ''} ${filters ? filters : ''}`;
+    const filtersToGroq = filters?.length > 0 ? filters.map(field => {
+            let [key, value] = field.split(',');
+            if (key === 'difficulty') {
+                key = 'difficulty_string';
+            }
+            return `&& ${key} == "${value}"`;
+        }).join(' ')
+        : undefined;
+    
+    const commonFilter = `_type == '${contentType}' && brand == "${brand}"${style ? ` && '${style}' in genre[]->name` : ''}${artist ? ` && artist->name == '${artist}'` : ''} ${filtersToGroq ? filtersToGroq : ''}`;
     const query = `
         {  
           "meta": {
@@ -595,8 +604,7 @@ export async function fetchAllFilterOptions(
               }[count > 0]
             }
         }
-      }
-    }`;
+      }`;
   return fetchSanity(query, true);
 }
 
@@ -641,7 +649,7 @@ export async function fetchMethods(brand) {
       "slug": slug.current,
       status,
       "thumbnail": thumbnail.asset->url,
-      "thumbnail_logo": logo_image_url.asset->url
+      "thumbnail_logo": logo_image_url.asset->url,
       title,
       total_xp,
       "type": _type,