musora-content-services 1.0.111 → 1.0.113

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.113](https://github.com/railroadmedia/musora-content-services/compare/v1.0.112...v1.0.113) (2024-09-25)
+
+### [1.0.112](https://github.com/railroadmedia/musora-content-services/compare/v1.0.111...v1.0.112) (2024-09-24)
+
 ### [1.0.111](https://github.com/railroadmedia/musora-content-services/compare/v1.0.110...v1.0.111) (2024-09-24)
 
 ### [1.0.110](https://github.com/railroadmedia/musora-content-services/compare/v1.0.109...v1.0.110) (2024-09-23)

package/docs/config.js.html

@@ -114,7 +114,7 @@ module.exports = {
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.3</a> on Fri Sep 20 2024 13:45:33 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 Tue Sep 24 2024 20:13:55 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

@@ -149,7 +149,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 Fri Sep 20 2024 13:45:33 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 Tue Sep 24 2024 20:13:55 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

@@ -681,7 +681,7 @@ initializeService({
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.3</a> on Fri Sep 20 2024 13:45:33 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 Tue Sep 24 2024 20:13:55 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

@@ -1518,7 +1518,7 @@
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.3</a> on Fri Sep 20 2024 13:45:33 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 Tue Sep 24 2024 20:13:55 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

@@ -8166,7 +8166,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 Fri Sep 20 2024 13:45:33 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 Tue Sep 24 2024 20:13:55 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

@@ -372,7 +372,7 @@ export async function fetchUnlikeContent(contentId) {
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.3</a> on Fri Sep 20 2024 13:45:33 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 Tue Sep 24 2024 20:13:55 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

@@ -306,7 +306,7 @@ export async function fetchWorkouts(brand) {
 * @param {string} brand - The brand for which to fetch new releases.
 * @returns {Promise<Object|null>} - The fetched new releases data or null if not found.
 */
-export async function fetchNewReleases(brand, { page = 1, limit = 10, sort="-published_on" } = {}) {
+export async function fetchNewReleases(brand, { page = 1, limit = 20, sort="-published_on" } = {}) {
   const newTypes = getNewReleasesTypes(brand);
   const typesString = arrayToStringRepresentation(newTypes);
   const start = (page - 1) * limit;
@@ -559,7 +559,7 @@ export async function fetchAll(brand, type, {
                 'lessons': *[_type == '${type}' && brand == '${brand}' && ^._id == ${groupBy}._ref ${searchFilter} ${includedFieldsFilter} ${progressFilter}]{
                     ${fieldsString},
                     ${groupBy}
-                }[0...10]
+                }[0...20]
             }
             |order(${sortOrder})
             [${start}...${end}]
@@ -580,7 +580,7 @@ export async function fetchAll(brand, type, {
                 'lessons': *[brand == '${brand}' && ^._id in ${groupBy}[]._ref ${typeFilter} ${searchFilter} ${includedFieldsFilter} ${progressFilter}]{
                     ${fieldsString},
                     ${groupBy}
-                }[0...10]
+                }[0...20]
             }
             |order(${sortOrder})
             [${start}...${end}]
@@ -1239,7 +1239,7 @@ export async function fetchArtistLessons(brand, name, contentType, {
   const end = start + limit;
   const searchFilter = searchTerm ? `&& title match "${searchTerm}*"`: ''  
   const sortOrder = getSortOrder(sort);
-  const addType = contentType ? `_type == '${contentType}' && `:''
+  const addType = contentType && Array.isArray(contentType) ? `_type in ['${contentType.join("', '")}'] &&` : contentType ? `_type == '${contentType}' && `:''
   const includedFieldsFilter = includedFields.length > 0
   ? filtersToGroq(includedFields)
   : "";
@@ -1517,7 +1517,6 @@ function processMetadata(brand, type, withFilters = false) {
     if (!metadataElement) {
         return null;
     }
-
     const processedData = {
         type,
         thumbnailUrl: metadataElement.thumbnailUrl || null,
@@ -1527,54 +1526,14 @@ function processMetadata(brand, type, withFilters = false) {
 
     if (withFilters) {
         Object.keys(metadataElement).forEach(key => {
-            if (key !== 'thumbnailUrl' && key !== 'name' && key !== 'description') {
+            if ( !['thumbnailUrl', 'name', 'description'].includes(key) ) {
                 processedData[key] = metadataElement[key];
             }
         });
-//         processedData.icon = metadataElement.icon || null;
-//         processedData.sortBy = metadataElement.sortBy || null;
-//         processedData.allowableFilters = metadataElement.allowableFilters || [];
-//         processedData.tabs = metadataElement.tabs ? metadataElement.tabs.map(tab => ({
-//             name: tab.name,
-//             short_name: tab.short_name,
-//             value: tab.value || null,
-//             is_required_field: tab.is_required_field || false
-//         })) : [];
     }
 
     return processedData;
 }
-function processMetadatas(brand, type, withFilters=false) {
-    const metadataElement = contentMetadata[brand]?.[type];
-    if (!metadataElement) {
-        return null;
-    }
-
-    const processedData = {
-        type,
-        thumbnailUrl: metadataElement.thumbnailUrl || null,
-        name: metadataElement.name || null,
-        description: metadataElement.description || null
-    };
-
-    if(withFilters){
-        processedData.push({
-            icon: metadataElement.icon || null,
-                sortBy: metadataElement.sortBy || null,
-                allowableFilters: metadataElement.allowableFilters || [],
-            tabs: metadataElement.tabs ? metadataElement.tabs.map(tab => ({
-                name:              tab.name,
-                short_name:        tab.short_name,
-                value:             tab.value || null,
-                is_required_field: tab.is_required_field || false
-            })) : [],
-
-        });
-    }
-
-    return processedData;
-}
-
 
 
 
@@ -1594,7 +1553,7 @@ function processMetadatas(brand, type, withFilters=false) {
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.3</a> on Fri Sep 20 2024 13:45:33 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 Tue Sep 24 2024 20:13:55 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.111",
+  "version": "1.0.113",
   "description": "A package for Musoras content services ",
   "main": "src/index.js",
   "scripts": {

package/src/contentTypeConfig.js

@@ -321,7 +321,7 @@ const contentMetadata = {
             allowableFilters: [],
             sortBy: 'sort',
         },
-        'live-stream': {
+        'live': {
             thumbnailUrl: 'https://dpwjbsxqtam5n.cloudfront.net/shows/show-live.jpg',
             name: 'Live',
             shortname: 'Live Lessons',
@@ -1680,7 +1680,7 @@ 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) {        
         case 'drumeo':
-            return [...baseNewTypes, "drum-fest-international-2022", "spotlight", "the-history-of-electronic-drums", "backstage-secrets", "student-collaborations", "live-streams", "solos", "gear-guides", "performances", "in-rhythm", "challenges", "on-the-road", "diy-drum-experiments", "rhythmic-adventures-of-captain-carson", "study-the-greats", "rhythms-from-another-planet", "tama-drums", "paiste-cymbals", "behind-the-scenes", "exploring-beats", "sonor"];
+            return [...baseNewTypes, "drum-fest-international-2022", "spotlight", "the-history-of-electronic-drums", "backstage-secrets", "student-collaborations", "live", "solos", "gear-guides", "performances", "in-rhythm", "challenges", "on-the-road", "diy-drum-experiments", "rhythmic-adventures-of-captain-carson", "study-the-greats", "rhythms-from-another-planet", "tama-drums", "paiste-cymbals", "behind-the-scenes", "exploring-beats", "sonor"];
         case 'guitareo': 
             return [...baseNewTypes, "archives", "recording", "chords-and-scales"];
         case 'pianote':    
@@ -1694,7 +1694,7 @@ function getUpcomingEventsTypes(brand) {
     const baseLiveTypes = ["student-review", "student-review", "student-focus", "coach-stream", "live", "question-and-answer", "boot-camps", "quick-tips", "recording", "pack-bundle-lesson"];
     switch(brand) {
         case 'drumeo': 
-            return [...baseLiveTypes, "drum-fest-international-2022", "spotlight", "the-history-of-electronic-drums", "backstage-secrets", "student-collaborations", "live-streams", "podcasts", "solos", "gear-guides", "performances", "in-rhythm", "challenges", "on-the-road", "diy-drum-experiments", "rhythmic-adventures-of-captain-carson", "study-the-greats", "rhythms-from-another-planet", "tama-drums", "paiste-cymbals", "behind-the-scenes", "exploring-beats", "sonor"];
+            return [...baseLiveTypes, "drum-fest-international-2022", "spotlight", "the-history-of-electronic-drums", "backstage-secrets", "student-collaborations", "live", "podcasts", "solos", "gear-guides", "performances", "in-rhythm", "challenges", "on-the-road", "diy-drum-experiments", "rhythmic-adventures-of-captain-carson", "study-the-greats", "rhythms-from-another-planet", "tama-drums", "paiste-cymbals", "behind-the-scenes", "exploring-beats", "sonor"];
         case 'guitareo':
             return [...baseLiveTypes, "archives"];
         case 'pianote':

package/src/services/sanity.js

@@ -1192,7 +1192,7 @@ export async function fetchArtistLessons(brand, name, contentType, {
   const end = start + limit;
   const searchFilter = searchTerm ? `&& title match "${searchTerm}*"`: ''  
   const sortOrder = getSortOrder(sort);
-  const addType = contentType ? `_type == '${contentType}' && `:''
+  const addType = contentType && Array.isArray(contentType) ? `_type in ['${contentType.join("', '")}'] &&` : contentType ? `_type == '${contentType}' && `:''
   const includedFieldsFilter = includedFields.length > 0
   ? filtersToGroq(includedFields)
   : "";

package/test/sanityQueryService.test.js

@@ -359,9 +359,11 @@ describe('Sanity Queries', function () {
     });
 
     test('fetchShowsData', async () => {
-        const response = await fetchShowsData('singeo');
+        const response = await fetchShowsData('drumeo');
         log(response);
         expect(response.length).toBeGreaterThan(0);
+        const showTypes = response.map((x) => x.type);
+        expect(showTypes).toContain('live');
     });
 
     test('fetchMetadata', async () => {