musora-content-services 1.0.235 → 1.0.237

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.237](https://github.com/railroadmedia/musora-content-services/compare/v1.0.236...v1.0.237) (2024-12-14)
+
+### [1.0.236](https://github.com/railroadmedia/musora-content-services/compare/v1.0.235...v1.0.236) (2024-12-13)
+
 ### [1.0.235](https://github.com/railroadmedia/musora-content-services/compare/v1.0.234...v1.0.235) (2024-12-13)
 
 ### [1.0.234](https://github.com/railroadmedia/musora-content-services/compare/v1.0.233...v1.0.234) (2024-12-13)

package/package.json

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

package/src/services/sanity.js

@@ -518,15 +518,16 @@ export async function fetchAll(brand, type, {
     const start = (page - 1) * limit;
     const end = start + limit;
     let bypassStatusAndPublishedValidation = (type == 'instructor' || groupBy == 'artist' || groupBy == 'genre' || groupBy == 'instructor');
-
+    let bypassPermissions = bypassStatusAndPublishedValidation;
     // Construct the type filter
     let typeFilter;
 
-    if( type === 'archives' ) {
-        typeFilter = `&& status == "archived"`
+    if (type === 'archives') {
+        typeFilter = `&& status == "archived"`;
+        bypassStatusAndPublishedValidation = true;
     } else {
         typeFilter = type ? `&& _type == '${type}'` : "";
-    } 
+    }
 
     // Construct the search filter
     const searchFilter = searchTerm
@@ -598,7 +599,7 @@ export async function fetchAll(brand, type, {
 
     const filterWithRestrictions = await new FilterBuilder(filter, {
         bypassStatuses: bypassStatusAndPublishedValidation,
-        bypassPermissions: bypassStatusAndPublishedValidation,
+        bypassPermissions: bypassPermissions,
         bypassPublishedDateRestriction: bypassStatusAndPublishedValidation
     }).buildFilter();
     query = buildEntityAndTotalQuery(
@@ -835,13 +836,13 @@ export async function fetchAllFilterOptions(
     const constructCommonFilter = (excludeFilter) => {
         const filterWithoutOption = excludeFilter ? filtersToGroq(filters, excludeFilter) : includedFieldsFilter;
         const statusFilter = ' && status == "published"';
-        const includeStatusFilter = !isAdmin && !['instructor','artist','genre'].includes(contentType);
+        const includeStatusFilter = !isAdmin && !['instructor', 'artist', 'genre'].includes(contentType);
 
         return coachId
             ? `brand == '${brand}' && status == "published" && references(*[_type=='instructor' && railcontent_id == ${coachId}]._id) ${filterWithoutOption || ''} ${term ? ` && (title match "${term}" || album match "${term}" || artist->name match "${term}" || genre[]->name match "${term}")` : ''}`
             : `_type == '${contentType}' && brand == "${brand}"${includeStatusFilter ? statusFilter : ''}${style && excludeFilter !== "style" ? ` && '${style}' in genre[]->name` : ''}${artist && excludeFilter !== "artist" ? ` && artist->name == '${artist}'` : ''} ${progressFilter} ${filterWithoutOption || ''} ${term ? ` && (title match "${term}" || album match "${term}" || artist->name match "${term}" || genre[]->name match "${term}")` : ''}`;
     };
-    
+
     const metaData = processMetadata(brand, contentType, true);
     const allowableFilters = metaData?.allowableFilters || [];
     const tabs = metaData?.tabs || [];
@@ -1603,15 +1604,17 @@ export async function fetchGenreLessons(brand, name, contentType, {
 }
 
 export async function fetchTopLevelParentId(railcontentId) {
+    const statusFilter = "&& status in ['scheduled', 'published', 'archived', 'unlisted']";
+
     const query = `*[railcontent_id == ${railcontentId}]{
       railcontent_id,
-      'parents': *[^._id in child[]._ref && !(_id in path('drafts.**'))]{
+      'parents': *[^._id in child[]._ref ${statusFilter}]{
         railcontent_id,
-          'parents': *[^._id in child[]._ref && !(_id in path('drafts.**'))]{
+          'parents': *[^._id in child[]._ref ${statusFilter}]{
             railcontent_id,
-            'parents': *[^._id in child[]._ref && !(_id in path('drafts.**'))]{
+            'parents': *[^._id in child[]._ref ${statusFilter}]{
               railcontent_id,
-               'parents': *[^._id in child[]._ref && !(_id in path('drafts.**'))]{
+               'parents': *[^._id in child[]._ref ${statusFilter}]{
                   railcontent_id,               
             } 
           }
@@ -1655,6 +1658,7 @@ export async function fetchHierarchy(railcontentId) {
     let response = await fetchSanity(query, false, {processNeedAccess: false});
     if (!response) return null;
     let data = {
+        topLevelId: topLevelId,
         parents: {},
         children: {}
     };
@@ -2048,7 +2052,9 @@ function getFilterOptions(option, commonFilter, contentType, brand) {
         ][count > 0],`;
             break;
         case "type":
-            const typesString = types.map(t => {return `{"type": "${t}"}`}).join(', ');
+            const typesString = types.map(t => {
+                return `{"type": "${t}"}`
+            }).join(', ');
             filterGroq = `"type": [${typesString}]{type, 'count': count(*[_type == ^.type && ${commonFilter}])}[count > 0],`;
             break;
         case "genre":

package/test/contentProgress.test.js

@@ -156,15 +156,15 @@ describe('contentProgressDataContext', function () {
     });
 
 
-    test('recordWatchSession', async () => {
-        const contentId = 241250;
-        let progress = await getProgressPercentage(contentId); //force load context
-
-        await recordWatchSession(contentId, 'video', 'vimeo', 1673, 554, 5);
-        progress = await getProgressPercentage(241250);
-
-        expect(progress).toBe(33);
-    });
+    // test('recordWatchSession', async () => {
+    //     const contentId = 241250;
+    //     let progress = await getProgressPercentage(contentId); //force load context
+    //
+    //     await recordWatchSession(contentId, 'video', 'vimeo', 1673, 554, 5);
+    //     progress = await getProgressPercentage(241250);
+    //
+    //     expect(progress).toBe(33);
+    // });
     // test('assignmentCompleteBubblingToCompleted', async () => {
     //     let assignmentId = 241685;
     //     let contentId = 241257;

package/test/sanityQueryService.test.js

@@ -668,6 +668,11 @@ describe('Sanity Queries', function () {
         expect(hierarchy.children[243085]).toStrictEqual([243170, 243171, 243172, 243174, 243176]);
     });
 
+    test('fetchTopLeveldrafts', async () => {
+        let id = await fetchTopLevelParentId(413955);
+        expect(id).toBe(413955);
+    });
+
     test('fetchCommentData', async()=>{
         let data = await fetchCommentModContentData([241251,241252, 211153]);
         expect(data[241251].title).toBe("Setting Up Your Space");