musora-content-services 1.0.186 → 1.0.188

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.188](https://github.com/railroadmedia/musora-content-services/compare/v1.0.187...v1.0.188) (2024-11-28)
+
+### [1.0.187](https://github.com/railroadmedia/musora-content-services/compare/v1.0.186...v1.0.187) (2024-11-28)
+
 ### [1.0.186](https://github.com/railroadmedia/musora-content-services/compare/v1.0.185...v1.0.186) (2024-11-28)
 
 ### [1.0.185](https://github.com/railroadmedia/musora-content-services/compare/v1.0.176...v1.0.185) (2024-11-27)

package/package.json

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

package/src/services/sanity.js

@@ -532,18 +532,22 @@ export async function fetchAll(brand, type, {
     const progressFilter = await getProgressFilter(progress, progressIds);
 
     // Determine the sort order
-    const sortOrder = getSortOrder(sort);
+    const sortOrder = getSortOrder(sort, groupBy);
 
     let fields = useDefaultFields ? customFields.concat(DEFAULT_FIELDS, additionalFields) : customFields;
     let fieldsString = fields.join(',');
 
+    let customFilter = '';
+    if (type == 'instructor') {
+        customFilter = '&& coach_card_image != null'
+    }
     // Determine the group by clause
     let query = "";
     let entityFieldsString = "";
     let filter = "";
     if (groupBy !== "" && isGroupByOneToOne) {
         const webUrlPath = 'artists';
-        const lessonsFilter = `_type == '${type}' && brand == '${brand}' && ^._id == ${groupBy}._ref ${searchFilter} ${includedFieldsFilter} ${progressFilter}`;
+        const lessonsFilter = `_type == '${type}' && brand == '${brand}' && ^._id == ${groupBy}._ref ${searchFilter} ${includedFieldsFilter} ${progressFilter} ${customFilter}`;
         const lessonsFilterWithRestrictions = await new FilterBuilder(lessonsFilter).buildFilter();
         entityFieldsString = `
                 'id': railcontent_id,
@@ -560,7 +564,7 @@ export async function fetchAll(brand, type, {
         filter = `_type == '${groupBy}' && count(*[brand == '${brand}' && ^._id == ${groupBy}._ref ${typeFilter} ${searchFilter} ${includedFieldsFilter} ${progressFilter}]._id) > 0`;
     } else if (groupBy !== "") {
         const webUrlPath = (groupBy == 'genre') ? '/genres' : '';
-        const lessonsFilter = `brand == '${brand}' && ^._id in ${groupBy}[]._ref ${typeFilter} ${searchFilter} ${includedFieldsFilter} ${progressFilter}`;
+        const lessonsFilter = `brand == '${brand}' && ^._id in ${groupBy}[]._ref ${typeFilter} ${searchFilter} ${includedFieldsFilter} ${progressFilter} ${customFilter}`;
         const lessonsFilterWithRestrictions = await new FilterBuilder(lessonsFilter).buildFilter();
 
         entityFieldsString = `
@@ -576,7 +580,7 @@ export async function fetchAll(brand, type, {
                 }[0...20]`;
         filter = `_type == '${groupBy}' && count(*[brand == '${brand}' && ^._id in ${groupBy}[]._ref ${typeFilter} ${searchFilter} ${includedFieldsFilter} ${progressFilter}]._id) > 0`;
     } else {
-        filter = `brand == "${brand}" ${typeFilter} ${searchFilter} ${includedFieldsFilter} ${progressFilter}`
+        filter = `brand == "${brand}" ${typeFilter} ${searchFilter} ${includedFieldsFilter} ${progressFilter} ${customFilter}`
         entityFieldsString = fieldsString;
     }
 

package/test/sanityQueryService.test.js

@@ -227,6 +227,13 @@ describe('Sanity Queries', function () {
         expect(response.entity[0].instructors).toBeTruthy();
     });
 
+    test('fetchAllInstructors', async () => {
+        const response = await fetchAll('drumeo', 'instructor');
+        log(response);
+        expect(response.entity[0].name).toBeDefined();
+        expect(response.entity[0].coach_card_image).toBeTruthy();
+    });
+
     test('fetchAllSortField', async () => {
         const response = await fetchAll('drumeo', 'rhythmic-adventures-of-captain-carson', {});
         log(response);