musora-content-services 2.27.1 → 2.27.3

package/src/services/dateUtils.js

@@ -1,58 +1,47 @@
 // dateUtils.js
+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 isBetween from 'dayjs/plugin/isBetween'
+import isSameOrBefore from 'dayjs/plugin/isSameOrBefore'
 
-export function convertToTimeZone(date, timeZone) {
-  const formatter = new Intl.DateTimeFormat('en-US', {
-    timeZone,
-    year: 'numeric',
-    month: '2-digit',
-    day: '2-digit',
-    hour: '2-digit',
-    minute: '2-digit',
-    second: '2-digit',
-    hour12: false,
-  });
+dayjs.extend(utc);
+dayjs.extend(timezone);
+dayjs.extend(isSameOrAfter)
+dayjs.extend(isoWeek)
+dayjs.extend(isBetween)
+dayjs.extend(isSameOrBefore)
 
-  const parts = formatter.formatToParts(date).reduce((acc, part) => {
-    if (part.type !== 'literal') acc[part.type] = part.value;
-    return acc;
-  }, {});
+export function toDayjs(date, timeZone = 'UTC') {
+  return dayjs.tz(date, timeZone).startOf('day')
+}
 
-  return new Date(`${parts.year}-${parts.month}-${parts.day}T${parts.hour}:${parts.minute}:${parts.second}`);
+export function convertToTimeZone(date, timeZone) {
+  return dayjs(date).tz(timeZone).format('YYYY-MM-DD');
 }
-// Get start of the week (Monday)
-export function getMonday(date) {
-  const d = new Date(date);
-  const day = d.getDay();
-  const diff = d.getDate() - day + (day === 0 ? -6 : 1);
-  return new Date(d.setDate(diff));
+
+export function getMonday(date, timeZone = Intl.DateTimeFormat().resolvedOptions().timeZone) {
+  // Use isoWeekday(1) - Monday is 1
+  return toDayjs(date, timeZone).isoWeekday(1)
 }
 
-// Get the week number
-export function getWeekNumber(d) {
-  let newDate = new Date(d.getTime());
-  newDate.setUTCDate(newDate.getUTCDate() + 4 - (newDate.getUTCDay()||7));
-  var yearStart = new Date(Date.UTC(newDate.getUTCFullYear(),0,1));
-  var weekNo = Math.ceil(( ( (newDate - yearStart) / 86400000) + 1)/7);
-  return  weekNo;
+// Get the ISO week number for a dayjs object
+export function getWeekNumber(date) {
+  return dayjs(date).isoWeek()
 }
 //Check if two dates are the same
-export function isSameDate(date1, date2, method = '') {
-  return date1.toISOString().split('T')[0] === date2.toISOString().split('T')[0];
+export function isSameDate(date1, date2) {
+  return dayjs(date1).isSame(dayjs(date2), 'day')
 }
 
 // Check if two dates are consecutive days
-export function isNextDay(prev, current) {
-  const prevDate = new Date(prev.getFullYear(), prev.getMonth(), prev.getDate());
-  const nextDate = new Date(prevDate);
-  nextDate.setDate(prevDate.getDate() + 1); // Add 1 day
-
-  return (
-    nextDate.getFullYear() === current.getFullYear() &&
-    nextDate.getMonth() === current.getMonth() &&
-    nextDate.getDate() === current.getDate()
-  );
+export function isNextDay(date1, date2) {
+  const d1 = dayjs(date1).startOf('day')
+  const d2 = dayjs(date2).startOf('day')
+  return d2.diff(d1, 'day') === 1
 }
-
 export function getTimeRemainingUntilLocal(targetUtcIsoString, {withTotalSeconds} = {}) {
   const targetUTC = new Date(targetUtcIsoString);
   if (isNaN(targetUTC.getTime())) {

package/src/services/railcontent.js

@@ -323,6 +323,11 @@ export async function fetchContentProgress(currentVersion) {
   return fetchDataHandler(url, currentVersion)
 }
 
+export async function postPlaylistContentEngaged(playlistItemId) {
+  let url = `/railtracker/v1/last-engaged/${playlistItemId}`
+  return postDataHandler(url)
+}
+
 export async function postRecordWatchSession(
   contentId,
   mediaTypeId,
@@ -786,17 +791,9 @@ export async function fetchUserPractices(currentVersion = 0, { userId } = {}) {
 
   const userTimeZone = Intl.DateTimeFormat().resolvedOptions().timeZone;
 
-
   const formattedPractices = userPractices.reduce((acc, practice) => {
     // Convert UTC date to user's local date (still a Date object)
-    const utcDate = new Date(practice.day);
-    const localDate = convertToTimeZone(utcDate, userTimeZone);
-
-    const userTimeZoneDay =
-      localDate.getFullYear() + '-' +
-      String(localDate.getMonth() + 1).padStart(2, '0') + '-' +
-      String(localDate.getDate()).padStart(2, '0');
-
+    const userTimeZoneDay = convertToTimeZone(practice.day, userTimeZone);
     if (!acc[userTimeZoneDay]) {
       acc[userTimeZoneDay] = [];
     }

package/src/services/sanity.js

@@ -31,6 +31,7 @@ import {
 import { arrayToStringRepresentation, FilterBuilder } from '../filterBuilder.js'
 import { fetchUserPermissions } from './user/permissions.js'
 import { getAllCompleted, getAllStarted, getAllStartedOrCompleted } from './contentProgress.js'
+import {fetchRecentActivitiesActiveTabs} from "./userActivity.js";
 
 /**
  * Exported functions that are excluded from index generation.
@@ -2152,7 +2153,12 @@ export async function fetchShowsData(brand) {
  *   .catch(error => console.error(error));
  */
 export async function fetchMetadata(brand, type) {
-  const processedData = processMetadata(brand, type, true)
+  let processedData =  processMetadata(brand, type, true)
+  if(processedData?.onlyAvailableTabs === true) {
+    const activeTabs = await fetchRecentActivitiesActiveTabs()
+    processedData.tabs = activeTabs
+  }
+
   return processedData ? processedData : {}
 }
 

package/src/services/userActivity.js

@@ -16,7 +16,7 @@ import { DataContext, UserActivityVersionKey } from './dataContext.js'
 import { fetchByRailContentIds, fetchShows } from './sanity'
 import {fetchPlaylist, fetchUserPlaylists} from "./content-org/playlists"
 import {pinnedGuidedCourses} from "./content-org/guided-courses"
-import {convertToTimeZone, getMonday, getWeekNumber, isSameDate, isNextDay, getTimeRemainingUntilLocal} from './dateUtils.js'
+import {convertToTimeZone, getMonday, getWeekNumber, isSameDate, isNextDay, getTimeRemainingUntilLocal, toDayjs} from './dateUtils.js'
 import { globalConfig } from './config'
 import {collectionLessonTypes, lessonTypesMapping, progressTypesMapping, showsLessonTypes, songs} from "../contentTypeConfig";
 import {
@@ -27,6 +27,9 @@ import {
 } from "./contentProgress";
 import {TabResponseType} from "../contentMetaData";
 import {isContentLikedByIds} from "./contentLikes.js";
+import dayjs from 'dayjs'
+import isSameOrBefore from 'dayjs/plugin/isSameOrBefore'
+import weekOfYear from 'dayjs/plugin/weekOfYear'
 
 const DATA_KEY_PRACTICES = 'practices'
 const DATA_KEY_LAST_UPDATED_TIME = 'u'
@@ -86,24 +89,21 @@ export let userActivityContext = new DataContext(UserActivityVersionKey, fetchUs
  *   .catch(error => console.error(error));
  */
 export async function getUserWeeklyStats() {
+  const timeZone = Intl.DateTimeFormat().resolvedOptions().timeZone;
   let data = await userActivityContext.getData()
   let practices = data?.[DATA_KEY_PRACTICES] ?? {}
   let sortedPracticeDays = Object.keys(practices)
-    .map((date) => new Date(date))
-    .sort((a, b) => b - a)
-
-  let today = new Date()
-  today.setHours(0, 0, 0, 0)
-  let startOfWeek = getMonday(today) // Get last Monday
+    .map((date) => toDayjs(date)) // Convert to dayjs instance
+    .sort((a, b) => b.valueOf() - a.valueOf())
+  let today = dayjs()
+  let startOfWeek = getMonday(today, timeZone) // Get last Monday
   let dailyStats = []
-
   for (let i = 0; i < 7; i++) {
-    let day = new Date(startOfWeek)
-    day.setDate(startOfWeek.getDate() + i)
-    let hasPractice = sortedPracticeDays.some((practiceDate) => isSameDate(practiceDate, day))
+    const day = startOfWeek.add(i, 'day')
+    let hasPractice = sortedPracticeDays.some((practiceDate) => isSameDate(practiceDate, day.format('YYYY-MM-DD')))
     let isActive = isSameDate(today, day)
     let type = hasPractice ? 'tracked' : isActive ? 'active' : 'none'
-    dailyStats.push({ key: i, label: DAYS[i], isActive, inStreak: hasPractice, type })
+    dailyStats.push({ key: i, label: DAYS[i], isActive, inStreak: hasPractice, type, day: day.format('YYYY-MM-DD') })
   }
 
   let { streakMessage } = getStreaksAndMessage(practices)
@@ -142,83 +142,77 @@ export async function getUserWeeklyStats() {
  * getUserMonthlyStats({ userId: 123 }).then(console.log);
  */
 export async function getUserMonthlyStats(params = {}) {
-  const now = new Date()
+  const now = dayjs()
   const {
-    year = now.getFullYear(),
-    month = now.getMonth(),
-    day = 1,
+    year = now.year(),
+    month = now.month(), // 0-indexed
     userId = globalConfig.sessionConfig.userId,
   } = params
-  let practices = await getUserPractices(userId)
+  const timeZone = Intl.DateTimeFormat().resolvedOptions().timeZone
+  const practices = await getUserPractices(userId)
 
-  // Get the first day of the specified month and the number of days in that month
-  let firstDayOfMonth = new Date(year, month, 1)
-  let today = new Date()
-  today.setHours(0, 0, 0, 0)
+  const firstDayOfMonth = dayjs.tz(`${year}-${month + 1}-01`, timeZone).startOf('day')
+  const endOfMonth = firstDayOfMonth.endOf('month')
+  const today = dayjs().tz(timeZone).startOf('day')
 
-  let startOfGrid = getMonday(firstDayOfMonth)
+  let startOfGrid = getMonday(firstDayOfMonth, timeZone)
 
-  let previousWeekStart = new Date(startOfGrid)
-  previousWeekStart.setDate(previousWeekStart.getDate() - 7)
-
-  let previousWeekEnd = new Date(startOfGrid)
-  previousWeekEnd.setDate(previousWeekEnd.getDate() - 1)
+  // Previous week range
+  const previousWeekStart = startOfGrid.subtract(7, 'day')
+  const previousWeekEnd = startOfGrid.subtract(1, 'day')
 
   let hadStreakBeforeMonth = false
-  for (let d = new Date(previousWeekStart); d <= previousWeekEnd; d.setDate(d.getDate() + 1)) {
-    let dayKey = `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, '0')}-${String(d.getDate()).padStart(2, '0')}`
-    if (practices[dayKey]) {
+  for (let d = previousWeekStart.clone(); d.isSameOrBefore(previousWeekEnd); d = d.add(1, 'day')) {
+    const key = d.format('YYYY-MM-DD')
+    if (practices[key]) {
       hadStreakBeforeMonth = true
       break
     }
   }
 
-  let endOfMonth = new Date(year, month + 1, 0)
-  let endOfGrid = new Date(year, month + 1, 0)
-  while (endOfGrid.getDay() !== 0) {
-    endOfGrid.setDate(endOfGrid.getDate() + 1)
+ // let endOfMonth = new Date(year, month + 1, 0)
+  let endOfGrid = endOfMonth.clone()
+  while (endOfGrid.day() !== 0) {
+    endOfGrid = endOfGrid.add(1, 'day')
   }
-  let daysInMonth = Math.ceil((endOfGrid - startOfGrid) / (1000 * 60 * 60 * 24)) + 1
-
+  const daysInMonth = endOfGrid.diff(startOfGrid, 'day') + 1
   let dailyStats = []
   let practiceDuration = 0
   let daysPracticed = 0
   let weeklyStats = {}
 
   for (let i = 0; i < daysInMonth; i++) {
-    let day = new Date(startOfGrid)
-    day.setDate(startOfGrid.getDate() + i)
-    let dayKey = `${day.getFullYear()}-${String(day.getMonth() + 1).padStart(2, '0')}-${String(day.getDate()).padStart(2, '0')}`
-
-    // Check if the user has activity for the day
-    let dayActivity = practices[dayKey] ?? null
+    let day = startOfGrid.add(i, 'day')
+    let key = day.format('YYYY-MM-DD')
+    let activity = practices[key] ?? null
     let weekKey = getWeekNumber(day)
 
     if (!weeklyStats[weekKey]) {
       weeklyStats[weekKey] = { key: weekKey, inStreak: false }
     }
 
-    if (dayActivity !== null && firstDayOfMonth <= day && day <= endOfMonth) {
-      practiceDuration += dayActivity.reduce((sum, entry) => sum + entry.duration_seconds, 0)
+    if (activity && day.isBetween(firstDayOfMonth, endOfMonth, null, '[]')) {
+      practiceDuration += activity.reduce((sum, entry) => sum + entry.duration_seconds, 0)
       daysPracticed++
     }
 
-    let isActive = isSameDate(today, day)
-    let type = dayActivity !== null ? 'tracked' : isActive ? 'active' : 'none'
-    let isInStreak = dayActivity !== null
-    if (isInStreak) {
+    if (activity) {
       weeklyStats[weekKey].inStreak = true
     }
 
+    const isActive = day.isSame(today, 'day')
+    const type = activity ? 'tracked' : isActive ? 'active' : 'none'
+
     dailyStats.push({
       key: i,
-      label: dayKey,
+      label: key,
       isActive,
-      inStreak: dayActivity !== null,
+      inStreak: !!activity,
       type,
     })
   }
 
+  // Continue streak into month
   if (hadStreakBeforeMonth) {
     const firstWeekKey = getWeekNumber(startOfGrid)
     if (weeklyStats[firstWeekKey]) {
@@ -226,14 +220,15 @@ export async function getUserMonthlyStats(params = {}) {
     }
   }
 
-  let filteredPractices = Object.keys(practices)
-    .filter((date) => new Date(date) <= endOfMonth)
-    .reduce((obj, key) => {
-      obj[key] = practices[key]
-      return obj
+  // Filter past practices only
+  let filteredPractices = Object.entries(practices)
+    .filter(([date]) => dayjs.tz(date, timeZone).isSameOrBefore(endOfMonth))
+    .reduce((acc, [date, val]) => {
+      acc[date] = val
+      return acc
     }, {})
 
-  let { currentDailyStreak, currentWeeklyStreak } = calculateStreaks(filteredPractices)
+  const { currentDailyStreak, currentWeeklyStreak } = calculateStreaks(filteredPractices)
 
   return {
     data: {
@@ -392,12 +387,7 @@ export async function restoreUserPractice(id) {
     if (restoredPractice) {
       await userActivityContext.updateLocal(async function (localContext) {
         const userTimeZone = Intl.DateTimeFormat().resolvedOptions().timeZone
-        const utcDate = new Date(restoredPractice.day)
-        const localDate = convertToTimeZone(utcDate, userTimeZone)
-        const date =
-          localDate.getFullYear() + '-' +
-          String(localDate.getMonth() + 1).padStart(2, '0') + '-' +
-          String(localDate.getDate()).padStart(2, '0')
+        const date = convertToTimeZone(restoredPractice.day, userTimeZone)
         if (localContext.data[DATA_KEY_PRACTICES][date]) {
           localContext.data[DATA_KEY_PRACTICES][date] = []
         }
@@ -621,7 +611,7 @@ function getStreaksAndMessage(practices) {
   }
 }
 
-async function getUserPracticeIds(day = new Date().toISOString().split('T')[0], userId = null) {
+async function getUserPracticeIds(day = dayjs().format('YYYY-MM-DD'), userId = null) {
   let practices = {}
   if (userId !== globalConfig.sessionConfig.userId) {
     let data = await fetchUserPractices(0, { userId: userId })
@@ -651,6 +641,7 @@ function calculateStreaks(practices, includeStreakMessage = false) {
   let lastActiveDay = null
   let streakMessage = ''
 
+  const timeZone = Intl.DateTimeFormat().resolvedOptions().timeZone;
   let sortedPracticeDays = Object.keys(practices)
     .map((dateStr) => {
       const [year, month, day] = dateStr.split('-').map(Number)
@@ -702,9 +693,8 @@ function calculateStreaks(practices, includeStreakMessage = false) {
     let yesterday = new Date(today)
     yesterday.setDate(today.getDate() - 1)
 
-    let currentWeekStart = getMonday(today)
-    let lastWeekStart = new Date(currentWeekStart)
-    lastWeekStart.setDate(currentWeekStart.getDate() - 7)
+    let currentWeekStart = getMonday(today, timeZone)
+    let lastWeekStart = currentWeekStart.subtract(7, 'days')
 
     let hasYesterdayPractice = sortedPracticeDays.some((date) => isSameDate(date, yesterday))
     let hasCurrentWeekPractice = sortedPracticeDays.some((date) => date >= currentWeekStart)
@@ -837,7 +827,6 @@ async function formatPracticeMeta(practices) {
   const userTimeZone = Intl.DateTimeFormat().resolvedOptions().timeZone
 
   return practices.map((practice) => {
-    const utcDate = new Date(practice.created_at)
     const content = contents.find((c) => c.id === practice.content_id) || {}
 
     return {
@@ -854,7 +843,7 @@ async function formatPracticeMeta(practices) {
       content_type: getFormattedType(content.type || '', content.brand),
       content_id: practice.content_id || null,
       content_brand: content.brand || null,
-      created_at: convertToTimeZone(utcDate, userTimeZone),
+      created_at: convertToTimeZone(dayjs(practice.created_at), userTimeZone),
       sanity_type: content.type || null,
       content_slug: content.slug || null,
     }
@@ -973,6 +962,7 @@ export async function getProgressRows({ brand = null, limit = 8 } = {}) {
       childToParentMap[content.id] = content.parent_content_data[content.parent_content_data.length - 1];
     }
   });
+
   const progressMap = new Map();
   for (const [idStr, progress] of Object.entries(progressContents)) {
     const id = parseInt(idStr);
@@ -1474,4 +1464,21 @@ function getFirstLeafLessonId(data) {
   return data.lessons ? findFirstLeaf(data.lessons) : null
 }
 
+export async function fetchRecentActivitiesActiveTabs() {
+  const url = `/api/user-management-system/v1/activities/tabs`
+  try {
+    const tabs = await fetchHandler(url, 'GET');
+    const activitiesTabs = [];
+
+    tabs.forEach(tab => {
+      activitiesTabs.push({ name: tab.label, short_name:tab.label });
+    });
+
+    return activitiesTabs;
+  } catch (error) {
+    console.error('Error fetching activity tabs:', error);
+    return [];
+  }
+}
+