Fix modules in Special Term do not show up in Today page (#3814)

* exclude-lessons-not-current-week-from-today-schedule

* Revert "exclude-lessons-not-current-week-from-today-schedule"

This reverts commit c1a8574.

* use sem2 weekInfo considering week before sem2

* update semesterNameMap in TodayContainer and add tests

* use startOfDay for date in isLessonAvailable

* fix linting errors

* fix linting errors

---------

Co-authored-by: Ravern Koh <[email protected]>

Author: xinyuwang-nus

website/src/utils/timetables.ts

@@ -18,7 +18,7 @@ import {
   sample,
   values,
 } from 'lodash';
-import { addDays, min as minDate, parseISO } from 'date-fns';
+import { addDays, min as minDate, parseISO, startOfDay } from 'date-fns';
 import qs from 'query-string';
 
 import {
@@ -360,7 +360,7 @@ export function isLessonAvailable(
     (weekRange) => {
       const end = minDate([parseISO(weekRange.end), date]);
       for (let current = parseISO(weekRange.start); current <= end; current = addDays(current, 7)) {
-        if (isEqual(current, date)) return true;
+        if (isEqual(current, startOfDay(date))) return true;
       }
 
       return false;

website/src/views/today/TodayContainer/TodayContainer.test.tsx

@@ -251,7 +251,7 @@ describe(TodayContainerComponent, () => {
 });
 
 describe(mapStateToProps, () => {
-  test('should use correct semester', () => {
+  test('should use correct semester (test 1, special case)', () => {
     // On week -1 of sem 2 the semester should be 2, not 1
     const ownProps: any = {
       // Week -1 of sem 2 of AY2018/2019
@@ -280,3 +280,123 @@ describe(mapStateToProps, () => {
     expect(mapStateToProps(state, ownProps).timetableWithLessons).toHaveProperty('CS1010S');
   });
 });
+
+describe(mapStateToProps, () => {
+  test('should use correct semester (test 2)', () => {
+    // On week -1 of orientation week, it should be special term II
+    const ownProps: any = {
+      currentTime: new Date('2024-08-04T00:00:00.000Z'),
+    };
+
+    const state: any = {
+      moduleBank: { modules: {} },
+      timetables: {
+        lessons: {
+          [4]: {
+            CS3216: {},
+          },
+          [1]: {
+            CS1010S: {},
+          },
+        },
+        colors: {
+          [4]: COLORS,
+          [1]: COLORS,
+        },
+      },
+    };
+
+    // Should return special term II timetable, not sem 1
+    expect(mapStateToProps(state, ownProps).timetableWithLessons).toHaveProperty('CS3216');
+  });
+});
+
+describe(mapStateToProps, () => {
+  test('should use correct semester (test 3)', () => {
+    // On orientation week, it should be sem1
+    const ownProps: any = {
+      currentTime: new Date('2024-08-05T00:00:00.000Z'),
+    };
+
+    const state: any = {
+      moduleBank: { modules: {} },
+      timetables: {
+        lessons: {
+          [4]: {
+            CS3216: {},
+          },
+          [1]: {
+            CS1010S: {},
+          },
+        },
+        colors: {
+          [4]: COLORS,
+          [1]: COLORS,
+        },
+      },
+    };
+
+    // Should return sem1 timetable
+    expect(mapStateToProps(state, ownProps).timetableWithLessons).toHaveProperty('CS1010S');
+  });
+});
+
+describe(mapStateToProps, () => {
+  test('should use correct semester (test 4)', () => {
+    // On week -1 of special term I, it should be sem2
+    const ownProps: any = {
+      currentTime: new Date('2025-05-11T00:00:00.000Z'),
+    };
+
+    const state: any = {
+      moduleBank: { modules: {} },
+      timetables: {
+        lessons: {
+          [2]: {
+            CS3216: {},
+          },
+          [3]: {
+            CS1010S: {},
+          },
+        },
+        colors: {
+          [2]: COLORS,
+          [3]: COLORS,
+        },
+      },
+    };
+
+    // Should return sem2 timetable
+    expect(mapStateToProps(state, ownProps).timetableWithLessons).toHaveProperty('CS3216');
+  });
+});
+
+describe(mapStateToProps, () => {
+  test('should use correct semester (test 5)', () => {
+    // On week -1 of special term II, it should be special term I
+    const ownProps: any = {
+      currentTime: new Date('2025-06-22T00:00:00.000Z'),
+    };
+
+    const state: any = {
+      moduleBank: { modules: {} },
+      timetables: {
+        lessons: {
+          [3]: {
+            CS3216: {},
+          },
+          [4]: {
+            CS1010S: {},
+          },
+        },
+        colors: {
+          [3]: COLORS,
+          [4]: COLORS,
+        },
+      },
+    };
+
+    // Should return special term I timetable
+    expect(mapStateToProps(state, ownProps).timetableWithLessons).toHaveProperty('CS3216');
+  });
+});

website/src/views/today/TodayContainer/TodayContainer.tsx

@@ -53,8 +53,8 @@ const EMPTY_LESSONS: ColoredLesson[] = [];
 const semesterNameMap: Record<string, number> = {
   'Semester 1': 1,
   'Semester 2': 2,
-  'Special Sem 1': 3,
-  'Special Sem 2': 4,
+  'Special Term I': 3,
+  'Special Term II': 4,
 };
 
 export type OwnProps = TimerData;
@@ -347,8 +347,19 @@ export class TodayContainerComponent extends React.PureComponent<Props, State> {
 
 export const mapStateToProps = (state: StoreState, ownProps: OwnProps) => {
   const { modules } = state.moduleBank;
-  const lastDay = addDays(ownProps.currentTime, DAYS);
-  const weekInfo = NUSModerator.academicCalendar.getAcadWeekInfo(lastDay);
+
+  const lastDay = addDays(ownProps.currentTime, DAYS); // current date plus 7 days
+  const todayWeekInfo = NUSModerator.academicCalendar.getAcadWeekInfo(ownProps.currentTime);
+  const nextWeekInfo = NUSModerator.academicCalendar.getAcadWeekInfo(lastDay);
+
+  const todaySemester = semesterNameMap[todayWeekInfo.sem];
+  const nextWeekSemester = semesterNameMap[nextWeekInfo.sem];
+
+  // On week -1 of semester 2, the semester should be 2, not 1
+  const weekBeforeSem2 = todaySemester === 1 && nextWeekSemester === 2;
+  // If it's the week before semester 2, use sem2's week info, otherwise use current date's week info
+  const weekInfo = weekBeforeSem2 ? nextWeekInfo : todayWeekInfo;
+
   const semester = semesterNameMap[weekInfo.sem];
   const timetable = getSemesterTimetableLessons(state)(semester);
   const colors = getSemesterTimetableColors(state)(semester);