musora-content-services 1.0.93 → 1.0.95

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.95](https://github.com/railroadmedia/musora-content-services/compare/v1.0.94...v1.0.95) (2024-09-12)
+
+### [1.0.94](https://github.com/railroadmedia/musora-content-services/compare/v1.0.93...v1.0.94) (2024-09-12)
+
 ### [1.0.93](https://github.com/railroadmedia/musora-content-services/compare/v1.0.92...v1.0.93) (2024-09-11)
 
 ### [1.0.92](https://github.com/railroadmedia/musora-content-services/compare/v1.0.91...v1.0.92) (2024-09-11)

package/package.json

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

package/src/services/railcontent.js

@@ -126,7 +126,7 @@ export async function fetchSongsInProgress(brand) {
         const response = await fetchAbsolute(url, { headers });
         const result = await response.json();
         if(result){
-            console.log('fetchSongsInProgress', result);
+            //console.log('fetchSongsInProgress', result);
             return result;
         } else {
             console.log('result not json');
@@ -155,7 +155,7 @@ export async function fetchContentInProgress(type="all", brand, {
     limit = 10,
   } = {}) {
     let url;
-    if(type !== "all") {
+    if(type === "all") {
         url = `/content/in_progress/${globalConfig.railcontentConfig.userId}?brand=${brand}&limit=${limit}&page=${page}`;
     } else {
         url = `/content/in_progress/${globalConfig.railcontentConfig.userId}?content_type=${type}&brand=${brand}&limit=${limit}&page=${page}`;
@@ -197,7 +197,7 @@ export async function fetchCompletedContent(type="all", brand, {
     limit = 10,
   } = {}) {
     let url;
-    if(type !== "all") {
+    if(type === "all") {
         url = `/content/completed/${globalConfig.railcontentConfig.userId}?brand=${brand}&limit=${limit}&page=${page}`;
     } else {
         url = `/content/completed/${globalConfig.railcontentConfig.userId}?content_type=${type}&brand=${brand}&limit=${limit}&page=${page}`;
@@ -254,10 +254,11 @@ export async function fetchContentPageUserData(contentId) {
     }
 }
 
-function fetchAbsolute(url, params) {  
-    if (url.startsWith('/')) {
-        return fetch(globalConfig.railcontentConfig.baseUrl + url, params)
-    } else {
-        return fetch(url, params);
-    }   
+function fetchAbsolute(url, params) { 
+    if(globalConfig.railcontentConfig.baseUrl) {
+        if (url.startsWith('/')) {
+            return fetch(globalConfig.railcontentConfig.baseUrl + url, params)
+        }
+    } 
+    return fetch(url, params);
 }

package/src/services/sanity.js

@@ -286,11 +286,14 @@ export async function fetchNewReleases(brand) {
 * @returns {Promise<Object|null>} - A promise that resolves to an array of upcoming event objects or null if not found.
 *
 * @example
-* fetchUpcomingEvents('drumeo')
+* fetchUpcomingEvents('drumeo', {
+*   page: 2,
+*   limit: 20,
+* })
 *   .then(events => console.log(events))
 *   .catch(error => console.error(error));
 */
-export async function fetchUpcomingEvents(brand) {
+export async function fetchUpcomingEvents(brand, { page = 1, limit = 10 }) {
   const baseLiveTypes = ["student-review", "student-reviews", "student-focus", "coach-stream", "live", "question-and-answer", "student-review", "boot-camps", "recording", "pack-bundle-lesson"];
   const liveTypes = {
       'drumeo': [...baseLiveTypes, "drum-fest-international-2022", "spotlight", "the-history-of-electronic-drums", "backstage-secrets", "quick-tips", "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-drums"],
@@ -301,6 +304,8 @@ export async function fetchUpcomingEvents(brand) {
   };
   const typesString = arrayJoinWithQuotes(liveTypes[brand] ?? liveTypes['default']);
   const now = getSanityDate(new Date());
+  const start = (page - 1) * limit;
+  const end = start + limit;
   const query = `*[_type in [${typesString}] && brand == '${brand}' && published_on > '${now}' && status == 'scheduled']{
         "id": railcontent_id,
         title,
@@ -313,7 +318,7 @@ export async function fetchUpcomingEvents(brand) {
         published_on,
         "type": _type,
         web_url_path,
-      } | order(published_on asc)[0...5]`;
+    } | order(published_on asc)[${start}...${end}]`;
   return fetchSanity(query, true);
 }
 
@@ -437,6 +442,7 @@ export async function fetchAll(brand, type, {
                 'type': _type,
                 name,
                 'head_shot_picture_url': thumbnail_url.asset->url,
+                web_url_path,
                 'all_lessons_count': count(*[_type == '${type}' && brand == '${brand}' && ^._id == ${groupBy}._ref ${searchFilter} ${includedFieldsFilter} ${progressFilter}]._id),
                 'lessons': *[_type == '${type}' && brand == '${brand}' && ^._id == ${groupBy}._ref ${searchFilter} ${includedFieldsFilter} ${progressFilter}]{
                     ${fieldsString},
@@ -456,6 +462,7 @@ export async function fetchAll(brand, type, {
                 'type': _type,
                 name,
                 'head_shot_picture_url': thumbnail_url.asset->url,
+                web_url_path,
                 'all_lessons_count': count(*[_type == '${type}' && brand == '${brand}' && ^._id in ${groupBy}[]._ref ${searchFilter} ${includedFieldsFilter} ${progressFilter}]._id),
                 'lessons': *[_type == '${type}' && brand == '${brand}' && ^._id in ${groupBy}[]._ref ${searchFilter} ${includedFieldsFilter} ${progressFilter}]{
                     ${fieldsString},