musora-content-services 1.0.102 → 1.0.105

package/src/services/railcontent.js

@@ -150,15 +150,15 @@ export async function fetchSongsInProgress(brand) {
  *   .then(songs => console.log(songs))
  *   .catch(error => console.error(error));
  */
-export async function fetchContentInProgress(type="all", brand, {
-    page = 1,
-    limit = 10,
-  } = {}) {
+export async function fetchContentInProgress(type="all", brand, { page, limit } = {}) {
     let url;
+    const limitString = limit ? `&limit=${limit}` : '';
+    const pageString = page ? `&page=${page}` : '';
+
     if(type === "all") {
-        url = `/content/in_progress/${globalConfig.railcontentConfig.userId}?brand=${brand}&limit=${limit}&page=${page}`;
+        url = `/content/in_progress/${globalConfig.railcontentConfig.userId}?brand=${brand}${limitString}${pageString}`;
     } else {
-        url = `/content/in_progress/${globalConfig.railcontentConfig.userId}?content_type=${type}&brand=${brand}&limit=${limit}&page=${page}`;
+        url = `/content/in_progress/${globalConfig.railcontentConfig.userId}?content_type=${type}&brand=${brand}${limitString}${pageString}`;
     }
     const headers = {
         'Content-Type': 'application/json',
@@ -192,15 +192,15 @@ export async function fetchContentInProgress(type="all", brand, {
  *   .then(songs => console.log(songs))
  *   .catch(error => console.error(error));
  */
-export async function fetchCompletedContent(type="all", brand, {
-    page = 1,
-    limit = 10,
-  } = {}) {
+export async function fetchCompletedContent(type="all", brand, { page, limit } = {}) {
     let url;
+    const limitString = limit ? `&limit=${limit}` : '';
+    const pageString = page ? `&page=${page}` : '';
+
     if(type === "all") {
-        url = `/content/completed/${globalConfig.railcontentConfig.userId}?brand=${brand}&limit=${limit}&page=${page}`;
+        url = `/content/completed/${globalConfig.railcontentConfig.userId}?brand=${brand}${limitString}${pageString}`;
     } else {
-        url = `/content/completed/${globalConfig.railcontentConfig.userId}?content_type=${type}&brand=${brand}&limit=${limit}&page=${page}`;
+        url = `/content/completed/${globalConfig.railcontentConfig.userId}?content_type=${type}&brand=${brand}${limitString}${pageString}`;
     }
     const headers = {
         'Content-Type': 'application/json',

package/src/services/sanity.js

@@ -90,6 +90,7 @@ export async function fetchRelatedSongs(brand, songId) {
             "url": web_url_path,
             "published_on": published_on,
             status,
+            "image": thumbnail.asset->url,
             "fields": [
               {
                 "key": "title",
@@ -108,10 +109,6 @@ export async function fetchRelatedSongs(brand, songId) {
                 "value": soundslice[0].soundslice_length_in_second
               }
             ],
-            "data": [{
-              "key": "thumbnail_url",
-              "value": thumbnail.asset->url
-            }]
           }[0...10]),
             ...(*[_type == "song" && brand == "${brand}" && railcontent_id != ${songId} && references(^.genre[]->_id)]{
             "type": _type,
@@ -229,6 +226,27 @@ export async function fetchSongCount(brand) {
   return fetchSanity(query, true);
 }
 
+/**
+ * Fetch the latest workouts for a specific brand, including completion status and progress.
+ * This function retrieves up to five of the latest workout content for a given brand, sorted in descending order by their publication date.
+ * It also includes completion status and progress percentage for each workout by fetching additional data about user progress.
+ *
+ * @param {string} brand - The brand for which to fetch workouts (e.g., 'drumeo', 'pianote').
+ * @returns {Promise<Array<Object>|null>} - A promise that resolves to an array of workout data objects with additional properties for completion status and progress percentage, or null if no workouts are found.
+ *
+ * @example
+ * fetchWorkouts('drumeo')
+ *   .then(workouts => console.log(workouts))
+ *   .catch(error => console.error(error)); 
+ */
+export async function fetchWorkouts(brand) {
+  const fields = getFieldsForContentType('workout');
+  const query = `*[_type == 'workout' && brand == '${brand}'] [0...5] {
+        ${fields.toString()}
+      } | order(published_on desc)[0...5]`
+  return fetchSanity(query, true);
+}
+
 /**
 * Fetch the latest new releases for a specific brand.
 * @param {string} brand - The brand for which to fetch new releases.
@@ -415,6 +433,7 @@ export async function fetchAll(brand, type, {
     let config = contentTypeConfig[type] ?? {};
     let additionalFields = config?.fields ?? [];
     let isGroupByOneToOne = (groupBy ? config?.relationships?.[groupBy]?.isOneToOne : false) ?? false;
+    let webUrlPathType = config?.slug ?? type;
     const start = (page - 1) * limit;
     const end = start + limit;
 
@@ -443,6 +462,7 @@ export async function fetchAll(brand, type, {
     // Determine the group by clause
     let query = "";
     if (groupBy !== "" && isGroupByOneToOne) {
+        let webUrlPath = 'artists';
         query = `
         {
             "total": count(*[_type == '${groupBy}' && count(*[_type == '${type}' && brand == '${brand}' && ^._id == ${groupBy}._ref ${searchFilter} ${includedFieldsFilter} ${progressFilter}]._id) > 0]),
@@ -452,7 +472,7 @@ export async function fetchAll(brand, type, {
                 'type': _type,
                 name,
                 'head_shot_picture_url': thumbnail_url.asset->url,
-                web_url_path,
+                'web_url_path': '/${brand}/${webUrlPath}/'+name+'?included_fieds[]=type,${type}',
                 'all_lessons_count': count(*[_type == '${type}' && brand == '${brand}' && ^._id == ${groupBy}._ref ${searchFilter} ${includedFieldsFilter} ${progressFilter}]._id),
                 'lessons': *[_type == '${type}' && brand == '${brand}' && ^._id == ${groupBy}._ref ${searchFilter} ${includedFieldsFilter} ${progressFilter}]{
                     ${fieldsString},
@@ -463,6 +483,7 @@ export async function fetchAll(brand, type, {
             [${start}...${end}]
         }`;
     } else if (groupBy !== "") {
+        let webUrlPath = (groupBy == 'genre')?'/genres':'';
         query = `
         {
             "total": count(*[_type == '${groupBy}' && count(*[_type == '${type}' && brand == '${brand}' && ^._id in ${groupBy}[]._ref ${searchFilter} ${includedFieldsFilter} ${progressFilter}]._id) > 0]),
@@ -472,7 +493,7 @@ export async function fetchAll(brand, type, {
                 'type': _type,
                 name,
                 'head_shot_picture_url': thumbnail_url.asset->url,
-                web_url_path,
+                'web_url_path': select(defined(web_url_path)=> web_url_path +'?included_fieds[]=type,${type}',!defined(web_url_path)=> '/${brand}${webUrlPath}/'+name+'/${webUrlPathType}'),
                 'all_lessons_count': count(*[_type == '${type}' && brand == '${brand}' && ^._id in ${groupBy}[]._ref ${searchFilter} ${includedFieldsFilter} ${progressFilter}]._id),
                 'lessons': *[_type == '${type}' && brand == '${brand}' && ^._id in ${groupBy}[]._ref ${searchFilter} ${includedFieldsFilter} ${progressFilter}]{
                     ${fieldsString},
@@ -658,6 +679,7 @@ export async function fetchMethod(brand, slug) {
     status,
     title,
     video,
+    length_in_seconds,
     "type": _type,
     "levels": child[]->
       {
@@ -712,7 +734,6 @@ export async function fetchMethodNextLesson(railcontentId, methodId) {
   return childIndex ? await fetchByRailContentId(childIndex) : null;
 }
 
-
 /**
  * Fetch the next lesson for a specific method by Railcontent ID.
  * @param {string} railcontentId - The Railcontent ID of the current lesson.

package/test/log.js

@@ -0,0 +1,5 @@
+export function log(message, forceEnabled = false) {
+    if (process.env.DEBUG === 'true' || forceEnabled) {
+        console.log(message);
+    }
+}

package/test/sanityQueryService.test.js

@@ -1,4 +1,5 @@
 import {initializeService} from '../src/services/config.js';
+import {log} from './log.js';
 
 const {
     fetchSongById,
@@ -37,14 +38,14 @@ const {
 
 describe('Sanity Queries', function () {
     beforeEach(() => {
-        const config = { 
+        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,
+                useCachedAPI: process.env.SANITY_USE_CACHED_API === 'true' || true,
                 version: '2021-06-07',
-                debug: process.env.DEBUG || false
+                debug: process.env.DEBUG === 'true' || false
             }
         };
         initializeService(config);
@@ -66,7 +67,7 @@ describe('Sanity Queries', function () {
 
     test('fetchSongArtistCount', async () => {
         const response = await fetchSongArtistCount('drumeo');
-        console.log(response);
+        log(response);
         expect(response).toBeGreaterThan(1000);
     });
 
@@ -95,7 +96,7 @@ describe('Sanity Queries', function () {
 
     test('fetchAllSongs', async () => {
         const response = await fetchAllSongs('drumeo', {});
-        console.log(response);
+        log(response);
         expect(response.entity[0].soundslice).toBeDefined();
         expect(response.entity[0].artist_name).toBeDefined();
         expect(response.entity[0].instrumentless).toBeDefined();
@@ -111,20 +112,20 @@ describe('Sanity Queries', function () {
 
     test('fetchAllWorkouts', async () => {
         const response = await fetchAll('drumeo', 'workout',{});
-        console.log(response);
+        log(response);
         expect(response.entity[0].id).toBeDefined();
     });
 
     test('fetchAllInstructorField', async () => {
         const response = await fetchAll('drumeo', 'quick-tips',{searchTerm: 'Domino Santantonio'});
-        console.log(response);
+        log(response);
         expect(response.entity[0].id).toBeDefined();
         expect(response.entity[0].instructors).toBeTruthy();
     });
 
     test('fetchAllSortField', async () => {
         const response = await fetchAll('drumeo', 'rhythmic-adventures-of-captain-carson',{});
-        console.log(response);
+        log(response);
         expect(response.entity[0].id).toBeDefined();
         expect(response.entity[0].sort).toBeDefined();
     });
@@ -132,7 +133,7 @@ describe('Sanity Queries', function () {
 
     test('fetchAllChallenges', async () => {
         const response = await fetchAll('drumeo', 'challenge',{});
-        console.log(response);
+        log(response);
         expect(response.entity[0].registration_url).toBeDefined();
         expect(response.entity[0].enrollment_start_time).toBeDefined();
         expect(response.entity[0].enrollment_end_time).toBeDefined();
@@ -146,12 +147,12 @@ describe('Sanity Queries', function () {
 
     test('fetchAll-CustomFields', async () => {
         let response = await fetchAll('drumeo', 'challenge',{customFields:['garbage']});
-        console.log(response);
+        log(response);
         expect(response.entity[0].garbage).toBeDefined();
         expect(response.entity[0].id).toBeDefined();
 
         response = await fetchAll('drumeo', 'challenge',{useDefaultFields: false, customFields:['garbage']});
-        console.log(response);
+        log(response);
         expect(response.entity[0].garbage).toBeDefined();
         expect.not.objectContaining(response.entity[0].id);
     });
@@ -177,8 +178,8 @@ describe('Sanity Queries', function () {
         const id = 191338; ////https://web-staging-one.musora.com/admin/studio/publishing/structure/play-along;play-along_191338
         const expectedChildID = 191492;
         const response = await fetchChildren(id);
-        console.log('num children', response.length);
-        console.log(response);
+        log('num children', response.length);
+        log(response);
         
         expect(response.length > 0).toBeTruthy();
         const foundExpectedChild = response.some((child) => {
@@ -209,15 +210,14 @@ describe('Sanity Queries', function () {
     });
 
     test('fetchMethod', async () => {
-        const response = await fetchMethod('drumeo', 'drumeo-method');
-        //console.log(response);
+        const response = await fetchMethod('drumeo', 'drumeo-method');log(response);
         expect(response).toBeDefined();
         expect(response.levels.length).toBeGreaterThan(0);
     });
 
     test('fetchMethods', async () => {
         const response = await fetchMethods('drumeo');
-        console.log(response);
+        log(response);
         expect(response.length).toBeGreaterThan(0);
         expect(response[0].type).toBe('learning-path');
     });
@@ -250,15 +250,14 @@ describe('Sanity Queries', function () {
     });
 
     test('fetchFoundation', async () => {
-        const response = await fetchFoundation('foundations-2019');
-        //  console.log(response);
+        const response = await fetchFoundation('foundations-2019');log(response);
         expect(response.units.length).toBeGreaterThan(0);
         expect(response.type).toBe('foundation');
     });
 
     test('fetchPackAll', async () => {
         const response = await fetchPackAll(212899); //https://web-staging-one.musora.com/admin/studio/publishing/structure/pack;pack_212899%2Cinspect%3Don
-        // console.log(response);
+        log(response);
         expect(response.slug).toBe('creative-control');
     });
 
@@ -266,8 +265,9 @@ describe('Sanity Queries', function () {
         let response = await fetchAllPacks('drumeo');
         response = await fetchAllPacks('drumeo', 'slug');
         const titles = response.map((doc) => doc.title);
-        const sortedTitles = [...titles].sort((a, b) => a.localeCompare(b));
-        // This  fails for upper/lower case compare and I couldn't  figure it out. Sanity sorts with case sensativity, and localeCompare should do the same but doesn't
+
+        const sortedTitles = [...titles].sort((a, b) => a === b ? 0 : a > b ? 1 : -1);
+
         expect(titles).toStrictEqual(sortedTitles);
         response = await fetchAllPacks('drumeo', 'slug', 'Creative Control');
         expect(response[0].id).toBe(212899);
@@ -292,4 +292,22 @@ describe('Sanity Queries', function () {
         const response = await fetchScheduledReleases('drumeo', {});
         expect(response.length).toBeGreaterThan(0);
     });
+
+    test('fetchAll-GroupBy-Genre', async () => {
+        let response = await fetchAll('drumeo', 'solo',{groupBy: 'genre'});
+        log(response);
+        expect(response.entity[0].web_url_path).toContain('/drumeo/genres/');
+    });
+
+    test('fetchAll-GroupBy-Artists', async () => {
+        let response = await fetchAll('drumeo', 'song',{groupBy: 'artist'});
+        log(response);
+        expect(response.entity[0].web_url_path).toContain('/drumeo/artists/');
+    });
+
+    test('fetchAll-GroupBy-Instructors', async () => {
+        let response = await fetchAll('drumeo', 'course',{groupBy: 'instructor'});
+        log(response);
+        expect(response.entity[0].web_url_path).toContain('/drumeo/coaches/');
+    });
 });