musora-content-services 1.0.139 → 1.0.140

package/CHANGELOG.md

@@ -2,6 +2,8 @@
 
 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.140](https://github.com/railroadmedia/musora-content-services/compare/v1.0.139...v1.0.140) (2024-10-16)
+
 ### [1.0.139](https://github.com/railroadmedia/musora-content-services/compare/v1.0.137...v1.0.139) (2024-10-16)
 
 ### [1.0.138](https://github.com/railroadmedia/musora-content-services/compare/v1.0.137...v1.0.138) (2024-10-15)

package/docs/config.js.html

@@ -126,7 +126,7 @@ module.exports = {
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.3</a> on Tue Oct 15 2024 11:28:17 GMT+0000 (Coordinated Universal Time) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.3</a> on Wed Oct 16 2024 19:36:10 GMT+0000 (Coordinated Universal Time) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/index.html

@@ -155,7 +155,7 @@ with <code>npm test -- -t=&quot;userContext&quot;</code> or just the contentLike
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.3</a> on Tue Oct 15 2024 11:28:17 GMT+0000 (Coordinated Universal Time) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.3</a> on Wed Oct 16 2024 19:36:10 GMT+0000 (Coordinated Universal Time) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/module-Config.html

@@ -828,7 +828,7 @@ initializeService({
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.3</a> on Tue Oct 15 2024 11:28:17 GMT+0000 (Coordinated Universal Time) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.3</a> on Wed Oct 16 2024 19:36:10 GMT+0000 (Coordinated Universal Time) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/module-Railcontent-Services.html

@@ -1435,7 +1435,7 @@
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.3</a> on Tue Oct 15 2024 11:28:17 GMT+0000 (Coordinated Universal Time) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.3</a> on Wed Oct 16 2024 19:36:10 GMT+0000 (Coordinated Universal Time) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/module-Sanity-Services.html

@@ -1242,7 +1242,7 @@ fetchAllFilterOptions('myBrand', '', 'Rock', 'John Doe', 'coach-lessons', 'Love'
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line1012">line 1012</a>
+        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line1028">line 1028</a>
     </li></ul></dd>
     
 
@@ -2042,7 +2042,7 @@ fetchAllFilterOptions('myBrand', '', 'Rock', 'John Doe', 'coach-lessons', 'Love'
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line1255">line 1255</a>
+        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line1271">line 1271</a>
     </li></ul></dd>
     
 
@@ -3110,7 +3110,7 @@ fetchAllFilterOptions('myBrand', '', 'Rock', 'John Doe', 'coach-lessons', 'Love'
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line1209">line 1209</a>
+        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line1225">line 1225</a>
     </li></ul></dd>
     
 
@@ -3276,7 +3276,7 @@ It's an ongoing discussion (Aug 2024), but it's been included here if necessary<
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line1451">line 1451</a>
+        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line1480">line 1480</a>
     </li></ul></dd>
     
 
@@ -3441,7 +3441,7 @@ It's an ongoing discussion (Aug 2024), but it's been included here if necessary<
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line1130">line 1130</a>
+        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line1146">line 1146</a>
     </li></ul></dd>
     
 
@@ -3808,7 +3808,7 @@ It's an ongoing discussion (Aug 2024), but it's been included here if necessary<
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line1155">line 1155</a>
+        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line1171">line 1171</a>
     </li></ul></dd>
     
 
@@ -4251,7 +4251,7 @@ It's an ongoing discussion (Aug 2024), but it's been included here if necessary<
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line1194">line 1194</a>
+        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line1210">line 1210</a>
     </li></ul></dd>
     
 
@@ -4574,7 +4574,7 @@ It's an ongoing discussion (Aug 2024), but it's been included here if necessary<
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line1307">line 1307</a>
+        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line1323">line 1323</a>
     </li></ul></dd>
     
 
@@ -5055,7 +5055,7 @@ It's an ongoing discussion (Aug 2024), but it's been included here if necessary<
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line908">line 908</a>
+        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line921">line 921</a>
     </li></ul></dd>
     
 
@@ -5220,7 +5220,7 @@ It's an ongoing discussion (Aug 2024), but it's been included here if necessary<
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line1501">line 1501</a>
+        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line1530">line 1530</a>
     </li></ul></dd>
     
 
@@ -6590,7 +6590,7 @@ It's an ongoing discussion (Aug 2024), but it's been included here if necessary<
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line882">line 882</a>
+        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line887">line 887</a>
     </li></ul></dd>
     
 
@@ -6748,7 +6748,7 @@ It's an ongoing discussion (Aug 2024), but it's been included here if necessary<
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line1039">line 1039</a>
+        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line1055">line 1055</a>
     </li></ul></dd>
     
 
@@ -6906,7 +6906,7 @@ It's an ongoing discussion (Aug 2024), but it's been included here if necessary<
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line1099">line 1099</a>
+        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line1115">line 1115</a>
     </li></ul></dd>
     
 
@@ -7071,7 +7071,7 @@ It's an ongoing discussion (Aug 2024), but it's been included here if necessary<
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line1113">line 1113</a>
+        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line1129">line 1129</a>
     </li></ul></dd>
     
 
@@ -7385,7 +7385,7 @@ It's an ongoing discussion (Aug 2024), but it's been included here if necessary<
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line966">line 966</a>
+        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line982">line 982</a>
     </li></ul></dd>
     
 
@@ -7567,7 +7567,7 @@ It's an ongoing discussion (Aug 2024), but it's been included here if necessary<
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line985">line 985</a>
+        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line1001">line 1001</a>
     </li></ul></dd>
     
 
@@ -7935,7 +7935,7 @@ It's an ongoing discussion (Aug 2024), but it's been included here if necessary<
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line1355">line 1355</a>
+        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line1371">line 1371</a>
     </li></ul></dd>
     
 
@@ -8401,7 +8401,7 @@ fetchSanity(query, true)
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line1476">line 1476</a>
+        <a href="sanity.js.html">sanity.js</a>, <a href="sanity.js.html#line1505">line 1505</a>
     </li></ul></dd>
     
 
@@ -9537,7 +9537,7 @@ It also includes completion status and progress percentage for each workout by f
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.3</a> on Tue Oct 15 2024 11:28:17 GMT+0000 (Coordinated Universal Time) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.3</a> on Wed Oct 16 2024 19:36:10 GMT+0000 (Coordinated Universal Time) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/railcontent.js.html

@@ -376,7 +376,7 @@ function fetchAbsolute(url, params) {
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.3</a> on Tue Oct 15 2024 11:28:17 GMT+0000 (Coordinated Universal Time) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.3</a> on Wed Oct 16 2024 19:36:10 GMT+0000 (Coordinated Universal Time) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/sanity.js.html

@@ -149,7 +149,7 @@ export async function fetchSongArtistCount(brand) {
 export async function fetchRelatedSongs(brand, songId) {
     const query = `
       *[_type == "song" && railcontent_id == ${songId}]{
-        "data": array::unique([
+        "entity": array::unique([
             ...(*[_type == "song" && brand == "${brand}" && railcontent_id != ${songId} && references(^.artist->_id)]{
             "type": _type,
             "id": railcontent_id,
@@ -879,7 +879,7 @@ export async function fetchMethodNextLesson(railcontentId, methodId) {
  */
 export async function fetchMethodPreviousNextLesson(railcontentId, methodId) {
     const sortedChildren = await fetchMethodChildrenIds(methodId);
-    const index = sortedChildren.indexOf(railcontentId);
+    const index = sortedChildren.indexOf(Number(railcontentId));
     let nextId = sortedChildren[index + 1];
     let previousId = sortedChildren[index  -1];
     let nextPrev = await fetchByRailContentIds([nextId, previousId]);
@@ -894,13 +894,16 @@ export async function fetchMethodPreviousNextLesson(railcontentId, methodId) {
 * @returns {Promise<Array<Object>|null>} - The fetched children data or null if not found.
 */
 export async function fetchMethodChildrenIds(railcontentId) {
-    const query = `*[_type == 'learning-path' && railcontent_id == ${railcontentId}]{
+    const query = `*[ railcontent_id == ${railcontentId}]{
     'children': child[]-> {
         'id': railcontent_id,
+        'type' : _type,
             'children': child[]-> {
-            'id': railcontent_id,
-                'children': child[]-> {
                 'id': railcontent_id,
+                'type' : _type,
+                    'children': child[]-> {
+                        'id': railcontent_id,
+                        'type' : _type,
             }
         }
     }
@@ -912,9 +915,11 @@ export async function fetchMethodChildrenIds(railcontentId) {
 function getChildrenToDepth(parent, depth = 1)
 {
     let allChildrenIds = [];
-    if (parent['children']) {
+    if (parent && parent['children'] && depth > 0) {
         parent['children'].forEach((child) => {
-            allChildrenIds.push(child['id']);
+            if(!child['children']) {
+                allChildrenIds.push(child['id']);
+            }
             allChildrenIds = allChildrenIds.concat(getChildrenToDepth(child, depth-1));
         })
     }
@@ -927,19 +932,27 @@ function getChildrenToDepth(parent, depth = 1)
 * @returns {Promise<Object|null>} - The fetched next and previous lesson data or null if found.
 */
 export async function fetchNextPreviousLesson(railcontentId) {
-  //TODO: Implement getTypeNeighbouringSiblings/getNextAndPreviousLessons
-  const query = `*[_railcontent_id == ${railcontentId}]{
-        railcontent_id,
-        title,
-        "image": thumbnail.asset->url,
-        "artist_name": artist->name,
-        artist,
-        difficulty,
-        difficulty_string,
-        web_url_path,
-        published_on
-      }`
-  return fetchSanity(query, false);
+    const document = await fetchLessonContent(railcontentId);
+    if (document.parent_content_data && document.parent_content_data.length > 0) {
+        const lastElement = document.parent_content_data[document.parent_content_data.length - 1];
+        const results = await fetchMethodPreviousNextLesson(railcontentId, lastElement.id);
+        return results;
+    }
+    const processedData = processMetadata(document.brand, document.type, true);
+    let sortBy = processedData?.sortBy ?? 'published_on';
+    const isDesc = sortBy.startsWith('-');
+    sortBy = isDesc ? sortBy.substring(1) : sortBy;
+    const sortValue = document[sortBy];
+    const isNumeric = !isNaN(sortValue);
+    let prevComparison = isNumeric ? `${sortBy} <= ${sortValue}` : `${sortBy} <= "${sortValue}"`;
+    let nextComparison = isNumeric ? `${sortBy} >= ${sortValue}` : `${sortBy} >= "${sortValue}"`;
+    const fields = getFieldsForContentType(document.type);
+    const query = `{
+      "prevLesson": *[brand == "${document.brand}" && status == "${document.status}" && _type == "${document.type}" && ${prevComparison} && railcontent_id != ${railcontentId}] | order(${sortBy} desc){${fields}}[0...1][0],
+      "nextLesson": *[brand == "${document.brand}" && status == "${document.status}" && _type == "${document.type}" && ${nextComparison} && railcontent_id != ${railcontentId}] | order(${sortBy} asc){${fields}}[0...1][0]
+    }`;
+
+    return await fetchSanity(query, true);
 }
 
 /**
@@ -961,6 +974,7 @@ export async function fetchLessonContent(railContentId) {
           difficulty, 
           difficulty_string, 
           brand, 
+          status,
           soundslice, 
           instrumentless, 
           railcontent_id, 
@@ -992,7 +1006,9 @@ export async function fetchLessonContent(railContentId) {
           mp3_no_drums_yes_click_url,
           mp3_yes_drums_no_click_url,
           mp3_yes_drums_yes_click_url,
-          "permission_id": permission[]->railcontent_id,`;
+          "permission_id": permission[]->railcontent_id,
+          parent_content_data,
+          sort`;
     const query = buildQuery(
         `railcontent_id == ${railContentId}`,
         filterParams,
@@ -1443,23 +1459,36 @@ export async function fetchSanity(query,
   }
 }
 
-async function needsAccessDecorator(results)
-{
-    if (globalConfig.sanityConfig.useDummyRailContentMethods) return results;
-    let userPermissions = await getUserPermissions();
-    userPermissions = new Set(userPermissions);
-    if (Array.isArray(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);
-    }
-    return results;
+async function needsAccessDecorator(results) {
+  if (globalConfig.sanityConfig.useDummyRailContentMethods) return results;
+  
+  let userPermissions = await getUserPermissions();
+  userPermissions = new Set(userPermissions);
+  
+  if (Array.isArray(results)) {
+      results.forEach((result) => {
+          result['need_access'] = doesUserNeedAccessToContent(result, userPermissions);
+      });
+  } else if (results.entity && Array.isArray(results.entity)) {
+      // Group By
+      results.entity.forEach((result) => {
+          if (result.lessons) {
+              result.lessons.forEach((lesson) => {
+                  lesson['need_access'] = doesUserNeedAccessToContent(lesson, userPermissions); // Updated to check lesson access
+              });
+          } else {
+              result['need_access'] = doesUserNeedAccessToContent(result, userPermissions);
+          }
+      });
+  } else if (results.related_lessons && Array.isArray(results.related_lessons)) {
+    results.related_lessons.forEach((result) => {
+      result['need_access'] = doesUserNeedAccessToContent(result, userPermissions);
+    })
+  } else {
+      results['need_access'] = doesUserNeedAccessToContent(results, userPermissions);
+  }
+
+  return results;
 }
 
 function doesUserNeedAccessToContent(result, userPermissions)
@@ -1754,7 +1783,7 @@ function cleanUpGroq(query) {
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.3</a> on Tue Oct 15 2024 11:28:17 GMT+0000 (Coordinated Universal Time) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.3</a> on Wed Oct 16 2024 19:36:10 GMT+0000 (Coordinated Universal Time) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/package.json

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

package/src/services/sanity.js

@@ -102,7 +102,7 @@ export async function fetchSongArtistCount(brand) {
 export async function fetchRelatedSongs(brand, songId) {
     const query = `
       *[_type == "song" && railcontent_id == ${songId}]{
-        "data": array::unique([
+        "entity": array::unique([
             ...(*[_type == "song" && brand == "${brand}" && railcontent_id != ${songId} && references(^.artist->_id)]{
             "type": _type,
             "id": railcontent_id,
@@ -1412,23 +1412,36 @@ export async function fetchSanity(query,
   }
 }
 
-async function needsAccessDecorator(results)
-{
-    if (globalConfig.sanityConfig.useDummyRailContentMethods) return results;
-    let userPermissions = await getUserPermissions();
-    userPermissions = new Set(userPermissions);
-    if (Array.isArray(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);
-    }
-    return results;
+async function needsAccessDecorator(results) {
+  if (globalConfig.sanityConfig.useDummyRailContentMethods) return results;
+  
+  let userPermissions = await getUserPermissions();
+  userPermissions = new Set(userPermissions);
+  
+  if (Array.isArray(results)) {
+      results.forEach((result) => {
+          result['need_access'] = doesUserNeedAccessToContent(result, userPermissions);
+      });
+  } else if (results.entity && Array.isArray(results.entity)) {
+      // Group By
+      results.entity.forEach((result) => {
+          if (result.lessons) {
+              result.lessons.forEach((lesson) => {
+                  lesson['need_access'] = doesUserNeedAccessToContent(lesson, userPermissions); // Updated to check lesson access
+              });
+          } else {
+              result['need_access'] = doesUserNeedAccessToContent(result, userPermissions);
+          }
+      });
+  } else if (results.related_lessons && Array.isArray(results.related_lessons)) {
+    results.related_lessons.forEach((result) => {
+      result['need_access'] = doesUserNeedAccessToContent(result, userPermissions);
+    })
+  } else {
+      results['need_access'] = doesUserNeedAccessToContent(results, userPermissions);
+  }
+
+  return results;
 }
 
 function doesUserNeedAccessToContent(result, userPermissions)