musora-content-services 1.0.189 → 1.0.191

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.191](https://github.com/railroadmedia/musora-content-services/compare/v1.0.190...v1.0.191) (2024-11-28)
+
+### [1.0.190](https://github.com/railroadmedia/musora-content-services/compare/v1.0.189...v1.0.190) (2024-11-28)
+
 ### [1.0.189](https://github.com/railroadmedia/musora-content-services/compare/v1.0.188...v1.0.189) (2024-11-28)
 
 ### [1.0.188](https://github.com/railroadmedia/musora-content-services/compare/v1.0.187...v1.0.188) (2024-11-28)

package/package.json

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

package/src/services/sanity.js

@@ -632,14 +632,94 @@ async function handleCustomFetchAll(brand, type, {
 } = {}) {
     if (type === 'challenge') {
         if (groupBy === 'completed') {
-            return fetchCompletedChallenges(brand, page, limit);
+            const completedIds = fetchCompletedChallenges(brand, page, limit);
+            return fetchAll(brand, type,
+                {
+                    page,
+                    limit,
+                    searchTerm,
+                    sort,
+                    includedFields,
+                    groupBy,
+                    completedIds,
+                    useDefaultFields,
+                    customFields,
+                    progress
+                });
         } else if (groupBy === 'owned') {
-            return fetchOwnedChallenges(brand, page, limit);
+            const ownedIds = fetchOwnedChallenges(brand, page, limit);
+            return fetchAll(brand, type,
+                {
+                    page,
+                    limit,
+                    searchTerm,
+                    sort,
+                    includedFields,
+                    groupBy,
+                    ownedIds,
+                    useDefaultFields,
+                    customFields,
+                    progress
+                });
+        } else if (groupBy === 'difficulty_string') {
+            return fetchChallengesByDifficulty(brand, type, page, limit, searchTerm, sort, includedFields, groupBy, progressIds, useDefaultFields, customFields, progress);
         }
     }
     return null;
 }
 
+async function fetchChallengesByDifficulty(brand, type, page, limit, searchTerm, sort, includedFields, groupBy, progressIds, useDefaultFields, customFields, progress) {
+    let config = contentTypeConfig['challenge'] ?? {};
+    let additionalFields = config?.fields ?? [];
+
+    // Construct the search filter
+    const searchFilter = searchTerm
+        ? groupBy !== "" ?
+            `&& (^.name match "${searchTerm}*" || title match "${searchTerm}*")`
+            : `&& (artist->name match "${searchTerm}*" || instructor[]->name match "${searchTerm}*" || title match "${searchTerm}*" || name match "${searchTerm}*")`
+        : "";
+
+    // Construct the included fields filter, replacing 'difficulty' with 'difficulty_string'
+    const includedFieldsFilter = includedFields.length > 0
+        ? filtersToGroq(includedFields)
+        : "";
+
+    // limits the results to supplied progressIds for started & completed filters
+    const progressFilter = await getProgressFilter(progress, progressIds);
+
+    let fields = useDefaultFields ? customFields.concat(DEFAULT_FIELDS, additionalFields) : customFields;
+    let fieldsString = fields.join(',');
+
+
+    const lessonsFilter = `_type == 'challenge' && brand == '${brand}' && ^.name == difficulty_string ${searchFilter} ${includedFieldsFilter} ${progressFilter}`;
+    const lessonsFilterWithRestrictions = await new FilterBuilder(lessonsFilter).buildFilter();
+
+    const query = `{
+      "entity": [
+        {"name": "All"},
+        {"name": "Novice"},
+        {"name": "Beginner"},
+        {"name": "Intermediate"},
+        {"name": "Advanced"},
+        {"name": "Expert"}]
+          {
+            'id': 0,
+            name,
+            'all_lessons_count': count(*[${lessonsFilterWithRestrictions}]._id),
+            'lessons': *[${lessonsFilterWithRestrictions}]{
+                ${fieldsString},
+                name
+            }[0...20]
+          },
+          "total": 0
+        }`;
+    let data = await fetchSanity(query, true);
+    data.entity = data.entity.filter(function (difficulty) {
+        return difficulty.lessons.length > 0;
+    });
+    return data;
+}
+
 async function getProgressFilter(progress, progressIds) {
     switch (progress) {
         case "all":

package/test/sanityQueryService.test.js

@@ -256,6 +256,26 @@ describe('Sanity Queries', function () {
 
     });
 
+    test('fetchAllChallengesByGenre', async () => {
+        const response = await fetchAll('drumeo', 'challenge', {groupBy:'genre'});
+        expect(response.entity[0].type).toBe('genre');
+        expect(response.entity[0].lessons).toBeDefined();
+    });
+
+    test('fetchAllChallengesByDifficulty', async () => {
+        const response = await fetchAll('drumeo', 'challenge', {groupBy:'difficulty_string'});
+        expect(response.entity[0].name).toBeDefined();
+        expect(response.entity[0].lessons).toBeDefined();
+        expect(response.entity[0].lessons.length).toBeGreaterThan(0)
+    });
+
+    test('fetchAllChallengesByDifficulty', async () => {
+        const response = await fetchAll('drumeo', 'challenge', {groupBy:'difficulty_string'});
+        expect(response.entity[0].name).toBeDefined();
+        expect(response.entity[0].lessons).toBeDefined();
+        expect(response.entity[0].lessons.length).toBeGreaterThan(0)
+    });
+
     test('fetchAll-CustomFields', async () => {
         let response = await fetchAll('drumeo', 'challenge', {customFields: ['garbage']});
         log(response);