musora-content-services 1.0.43 → 1.0.44

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.44](https://github.com/railroadmedia/musora-content-services/compare/v1.0.43...v1.0.44) (2024-08-21)
+
 ### [1.0.43](https://github.com/railroadmedia/musora-content-services/compare/v1.0.42...v1.0.43) (2024-08-20)
 
 ### [1.0.42](https://github.com/railroadmedia/musora-content-services/compare/v1.0.41...v1.0.42) (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 20:28:18 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 21 2024 17:33:07 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

@@ -93,7 +93,8 @@
 <p>https://railroadmedia.github.io/musora-content-services/</p>
 <h2>Run tests</h2>
 <p>Copy .env file from 1Password &quot;musora-content-services .env&quot;
-Run the following to execute the tests</p>
+Run the following to execute the tests
+You may need to install jest (npm install --save-dev jest)</p>
 <pre class="prettyprint source"><code>npm test
 </code></pre></article>
     </section>
@@ -110,7 +111,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 20:28:18 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 21 2024 17:33:07 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 20:28:18 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 21 2024 17:33:07 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 20:28:18 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 21 2024 17:33:07 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

@@ -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#line596">line 596</a>
+        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line598">line 598</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#line768">line 768</a>
+        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line770">line 770</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#line674">line 674</a>
+        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line676">line 676</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#line638">line 638</a>
+        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line640">line 640</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#line617">line 617</a>
+        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line619">line 619</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#line648">line 648</a>
+        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line650">line 650</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#line728">line 728</a>
+        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line730">line 730</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#line754">line 754</a>
+        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line756">line 756</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#line707">line 707</a>
+        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line709">line 709</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#line809">line 809</a>
+        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line811">line 811</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 20:28:18 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 21 2024 17:33:08 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 20:28:18 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 21 2024 17:33:07 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

@@ -492,7 +492,7 @@ export async function fetchAll(brand, type, {
     let sortOrder;
     switch (sort) {
         case "slug":
-            sortOrder = "artist->name asc";
+            sortOrder = "title asc";
             break;
         case "published_on":
             sortOrder = "published_on asc";
@@ -501,7 +501,7 @@ export async function fetchAll(brand, type, {
             sortOrder = "published_on desc";
             break;
         case "-slug":
-            sortOrder = "artist->name desc";
+            sortOrder = "title desc";
             break;
         case "-popularity":
             sortOrder = "popularity desc";
@@ -608,27 +608,29 @@ export async function fetchAllFilterOptions(
     contentType,
     term
 ) {
-  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]
+    const commonFilter = `_type == '${contentType}' && brand == "${brand}"${style ? ` && '${style}' in genre[]->name` : ''}${artist ? ` && artist->name == '${artist}'` : ''} ${filters ? filters : ''}`;
+    const query = `
+        {  
+          "meta": {
+            "totalResults": count(*[${commonFilter}
+              ${term ? ` && (title match "${term}" || album match "${term}" || artist->name match "${term}" || genre[]->name match "${term}")` : ''}]),
+            "filterOptions": {
+              "difficulty": [
+                  {"type": "Introductory", "count": count(*[${commonFilter} && difficulty_string == "Introductory"])},
+                  {"type": "Beginner", "count": count(*[${commonFilter} && difficulty_string == "Beginner"])},
+                  {"type": "Intermediate", "count": count(*[${commonFilter} && difficulty_string == "Intermediate" ])},
+                  {"type": "Advanced", "count": count(*[${commonFilter} && difficulty_string == "Advanced" ])},
+                  {"type": "Expert", "count": count(*[${commonFilter} && difficulty_string == "Expert" ])}
+              ][count > 0],
+              "instrumentless": [
+                  {"type": "Full Song Only", "count": count(*[${commonFilter} && instrumentless == false ])},
+                  {"type": "Instrument Removed", "count": count(*[${commonFilter} && instrumentless == true ])}
+              ][count > 0],
+              "genre": *[_type == 'genre' && '${contentType}' in filter_types] {
+                "type": name,
+                "count": count(*[${commonFilter} && references(^._id)])
+              }[count > 0]
+            }
         }
       }
     }`;
@@ -862,10 +864,10 @@ export async function fetchSanity(query, isList) {
   if (globalConfig.sanityConfig.debug) {
       console.log("fetchSanity Query:", query);
   }
-
+  const perspective = globalConfig.sanityConfig.perspective ?? 'published';
   const encodedQuery = encodeURIComponent(query);
   const api = globalConfig.sanityConfig.useCachedAPI ? 'apicdn' : 'api';
-  const url = `https://${globalConfig.sanityConfig.projectId}.${api}.sanity.io/v${globalConfig.sanityConfig.version}/data/query/${globalConfig.sanityConfig.dataset}?query=${encodedQuery}`;
+  const url = `https://${globalConfig.sanityConfig.projectId}.${api}.sanity.io/v${globalConfig.sanityConfig.version}/data/query/${globalConfig.sanityConfig.dataset}?perspective=${perspective}&query=${encodedQuery}`;
   const headers = {
       'Authorization': `Bearer ${globalConfig.sanityConfig.token}`,
       'Content-Type': 'application/json'
@@ -935,7 +937,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 20:28:18 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 21 2024 17:33:07 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.43",
+  "version": "1.0.44",
   "description": "A package for Musoras content services ",
   "main": "src/index.js",
   "scripts": {
@@ -22,12 +22,12 @@
     "dotenv": "^16.4.5",
     "jest": "^29.7.0",
     "jsdoc": "^4.0.3",
-    "standard-version": "^9.5.0"
+    "standard-version": "^9.5.0",
+    "ts-jest": "^29.2.4"
   },
   "dependencies": {
     "@babel/preset-env": "^7.25.3",
     "babel-jest": "^29.7.0",
-    "docdash": "^2.0.2",
-    "ts-jest": "^29.2.4"
+    "docdash": "^2.0.2"
   }
 }

package/src/services/sanity.js

@@ -445,7 +445,7 @@ export async function fetchAll(brand, type, {
     let sortOrder;
     switch (sort) {
         case "slug":
-            sortOrder = "artist->name asc";
+            sortOrder = "title asc";
             break;
         case "published_on":
             sortOrder = "published_on asc";
@@ -454,7 +454,7 @@ export async function fetchAll(brand, type, {
             sortOrder = "published_on desc";
             break;
         case "-slug":
-            sortOrder = "artist->name desc";
+            sortOrder = "title desc";
             break;
         case "-popularity":
             sortOrder = "popularity desc";

package/test/sanityQueryService.test.js

@@ -26,14 +26,16 @@ const {
 
 describe('Sanity Queries', function () {
     beforeEach(() => {
-        const config = { 'sanityConfig':{
-            token: process.env.SANITY_API_TOKEN,
-            projectId: process.env.SANITY_PROJECT_ID,
-            dataset: process.env.SANITY_DATASET,
-            useCachedAPI: process.env.SANITY_USE_CACHED_API || true,
-            version: '2021-06-07',
-            debug: process.env.DEBUG || false
-        }};
+        const config = { 
+            sanityConfig: {
+                token: process.env.SANITY_API_TOKEN,
+                projectId: process.env.SANITY_PROJECT_ID,
+                dataset: process.env.SANITY_DATASET,
+                useCachedAPI: process.env.SANITY_USE_CACHED_API || true,
+                version: '2021-06-07',
+                debug: process.env.DEBUG || false
+            }
+        };
         initializeService(config);
     });