musora-content-services 1.0.192 → 1.0.194

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.194](https://github.com/railroadmedia/musora-content-services/compare/v1.0.193...v1.0.194) (2024-11-29)
+
+### [1.0.193](https://github.com/railroadmedia/musora-content-services/compare/v1.0.192...v1.0.193) (2024-11-28)
+
 ### [1.0.192](https://github.com/railroadmedia/musora-content-services/compare/v1.0.191...v1.0.192) (2024-11-28)
 
 ### [1.0.191](https://github.com/railroadmedia/musora-content-services/compare/v1.0.190...v1.0.191) (2024-11-28)

package/package.json

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

package/src/services/sanity.js

@@ -632,7 +632,7 @@ async function handleCustomFetchAll(brand, type, {
 } = {}) {
     if (type === 'challenge') {
         if (groupBy === 'completed') {
-            const completedIds = fetchCompletedChallenges(brand, page, limit);
+            const completedIds = await fetchCompletedChallenges(brand, page, limit);
             return fetchAll(brand, type,
                 {
                     page,
@@ -641,13 +641,13 @@ async function handleCustomFetchAll(brand, type, {
                     sort,
                     includedFields,
                     groupBy: '',
-                    completedIds,
+                    progressIds: completedIds,
                     useDefaultFields,
                     customFields,
                     progress
                 });
         } else if (groupBy === 'owned') {
-            const ownedIds = fetchOwnedChallenges(brand, page, limit);
+            const ownedIds = await fetchOwnedChallenges(brand, page, limit);
             return fetchAll(brand, type,
                 {
                     page,
@@ -656,7 +656,7 @@ async function handleCustomFetchAll(brand, type, {
                     sort,
                     includedFields,
                     groupBy: '',
-                    ownedIds,
+                    progressIds: ownedIds,
                     useDefaultFields,
                     customFields,
                     progress

package/test/sanityQueryService.test.js

@@ -1,4 +1,6 @@
 import {getFieldsForContentType} from "../src/contentTypeConfig";
+const railContentModule = require('../src/services/railcontent.js')
+
 import {
     fetchAssignments,
     fetchCommentModContentData,
@@ -8,6 +10,7 @@ import {
 import {log} from './log.js';
 import {initializeTestService} from "./initializeTests";
 import {dataContext} from "../src/services/contentProgress";
+import {fetchOwnedChallenges} from "../src";
 
 const {
     fetchSongById,
@@ -266,14 +269,21 @@ describe('Sanity Queries', function () {
         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)
+        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('fetchAllChallengesByCompleted', async () => {
+        var mock = jest.spyOn(railContentModule, 'fetchCompletedChallenges');
+        mock.mockImplementation(() => [402204]);
+        const response = await fetchAll('drumeo', 'challenge', {groupBy:'completed'});
+        expect(response.entity.length).toBe(1);
+    });
+
+    test('fetchAllChallengesByOwned', async () => {
+        var mock = jest.spyOn(railContentModule, 'fetchOwnedChallenges');
+        mock.mockImplementation(() => [402204]);
+        const response = await fetchAll('drumeo', 'challenge', {groupBy:'owned'});
+        expect(response.entity.length).toBe(1);
     });
 
     test('fetchAll-CustomFields', async () => {