musora-content-services 1.0.180 → 1.0.182

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.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)
 
 ### [1.0.179](https://github.com/railroadmedia/musora-content-services/compare/v1.0.178...v1.0.179) (2024-11-19)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "musora-content-services",
-  "version": "1.0.180",
+  "version": "1.0.182",
   "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/dataContext.js

@@ -15,6 +15,7 @@ let cache = null;
 
 export class DataContext {
     context = null;
+    dataPromise = null;
 
     constructor(dataVersionKey, fetchDataFunction) {
         this.dataVersionKey = dataVersionKey;
@@ -24,6 +25,13 @@ export class DataContext {
     }
 
     async getData() {
+        if (!this.dataPromise) {
+            this.dataPromise = this.getDataPromise();
+        }
+        return this.dataPromise;
+    }
+
+    async getDataPromise() {
         await this.ensureLocalContextLoaded();
         const shouldVerify = await this.shouldVerifyServerVerions();
 
@@ -36,6 +44,7 @@ export class DataContext {
             }
             cache.setItem(this.localStorageLastUpdatedKey, new Date().getTime()?.toString());
         }
+        this.dataPromise = null;
         return this.context.data;
     }
 

package/src/services/sanity.js

@@ -510,7 +510,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 +543,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 +560,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]`;

package/test/sanityQueryService.test.js

@@ -66,7 +66,7 @@ describe('Sanity Queries', function () {
     test('fetchArtists', async () => {
         const response = await fetchArtists('drumeo');
         const artistNames = response.map((x) => x.name);
-        expect(artistNames).toContain("Arctic Monkeys");
+        expect(artistNames).toContain("Audioslave");
 
     }, 10000);
 
@@ -161,11 +161,11 @@ describe('Sanity Queries', function () {
 
     test('fetchAllSongsInProgress', async () => {
        var mock = jest.spyOn(dataContext, 'fetchData');
-        var json = JSON.parse(`{"version":1,"config":{"key":1,"enabled":1,"checkInterval":1,"refreshInterval":2},"data":{"232979":{"s":"started","p":6,"t":20,"u":1731108082}}}`);
+        var json = JSON.parse(`{"version":1,"config":{"key":1,"enabled":1,"checkInterval":1,"refreshInterval":2},"data":{"412941":{"s":"started","p":6,"t":20,"u":1731108082}}}`);
         mock.mockImplementation(() =>
             json);
         const response = await fetchAll('drumeo', 'song',{progress:"in progress"});
-        expect(response.entity[0].id).toBe(232979);
+        expect(response.entity[0].id).toBe(412941);
         expect(response.entity.length).toBe(1);
     });
 
@@ -361,13 +361,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', {