musora-content-services 1.0.32 → 1.0.34

package/src/services/railcontent.js

@@ -7,9 +7,7 @@ const { globalConfig } = require('./config');
 /**
  * Fetches the completion status of a specific song for the current user.
  *
- * @param {string} userId - The ID of the current user.
  * @param {string} content_id - The ID of the song content to check.
- * @param {string} token - The CSRF token for authentication.
  * @returns {Promise<Object|null>} - Returns the completion status object if found, otherwise null.
  * @example
  * fetchCurrentSongComplete('user123', 'song456', 'csrf-token')
@@ -45,9 +43,7 @@ export async function fetchCurrentSongComplete(content_id) {
 /**
  * Fetches the completion status for multiple songs for the current user.
  *
- * @param {string} userId - The ID of the current user.
  * @param {Array<string>} contentIds - An array of content IDs to check.
- * @param {string} token - The CSRF token for authentication.
  * @returns {Promise<Object|null>} - Returns an object containing completion statuses keyed by content ID, or null if an error occurs.
  * @example
  * fetchAllCompletedStates('user123', ['song456', 'song789'], 'csrf-token')
@@ -79,12 +75,10 @@ export async function fetchAllCompletedStates(contentIds) {
 /**
  * Fetches a list of songs that are currently in progress for the current user.
  *
- * @param {string} userId - The ID of the current user.
  * @param {string} brand - The brand associated with the songs.
- * @param {string} token - The CSRF token for authentication.
  * @returns {Promise<Object|null>} - Returns an object containing in-progress songs if found, otherwise null.
  * @example
- * fetchSongsInProgress('user123', 'drumeo', 'csrf-token')
+ * fetchSongsInProgress('drumeo')
  *   .then(songs => console.log(songs))
  *   .catch(error => console.error(error));
  */
@@ -110,3 +104,40 @@ export async function fetchSongsInProgress(brand) {
         return null;
     }
 }
+
+/**
+ * Fetches a list of content that is currently in progress for the current user.
+ *
+ * @param {string} type - The content type associated with the content.
+ * @param {string} brand - The brand associated with the content.
+ * @returns {Promise<Object|null>} - Returns an object containing in-progress content if found, otherwise null.
+ * @example
+ * fetchContentInProgress('song', 'drumeo')
+ *   .then(songs => console.log(songs))
+ *   .catch(error => console.error(error));
+ */
+export async function fetchContentInProgress(type="all", brand) {
+    let url;
+    if(type!=="all") {
+        url = `/content/in_progress/${globalConfig.railcontentConfig.userId}?brand=${brand}`;
+    } else {
+        url = `/content/in_progress/${globalConfig.railcontentConfig.userId}?content_type=${type}&brand=${brand}`;
+    }
+    const headers = {
+        'Content-Type': 'application/json',
+        'X-CSRF-TOKEN': globalConfig.railcontentConfig.token
+    };
+    try {
+        const response = await fetch(url, { headers });
+        const result = await response.json();
+        if(result){
+            console.log('contentInProgress', result);
+            return result;
+        } else {
+            console.log('result not json');
+        }
+    } catch (error) {
+        console.error('Fetch error:', error);
+        return null;
+    }
+}

package/src/services/sanity.js

@@ -1,11 +1,10 @@
 /**
  * @module Sanity-Services
  */
+import {contentTypeConfig} from "../contentTypeConfig";
+import {globalConfig} from "./config";
 
-const { contentTypeConfig } = require('../contentTypeConfig.js');
-const { globalConfig } = require('./config');
-
-import { fetchAllCompletedStates, fetchCurrentSongComplete } from './railcontent.js'; 
+import { fetchAllCompletedStates, fetchCurrentSongComplete } from './railcontent.js';
 
 /**
 * Fetch a song by its document ID from Sanity.
@@ -20,6 +19,10 @@ import { fetchAllCompletedStates, fetchCurrentSongComplete } from './railcontent
 */
 export async function fetchSongById(documentId) {
     const fields = [
+      '"id": railcontent_id',
+      'railcontent_id',
+      '"type": _type',
+      'description',
       'title',
       '"thumbnail_url": thumbnail.asset->url',
       '"style": genre[0]->name',
@@ -28,8 +31,9 @@ export async function fetchSongById(documentId) {
       'instrumentless',
       'soundslice',
       '"resources": resource[]{resource_url, resource_name}',
+      '"url": web_url_path',
     ];
-  
+
     const query = `
         *[_type == "song" && railcontent_id == ${documentId}]{
             ${fields.join(', ')}
@@ -144,11 +148,11 @@ export async function fetchRelatedSongs(brand, songId) {
           }[0...10])
         ])[0...10]
     }`;
-  
+
     // Fetch the related songs data
     return fetchSanity(query, false);
 }
-  
+
 /**
  * Fetch all songs for a specific brand with pagination and search options.
  * @param {string} brand - The brand for which to fetch songs.
@@ -289,7 +293,7 @@ export async function fetchNewReleases(brand) {
 
 
 /**
- * Fetch upcoming events for a specific brand that are within 48 hours before their `published_on` date 
+ * Fetch upcoming events for a specific brand that are within 48 hours before their `published_on` date
  * and are currently ongoing based on their `length_in_seconds`.
  *
  * This function retrieves events that have a `published_on` date within the last 48 hours or are currently
@@ -303,7 +307,7 @@ export async function fetchNewReleases(brand) {
  * fetchLiveEvent('drumeo')
  *   .then(events => console.log(events))
  *   .catch(error => console.error(error));
- * 
+ *
  */
 export async function fetchLiveEvent(brand) {
     const baseLiveTypes = ["student-review", "student-reviews", "student-focus", "coach-stream", "live", "question-and-answer", "student-review", "boot-camps", "recording", "pack-bundle-lesson"];
@@ -511,7 +515,10 @@ export async function fetchAll(brand, type, {
           break;
   }
 
-    let defaultFields = ['railcontent_id',
+    let defaultFields = [
+        '"id": railcontent_id',
+        'railcontent_id',
+        '"type": _type',
         'title',
         '"image": thumbnail.asset->url',
         'difficulty',

package/test/sanityQueryService.test.js

@@ -1,5 +1,6 @@
+import {initializeService} from '../src/services/config.js';
+
 const {
-    initializeService,
     fetchSongById,
     fetchArtists,
     fetchSongArtistCount,
@@ -21,18 +22,18 @@ const {
     fetchPackAll,
     fetchPackChildren,
     fetchLessonContent
-} = require('../src/index.js');
+} = require('../src/services/sanity.js');
 
 describe('Sanity Queries', function () {
     beforeEach(() => {
-        const config = {
+        const config = { 'sanityConfig':{
             token: process.env.SANITY_API_TOKEN,
             projectId: process.env.SANITY_PROJECT_ID,
             dataset: process.env.SANITY_DATASET,
             useCachedAPI: process.env.SANITY_USE_CACHED_API || true,
             version: '2021-06-07',
             debug: process.env.DEBUG || false
-        };
+        }};
         initializeService(config);
     });