musora-content-services 1.0.181 → 1.0.183

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.183](https://github.com/railroadmedia/musora-content-services/compare/v1.0.182...v1.0.183) (2024-11-25)
+
+### [1.0.182](https://github.com/railroadmedia/musora-content-services/compare/v1.0.181...v1.0.182) (2024-11-25)
+
 ### [1.0.181](https://github.com/railroadmedia/musora-content-services/compare/v1.0.180...v1.0.181) (2024-11-25)
 
 ### [1.0.180](https://github.com/railroadmedia/musora-content-services/compare/v1.0.179...v1.0.180) (2024-11-23)

package/package.json

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

package/src/contentTypeConfig.js

@@ -347,7 +347,7 @@ let contentTypeConfig = {
             '"focus": focus[]->name',
             'focus_text',
             'forum_thread_id',
-            '"long_bio": long_bio[0].children[0].text,',
+            '"long_bio": long_bio[0].children[0].text',
             'name',
             '"short_bio" : short_bio[0].children[0].text',
             'bands',

package/src/services/sanity.js

@@ -499,7 +499,8 @@ export async function fetchAll(brand, type, {
         progressIds,
         useDefaultFields,
         customFields,
-        progress});
+        progress
+    });
     if (customResults) {
         return customResults;
     }
@@ -510,7 +511,7 @@ export async function fetchAll(brand, type, {
     let webUrlPathType = config?.slug ?? type;
     const start = (page - 1) * limit;
     const end = start + limit;
-    let bypassStatusAndPublishedValidation = (type == 'instructor');
+    let bypassStatusAndPublishedValidation = (type == 'instructor' || groupBy == 'artist' || groupBy == 'genre' || groupBy == 'instructor');
 
     // Construct the type filter
     const typeFilter = type ? `&& _type == '${type}'` : "";
@@ -543,14 +544,15 @@ export async function fetchAll(brand, type, {
     if (groupBy !== "" && isGroupByOneToOne) {
         const webUrlPath = 'artists';
         const lessonsFilter = `_type == '${type}' && brand == '${brand}' && ^._id == ${groupBy}._ref ${searchFilter} ${includedFieldsFilter} ${progressFilter}`;
+        const lessonsFilterWithRestrictions = await new FilterBuilder(lessonsFilter).buildFilter();
         entityFieldsString = `
                 'id': railcontent_id,
                 'type': _type,
                 name,
                 'head_shot_picture_url': thumbnail_url.asset->url,
                 'web_url_path': '/${brand}/${webUrlPath}/'+name+'?included_fieds[]=type,${type}',
-                'all_lessons_count': count(*[${lessonsFilter}]._id),
-                'lessons': *[${lessonsFilter}]{
+                'all_lessons_count': count(*[${lessonsFilterWithRestrictions}]._id),
+                'lessons': *[${lessonsFilterWithRestrictions}]{
                     ${fieldsString},
                     ${groupBy}
                 }[0...20]
@@ -559,14 +561,16 @@ export async function fetchAll(brand, type, {
     } else if (groupBy !== "") {
         const webUrlPath = (groupBy == 'genre') ? '/genres' : '';
         const lessonsFilter = `brand == '${brand}' && ^._id in ${groupBy}[]._ref ${typeFilter} ${searchFilter} ${includedFieldsFilter} ${progressFilter}`;
+        const lessonsFilterWithRestrictions = await new FilterBuilder(lessonsFilter).buildFilter();
+
         entityFieldsString = `
                 'id': railcontent_id,
                 'type': _type,
                 name,
                 'head_shot_picture_url': thumbnail_url.asset->url,
                 '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(*[${lessonsFilter}]._id),
-                'lessons': *[${lessonsFilter}]{
+                'all_lessons_count': count(*[${lessonsFilterWithRestrictions}]._id),
+                'lessons': *[${lessonsFilterWithRestrictions}]{
                     ${fieldsString},
                     ${groupBy}
                 }[0...20]`;
@@ -576,7 +580,11 @@ export async function fetchAll(brand, type, {
         entityFieldsString = fieldsString;
     }
 
-    const filterWithRestrictions = await new FilterBuilder(filter,{bypassStatuses:bypassStatusAndPublishedValidation, bypassPermissions: bypassStatusAndPublishedValidation, bypassPublishedDateRestriction: bypassStatusAndPublishedValidation} ).buildFilter();
+    const filterWithRestrictions = await new FilterBuilder(filter, {
+        bypassStatuses: bypassStatusAndPublishedValidation,
+        bypassPermissions: bypassStatusAndPublishedValidation,
+        bypassPublishedDateRestriction: bypassStatusAndPublishedValidation
+    }).buildFilter();
     query = buildEntityAndTotalQuery(
         filterWithRestrictions,
         entityFieldsString,
@@ -621,7 +629,7 @@ async function handleCustomFetchAll(brand, type, {
     if (type === 'challenge') {
         if (groupBy === 'completed') {
             return fetchCompletedChallenges(brand, page, limit);
-        } else if(groupBy === 'owned') {
+        } else if (groupBy === 'owned') {
             return fetchOwnedChallenges(brand, page, limit);
         }
     }
@@ -906,7 +914,10 @@ export async function fetchMethodPreviousNextLesson(railcontentId, methodId) {
     const index = sortedChildren.indexOf(Number(railcontentId));
     let nextId = sortedChildren[index + 1];
     let previousId = sortedChildren[index - 1];
-    let nextPrev = await fetchByRailContentIds([nextId, previousId]);
+    let ids = [];
+    if (nextId) ids.push(nextId);
+    if (previousId) ids.push(previousId);
+    let nextPrev = await fetchByRailContentIds(ids);
     const nextLesson = nextPrev.find((elem) => {
         return elem['id'] === nextId
     });
@@ -993,7 +1004,7 @@ export async function fetchNextPreviousLesson(railcontentId) {
  *   .catch(error => console.error(error));
  */
 export async function fetchLessonContent(railContentId) {
-    const filterParams = {isSingle:true};
+    const filterParams = {isSingle: true};
     // Format changes made to the `fields` object may also need to be reflected in Musora-web-platform SanityGateway.php $fields object
     // Currently only for challenges and challenge lessons
     // If you're unsure, message Adrian, or just add them.

package/test/sanityQueryService.test.js

@@ -1,5 +1,10 @@
 import {getFieldsForContentType} from "../src/contentTypeConfig";
-import {fetchAssignments, fetchCommentModContentData, fetchSanity} from "../src/services/sanity";
+import {
+    fetchAssignments,
+    fetchCommentModContentData,
+    fetchMethodPreviousNextLesson,
+    fetchSanity
+} from "../src/services/sanity";
 import {log} from './log.js';
 import {initializeTestService} from "./initializeTests";
 import {dataContext} from "../src/services/contentProgress";
@@ -361,13 +366,13 @@ describe('Sanity Queries', function () {
     });
 
     test('fetchAll-WithProgress', async () => {
-        const ids = [410213, 305649];
+        const ids = [410213, 410215];
         let response = await fetchAll('drumeo', 'song', {
             sort: 'slug',
             progressIds: ids,
         });
         expect(response.entity.length).toBe(2);
-        expect(response.entity[0].id = 305649);
+        expect(response.entity[0].id = 410215);
         expect(response.entity[1].id = 410213);
         // change the type and we expect no results
         response = await fetchAll('drumeo', 'quick-tip', {
@@ -555,6 +560,17 @@ describe('Sanity Queries', function () {
         expect(response.nextLesson.sort).toBeGreaterThanOrEqual(document.sort);
     });
 
+    test('fetchMethodNextPreviousLesson-Last', async () => {
+        const id = 396234;
+        const methodId = 396229;
+        const response = await fetchMethodPreviousNextLesson(id, methodId);
+        log(response);
+        expect(response.prevLesson).toBeDefined();
+        expect(response.prevLesson.id).toBe(396233);
+        expect(response.prevLesson.type).toBe('course-part');
+        expect(response.nextLesson).not.toBeDefined();
+    });
+
     test('fetchNextPreviousLesson-Method-Lesson', async () => {
         const id = 241265;
         const response = await fetchNextPreviousLesson(id);