musora-content-services 1.0.246 → 1.0.250

package/CHANGELOG.md

@@ -2,6 +2,16 @@
 
 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.250](https://github.com/railroadmedia/musora-content-services/compare/v1.0.249...v1.0.250) (2024-12-19)
+
+### [1.0.249](https://github.com/railroadmedia/musora-content-services/compare/v1.0.247...v1.0.249) (2024-12-19)
+
+### [1.0.248](https://github.com/railroadmedia/musora-content-services/compare/v1.0.247...v1.0.248) (2024-12-19)
+
+### [1.0.247](https://github.com/railroadmedia/musora-content-services/compare/v1.0.245...v1.0.247) (2024-12-18)
+
+### [1.0.246](https://github.com/railroadmedia/musora-content-services/compare/v1.0.244...v1.0.246) (2024-12-18)
+
 ### [1.0.246](https://github.com/railroadmedia/musora-content-services/compare/v1.0.245...v1.0.246) (2024-12-18)
 
 ### [1.0.245](https://github.com/railroadmedia/musora-content-services/compare/v1.0.244...v1.0.245) (2024-12-18)

package/package.json

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

package/src/contentMetaData.js

@@ -294,7 +294,7 @@ const contentMetadata = {
             icon: 'icon-drums',
             description: "The 40 drum rudiments are essential for any drummer, no matter the style, genre, or scenario. You can use the videos below to help you learn, practice, and perfect every single one.",
             allowableFilters: ['difficulty', 'genre', 'gear', 'topic'],
-            tabs: [
+            tabs: [  
                 {
                     name: 'All',
                     short_name: 'ALL',
@@ -304,25 +304,25 @@ const contentMetadata = {
                     name: 'Drags',
                     short_name: 'DRAGS',
                     is_required_field: true,
-                    value: 'topic,drags',
+                    value: 'topic,Drags',
                 },
                 {
                     name: 'Flams',
                     short_name: 'FLAMS',
                     is_required_field: true,
-                    value: 'topic,flams',
+                    value: 'topic,Flams',
                 },
                 {
                     name: 'Paradiddles',
                     short_name: 'PARADIDDLES',
                     is_required_field: true,
-                    value: 'topic,paradiddles',
+                    value: 'topic,Paradiddles',
                 },
                 {
                     name: 'Rolls',
                     short_name: 'ROLLS',
                     is_required_field: true,
-                    value: 'topic,rolls',
+                    value: 'topic,Rolls',
                 },
             ],
             sortBy: 'sort',

package/src/services/contentProgress.js

@@ -265,10 +265,10 @@ function uuidv4() {
 }
 
 function bubbleProgress(hierarchy, contentId, localContext) {
-    let parentId = hierarchy.parents[contentId];
+    let parentId = hierarchy?.parents?.[contentId];
     if (!parentId) return;
     let data = localContext.data[parentId] ?? {};
-    let childProgress = hierarchy.children[parentId].map(function (childId) {
+    let childProgress = hierarchy?.children?.[parentId]?.map(function (childId) {
         return localContext.data[childId]?.[DATA_KEY_PROGRESS] ?? 0;
     });
     let progress = Math.round(childProgress.reduce((a, b) => a + b, 0) / childProgress.length);

package/src/services/dataContext.js

@@ -38,7 +38,7 @@ export class DataContext {
         if ((!this.context) || shouldVerify) {
             let version = this.version();
             let data = await this.fetchData(version);
-            if (data.version !== "No Change") {
+            if (data?.version !== "No Change") {
                 this.context = data;
                 cache.setItem(this.localStorageKey, JSON.stringify(data));
             }
@@ -89,7 +89,7 @@ export class DataContext {
         await this.ensureLocalContextLoaded();
         if (this.context) {
             await localUpdateFunction(this.context);
-            this.context.version++;
+            if (this.context) this.context.version++;
             let data = JSON.stringify(this.context);
             cache.setItem(this.localStorageKey, data);
             cache.setItem(this.localStorageLastUpdatedKey, new Date().getTime().toString());

package/src/services/sanity.js

@@ -115,10 +115,12 @@ export async function fetchPlayAlongsCount(brand) {
  *   .catch(error => console.error(error));
  */
 export async function fetchRelatedSongs(brand, songId) {
+    const now = getSanityDate(new Date());
     const query = `
       *[_type == "song" && railcontent_id == ${songId}]{
         "entity": array::unique([
-            ...(*[_type == "song" && brand == "${brand}" && railcontent_id != ${songId} && references(^.artist->_id)]{
+            ...(*[_type == "song" && brand == "${brand}" && railcontent_id != ${songId} && references(^.artist->_id)
+            && (status in ['published'] || (status == 'scheduled' && defined(published_on) && published_on >= '${now}'))]{
             "type": _type,
             "id": railcontent_id,
             "url": web_url_path,
@@ -144,7 +146,8 @@ export async function fetchRelatedSongs(brand, songId) {
               }
             ],
           }[0...10]),
-            ...(*[_type == "song" && brand == "${brand}" && railcontent_id != ${songId} && references(^.genre[]->_id)]{
+            ...(*[_type == "song" && brand == "${brand}" && railcontent_id != ${songId} && references(^.genre[]->_id)
+            && (status in ['published'] || (status == 'scheduled' && defined(published_on) && published_on >= '${now}'))]{
             "type": _type,
             "id": railcontent_id,
             "url": web_url_path,
@@ -1557,13 +1560,13 @@ export async function fetchArtistLessons(brand, name, contentType, {
 
     // limits the results to supplied progressIds for started & completed filters
     const progressFilter = progressIds !== undefined ? `&& railcontent_id in [${progressIds.join(',')}]` : "";
-
+    const now = getSanityDate(new Date());
     const query = `{
     "entity": 
       *[_type == 'artist' && name == '${name}']
         {'type': _type, name, 'thumbnail_url':thumbnail_url.asset->url, 
         'lessons_count': count(*[${addType} brand == '${brand}' && references(^._id)]), 
-        'lessons': *[${addType} brand == '${brand}' && references(^._id) ${searchFilter} ${includedFieldsFilter} ${progressFilter}]{${fieldsString}}
+        'lessons': *[${addType} brand == '${brand}' && references(^._id) && (status in ['published'] || (status == 'scheduled' && defined(published_on) && published_on >= '${now}')) ${searchFilter} ${includedFieldsFilter} ${progressFilter}]{${fieldsString}}
       [${start}...${end}]}
       |order(${sortOrder})
   }`;
@@ -1607,13 +1610,13 @@ export async function fetchGenreLessons(brand, name, contentType, {
         : "";
     // limits the results to supplied progressIds for started & completed filters
     const progressFilter = progressIds !== undefined ? `&& railcontent_id in [${progressIds.join(',')}]` : "";
-
+    const now = getSanityDate(new Date());
     const query = `{
     "entity": 
       *[_type == 'genre' && name == '${name}']
         {'type': _type, name, 'thumbnail_url':thumbnail_url.asset->url, 
         'lessons_count': count(*[${addType} brand == '${brand}' && references(^._id)]), 
-        'lessons': *[${addType} brand == '${brand}' && references(^._id) ${searchFilter} ${includedFieldsFilter} ${progressFilter}]{${fieldsString}}
+        'lessons': *[${addType} brand == '${brand}' && references(^._id) && (status in ['published'] || (status == 'scheduled' && defined(published_on) && published_on >= '${now}')) ${searchFilter} ${includedFieldsFilter} ${progressFilter}]{${fieldsString}}
       [${start}...${end}]}
       |order(${sortOrder})
   }`;