musora-content-services 1.0.27 → 1.0.29

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.29](https://github.com/railroadmedia/musora-content-services/compare/v1.0.28...v1.0.29) (2024-08-14)
+
+### [1.0.28](https://github.com/railroadmedia/musora-content-services/compare/v1.0.27...v1.0.28) (2024-08-14)
+
 ### [1.0.27](https://github.com/railroadmedia/musora-content-services/compare/v1.0.26...v1.0.27) (2024-08-14)
 
 ### [1.0.26](https://github.com/railroadmedia/musora-content-services/compare/v1.0.25...v1.0.26) (2024-08-14)

package/package.json

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

package/src/services/railcontent.js

@@ -18,7 +18,6 @@ const { globalConfig } = require('./config');
  */
 export async function fetchCurrentSongComplete(content_id) {
     const url = `/content/user_progress/${globalConfig.railcontentConfig.userId}?content_ids[]=${content_id}`;
-    console.log('Request URL:', url); // Debugging log
 
     const headers = {
         'Content-Type': 'application/json',
@@ -27,13 +26,14 @@ export async function fetchCurrentSongComplete(content_id) {
 
     try {
         const response = await fetch(url, { headers });
-        if (!response.ok) {
-            throw new Error(`HTTP error! status: ${response.status}`);
-        }
         const result = await response.json();
-        if (result) {
-            console.log('API result:', result);
-            return result[globalConfig.railcontentConfig.userId];
+
+        if (result && result[content_id]) {
+            console.log('result', result[content_id]);
+            return result[content_id];  // Return the correct object
+        } else {
+            console.log('Invalid result structure', result);
+            return null;  // Handle unexpected structure
         }
     } catch (error) {
         console.error('Fetch error:', error);
@@ -41,6 +41,7 @@ export async function fetchCurrentSongComplete(content_id) {
     }
 }
 
+
 /**
  * Fetches the completion status for multiple songs for the current user.
  *

package/src/services/sanity.js

@@ -18,41 +18,26 @@ import { fetchAllCompletedStates, fetchCurrentSongComplete } from './railcontent
 *   .then(song => console.log(song))
 *   .catch(error => console.error(error));
 */
-export async function fetchSongById(songId) {
+export async function fetchSongById(documentId) {
+    const fields = [
+      'title',
+      '"thumbnail_url": thumbnail.asset->url',
+      '"style": genre[0]->name',
+      '"artist": artist->name',
+      'album',
+      'instrumentless',
+      'soundslice',
+      '"resources": resource[]{resource_url, resource_name}',
+    ];
+  
     const query = `
-    *[_type == "song" && railcontent_id == ${songId}]{
-      title,
-      "thumbnail_url": thumbnail.asset->url,
-      "style": genre[0]->name,
-      "artist": artist->name,
-      album,
-      instrumentless,
-      soundslice,
-      railcontent_id,
-      "resources": resource[]{resource_url, resource_name},
-    }`;
-
-    try {
-        const songData = await fetchSanity(query, false);
-        const currentSongComplete = await fetchCurrentSongComplete(songId);
-
-        if (songData && currentSongComplete) {
-            console.log('currentSongComplete', currentSongComplete);
-            songData.completed = currentSongComplete.state !== "not started";
-            songData.progress_percent = currentSongComplete.percent.toString();
-        } else {
-            console.log('no currentSongComplete', currentSongComplete);
-        }
+        *[_type == "song" && railcontent_id == ${documentId}]{
+            ${fields.join(', ')}
+        }`;
 
-        console.log('all songData', songData);
-        return songData;
-    } catch (error) {
-        console.error('Error fetching song by ID:', error);
-        return null;
-    }
+    return fetchSanity(query, true);
 }
 
-
 /**
 * Fetch all artists with lessons available for a specific brand.
 *
@@ -161,32 +146,7 @@ export async function fetchRelatedSongs(brand, songId) {
     }`;
   
     // Fetch the related songs data
-    const relatedSongsData = await fetchSanity(query, true);
-  
-    if (!relatedSongsData || !userId || !token) {
-        return relatedSongsData;
-    }
-  
-    // Extract the IDs of related lessons
-    const relatedLessonIds = relatedSongsData.data.map(lesson => lesson.id);
-  
-    // Fetch the completion states for the related lessons
-    const relatedLessonsCompletionStates = await fetchAllCompletedStates(relatedLessonIds);
-  
-    // Map the completion states to the related lessons
-    relatedSongsData.data = relatedSongsData.data.map(lesson => {
-        const lessonCompletionState = relatedLessonsCompletionStates[lesson.id];
-        if (lessonCompletionState) {
-            return {
-                ...lesson,
-                completed: lessonCompletionState.state !== "not started",
-                lesson_progress: lessonCompletionState.percent.toString()
-            };
-        }
-        return lesson;
-    });
-  
-    return relatedSongsData;
+    return fetchSanity(query, true);
 }
   
 /**