musora-content-services 1.0.182 → 1.0.184

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.184](https://github.com/railroadmedia/musora-content-services/compare/v1.0.183...v1.0.184) (2024-11-25)
+
+### [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)

package/package.json

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

package/src/services/sanity.js

@@ -499,7 +499,8 @@ export async function fetchAll(brand, type, {
         progressIds,
         useDefaultFields,
         customFields,
-        progress});
+        progress
+    });
     if (customResults) {
         return customResults;
     }
@@ -579,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,
@@ -624,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);
         }
     }
@@ -909,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
     });
@@ -996,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.
@@ -1635,6 +1643,7 @@ export async function fetchSanity(query,
         ]);
         const response = promisesResult[0];
         const userPermissions = promisesResult[1]?.permissions;
+        const isAdmin = promisesResult[1]?.isAdmin;
 
         if (!response.ok) {
             throw new Error(`Sanity API error: ${response.status} - ${response.statusText}`);
@@ -1645,7 +1654,7 @@ export async function fetchSanity(query,
                 console.log("fetchSanity Results:", result);
             }
             let results = isList ? result.result : result.result[0];
-            results = processNeedAccess ? await needsAccessDecorator(results, userPermissions) : results;
+            results = processNeedAccess ? await needsAccessDecorator(results, userPermissions, isAdmin) : results;
             return customPostProcess ? customPostProcess(results) : results;
         } else {
             throw new Error('No results found');
@@ -1656,38 +1665,41 @@ export async function fetchSanity(query,
     }
 }
 
-function needsAccessDecorator(results, userPermissions) {
+function needsAccessDecorator(results, userPermissions, isAdmin) {
     if (globalConfig.sanityConfig.useDummyRailContentMethods) return results;
 
     userPermissions = new Set(userPermissions);
 
     if (Array.isArray(results)) {
         results.forEach((result) => {
-            result['need_access'] = doesUserNeedAccessToContent(result, userPermissions);
+            result['need_access'] = doesUserNeedAccessToContent(result, userPermissions, isAdmin);
         });
     } else if (results.entity && Array.isArray(results.entity)) {
         // Group By
         results.entity.forEach((result) => {
             if (result.lessons) {
                 result.lessons.forEach((lesson) => {
-                    lesson['need_access'] = doesUserNeedAccessToContent(lesson, userPermissions); // Updated to check lesson access
+                    lesson['need_access'] = doesUserNeedAccessToContent(lesson, userPermissions, isAdmin); // Updated to check lesson access
                 });
             } else {
-                result['need_access'] = doesUserNeedAccessToContent(result, userPermissions);
+                result['need_access'] = doesUserNeedAccessToContent(result, userPermissions, isAdmin);
             }
         });
     } else if (results.related_lessons && Array.isArray(results.related_lessons)) {
         results.related_lessons.forEach((result) => {
-            result['need_access'] = doesUserNeedAccessToContent(result, userPermissions);
+            result['need_access'] = doesUserNeedAccessToContent(result, userPermissions, isAdmin);
         })
     } else {
-        results['need_access'] = doesUserNeedAccessToContent(results, userPermissions);
+        results['need_access'] = doesUserNeedAccessToContent(results, userPermissions, isAdmin);
     }
 
     return results;
 }
 
-function doesUserNeedAccessToContent(result, userPermissions) {
+function doesUserNeedAccessToContent(result, userPermissions, isAdmin) {
+    if (isAdmin ?? false) {
+        return false;
+    }
     const permissions = new Set(result?.permission_id ?? []);
     if (permissions.size === 0) {
         return false;

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";
@@ -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);