musora-content-services 2.2.0 → 2.3.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "musora-content-services",
-  "version": "2.2.0",
+  "version": "2.3.1",
   "description": "A package for Musoras content services ",
   "main": "src/index.js",
   "type": "module",

package/src/contentTypeConfig.js

@@ -521,6 +521,7 @@ export let contentTypeConfig = {
   returning: {
     fields: [
       `quarter_published`,
+      '"thumbnail": thumbnail.asset->url',
     ]
   }
 }

package/src/index.d.ts

@@ -94,8 +94,11 @@ import {
 	fetchUserChallengeProgress,
 	fetchUserLikes,
 	fetchUserPermissionsData,
+	fetchUserPracticeMeta,
+	fetchUserPractices,
 	likeComment,
 	likePlaylist,
+	logUserPractice,
 	openComment,
 	pinPlaylist,
 	playback,
@@ -179,6 +182,11 @@ import {
 	jumpToContinueContent
 } from './services/sanity.js';
 
+import {
+	blockUser,
+	unblockUser
+} from './services/user/management.js';
+
 import {
 	fetchUserPermissions,
 	reset
@@ -190,7 +198,17 @@ import {
 } from './services/user/sessions.js';
 
 import {
-	getUserActivityStats
+	deletePracticeSession,
+	getPracticeSessions,
+	getRecentActivity,
+	getUserMonthlyStats,
+	getUserPractices,
+	getUserWeeklyStats,
+	recordUserPractice,
+	removeUserPractice,
+	restorePracticeSession,
+	restoreUserPractice,
+	updateUserPractice
 } from './services/userActivity.js';
 
 declare module 'musora-content-services' {
@@ -199,6 +217,7 @@ declare module 'musora-content-services' {
 		assignModeratorToComment,
 		assignmentStatusCompleted,
 		assignmentStatusReset,
+		blockUser,
 		closeComment,
 		contentStatusCompleted,
 		contentStatusReset,
@@ -209,6 +228,7 @@ declare module 'musora-content-services' {
 		deletePlaylist,
 		deletePlaylistItem,
 		deletePlaylistLike,
+		deletePracticeSession,
 		duplicatePlaylist,
 		editComment,
 		fetchAll,
@@ -288,6 +308,8 @@ declare module 'musora-content-services' {
 		fetchUserPermissions,
 		fetchUserPermissionsData,
 		fetchUserPlaylists,
+		fetchUserPracticeMeta,
+		fetchUserPractices,
 		getActiveDiscussions,
 		getAllCompleted,
 		getAllStarted,
@@ -295,17 +317,21 @@ declare module 'musora-content-services' {
 		getContentRows,
 		getLessonContentRows,
 		getNewAndUpcoming,
+		getPracticeSessions,
 		getProgressPercentage,
 		getProgressPercentageByIds,
 		getProgressState,
 		getProgressStateByIds,
 		getRecent,
+		getRecentActivity,
 		getRecommendedForYou,
 		getResumeTimeSeconds,
 		getScheduleContentRows,
 		getSortOrder,
 		getTabResults,
-		getUserActivityStats,
+		getUserMonthlyStats,
+		getUserPractices,
+		getUserWeeklyStats,
 		globalConfig,
 		initializeService,
 		isContentLiked,
@@ -313,6 +339,7 @@ declare module 'musora-content-services' {
 		likeComment,
 		likeContent,
 		likePlaylist,
+		logUserPractice,
 		login,
 		logout,
 		openComment,
@@ -334,17 +361,23 @@ declare module 'musora-content-services' {
 		rankCategories,
 		rankItems,
 		recommendations,
+		recordUserPractice,
 		recordWatchSession,
+		removeUserPractice,
 		replyToComment,
 		reportPlaylist,
 		reset,
+		restorePracticeSession,
+		restoreUserPractice,
 		setStudentViewForUser,
 		unassignModeratorToComment,
+		unblockUser,
 		unlikeComment,
 		unlikeContent,
 		unpinPlaylist,
 		updatePlaylist,
 		updatePlaylistItem,
+		updateUserPractice,
 		verifyLocalDataContext,
 	}
 }

package/src/index.js

@@ -94,8 +94,11 @@ import {
 	fetchUserChallengeProgress,
 	fetchUserLikes,
 	fetchUserPermissionsData,
+	fetchUserPracticeMeta,
+	fetchUserPractices,
 	likeComment,
 	likePlaylist,
+	logUserPractice,
 	openComment,
 	pinPlaylist,
 	playback,
@@ -179,6 +182,11 @@ import {
 	jumpToContinueContent
 } from './services/sanity.js';
 
+import {
+	blockUser,
+	unblockUser
+} from './services/user/management.js';
+
 import {
 	fetchUserPermissions,
 	reset
@@ -190,7 +198,17 @@ import {
 } from './services/user/sessions.js';
 
 import {
-	getUserActivityStats
+	deletePracticeSession,
+	getPracticeSessions,
+	getRecentActivity,
+	getUserMonthlyStats,
+	getUserPractices,
+	getUserWeeklyStats,
+	recordUserPractice,
+	removeUserPractice,
+	restorePracticeSession,
+	restoreUserPractice,
+	updateUserPractice
 } from './services/userActivity.js';
 
 export {
@@ -198,6 +216,7 @@ export {
 	assignModeratorToComment,
 	assignmentStatusCompleted,
 	assignmentStatusReset,
+	blockUser,
 	closeComment,
 	contentStatusCompleted,
 	contentStatusReset,
@@ -208,6 +227,7 @@ export {
 	deletePlaylist,
 	deletePlaylistItem,
 	deletePlaylistLike,
+	deletePracticeSession,
 	duplicatePlaylist,
 	editComment,
 	fetchAll,
@@ -287,6 +307,8 @@ export {
 	fetchUserPermissions,
 	fetchUserPermissionsData,
 	fetchUserPlaylists,
+	fetchUserPracticeMeta,
+	fetchUserPractices,
 	getActiveDiscussions,
 	getAllCompleted,
 	getAllStarted,
@@ -294,17 +316,21 @@ export {
 	getContentRows,
 	getLessonContentRows,
 	getNewAndUpcoming,
+	getPracticeSessions,
 	getProgressPercentage,
 	getProgressPercentageByIds,
 	getProgressState,
 	getProgressStateByIds,
 	getRecent,
+	getRecentActivity,
 	getRecommendedForYou,
 	getResumeTimeSeconds,
 	getScheduleContentRows,
 	getSortOrder,
 	getTabResults,
-	getUserActivityStats,
+	getUserMonthlyStats,
+	getUserPractices,
+	getUserWeeklyStats,
 	globalConfig,
 	initializeService,
 	isContentLiked,
@@ -312,6 +338,7 @@ export {
 	likeComment,
 	likeContent,
 	likePlaylist,
+	logUserPractice,
 	login,
 	logout,
 	openComment,
@@ -333,16 +360,22 @@ export {
 	rankCategories,
 	rankItems,
 	recommendations,
+	recordUserPractice,
 	recordWatchSession,
+	removeUserPractice,
 	replyToComment,
 	reportPlaylist,
 	reset,
+	restorePracticeSession,
+	restoreUserPractice,
 	setStudentViewForUser,
 	unassignModeratorToComment,
+	unblockUser,
 	unlikeComment,
 	unlikeContent,
 	unpinPlaylist,
 	updatePlaylist,
 	updatePlaylistItem,
+	updateUserPractice,
 	verifyLocalDataContext,
 };

package/src/services/dataContext.js

@@ -10,6 +10,7 @@ const excludeFromGeneratedIndex = []
 //These constants need to match MWP UserDataVersionKeyEnum enum
 export const ContentLikesVersionKey = 0
 export const ContentProgressVersionKey = 1
+export const UserActivityVersionKey = 2
 
 let cache = null
 
@@ -101,8 +102,10 @@ export class DataContext {
 
   clearCache() {
     this.clearContext()
-    cache.removeItem(this.localStorageKey)
-    cache.removeItem(this.localStorageLastUpdatedKey)
+    if (cache) {
+      cache.removeItem(this.localStorageKey)
+      cache.removeItem(this.localStorageLastUpdatedKey)
+    }
   }
 
   clearContext() {
@@ -134,4 +137,14 @@ export class DataContext {
   version() {
     return this.context?.version ?? -1
   }
+  async updateLocal(localUpdateFunction) {
+    await this.ensureLocalContextLoaded()
+    if (this.context) {
+      const res = await localUpdateFunction(this.context)
+      if (this.context) this.context.version++
+      let data = JSON.stringify(this.context)
+      cache.setItem(this.localStorageKey, data)
+      this.setLastUpdatedTime()
+    }
+  }
 }

package/src/services/railcontent.js

@@ -1176,6 +1176,66 @@ export async function editComment(commentId, comment) {
   return await patchDataHandler(url, data)
 }
 
+export async function fetchUserPractices(currentVersion) {
+  const url = `/api/user/practices/v1/practices`
+  const response =  await fetchDataHandler(url, currentVersion)
+  const { data, version } = response;
+  const userPractices = data;
+
+  let formattedPractices = userPractices.reduce((acc, practice) => {
+    // Initialize the array if the day does not exist
+    if (!acc[practice.day]) {
+      acc[practice.day] = [];
+    }
+
+    // Push the practice entry into the array
+    acc[practice.day].push({ id:practice.id, duration_seconds: practice.duration_seconds });
+
+    return acc;
+  }, {});
+
+  let json = {
+    data: {
+      practices: formattedPractices
+    },
+    version: version
+  };
+
+  return json;
+}
+
+export async function logUserPractice(practiceDetails) {
+  const url = `/api/user/practices/v1/practices`
+  return await fetchHandler(url, 'POST', null, practiceDetails)
+}
+export async function fetchUserPracticeMeta(practiceIds) {
+  if(practiceIds.length == 0)
+  {
+    return [];
+  }
+  let idsString = '';
+  if (practiceIds && practiceIds.length > 0) {
+    idsString = '?';
+    practiceIds.forEach((id, index) => {
+      idsString += `practice_ids[]=${id}${index < practiceIds.length - 1 ? '&' : ''}`;
+    });
+  }
+  const url = `/api/user/practices/v1/practices${idsString}`
+  return await fetchHandler(url, 'GET', null)
+}
+
+function fetchAbsolute(url, params) {
+  if (globalConfig.railcontentConfig.authToken) {
+    params.headers['Authorization'] = `Bearer ${globalConfig.railcontentConfig.authToken}`
+  }
+
+  if (globalConfig.railcontentConfig.baseUrl) {
+    if (url.startsWith('/')) {
+      return fetch(globalConfig.railcontentConfig.baseUrl + url, params)
+    }
+  }
+  return fetch(url, params)
+}
 export async function fetchHandler(url, method = 'get', dataVersion = null, body = null) {
   return fetchJSONHandler(
     url,

package/src/services/sanity.js

@@ -353,6 +353,7 @@ export async function fetchNewReleases(
      "id": railcontent_id,
       title,
       "image": thumbnail.asset->url,
+      "thumbnail": thumbnail.asset->url,
       ${artistOrInstructorName()},
       "artists": instructor[]->name,
       difficulty,
@@ -396,6 +397,7 @@ export async function fetchUpcomingEvents(brand, { page = 1, limit = 10 } = {})
         "id": railcontent_id,
         title,
         "image": thumbnail.asset->url,
+        "thumbnail": thumbnail.asset->url,
         ${artistOrInstructorName()},
         "artists": instructor[]->name,
         difficulty,
@@ -444,6 +446,7 @@ export async function fetchScheduledReleases(brand, { page = 1, limit = 10 }) {
       "id": railcontent_id,
       title,
       "image": thumbnail.asset->url,
+      "thumbnail": thumbnail.asset->url,
       ${artistOrInstructorName()},
       "artists": instructor[]->name,
       difficulty,
@@ -1071,7 +1074,7 @@ export async function fetchMethod(brand, slug) {
         child_count,
         difficulty,
         difficulty_string,
-        "thumbnail_url": thumbnail.asset->url,
+        "thumbnail": thumbnail.asset->url,
         "instructor": instructor[]->{name},
         title,
         "type": _type,
@@ -1097,7 +1100,7 @@ export async function fetchMethodChildren(railcontentId) {
     "child_count":coalesce(count(child[${childrenFilter}]->), 0),
     "id": railcontent_id,
     "description": ${descriptionField},
-    "thumbnail_url": thumbnail.asset->url,
+    "thumbnail": thumbnail.asset->url,
     title,
     xp,
     total_xp,
@@ -1261,7 +1264,7 @@ export async function fetchLessonContent(railContentId) {
           railcontent_id,
           "id":railcontent_id,
           slug, artist->,
-          "thumbnail_url":thumbnail.asset->url,
+          "thumbnail":thumbnail.asset->url,
           "url": web_url_path,
           soundslice_slug,
           "description": description[0].children[0].text,
@@ -1406,7 +1409,7 @@ export async function fetchRelatedLessons(railContentId, brand) {
   ).buildFilter()
   const filterNeighbouringSiblings = await new FilterBuilder(`references(^._id)`).buildFilter()
   const childrenFilter = await new FilterBuilder(``, { isChildrenFilter: true }).buildFilter()
-  const queryFields = `_id, "id":railcontent_id, published_on, "instructor": instructor[0]->name, title, "thumbnail_url":thumbnail.asset->url, length_in_seconds, web_url_path, "type": _type, difficulty, difficulty_string, railcontent_id, artist->,"permission_id": permission[]->railcontent_id,_type, "genre": genre[]->name`
+  const queryFields = `_id, "id":railcontent_id, published_on, "instructor": instructor[0]->name, title, "thumbnail":thumbnail.asset->url, length_in_seconds, web_url_path, "type": _type, difficulty, difficulty_string, railcontent_id, artist->,"permission_id": permission[]->railcontent_id,_type, "genre": genre[]->name`
   const queryFieldsWithSort = queryFields + ', sort'
   const query = `*[railcontent_id == ${railContentId} && brand == "${brand}" && (!defined(permission) || references(*[_type=='permission']._id))]{
    _type, parent_type, railcontent_id,
@@ -1697,11 +1700,11 @@ export async function fetchArtistLessons(
   const query = `{
     "entity":
       *[_type == 'artist' && name == '${name}']
-        {'type': _type, name, 'thumbnail_url':thumbnail_url.asset->url,
+        {'type': _type, name, 'thumbnail':thumbnail_url.asset->url,
         'lessons_count': count(*[${addType} brand == '${brand}' && references(^._id)]),
         'lessons': *[${addType} brand == '${brand}' && references(^._id) && (status in ['published'] || (status == 'scheduled' && defined(published_on) && published_on >= '${now}')) ${searchFilter} ${includedFieldsFilter} ${progressFilter}]{${fieldsString}}
       [${start}...${end}]}
-      |order(${sortOrder})
+      |order(${sortOrder})f
   }`
   return fetchSanity(query, true)
 }
@@ -1751,7 +1754,7 @@ export async function fetchGenreLessons(
   const query = `{
     "entity":
       *[_type == 'genre' && name == '${name}']
-        {'type': _type, name, 'thumbnail_url':thumbnail_url.asset->url,
+        {'type': _type, name, 'thumbnail':thumbnail_url.asset->url,
         'lessons_count': count(*[${addType} brand == '${brand}' && references(^._id)]),
         'lessons': *[${addType} brand == '${brand}' && references(^._id) && (status in ['published'] || (status == 'scheduled' && defined(published_on) && published_on >= '${now}')) ${searchFilter} ${includedFieldsFilter} ${progressFilter}]{${fieldsString}}
       [${start}...${end}]}