musora-content-services 2.74.1 → 2.76.0

package/src/services/contentAggregator.js

@@ -1,12 +1,14 @@
 import {
-  getLastInteractedOf, getNavigateTo,
-  getNextLesson, getProgressDateByIds,
+  getLastInteractedOf,
+  getNavigateTo,
+  getNextLesson,
+  getProgressDateByIds,
   getProgressPercentageByIds,
   getProgressStateByIds,
-  getResumeTimeSecondsByIds
-} from "./contentProgress"
-import {isContentLikedByIds} from "./contentLikes"
-import {fetchLastInteractedChild, fetchLikeCount} from "./railcontent"
+  getResumeTimeSecondsByIds,
+} from './contentProgress'
+import { isContentLikedByIds } from './contentLikes'
+import { fetchLastInteractedChild, fetchLikeCount } from './railcontent'
 
 /**
  * Combine sanity data with BE contextual data.
@@ -55,8 +57,9 @@ import {fetchLastInteractedChild, fetchLikeCount} from "./railcontent"
  *
  */
 
-export async function addContextToContent(dataPromise, ...dataArgs)
-{
+// need to add method support.
+// this means returning collection_type and collection_id
+export async function addContextToContent(dataPromise, ...dataArgs) {
   const lastArg = dataArgs[dataArgs.length - 1]
   const options = typeof lastArg === 'object' && !Array.isArray(lastArg) ? lastArg : {}
 
@@ -78,18 +81,27 @@ export async function addContextToContent(dataPromise, ...dataArgs)
 
   let data = await dataPromise(...dataParam)
   const isDataAnArray = Array.isArray(data)
-  if(isDataAnArray && data.length === 0) return data
-  if(!data) return false
+  if (isDataAnArray && data.length === 0) return data
+  if (!data) return false
 
   const items = extractItemsFromData(data, dataField, isDataAnArray, dataField_includeParent) ?? []
-  const ids = items.map(item => item?.id).filter(Boolean)
-  if(ids.length === 0) return data
+  const ids = items.map((item) => item?.id).filter(Boolean)
+  if (ids.length === 0) return data
 
-  const [progressData, isLikedData, resumeTimeData, lastInteractedChildData, nextLessonData, navigateToData] = await Promise.all([
-    addProgressPercentage || addProgressStatus || addProgressTimestamp ? getProgressDateByIds(ids) : Promise.resolve(null),
+  const [
+    progressData,
+    isLikedData,
+    resumeTimeData,
+    lastInteractedChildData,
+    nextLessonData,
+    navigateToData,
+  ] = await Promise.all([
+    addProgressPercentage || addProgressStatus || addProgressTimestamp
+      ? getProgressDateByIds(ids)
+      : Promise.resolve(null),
     addIsLiked ? isContentLikedByIds(ids) : Promise.resolve(null),
     addResumeTimeSeconds ? getResumeTimeSecondsByIds(ids) : Promise.resolve(null),
-    addLastInteractedChild ? fetchLastInteractedChild(ids)  : Promise.resolve(null),
+    addLastInteractedChild ? fetchLastInteractedChild(ids) : Promise.resolve(null),
     addNextLesson ? getNextLesson(items) : Promise.resolve(null),
     addNavigateTo ? getNavigateTo(items) : Promise.resolve(null),
   ])
@@ -103,33 +115,40 @@ export async function addContextToContent(dataPromise, ...dataArgs)
     ...(addLikeCount && ids.length === 1 ? { likeCount: await fetchLikeCount(item.id) } : {}),
     ...(addResumeTimeSeconds ? { resumeTime: resumeTimeData?.[item.id] } : {}),
     ...(addLastInteractedChild ? { lastInteractedChild: lastInteractedChildData?.[item.id] } : {}),
-    ...(addNextLesson ? { nextLesson: nextLessonData?.[item.id] } : {}),
+    ...(addNextLesson
+      ? {
+          nextLesson: nextLessonData?.[item.id], //deprecated
+          next_lesson_id: nextLessonData?.[item.id],
+          next_lesson: item?.children?.find((child) => child.id === nextLessonData?.[item.id]),
+        }
+      : {}),
     ...(addNavigateTo ? { navigateTo: navigateToData?.[item.id] } : {}),
   })
 
   return await processItems(data, addContext, dataField, isDataAnArray, dataField_includeParent)
 }
 
-export async function getNavigateToForPlaylists(data, {dataField = null} = {} )
-{
+export async function getNavigateToForPlaylists(data, { dataField = null } = {}) {
   let playlists = extractItemsFromData(data, dataField, false, false)
   let allIds = []
-  playlists.forEach((playlist) => allIds = [...allIds, ...playlist.items.map(a => a.content_id)])
-  const progressOnItems = await getProgressStateByIds(allIds);
+  playlists.forEach(
+    (playlist) => (allIds = [...allIds, ...playlist.items.map((a) => a.content_id)])
+  )
+  const progressOnItems = await getProgressStateByIds(allIds)
   const addContext = async (playlist) => {
-    const allItemsCompleted = playlist.items.every(i => {
-      const itemId = i.content_id;
-      const progress = progressOnItems[itemId];
-      return progress && progress === 'completed';
-    });
-    let nextItem = playlist.items[0] ?? null;
+    const allItemsCompleted = playlist.items.every((i) => {
+      const itemId = i.content_id
+      const progress = progressOnItems[itemId]
+      return progress && progress === 'completed'
+    })
+    let nextItem = playlist.items[0] ?? null
     if (!allItemsCompleted) {
-      const lastItemProgress = progressOnItems[playlist.last_engaged_on];
-      const index = playlist.items.findIndex(i => i.content_id === playlist.last_engaged_on);
+      const lastItemProgress = progressOnItems[playlist.last_engaged_on]
+      const index = playlist.items.findIndex((i) => i.content_id === playlist.last_engaged_on)
       if (lastItemProgress === 'completed') {
-        nextItem = playlist.items[index + 1] ?? nextItem;
+        nextItem = playlist.items[index + 1] ?? nextItem
       } else {
-        nextItem = playlist.items[index] ?? nextItem;
+        nextItem = playlist.items[index] ?? nextItem
       }
     }
     playlist.navigateTo = {
@@ -138,11 +157,10 @@ export async function getNavigateToForPlaylists(data, {dataField = null} = {} )
     }
     return playlist
   }
-  return await processItems(data, addContext, dataField, false, false,)
+  return await processItems(data, addContext, dataField, false, false)
 }
 
-function extractItemsFromData(data, dataField, isParentArray, includeParent)
-{
+function extractItemsFromData(data, dataField, isParentArray, includeParent) {
   let items = []
   if (dataField) {
     if (isParentArray) {
@@ -162,18 +180,17 @@ function extractItemsFromData(data, dataField, isParentArray, includeParent)
       }
     }
   } else if (Array.isArray(data)) {
-    items = data;
+    items = data
   } else if (data?.id) {
     items = [data]
   }
   return items
 }
 
-async function processItems(data, addContext, dataField, isParentArray, includeParent)
-{
+async function processItems(data, addContext, dataField, isParentArray, includeParent) {
   if (dataField) {
     if (isParentArray) {
-      for(let parent of data) {
+      for (let parent of data) {
         parent[dataField] = Array.isArray(parent[dataField])
           ? await Promise.all(parent[dataField].map(addContext))
           : await addContext(parent[dataField])
@@ -184,16 +201,10 @@ async function processItems(data, addContext, dataField, isParentArray, includeP
         : await addContext(data[dataField])
     }
     if (includeParent) {
-      data = isParentArray
-        ? await Promise.all(data.map(addContext))
-        : await addContext(data)
+      data = isParentArray ? await Promise.all(data.map(addContext)) : await addContext(data)
     }
     return data
   } else {
-    return Array.isArray(data)
-      ? await Promise.all(data.map(addContext))
-      : await addContext(data)
+    return Array.isArray(data) ? await Promise.all(data.map(addContext)) : await addContext(data)
   }
 }
-
-

package/src/services/contentProgress.js

@@ -117,10 +117,7 @@ export async function getNavigateTo(data) {
         const firstChild = content.children[0]
         let lastInteractedChildNavToData = await getNavigateTo([firstChild])
         lastInteractedChildNavToData = lastInteractedChildNavToData[firstChild.id] ?? null
-        navigateToData[content.id] = buildNavigateTo(
-          firstChild,
-          lastInteractedChildNavToData
-        )
+        navigateToData[content.id] = buildNavigateTo(firstChild, lastInteractedChildNavToData)
       } else {
         const childrenStates = await getProgressStateByIds(childrenIds)
         const lastInteracted = await getLastInteractedOf(childrenIds)
@@ -400,7 +397,12 @@ function startStatusInLocalContext(localContext, contentId, hierarchy) {
   setStartedOrCompletedStatusInLocalContext(localContext, contentId, false, hierarchy)
 }
 
-function setStartedOrCompletedStatusInLocalContext(localContext, contentId, isCompleted, hierarchy) {
+function setStartedOrCompletedStatusInLocalContext(
+  localContext,
+  contentId,
+  isCompleted,
+  hierarchy
+) {
   let data = localContext.data[contentId] ?? {}
   data[DATA_KEY_PROGRESS] = isCompleted ? 100 : 0
   data[DATA_KEY_STATUS] = isCompleted ? STATE_COMPLETED : STATE_STARTED

package/src/services/dateUtils.js

@@ -1,14 +1,14 @@
 // dateUtils.js
-import dayjs from "dayjs";
-import utc from "dayjs/plugin/utc";
-import timezone from "dayjs/plugin/timezone";
+import dayjs from 'dayjs'
+import utc from 'dayjs/plugin/utc'
+import timezone from 'dayjs/plugin/timezone'
 import isSameOrAfter from 'dayjs/plugin/isSameOrAfter'
-import isoWeek from 'dayjs/plugin/isoWeek';
+import isoWeek from 'dayjs/plugin/isoWeek'
 import isBetween from 'dayjs/plugin/isBetween'
 import isSameOrBefore from 'dayjs/plugin/isSameOrBefore'
 
-dayjs.extend(utc);
-dayjs.extend(timezone);
+dayjs.extend(utc)
+dayjs.extend(timezone)
 dayjs.extend(isSameOrAfter)
 dayjs.extend(isoWeek)
 dayjs.extend(isBetween)
@@ -19,7 +19,7 @@ export function toDayjs(date, timeZone = 'UTC') {
 }
 
 export function convertToTimeZone(date, timeZone) {
-  return dayjs(date).tz(timeZone).format('YYYY-MM-DD');
+  return dayjs(date).tz(timeZone).format('YYYY-MM-DD')
 }
 
 export function getMonday(date, timeZone = Intl.DateTimeFormat().resolvedOptions().timeZone) {
@@ -42,32 +42,35 @@ export function isNextDay(date1, date2) {
   const d2 = dayjs(date2).startOf('day')
   return d2.diff(d1, 'day') === 1
 }
-export function getTimeRemainingUntilLocal(targetUtcIsoString, {withTotalSeconds} = {}) {
-  const targetUTC = new Date(targetUtcIsoString);
+export function getTimeRemainingUntilLocal(targetUtcIsoString, { withTotalSeconds } = {}) {
+  const targetUTC = new Date(targetUtcIsoString)
   if (isNaN(targetUTC.getTime())) {
-    return "00:00:00";
+    return '00:00:00'
   }
 
-  const now = new Date();
-  const diff = targetUTC.getTime() - now.getTime();
+  const now = new Date()
+  const diff = targetUTC.getTime() - now.getTime()
 
   if (diff <= 0) {
-    return "00:00:00";
+    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');
-  if(withTotalSeconds) {
+  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')
+  if (withTotalSeconds) {
     return {
       totalSeconds,
-      formatted: `${hours}:${minutes}:${seconds}`
+      formatted: `${hours}:${minutes}:${seconds}`,
     }
   }
 
-  return `${hours}:${minutes}:${seconds}`;
+  return `${hours}:${minutes}:${seconds}`
 }
 
-
-
+export function getToday() {
+  const now = dayjs()
+  const timeZone = Intl.DateTimeFormat().resolvedOptions().timeZone
+  return dayjs().tz(timeZone).startOf('day')
+}

package/src/services/progress-row/method-card.js

@@ -0,0 +1,110 @@
+/**
+ * @module ProgressRow
+ */
+
+import {
+  getDailySession,
+  getActivePath,
+  resetAllLearningPaths,
+  startLearningPath,
+  fetchLearningPathLessons,
+} from '../content-org/learning-paths'
+import { getToday } from '../dateUtils.js'
+import { fetchByRailContentId, fetchByRailContentIds, fetchMethodV2IntroVideo } from '../sanity'
+import { addContextToContent } from '../contentAggregator.js'
+import { getProgressState } from '../contentProgress'
+
+export async function getMethodCard(brand) {
+  const introVideo = await fetchMethodV2IntroVideo(brand)
+  const introVideoProgressState = await getProgressState(introVideo.id)
+  //resetAllLearningPaths()
+  if (introVideoProgressState != 'completed') {
+    //startLearningPath('drumeo', 422533)
+    const timestamp = Math.floor(Date.now() / 1000)
+    return {
+      id: 0, // method card has no id
+      type: 'method',
+      header: 'Method',
+      body: {
+        thumbnail: introVideo.thumbnail,
+        title: introVideo.title,
+        subtitle: `${introVideo.difficulty_string} • ${introVideo.artist_name}`,
+      },
+      cta: {
+        text: 'Get Started',
+        action: getMethodActionCTA(introVideo),
+      },
+      progressTimestamp: timestamp,
+    }
+  } else {
+    //TODO: Optimize loading of dailySessions/Path, should not need multiple requests
+    const activeLearningPath = await getActivePath(brand)
+    const learningPath = await fetchLearningPathLessons(
+      activeLearningPath.active_learning_path_id,
+      brand,
+      getToday()
+    )
+
+    const allCompleted = learningPath?.todays_lessons.every(
+      (lesson) => lesson.progressStatus === 'completed'
+    )
+    const anyCompleted = learningPath?.todays_lessons.some(
+      (lesson) => lesson.progressStatus === 'completed'
+    )
+    const noneCompleted = learningPath?.todays_lessons.every(
+      (lesson) => lesson.progressStatus !== 'completed'
+    )
+
+    const nextIncompleteLesson = learningPath?.todays_lessons.find(
+      (lesson) => lesson.progressStatus !== 'completed'
+    )
+    let ctaText,
+      action,
+      nextLesson = null
+    if (noneCompleted) {
+      ctaText = 'Start Session'
+      action = getMethodActionCTA(nextIncompleteLesson)
+    } else if (anyCompleted && !allCompleted) {
+      ctaText = 'Continue Session'
+      action = getMethodActionCTA(nextIncompleteLesson)
+    } else if (allCompleted) {
+      ctaText = learningPath.next_lesson ? 'Start Next Lesson' : 'Browse Lessons'
+      action = learningPath.next_lesson
+        ? getMethodActionCTA(learningPath.next_lesson)
+        : {
+            type: 'lessons',
+            brand: brand,
+          }
+    }
+
+    let maxProgressTimestamp = Math.max(
+      ...learningPath?.children.map((lesson) => lesson.progressTimestamp)
+    )
+    if (!maxProgressTimestamp) {
+      maxProgressTimestamp = learningPath.active_learning_path_created_at
+    }
+
+    return {
+      id: 0,
+      type: 'learning-path-v2',
+      progressType: 'content',
+      header: 'Method',
+      body: learningPath,
+      cta: {
+        text: ctaText,
+        action: action,
+      },
+      // *1000 is to match playlists which are saved in millisecond accuracy
+      progressTimestamp: maxProgressTimestamp * 1000,
+    }
+  }
+}
+
+function getMethodActionCTA(item) {
+  return {
+    type: item.type,
+    brand: item.brand,
+    id: item.id,
+    slug: item.slug,
+  }
+}

package/src/services/sanity.js

@@ -2299,7 +2299,7 @@ export async function fetchShows(brand, type, sort = 'sort') {
 export async function fetchMethodV2IntroVideo(brand) {
   const type = "method-intro";
   const filter = `_type == '${type}' && brand == '${brand}'`;
-  const fields = getIntroVideoFields();
+  const fields = getIntroVideoFields('method');
 
   const query = `*[${filter}] { ${fields.join(", ")} }`;
   return fetchSanity(query, false);

package/src/services/user/account.ts

@@ -163,3 +163,30 @@ export async function numberOfActiveUsers(): Promise<number> {
   const response = await httpClient.get<{ active_users: number }>(apiUrl)
   return response.active_users
 }
+
+export interface UserResource {
+  id: number
+  email: string
+  display_name: string
+  first_name: string
+  last_name: string
+  permission_level: string
+  use_student_view: boolean
+  is_admin: boolean
+  show_admin_toggle: boolean
+  [key: string]: any // Allow additional properties from the API
+}
+
+/**
+ * Toggles the student view mode for admin users.
+ * When enabled, admins see the platform as a regular student would.
+ *
+ * @param {boolean} useStudentView - Whether to enable student view mode (true) or admin view mode (false).
+ * @returns {Promise<UserResource>} - A promise that resolves to the updated user resource.
+ * @throws {HttpError} - Throws HttpError if the request fails or user is not an admin.
+ */
+export async function toggleStudentView(useStudentView: boolean): Promise<UserResource> {
+  const apiUrl = `/api/user-management-system/v1/user/student-view`
+  const httpClient = new HttpClient(globalConfig.baseUrl, globalConfig.sessionConfig.token)
+  return httpClient.patch<UserResource>(apiUrl, { use_student_view: useStudentView })
+}

package/src/services/user/types.js

@@ -73,6 +73,8 @@
  * @property {number} send_mobile_app_push_notifications
  * @property {number} send_email_notifications
  * @property {number} use_legacy_video_player
+ * @property {boolean} use_student_view
+ * @property {boolean} show_admin_toggle
  * @property {number} drumeo_ship_magazine
  * @property {string|null} magazine_shipping_address_id
  * @property {string|null} ios_latest_review_display_date