Merge pull request #2788 from Qiskit/fix/2746-ongoing-events

fix(events): add ongoing events in "future events"

hooks/event-conversion-utils.ts

@@ -74,11 +74,14 @@ function isEventInDateRange (
   const eventStartDate: Date = new Date(startDate)
   const eventEndDate: Date = new Date(endDate)
   const isFutureRange: boolean = days > 0
+  const isOngoingEvent: boolean = eventStartDate <= today && today <= eventEndDate
   let eventDateToCheck: Date
 
   // Determine which date to check based on the days parameter and checking if
   // the event's dates are valid.
-  if (!isFutureRange && !isNaN(eventEndDate.getTime())) {
+  if (isFutureRange && isOngoingEvent) {
+    return true
+  } else if (!isFutureRange && !isNaN(eventEndDate.getTime())) {
     eventDateToCheck = eventEndDate
   } else if (!isNaN(eventStartDate.getTime())) {
     eventDateToCheck = eventStartDate

tests/hooks/event-conversion-utils.spec.ts

@@ -106,6 +106,13 @@ describe('isEventInDateRange', () => {
       endDate: ''
     }
     expect(isEventInDateRange(mockEvent, days)).toBe(true)
+    // Event started 100 days ago and end in 100 days (ongoing event)
+    mockEvent = {
+      ...mockEventBase,
+      startDate: getFormattedDate(-100),
+      endDate: getFormattedDate(100)
+    }
+    expect(isEventInDateRange(mockEvent, days)).toBe(true)
   })
 
   it('returns true if the event happened within the last 15 days', () => {
@@ -134,6 +141,14 @@ describe('isEventInDateRange', () => {
       endDate: ''
     }
     expect(isEventInDateRange(mockEvent, days)).toBe(false)
+
+    // Event started 100 days ago and end in 100 days (ongoing event)
+    mockEvent = {
+      ...mockEventBase,
+      startDate: getFormattedDate(-100),
+      endDate: getFormattedDate(100)
+    }
+    expect(isEventInDateRange(mockEvent, days)).toBe(false)
   })
 })