Merge pull request #73 from ChangePlusPlusVandy/show-current-events

Show current events

components/Home/MainDashboard.tsx

@@ -111,7 +111,7 @@ const MainDashboard = ({ userData }: { userData: QueriedUserData | null }) => {
             </div>
 
             <div>
-              <Header>Your upcoming events</Header>
+              <Header>Your current and upcoming events</Header>
               {/* TODO: add a filter icon on the right */}
 
               <UpcomingEvents />

components/Home/UpcomingEvents.tsx

@@ -28,7 +28,7 @@ const UpcomingEvents = () => {
   const [error, setError] = useState<Error>();
   // Fetch upcoming events when rendered
   useEffect(() => {
-    fetchData('/api/events/upcoming')
+    fetchData('/api/events/upcoming-current')
       .then(data => setEvents(data))
       .catch(err => setError(err));
   }, []);

pages/api/events/log-hour.ts

@@ -16,8 +16,8 @@ export default async function handler(
 
   switch (method) {
     /**
-     * @route GET /api/events/upcoming
-     * @desc Get all events in the future that the user is signed up for
+     * @route GET /api/events/log-hour
+     * @desc Get all events where start date is before today
      * @res QueriedVolunteerEventData[]
      */
     case 'GET':

pages/api/events/upcoming.ts → pages/api/events/upcoming-current.ts

@@ -16,8 +16,8 @@ export default async function handler(
 
   switch (method) {
     /**
-     * @route GET /api/events/upcoming
-     * @desc Get all events in the future that the user is signed up for
+     * @route GET /api/events/upcoming-current
+     * @desc Get all events in the future and in the present that the user is signed up for
      * @res QueriedVolunteerEventData[]
      */
     case 'GET':
@@ -33,9 +33,21 @@ export default async function handler(
         }
 
         // Use the user's events array to filter the VolunteerEvents
+        // select * from events where id in user.events and (startDate > today or (startDate < today and endDate > today))
+        const currentDate = new Date();
         const events = await VolunteerEvents.find({
           _id: { $in: user.events },
-          startDate: { $gt: new Date() },
+          $or: [
+            {
+              startDate: { $gt: currentDate },
+            },
+            {
+              $and: [
+                { startDate: { $lte: currentDate } },
+                { endDate: { $gt: currentDate } },
+              ],
+            },
+          ],
         }).sort({ startDate: 1 });
 
         return res.status(200).json(events);