musora-content-services 2.3.6 → 2.3.8

package/package.json

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

package/src/index.d.ts

@@ -47,6 +47,14 @@ import {
 	verifyLocalDataContext
 } from './services/dataContext.js';
 
+import {
+	convertToTimeZone,
+	getMonday,
+	getWeekNumber,
+	isNextDay,
+	isSameDate
+} from './services/dateUtils.js';
+
 import {
 	getActiveDiscussions
 } from './services/forum.js';
@@ -236,6 +244,7 @@ declare module 'musora-content-services' {
 		closeComment,
 		contentStatusCompleted,
 		contentStatusReset,
+		convertToTimeZone,
 		countAssignmentsAndLessons,
 		createComment,
 		createPlaylist,
@@ -332,6 +341,7 @@ declare module 'musora-content-services' {
 		getAllStartedOrCompleted,
 		getContentRows,
 		getLessonContentRows,
+		getMonday,
 		getNewAndUpcoming,
 		getPracticeSessions,
 		getProgressPercentage,
@@ -348,10 +358,13 @@ declare module 'musora-content-services' {
 		getUserMonthlyStats,
 		getUserPractices,
 		getUserWeeklyStats,
+		getWeekNumber,
 		globalConfig,
 		initializeService,
 		isBucketUrl,
 		isContentLiked,
+		isNextDay,
+		isSameDate,
 		jumpToContinueContent,
 		likeComment,
 		likeContent,

package/src/index.js

@@ -47,6 +47,14 @@ import {
 	verifyLocalDataContext
 } from './services/dataContext.js';
 
+import {
+	convertToTimeZone,
+	getMonday,
+	getWeekNumber,
+	isNextDay,
+	isSameDate
+} from './services/dateUtils.js';
+
 import {
 	getActiveDiscussions
 } from './services/forum.js';
@@ -235,6 +243,7 @@ export {
 	closeComment,
 	contentStatusCompleted,
 	contentStatusReset,
+	convertToTimeZone,
 	countAssignmentsAndLessons,
 	createComment,
 	createPlaylist,
@@ -331,6 +340,7 @@ export {
 	getAllStartedOrCompleted,
 	getContentRows,
 	getLessonContentRows,
+	getMonday,
 	getNewAndUpcoming,
 	getPracticeSessions,
 	getProgressPercentage,
@@ -347,10 +357,13 @@ export {
 	getUserMonthlyStats,
 	getUserPractices,
 	getUserWeeklyStats,
+	getWeekNumber,
 	globalConfig,
 	initializeService,
 	isBucketUrl,
 	isContentLiked,
+	isNextDay,
+	isSameDate,
 	jumpToContinueContent,
 	likeComment,
 	likeContent,

package/src/services/dateUtils.js

@@ -0,0 +1,55 @@
+// dateUtils.js
+
+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,
+  });
+
+  const parts = formatter.formatToParts(date).reduce((acc, part) => {
+    if (part.type !== 'literal') acc[part.type] = part.value;
+    return acc;
+  }, {});
+
+  return new Date(`${parts.year}-${parts.month}-${parts.day}T${parts.hour}:${parts.minute}:${parts.second}`);
+}
+// 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));
+}
+
+// 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;
+}
+//Check if two dates are the same
+export function isSameDate(date1, date2, method = '') {
+  return date1.toISOString().split('T')[0] === date2.toISOString().split('T')[0];
+}
+
+// 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()
+  );
+}
+

package/src/services/railcontent.js

@@ -3,6 +3,7 @@
  */
 import { globalConfig } from './config.js'
 import { fetchJSONHandler } from '../lib/httpHelper.js'
+import { convertToTimeZone } from './dateUtils.js';
 
 /**
  * Exported functions that are excluded from index generation.
@@ -1175,31 +1176,42 @@ export async function editComment(commentId, comment) {
 }
 
 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] = []
+  const url = `/api/user/practices/v1/practices`;
+  const response = await fetchDataHandler(url, currentVersion);
+  const { data, version } = response;
+  const userPractices = data;
+
+  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');
+
+    if (!acc[userTimeZoneDay]) {
+      acc[userTimeZoneDay] = [];
     }
 
-    // Push the practice entry into the array
-    acc[practice.day].push({ id: practice.id, duration_seconds: practice.duration_seconds })
+    acc[userTimeZoneDay].push({
+      id: practice.id,
+      duration_seconds: practice.duration_seconds,
+    });
 
-    return acc
-  }, {})
+    return acc;
+  }, {});
 
-  let json = {
+  return {
     data: {
       practices: formattedPractices,
     },
-    version: version,
-  }
-
-  return json
+    version,
+  };
 }
 
 export async function logUserPractice(practiceDetails) {

package/src/services/recommendations.js

@@ -113,16 +113,17 @@ export async function rankItems(brand, content_ids) {
   }
 }
 
-export async function recommendations(brand, { page = 1, limit = 10 } = {}) {
-  let data = {
-    brand: brand,
-    user_id: globalConfig.sessionConfig.userId,
-    num_recommendations: limit,
-  }
-  const url = `/recommendations/`
+export async function recommendations(brand, { section = ''} = {}) {
+  section = section.toUpperCase().replace('-', '_')
+  const sectionString = section ? `&section=${section}` : '';
+  const url = `/api/content/v1/recommendations?brand=${brand}${sectionString}`
   try {
-    const response = await fetchHandler(url, 'POST', data)
-    return response['recommendations']
+    return fetchJSONHandler(
+      url,
+      globalConfig.railcontentConfig.token,
+      globalConfig.railcontentConfig.baseUrl,
+      'get'
+    )
   } catch (error) {
     console.error('Fetch error:', error)
     return null