musora-content-services 1.0.76 → 1.0.78

package/src/index.js

@@ -30,12 +30,14 @@ import {
   fetchParentByRailContentId,
   fetchMethodPreviousNextLesson,
   fetchLiveEvent,
+  fetchChallengeOverview,
 } from './services/sanity.js';
 
 import { 
-  fetchCurrentSongComplete, 
+  fetchCompletedState, 
   fetchAllCompletedStates,
-  fetchContentInProgress 
+  fetchContentInProgress,
+  fetchVimeoData,
 } from './services/railcontent.js';
 
 
@@ -65,7 +67,7 @@ export {
     fetchPackAll,
     fetchPackChildren,
     fetchLessonContent,
-    fetchCurrentSongComplete, 
+    fetchCompletedState, 
     fetchAllCompletedStates,
     fetchContentInProgress,
     fetchCourseOverview,
@@ -73,4 +75,6 @@ export {
     fetchParentByRailContentId,
     fetchMethodPreviousNextLesson,
     fetchLiveEvent,
+    fetchChallengeOverview,
+    fetchVimeoData,
 }

package/src/services/railcontent.js

@@ -4,17 +4,18 @@
 
 const { globalConfig } = require('./config');
 
+
 /**
- * Fetches the completion status of a specific song for the current user.
+ * Fetches the completion status of a specific lesson for the current user.
  *
- * @param {string} content_id - The ID of the song content to check.
+ * @param {string} content_id - The ID of the lesson content to check.
  * @returns {Promise<Object|null>} - Returns the completion status object if found, otherwise null.
  * @example
- * fetchCurrentSongComplete('user123', 'song456', 'csrf-token')
+ * fetchCurrentSongComplete('user123', 'lesson456', 'csrf-token')
  *   .then(status => console.log(status))
  *   .catch(error => console.error(error));
  */
-export async function fetchCurrentSongComplete(content_id) {
+export async function fetchCompletedState(content_id) {
     const url = `/content/user_progress/${globalConfig.railcontentConfig.userId}?content_ids[]=${content_id}`;
 
     const headers = {
@@ -26,9 +27,40 @@ export async function fetchCurrentSongComplete(content_id) {
         const response = await fetch(url, { headers });
         const result = await response.json();
 
-        if (result && result[content_id]) {
-            console.log('result', result[content_id]);
-            return result[content_id];  // Return the correct object
+        if (result && result[content_id]) {            return result[content_id];  // Return the correct object
+        } else {
+            return null;  // Handle unexpected structure
+        }
+    } catch (error) {
+        console.error('Fetch error:', error);
+        return null;
+    }
+}
+
+/**
+ * Fetches the vimeo meta-data
+ *
+ * @param {string} vimeo_id - The vimeo id, found in the <document>.video.external_id field for lessons
+ * @returns {Promise<Object|null>} - Returns the
+ * @example
+ * fetchVimeoData('642900215')
+ *   .then(vimeoData => console.log(vimeoData))
+ *   .catch(error => console.error(error));
+ */
+export async function fetchVimeoData(vimeo_id) {
+    const url = `/content/vimeo-data/${vimeo_id}`;
+
+    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) {
+            return result;  // Return the correct object
         } else {
             console.log('Invalid result structure', result);
             return null;  // Handle unexpected structure
@@ -140,4 +172,36 @@ export async function fetchContentInProgress(type="all", brand) {
         console.error('Fetch error:', error);
         return null;
     }
+}
+
+
+/**
+ * Fetches user context data for a specific piece of content.
+ *
+ * @param {int} contentId - The content id.
+ * @returns {Promise<Object|null>} - Returns an object containing user context data if found, otherwise null.
+ * @example
+ * fetchContentPageUserData(406548)
+ *   .then(data => console.log(data))
+ *   .catch(error => console.error(error));
+ */
+export async function fetchContentPageUserData(contentId) {
+    let url = `/content/${contentId}/user_data/${globalConfig.railcontentConfig.userId}`;
+    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('fetchContentPageUserData', result);
+            return result;
+        } else {
+            console.log('result not json');
+        }
+    } catch (error) {
+        console.error('Fetch error:', error);
+        return null;
+    }
 }

package/src/services/sanity.js

@@ -639,6 +639,7 @@ return fetchSanity(query, false);
 export async function fetchMethodChildren(railcontentId) {
   const query = `*[railcontent_id == ${railcontentId}]{
     child_count,
+    "id": railcontent_id,
     "description": ${descriptionField},
     title,
     xp,
@@ -815,8 +816,9 @@ export async function fetchRelatedLessons(railContentId, brand) {
 */
 export async function fetchPackAll(railcontentId) {
   //TODO: Implement getPacks
-  const query = `*[_railcontent_id == ${railcontentId}]{
+  const query = `*[railcontent_id == ${railcontentId}]{
         railcontent_id,
+        "id": railcontent_id,
         title,
         "image": thumbnail.asset->url,
         "artist_name": artist->name,
@@ -886,6 +888,34 @@ export async function fetchPackChildren(railcontentId) {
   return fetchChildren(railcontentId, 'pack');
 }
 
+/**
+ * Fetch the data needed for the Challenge Overview screen.
+ * @param {string} id - The Railcontent ID of the course
+ * @returns {Promise<Object|null>} - The challenge information and lessons or null if not found.
+ *
+ * @example
+ * fetchChallengeOverview('challenge123')
+ *   .then(challenge => console.log(challenge))
+ *   .catch(error => console.error(error));
+ */
+export async function fetchChallengeOverview(id) {
+  // WIP
+  const query = `*[railcontent_id == ${id}]{
+    ${getFieldsForContentType("challenge", true)}
+    "lessons": child[]->{
+      "id": railcontent_id,
+      title,
+      "image": thumbnail.asset->url,
+      "instructors": instructor[]->name,
+      length_in_seconds,
+      difficulty_string,
+      difficulty,
+      "type": _type,
+    }
+  }`;
+  return fetchSanity(query, false);
+}
+
 /**
  * Fetch the data needed for the Course Overview screen.
  * @param {string} id - The Railcontent ID of the course

package/test/sanityQueryService.test.js

@@ -56,7 +56,7 @@ describe('Sanity Queries', function () {
         const artistNames = response.map((x) => x.name);
         expect(artistNames).toContain("Arctic Monkeys");
 
-    });
+    }, 10000);
 
     test('fetchSongArtistCount', async () => {
         const response = await fetchSongArtistCount('drumeo');
@@ -109,6 +109,21 @@ describe('Sanity Queries', function () {
         expect(response.entity[0].id).toBeDefined();
     });
 
+    test('fetchAllInstructorField', async () => {
+        const response = await fetchAll('drumeo', 'quick-tips',{searchTerm: 'Domino Santantonio'});
+        console.log(response);
+        expect(response.entity[0].id).toBeDefined();
+        expect(response.entity[0].instructors).toBeTruthy();
+    });
+
+    test('fetchAllSortField', async () => {
+        const response = await fetchAll('drumeo', 'rhythmic-adventures-of-captain-carson',{});
+        console.log(response);
+        expect(response.entity[0].id).toBeDefined();
+        expect(response.entity[0].sort).toBeDefined();
+    });
+
+
     test('fetchAllChallenges', async () => {
         const response = await fetchAll('drumeo', 'challenge',{});
         console.log(response);