Remove moment

Author: abraham

functions/__tests__/time.test.ts

@@ -1,30 +1,23 @@
-import { beforeEach, describe, expect, it, jest } from '@jest/globals';
-import moment from 'moment';
+import { beforeEach, describe, expect, it, jest, beforeAll, afterAll } from '@jest/globals';
 import {
   createTimeWindow,
   filterUpcomingTimeslots,
   getTodayDateString,
-  isMomentBetween,
+  isBetween,
   parseTimeAndGetFromNow,
   parseTimeAndSubtract,
 } from '../src/time';
 
-// Mock moment to control time for testing
-jest.mock('moment', () => {
-  const originalMoment = jest.requireActual('moment');
-  const mockMoment = (...args) => {
-    if (args.length === 0) {
-      // Return a fixed date when called without arguments (UTC)
-      return originalMoment.utc('2025-06-22T14:30:00Z');
-    }
-    return originalMoment(...args);
-  };
-
-  // Copy all moment properties
-  Object.setPrototypeOf(mockMoment, originalMoment);
-  Object.assign(mockMoment, originalMoment);
-
-  return mockMoment;
+// Mock Date to control time for testing
+const MOCK_TIME = new Date('2025-06-22T14:30:00.000Z');
+
+beforeAll(() => {
+  jest.useFakeTimers();
+  jest.setSystemTime(MOCK_TIME);
+});
+
+afterAll(() => {
+  jest.useRealTimers();
 });
 
 describe('Time utilities', () => {
@@ -38,7 +31,7 @@ describe('Time utilities', () => {
       expect(result).toBe('2025-06-22');
     });
 
-    it('should return today date with timezone offset', () => {
+    it('should return today date with positive timezone offset', () => {
       const result = getTodayDateString('+05:00');
       expect(result).toBe('2025-06-22');
     });
@@ -53,69 +46,76 @@ describe('Time utilities', () => {
     it('should create a time window around current time', () => {
       const window = createTimeWindow(3, 3);
 
-      expect(window.before.utc().format()).toBe('2025-06-22T14:27:00Z');
-      expect(window.after.utc().format()).toBe('2025-06-22T14:33:00Z');
+      expect(window.before.toISOString()).toBe('2025-06-22T14:27:00.000Z');
+      expect(window.after.toISOString()).toBe('2025-06-22T14:33:00.000Z');
     });
 
     it('should handle different before and after minutes', () => {
       const window = createTimeWindow(5, 10);
 
-      expect(window.before.utc().format()).toBe('2025-06-22T14:25:00Z');
-      expect(window.after.utc().format()).toBe('2025-06-22T14:40:00Z');
+      expect(window.before.toISOString()).toBe('2025-06-22T14:25:00.000Z');
+      expect(window.after.toISOString()).toBe('2025-06-22T14:40:00.000Z');
     });
   });
 
   describe('parseTimeAndSubtract', () => {
     it('should parse time string and subtract minutes', () => {
-      const result = parseTimeAndSubtract('15:00', '+02:00', 'HH:mm', 10);
+      const result = parseTimeAndSubtract('15:00', '+02:00', 10);
 
-      expect(result.utc().format()).toBe('2025-06-22T12:50:00Z');
+      expect(result.toISOString()).toBe('2025-06-22T12:50:00.000Z');
     });
 
     it('should handle different timezones', () => {
-      const result = parseTimeAndSubtract('09:30', '-05:00', 'HH:mm', 5);
+      const result = parseTimeAndSubtract('09:30', '-05:00', 5);
 
-      expect(result.utc().format()).toBe('2025-06-22T14:25:00Z');
+      expect(result.toISOString()).toBe('2025-06-22T14:25:00.000Z');
     });
   });
 
-  describe('isMomentBetween', () => {
-    it('should return true when moment is between two other moments', () => {
-      const start = moment('2025-06-22T14:00:00Z');
-      const end = moment('2025-06-22T15:00:00Z');
-      const target = moment('2025-06-22T14:30:00Z');
+  describe('isBetween', () => {
+    it('should return true when date is between two other dates', () => {
+      const start = new Date('2025-06-22T14:00:00Z');
+      const end = new Date('2025-06-22T15:00:00Z');
+      const target = new Date('2025-06-22T14:30:00Z');
 
-      expect(isMomentBetween(target, start, end)).toBe(true);
+      expect(isBetween(target, start, end)).toBe(true);
     });
 
-    it('should return false when moment is before the range', () => {
-      const start = moment('2025-06-22T14:00:00Z');
-      const end = moment('2025-06-22T15:00:00Z');
-      const target = moment('2025-06-22T13:30:00Z');
+    it('should return false when date is before the range', () => {
+      const start = new Date('2025-06-22T14:00:00Z');
+      const end = new Date('2025-06-22T15:00:00Z');
+      const target = new Date('2025-06-22T13:30:00Z');
 
-      expect(isMomentBetween(target, start, end)).toBe(false);
+      expect(isBetween(target, start, end)).toBe(false);
     });
 
-    it('should return false when moment is after the range', () => {
-      const start = moment('2025-06-22T14:00:00Z');
-      const end = moment('2025-06-22T15:00:00Z');
-      const target = moment('2025-06-22T15:30:00Z');
+    it('should return false when date is after the range', () => {
+      const start = new Date('2025-06-22T14:00:00Z');
+      const end = new Date('2025-06-22T15:00:00Z');
+      const target = new Date('2025-06-22T15:30:00Z');
 
-      expect(isMomentBetween(target, start, end)).toBe(false);
+      expect(isBetween(target, start, end)).toBe(false);
     });
   });
 
   describe('parseTimeAndGetFromNow', () => {
     it('should handle past times', () => {
       // For a time in the past (14:00 UTC today from 14:30 UTC)
-      const result = parseTimeAndGetFromNow('14:00', '+00:00', 'HH:mm');
+      const result = parseTimeAndGetFromNow('14:00', '+00:00');
 
       expect(result).toContain('ago');
     });
 
+    it('should handle future times', () => {
+      // For a time in the future (15:00 UTC today from 14:30 UTC)
+      const result = parseTimeAndGetFromNow('15:00', '+00:00');
+
+      expect(result).toContain('in');
+    });
+
     it('should work with different timezones', () => {
       // Test that the function doesn't throw and returns a string
-      const result = parseTimeAndGetFromNow('09:00', '-05:00', 'HH:mm');
+      const result = parseTimeAndGetFromNow('09:00', '-05:00');
 
       expect(typeof result).toBe('string');
       expect(result.length).toBeGreaterThan(0);
@@ -138,7 +138,6 @@ describe('Time utilities', () => {
         timeWindow,
         10, // notification offset
         '+00:00',
-        'HH:mm',
       );
 
       // With a 10-minute notification offset, 14:30 start time becomes 14:20 notification time
@@ -150,7 +149,7 @@ describe('Time utilities', () => {
     it('should include timeslots that match the notification window', () => {
       const timeWindow = createTimeWindow(15, 5); // 14:15 to 14:35
 
-      const result = filterUpcomingTimeslots(mockTimeslots, timeWindow, 10, '+00:00', 'HH:mm');
+      const result = filterUpcomingTimeslots(mockTimeslots, timeWindow, 10, '+00:00');
 
       // 14:30 start time with 10min offset = 14:20 notification time (within 14:15-14:35)
       // 15:00 start time with 10min offset = 14:50 notification time (outside window)
@@ -160,7 +159,7 @@ describe('Time utilities', () => {
     it('should handle empty timeslots array', () => {
       const timeWindow = createTimeWindow(3, 3);
 
-      const result = filterUpcomingTimeslots([], timeWindow, 10, '+00:00', 'HH:mm');
+      const result = filterUpcomingTimeslots([], timeWindow, 10, '+00:00');
 
       expect(result).toEqual([]);
     });

functions/package-lock.json

@@ -23,7 +23,6 @@
     "express": "^5.1.0",
     "firebase-admin": "^12.7.0",
     "firebase-functions": "^5.1.1",
-    "moment": "^2.30.1",
     "node-fetch": "^3.3.2"
   },
   "devDependencies": {

functions/package.json

@@ -12,8 +12,6 @@ import {
   parseTimeAndGetFromNow,
 } from './time';
 
-const FORMAT = 'HH:mm';
-
 const removeUserTokens = (tokensToUsers) => {
   const userTokens = Object.keys(tokensToUsers).reduce((acc, token) => {
     const userId = tokensToUsers[token];
@@ -116,7 +114,6 @@ export const scheduleNotifications = functions.pubsub
         timeWindow,
         10, // notification offset in minutes
         notificationsConfig.timezone,
-        FORMAT,
       );
 
       const upcomingSessions = upcomingTimeslot.reduce(
@@ -152,7 +149,6 @@ export const scheduleNotifications = functions.pubsub
         const fromNow = parseTimeAndGetFromNow(
           upcomingTimeslot[0].startTime,
           notificationsConfig.timezone,
-          FORMAT,
         );
 
         if (userIdsFeaturedSession.length) {