musora-content-services 1.0.247 → 1.0.251

package/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 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.251](https://github.com/railroadmedia/musora-content-services/compare/v1.0.250...v1.0.251) (2024-12-19)
+
+### [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)

package/package.json

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

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,
@@ -539,6 +542,8 @@ export async function fetchAll(brand, type, {
     if (type === 'archives') {
         typeFilter = `&& status == "archived"`;
         bypassStatusAndPublishedValidation = true;
+    } else if(type === 'pack'){
+        typeFilter = `&& (_type == 'pack' || _type == 'semester-pack')`;
     } else {
         typeFilter = type ? `&& _type == '${type}'` : "";
     }
@@ -1557,13 +1562,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 +1612,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})
   }`;