Fix bugs with calendar and session status/renewal date filtering

Author: benjaminJohnson2204

backend/src/controllers/session.ts

@@ -101,7 +101,9 @@ const createMissingRegularSessions = async () => {
             "sessionTime.start_time": session.start_time,
             "sessionTime.end_time": session.end_time,
             schedule: dayOfWeek,
+            status: "Joined",
             startDate: { $lte: new Date(date) },
+            renewalDate: { $gte: new Date(date) },
             programId: program._id,
           });
           if (enrollments.length === 0) {
@@ -205,6 +207,8 @@ const createMissingVaryingSessions = async () => {
       const enrollmentsThisDate = await EnrollmentModel.find({
         programId: program._id,
         startDate: { $lte: new Date(date) },
+        status: "Joined",
+        renewalDate: { $gte: new Date(date) },
       })
         .lean()
         .exec();

frontend/src/components/Calendar/util.ts

@@ -26,9 +26,9 @@ export const generateDates = (month: number, year: number, calendar?: CalendarRe
       for (const c of calendar.calendar) {
         const calendarDate = new Date(c.date);
         if (
-          calendarDate.getMonth() === date.getMonth() &&
-          calendarDate.getDate() === date.getDate() &&
-          calendarDate.getFullYear() === date.getFullYear()
+          calendarDate.getUTCMonth() === date.getMonth() &&
+          calendarDate.getUTCDate() === date.getDate() &&
+          calendarDate.getUTCFullYear() === date.getFullYear()
         ) {
           hours = c.hours;
           session = c.session;
@@ -53,9 +53,9 @@ export const generateDates = (month: number, year: number, calendar?: CalendarRe
       for (const c of calendar.calendar) {
         const calendarDate = new Date(c.date);
         if (
-          calendarDate.getMonth() === date.getMonth() &&
-          calendarDate.getDate() === date.getDate() &&
-          calendarDate.getFullYear() === date.getFullYear()
+          calendarDate.getUTCMonth() === date.getMonth() &&
+          calendarDate.getUTCDate() === date.getDate() &&
+          calendarDate.getUTCFullYear() === date.getFullYear()
         ) {
           hours = c.hours;
           session = c.session;
@@ -82,9 +82,9 @@ export const generateDates = (month: number, year: number, calendar?: CalendarRe
       for (const c of calendar.calendar) {
         const calendarDate = new Date(c.date);
         if (
-          calendarDate.getMonth() === date.getMonth() &&
-          calendarDate.getDate() === date.getDate() &&
-          calendarDate.getFullYear() === date.getFullYear()
+          calendarDate.getUTCMonth() === date.getMonth() &&
+          calendarDate.getUTCDate() === date.getDate() &&
+          calendarDate.getUTCFullYear() === date.getFullYear()
         ) {
           hours = c.hours;
           session = c.session;