added optional filtering

hack4impact-upenn · May 14, 2024 · 4700e8a · 4700e8a
1 parent 09ad124
commit 4700e8a
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 8 deletions.
diff --git a/client/src/components/buttons/SearchDonorsButton.tsx b/client/src/components/buttons/SearchDonorsButton.tsx
@@ -70,6 +70,13 @@ function SearchDonorsButton() {
   };
 
   const handleClose = () => {
+    setCampaign('');
+    setYearType('');
+    setMinDonation('');
+    setMaxDonation('');
+    setFilteredEmails('');
+    setStartTimePeriod(dayjs());
+    setEndTimePeriod(dayjs());
     setOpen(false);
   };
 
@@ -109,17 +116,25 @@ function SearchDonorsButton() {
           donationDate.isSame(startTimePeriod)) &&
         (donationDate.isBefore(endTimePeriod) ||
           donationDate.isSame(endTimePeriod));
-      const matchesPurpose = donation.purpose_id === campaign;
-      let matchesAmount = false;
+      //initialize all true
+      let matchesYearType = true;
+      let matchesPurpose = true;
+      let matchesAmount = true;
+
+      //if filters are non-empty
+      if (campaign !== null && campaign!== undefined && campaign!== '') {
+        matchesPurpose = donation.purpose_id === campaign;
+      }
+
       if (minDonation !== '' && maxDonation !== '') {
         const minDonationNumber = Number(minDonation);
         const maxDonationNumber = Number(maxDonation);
         matchesAmount =
           donation.amount >= minDonationNumber &&
           donation.amount <= maxDonationNumber;
       }
-      let matchesYearType = true;
-      if (donationType === 'grant') {
+
+      if (donationType === 'Grant') {
         matchesYearType = donation.grant_year === yearType;
       }
 
@@ -238,8 +253,8 @@ function SearchDonorsButton() {
                   value={yearType}
                   onChange={(e) => setYearType(e.target.value)}
                 >
-                  <MenuItem value="single">Single Year</MenuItem>
-                  <MenuItem value="multi">Multi Year</MenuItem>
+                  <MenuItem value="single-year">Single Year</MenuItem>
+                  <MenuItem value="multi-year">Multi Year</MenuItem>
                 </Select>
               </FormControl>
             </Box>

diff --git a/server/src/models/donation.model.ts b/server/src/models/donation.model.ts
@@ -11,7 +11,7 @@ const DonationSchema = new mongoose.Schema({
     enum: ['mail check', 'credit', 'paypal', 'other'],
     required: true,
   },
-  year: {
+  grant_year: {
     type: String,
     enum: ['multi-year', 'single-year'],
     required: false,
@@ -45,7 +45,7 @@ interface IDonation extends mongoose.Document {
   _id: string;
   type: string;
   payment_type: string;
-  year: string;
+  grant_year: string;
   date: Date;
   amount: number;
   acknowledged: boolean;