musora-content-services 1.0.42 → 1.0.43

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

package/README.md

@@ -55,6 +55,7 @@ https://railroadmedia.github.io/musora-content-services/
 ## Run tests
 Copy .env file from 1Password "musora-content-services .env"
 Run the following to execute the tests
+You may need to install jest (npm install --save-dev jest)
 ```
 npm test
 ```

package/package.json

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

package/src/contentTypeConfig.js

@@ -28,9 +28,14 @@ let contentTypeConfig = {
             '"instructors": instructor[]->name'
         ]
     },
+    'student-focus': {
+        'fields': [
+            '"instructors": instructor[]->name',
+        ]
+    },
 }
 
 
 module.exports = {
     contentTypeConfig
-}
+}

package/src/services/sanity.js

@@ -561,27 +561,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]
+            }
         }
       }
     }`;
@@ -815,10 +817,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'