fix: only show upcoming donations in donor dashboard (#159) (#160)

* only show upcoming donations in donor dashboard * fix tests
uwblueprint · Mar 3, 2022 · 8eceaf3 · 8eceaf3
1 parent 2979afa
commit 8eceaf3
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/backend/typescript/services/implementations/__tests__/schedulingService.test.ts b/backend/typescript/services/implementations/__tests__/schedulingService.test.ts
@@ -103,8 +103,12 @@ describe("pg schedulingService", () => {
       donorId.toString(),
       0,
     );
+    const currentDate = new Date();
     expect(res).toMatchObject(
-      testSchedules.filter((schedule) => schedule.donorId === donorId),
+      testSchedules.filter(
+        (schedule) =>
+          schedule.donorId === donorId && schedule.startTime >= currentDate,
+      ),
     );
   });
 

diff --git a/backend/typescript/services/implementations/schedulingService.ts b/backend/typescript/services/implementations/schedulingService.ts
@@ -94,8 +94,8 @@ class SchedulingService implements ISchedulingService {
     let schedulingDtos: Array<SchedulingDTO> = [];
     let schedulings: Array<Scheduling>;
     try {
+      const currentStartDate = new Date();
       if (weekLimit !== 0) {
-        const currentStartDate = new Date();
         const nextDate = new Date();
         nextDate.setDate(nextDate.getDate() + weekLimit * 7);
         schedulings = await Scheduling.findAll({
@@ -111,6 +111,9 @@ class SchedulingService implements ISchedulingService {
         schedulings = await Scheduling.findAll({
           where: {
             donor_id: Number(donorId),
+            start_time: {
+              [Op.gte]: currentStartDate,
+            },
           },
           order: [["start_time", "ASC"]],
         });