musora-content-services 1.0.231 → 1.0.233

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.233](https://github.com/railroadmedia/musora-content-services/compare/v1.0.218...v1.0.233) (2024-12-12)
+
+### [1.0.232](https://github.com/railroadmedia/musora-content-services/compare/v1.0.231...v1.0.232) (2024-12-11)
+
 ### [1.0.231](https://github.com/railroadmedia/musora-content-services/compare/v1.0.230...v1.0.231) (2024-12-10)
 
 ### [1.0.230](https://github.com/railroadmedia/musora-content-services/compare/v1.0.229...v1.0.230) (2024-12-10)

package/package.json

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

package/src/contentTypeConfig.js

@@ -391,6 +391,8 @@ let contentTypeConfig = {
     'sonor': contentWithSortField,
 }
 
+const songAccessMembership = 94;
+
 function getNewReleasesTypes(brand) {
     const baseNewTypes = ["student-review", "student-review", "student-focus", "coach-stream", "live", "question-and-answer", "boot-camps", "quick-tips", "workout", "challenge", "challenge-part", "podcasts", "pack", "song", "learning-path-level", "play-along", "course", "unit"];
     switch (brand) {
@@ -474,7 +476,7 @@ function filtersToGroq(filters, selectedFilters = []) {
                     return `bpm == ${value}`;
                 }
             } else if (['creativity', 'essential', 'focus', 'genre', 'lifestyle', 'theory', 'topic'].includes(key) && !selectedFilters.includes(key)) {
-                return `${key}[]->name match "${value}"`;
+                return `"${value}" in ${key}[]->name`;
             } else if (key === 'gear' && !selectedFilters.includes('gear')) {
                 return `gear match "${value}"`;
             } else if (key === 'instrumentless' && !selectedFilters.includes(key)) {
@@ -535,5 +537,6 @@ module.exports = {
     getNewReleasesTypes,
     getUpcomingEventsTypes,
     showsTypes,
-    coachLessonsTypes
+    coachLessonsTypes,
+    songAccessMembership
 }

package/src/filterBuilder.js

@@ -1,5 +1,7 @@
 import {fetchUserPermissions} from "./services/userPermissions";
-
+import {
+    songAccessMembership
+} from "./contentTypeConfig";
 
 export class FilterBuilder {
 
@@ -19,7 +21,8 @@ export class FilterBuilder {
             getFutureScheduledContentsOnly = false,
             bypassStatuses = false,
             bypassPublishedDateRestriction = false,
-            isSingle = false
+            isSingle = false,
+            allowsPullSongsContent = true
         } = {}) {
         this.availableContentStatuses = availableContentStatuses;
         this.bypassPermissions = bypassPermissions;
@@ -29,6 +32,7 @@ export class FilterBuilder {
         this.getFutureContentOnly = getFutureContentOnly;
         this.getFutureScheduledContentsOnly = getFutureScheduledContentsOnly;
         this.isSingle = isSingle;
+        this.allowsPullSongsContent = allowsPullSongsContent;
         this.filter = filter;
         // this.debug = process.env.DEBUG === 'true' || false;
         this.debug = false;
@@ -87,7 +91,10 @@ export class FilterBuilder {
 
     _applyPermissions() {
         if (this.bypassPermissions || this.userData.isAdmin) return this;
-        const requiredPermissions = this._getUserPermissions();
+        let requiredPermissions = this._getUserPermissions();
+        if(this.userData.isABasicMember && this.allowsPullSongsContent){
+            requiredPermissions = [...requiredPermissions, songAccessMembership];
+        }
         this._andWhere(`(!defined(permission) || references(*[_type == 'permission' && railcontent_id in ${arrayToRawRepresentation(requiredPermissions)}]._id))`);
         return this;
     }

package/src/services/sanity.js

@@ -291,7 +291,7 @@ export async function fetchNewReleases(brand, {page = 1, limit = 20, sort = "-pu
     const start = (page - 1) * limit;
     const end = start + limit;
     const sortOrder = getSortOrder(sort, brand);
-    const filter = `_type in ${typesString} && brand == '${brand}'`;
+    const filter = `_type in ${typesString} && brand == '${brand}' && show_in_new_feed == true`;
     const fields = `
      "id": railcontent_id,
       title,
@@ -306,7 +306,7 @@ export async function fetchNewReleases(brand, {page = 1, limit = 20, sort = "-pu
       web_url_path,
       "permission_id": permission[]->railcontent_id,
       `;
-    const filterParams = {};
+    const filterParams = {allowsPullSongsContent: false};
     const query = await buildQuery(
         filter,
         filterParams,

package/test/sanityQueryService.test.js

@@ -509,7 +509,7 @@ describe('Sanity Queries', function () {
     });
 
     test('fetchAll-IncludedFields-coaches-multiple-focus', async () => {
-        let response = await fetchAll('drumeo', 'instructor', {includedFields: ['focus,drumline', 'focus,recording']});
+        let response = await fetchAll('drumeo', 'instructor', {includedFields: ['focus,Drumline', 'focus,Recording']});
         log(response);
         expect(response.entity.length).toBeGreaterThan(0);
     });