musora-content-services 1.0.126 → 1.0.128

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.128](https://github.com/railroadmedia/musora-content-services/compare/v1.0.127...v1.0.128) (2024-10-03)
+
+### [1.0.127](https://github.com/railroadmedia/musora-content-services/compare/v1.0.123...v1.0.127) (2024-10-03)
+
 ### [1.0.126](https://github.com/railroadmedia/musora-content-services/compare/v1.0.124...v1.0.126) (2024-10-02)
 
 ### [1.0.125](https://github.com/railroadmedia/musora-content-services/compare/v1.0.124...v1.0.125) (2024-10-02)

package/package.json

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

package/src/services/railcontent.js

@@ -257,10 +257,6 @@ export async function fetchContentPageUserData(contentId) {
 
 export async function fetchUserPermissions() {
     let url = `/content/user_data_permissions`;
-    const headers = {
-        'Content-Type': 'application/json',
-        'X-CSRF-TOKEN': globalConfig.railcontentConfig.token
-    };
     // in the case of an unauthorized user, we return empty permissions
     return fetchHandler(url, 'get') ?? [];
 }

package/src/services/sanity.js

@@ -67,7 +67,7 @@ export async function fetchArtists(brand) {
     name,
     "lessonsCount": count(*[${filter}])
   }[lessonsCount > 0]`;
-  return fetchSanity(query, true);
+  return fetchSanity(query, true, {processNeedAccess:false});
 }
 
 /**
@@ -77,7 +77,7 @@ export async function fetchArtists(brand) {
 */
 export async function fetchSongArtistCount(brand) {
   const query = `count(*[_type == 'artist']{'lessonsCount': count(*[_type == 'song' && brand == '${brand}' && references(^._id)]._id)}[lessonsCount > 0])`;
-  return fetchSanity(query, true);
+  return fetchSanity(query, true, {processNeedAccess:false});
 }
 
 /**
@@ -234,7 +234,7 @@ export async function fetchSongFilterOptions(brand) {
 */
 export async function fetchSongCount(brand) {
   const query = `count(*[_type == 'song' && brand == "${brand}"])`;
-  return fetchSanity(query, true);
+  return fetchSanity(query, true, {processNeedAccess:false});
 }
 
 /**
@@ -243,7 +243,8 @@ export async function fetchSongCount(brand) {
  * 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.
+ * @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')
@@ -281,7 +282,9 @@ export async function fetchNewReleases(brand, { page = 1, limit = 20, sort="-pub
       length_in_seconds,
       published_on,
       "type": _type,
-      web_url_path,`;
+      web_url_path,
+      "permission_id": permission[]->railcontent_id,
+      `;
   const filterParams = {};
   const query = buildQuery(
       filter,
@@ -326,7 +329,8 @@ export async function fetchUpcomingEvents(brand, { page = 1, limit = 10 } = {})
         length_in_seconds,
         published_on,
         "type": _type,
-        web_url_path,`;
+        web_url_path,
+        "permission_id": permission[]->railcontent_id,`;
   const query = buildRawQuery(
       `_type in ${typesString} && brand == '${brand}' && published_on > '${now}' && status == 'scheduled'`,
       fields,
@@ -374,6 +378,7 @@ export async function fetchScheduledReleases(brand, { page = 1, limit = 10 }) {
       published_on,
       "type": _type,
       web_url_path,
+      "permission_id": permission[]->railcontent_id,
   } | order(published_on asc)[${start}...${end}]`;
   return fetchSanity(query, true);
 }
@@ -613,6 +618,7 @@ export async function fetchAllFilterOptions(
     progressIds = undefined,
     coachId = undefined, // New parameter for coach ID
 ) {
+  console.log('brand', brand)
     if (coachId && contentType !== 'coach-lessons') {
         throw new Error(`Invalid contentType: '${contentType}' for coachId. It must be 'coach-lessons'.`);
     }
@@ -664,7 +670,7 @@ export async function fetchAllFilterOptions(
             }
         }
       }`;
-  return fetchSanity(query, true);
+  return fetchSanity(query, true, {processNeedAccess:false});
 }
 
 /**
@@ -752,6 +758,7 @@ export async function fetchMethod(brand, slug) {
     video,
     length_in_seconds,
     "type": _type,
+    "permission_id": permission[]->railcontent_id,
     "levels": child[]->
       {
         "id": railcontent_id,
@@ -962,8 +969,8 @@ export async function fetchRelatedLessons(railContentId, brand) {
   //TODO: Implement $this->contentService->getFiltered
   const query = `*[railcontent_id == ${railContentId} && brand == "${brand}" && references(*[_type=='permission']._id)]{
               "related_lessons" : array::unique([
-                ...(*[_type=="song" && brand == "${brand}" && references(^.artist->_id)]{_id, "id":railcontent_id, published_on, title, "thumbnail_url":thumbnail.asset->url, difficulty_string, railcontent_id, artist->}[0...11]),
-                ...(*[_type=="song" && brand == "${brand}" && references(^.genre[]->_id)]{_id, "id":railcontent_id, published_on, title, "thumbnail_url":thumbnail.asset->url, difficulty_string, railcontent_id, artist->}[0...11])
+                ...(*[_type=="song" && brand == "${brand}" && references(^.artist->_id)]{_id, "id":railcontent_id, published_on, title, "thumbnail_url":thumbnail.asset->url, difficulty_string, railcontent_id, artist->,"permission_id": permission[]->railcontent_id,}[0...11]),
+                ...(*[_type=="song" && brand == "${brand}" && references(^.genre[]->_id)]{_id, "id":railcontent_id, published_on, title, "thumbnail_url":thumbnail.asset->url, difficulty_string, railcontent_id, artist->,"permission_id": permission[]->railcontent_id,}[0...11])
                 ])|order(published_on, railcontent_id)[0...11]}`;
   return fetchSanity(query, false);
 }
@@ -1364,6 +1371,10 @@ async function needsAccessDecorator(results)
         results.forEach((result) => {
             result['need_access'] = doesUserNeedAccessToContent(result, userPermissions);
         });
+    }else if (results.entity && Array.isArray(results.entity)) {
+        results.entity.forEach((result) => {
+            result['need_access'] = doesUserNeedAccessToContent(result, userPermissions);
+        });
     } else {
         results['need_access'] = doesUserNeedAccessToContent(results, userPermissions);
     }
@@ -1372,7 +1383,7 @@ async function needsAccessDecorator(results)
 
 function doesUserNeedAccessToContent(result, userPermissions)
 {
-    const permissions =  new Set(result.permission_id ?? []);
+    const permissions =  new Set(result?.permission_id ?? []);
     if (permissions.length === 0) {
         return false;
     }
@@ -1413,7 +1424,7 @@ export async function fetchCatalogMetadata(contentType)
         modal_text,
         sort_by,
       }`
-    return fetchSanity(query, false);
+    return fetchSanity(query, false, {processNeedAccess:false});
 }
 
 /**