musora-content-services 2.7.2 → 2.8.0

package/src/contentTypeConfig.js

@@ -139,8 +139,8 @@ export const singleLessonTypes = ['quick-tips', 'rudiment', 'coach-lessons'];
 export const practiceAlongsLessonTypes = ['workout', 'boot-camp','challenges'];
 export const performancesLessonTypes = ['performance','solo','drum-fest-international-2022'];
 export const documentariesLessonTypes = ['tama','sonor','history-of-electronic-drums','paiste-cymbals'];
-export const liveArchivesLessonTypes = ['podcast', 'coach-stream', 'live-streams'];
-export const studentArchivesLessonTypes = ['student-review', 'question-and-answer', 'student-focus','student-collaboration'];
+export const liveArchivesLessonTypes = ['podcast', 'coach-stream', 'question-and-answer', 'live-streams'];
+export const studentArchivesLessonTypes = ['student-review', 'student-focus','student-collaboration'];
 export const tutorialsLessonTypes = ['song-tutorial'];
 export const transcriptionsLessonTypes = ['song'];
 export const playAlongLessonTypes = ['play-along'];
@@ -181,19 +181,24 @@ export const lessonTypesMapping = {
 };
 
 export const progressTypesMapping = {
-  'lesson': [...singleLessonTypes,...practiceAlongsLessonTypes, ...liveArchivesLessonTypes, ...performancesLessonTypes, ...studentArchivesLessonTypes, ...documentariesLessonTypes],
+  'lesson': [...singleLessonTypes,...practiceAlongsLessonTypes, ...liveArchivesLessonTypes, ...performancesLessonTypes, ...studentArchivesLessonTypes, ...documentariesLessonTypes, 'live'],
   'course': ['course'],
   'show': showsLessonTypes,
   'song tutorial': tutorialsLessonTypes,
-  'transcription': transcriptionsLessonTypes,
-  'tabs': transcriptionsLessonTypes,
-  'sheet music': transcriptionsLessonTypes,
+  'songs': transcriptionsLessonTypes,
   'play-along': playAlongLessonTypes,
   'guided course': ['challenge'],
   'pack': ['pack', 'semester-pack'],
   'method': ['learning-path']
 };
 
+export const songs = {
+  drumeo: 'transcription',
+  guitareo: 'tab',
+  pianote: 'sheet music',
+  singeo: 'sheet music',
+}
+
 export const filterTypes = {
   lessons: [...individualLessonsTypes, ...collectionLessonTypes],
   songs: [...tutorialsLessonTypes, ...transcriptionsLessonTypes, ...playAlongLessonTypes, 'jam-track'],
@@ -207,7 +212,7 @@ export const recentTypes = {
 
 export let contentTypeConfig = {
   'progress-tracker': {
-    fields: ['"parent_content_data": parent_content_data[].id','"lessons": child[]->{"id": railcontent_id, "slug":slug.current, "brand":brand, "type": _type, "lessons": child[]->{"id":railcontent_id, "slug":slug.current,  "type": _type,"brand":brand}}'],
+    fields: ['"parent_content_data": parent_content_data[].id','"badge" : badge.asset->url','"lessons": child[]->{"id": railcontent_id, "slug":slug.current, "brand":brand, "type": _type, "lessons": child[]->{"id":railcontent_id, "slug":slug.current,  "type": _type,"brand":brand}}'],
   },
   song: {
     fields: ['album', 'soundslice', 'instrumentless', `"resources": ${resourcesField}`],

package/src/index.d.ts

@@ -68,6 +68,7 @@ import {
 import {
 	convertToTimeZone,
 	getMonday,
+	getTimeRemainingUntilLocal,
 	getWeekNumber,
 	isNextDay,
 	isSameDate
@@ -221,7 +222,10 @@ import {
 
 import {
 	blockUser,
-	unblockUser
+	deletePicture,
+	unblockUser,
+	uploadPicture,
+	uploadPictureFromS3
 } from './services/user/management.js';
 
 import {
@@ -282,6 +286,7 @@ declare module 'musora-content-services' {
 		createPracticeNotes,
 		deleteComment,
 		deleteItemsFromPlaylist,
+		deletePicture,
 		deletePlaylist,
 		deletePracticeSession,
 		deleteUserActivity,
@@ -396,6 +401,7 @@ declare module 'musora-content-services' {
 		getScheduleContentRows,
 		getSortOrder,
 		getTabResults,
+		getTimeRemainingUntilLocal,
 		getUserMonthlyStats,
 		getUserPractices,
 		getUserWeeklyStats,
@@ -459,6 +465,8 @@ declare module 'musora-content-services' {
 		updatePlaylist,
 		updatePracticeNotes,
 		updateUserPractice,
+		uploadPicture,
+		uploadPictureFromS3,
 		verifyImageSRC,
 		verifyLocalDataContext,
 	}

package/src/index.js

@@ -68,6 +68,7 @@ import {
 import {
 	convertToTimeZone,
 	getMonday,
+	getTimeRemainingUntilLocal,
 	getWeekNumber,
 	isNextDay,
 	isSameDate
@@ -221,7 +222,10 @@ import {
 
 import {
 	blockUser,
-	unblockUser
+	deletePicture,
+	unblockUser,
+	uploadPicture,
+	uploadPictureFromS3
 } from './services/user/management.js';
 
 import {
@@ -281,6 +285,7 @@ export {
 	createPracticeNotes,
 	deleteComment,
 	deleteItemsFromPlaylist,
+	deletePicture,
 	deletePlaylist,
 	deletePracticeSession,
 	deleteUserActivity,
@@ -395,6 +400,7 @@ export {
 	getScheduleContentRows,
 	getSortOrder,
 	getTabResults,
+	getTimeRemainingUntilLocal,
 	getUserMonthlyStats,
 	getUserPractices,
 	getUserWeeklyStats,
@@ -458,6 +464,8 @@ export {
 	updatePlaylist,
 	updatePracticeNotes,
 	updateUserPractice,
+	uploadPicture,
+	uploadPictureFromS3,
 	verifyImageSRC,
 	verifyLocalDataContext,
 };

package/src/lib/httpHelper.js

@@ -1,44 +1,84 @@
 import { globalConfig } from '../services/config.js'
 
-export async function fetchJSONHandler(url, token, baseUrl, method = 'get', dataVersion = null, body = null) {
-  let headers = {
+export async function fetchJSONHandler(
+  url,
+  token,
+  baseUrl,
+  method = 'get',
+  dataVersion = null,
+  body = null
+) {
+  const headers = {
     'Content-Type': 'application/json',
     Accept: 'application/json',
     'X-CSRF-TOKEN': token,
   }
 
+  if (body) {
+    body = JSON.stringify(body)
+  }
+
+  try {
+    const response = await fetchHandler(url, token, baseUrl, method, headers, dataVersion, body)
+
+    if (response.ok) {
+      const contentType = response.headers.get('content-type')
+      if (
+        contentType &&
+        contentType.indexOf('application/json') !== -1 &&
+        response.status !== 204
+      ) {
+        return await response.json()
+      } else {
+        return await response.text()
+      }
+    } else {
+      console.error(`Fetch error: ${method} ${url} ${response.status} ${response.statusText}`)
+      console.log(response)
+    }
+  } catch (error) {
+    console.error('Fetch error:', error)
+  }
+  return null
+}
+
+export async function fetchHandler(
+  url,
+  token,
+  baseUrl,
+  method = 'get',
+  headers = {},
+  dataVersion = null,
+  body = null
+) {
+  let reqHeaders = {
+    ...headers,
+    Accept: 'application/json',
+    'X-CSRF-TOKEN': token,
+  }
+
   if (!globalConfig.isMA) {
     const params = new URLSearchParams(window.location.search)
     if (params.get('testNow')) {
-      headers['testNow'] = params.get('testNow')
+      reqHeaders['testNow'] = params.get('testNow')
     }
     if (params.get('timezone')) {
-      headers['M-Client-Timezone'] = params.get('timezone')
+      reqHeaders['M-Client-Timezone'] = params.get('timezone')
     }
   }
 
-  if (globalConfig.localTimezoneString) headers['M-Client-Timezone'] = globalConfig.localTimezoneString
-  if (dataVersion) headers['Data-Version'] = dataVersion
+  if (globalConfig.localTimezoneString)
+    reqHeaders['M-Client-Timezone'] = globalConfig.localTimezoneString
+  if (dataVersion) reqHeaders['Data-Version'] = dataVersion
   const options = {
     method,
-    headers,
+    headers: reqHeaders,
   }
-  if (body) options.body = JSON.stringify(body)
+  if (body) options.body = body
   if (token) options.headers['Authorization'] = `Bearer ${token}`
   if (baseUrl && url.startsWith('/')) url = baseUrl + url
   try {
-    const response = await fetch(url, options)
-    if (response.ok) {
-      const contentType = response.headers.get("content-type");
-      if (contentType && contentType.indexOf("application/json") !== -1) {
-        return await response.json()
-      } else {
-        return await response.text()
-      }
-    } else {
-      console.error(`Fetch error: ${method} ${url} ${response.status} ${response.statusText}`)
-      console.log(response)
-    }
+    return fetch(url, options)
   } catch (error) {
     console.error('Fetch error:', error)
   }

package/src/services/dateUtils.js

@@ -53,3 +53,26 @@ export function isNextDay(prev, current) {
   );
 }
 
+export function getTimeRemainingUntilLocal(targetUtcIsoString) {
+  const targetUTC = new Date(targetUtcIsoString);
+  if (isNaN(targetUTC.getTime())) {
+    return "00:00:00";
+  }
+
+  const now = new Date();
+  const diff = targetUTC.getTime() - now.getTime();
+
+  if (diff <= 0) {
+    return "00:00:00";
+  }
+
+  const totalSeconds = Math.floor(diff / 1000);
+  const hours = String(Math.floor(totalSeconds / 3600)).padStart(2, '0');
+  const minutes = String(Math.floor((totalSeconds % 3600) / 60)).padStart(2, '0');
+  const seconds = String(totalSeconds % 60).padStart(2, '0');
+
+  return `${hours}:${minutes}:${seconds}`;
+}
+
+
+

package/src/services/user/management.js

@@ -1,14 +1,9 @@
 /**
  * @module UserManagement
  */
-import { fetchHandler } from '../railcontent.js'
-
-/**
- * Exported functions that are excluded from index generation.
- *
- * @type {string[]}
- */
-const excludeFromGeneratedIndex = []
+import { fetchHandler as railcontentFetchHandler } from '../railcontent.js'
+import { fetchHandler, fetchJSONHandler } from '../../lib/httpHelper.js'
+import { globalConfig } from '../config.js'
 
 const baseUrl = `/api/user-management-system`
 
@@ -19,7 +14,7 @@ const baseUrl = `/api/user-management-system`
  */
 export async function blockUser(userId) {
   const url = `${baseUrl}/v1/block/${userId}`
-  return fetchHandler(url, 'post')
+  return railcontentFetchHandler(url, 'post')
 }
 
 /**
@@ -29,5 +24,83 @@ export async function blockUser(userId) {
  */
 export async function unblockUser(userId) {
   const url = `${baseUrl}/v1/unblock/${userId}`
-  return fetchHandler(url, 'post')
+  return railcontentFetchHandler(url, 'post')
+}
+
+/**
+ * Upload a picture to the server
+ * @param {string} fieldKey
+ * @param {File} file
+ * @returns {Promise<any|string|null>}
+ */
+export async function uploadPicture(fieldKey, file) {
+  const formData = new FormData()
+  formData.append('file', file)
+  formData.append('fieldKey', fieldKey)
+  const apiUrl = `${baseUrl}/v1/picture`
+
+  const response = await fetchHandler(
+    apiUrl,
+    globalConfig.sessionConfig.token,
+    globalConfig.baseUrl,
+    'POST',
+    null,
+    null,
+    formData
+  )
+
+  if (!response.ok) {
+    const problemDetails = await response.json()
+    console.log('Error uploading picture:', problemDetails.detail)
+    throw new Error(`Upload failed: ${problemDetails.detail}`)
+  }
+
+  const { url } = await response.json()
+  console.log('Picture uploaded successfully:', url)
+
+  return url
+}
+
+/**
+ * Saves a picture uploaded to S3
+ * @param {string} fieldKey
+ * @param {string} s3_bucket_path
+ * @returns {Promise<any|string|null>}
+ */
+export async function uploadPictureFromS3(fieldKey, s3_bucket_path) {
+  const apiUrl = `${baseUrl}/v1/picture/s3`
+
+  const response = await fetchJSONHandler(
+    apiUrl,
+    globalConfig.sessionConfig.token,
+    globalConfig.baseUrl,
+    'POST',
+    null,
+    {
+      fieldKey,
+      s3_bucket_path,
+    }
+  )
+
+  if (!response.ok) {
+    const problemDetails = await response.json()
+    console.log('Error uploading picture:', problemDetails.detail)
+    throw new Error(`Upload failed: ${problemDetails.detail}`)
+  }
+
+  const { url } = await response.json()
+
+  return url
+}
+
+/**
+ * @param {string} pictureUrl
+ * @returns {Promise<any>}
+ */
+export async function deletePicture(pictureUrl) {
+  const apiUrl = `${baseUrl}/v1/picture`
+
+  fetchJSONHandler(apiUrl, globalConfig.sessionConfig.token, globalConfig.baseUrl, 'DELETE', null, {
+    picture_url: pictureUrl,
+  })
 }