refactor: test mode filter is weird

impress-org · Nov 10, 2023 · c719922 · c719922
1 parent 367a1b1
commit c719922
Showing 1 changed file with 6 additions and 11 deletions.
diff --git a/src/Donations/Endpoints/ListDonations.php b/src/Donations/Endpoints/ListDonations.php
@@ -276,25 +276,20 @@ private function getWhereConditions(QueryBuilder $query): array
         }
 
         if ($hasWhereConditions) {
-            $query->having(
+            if ($testMode){
+                $query->having(
                 'give_donationmeta_attach_meta_mode.meta_value',
                 '=',
-                $testMode ? DonationMode::TEST : DonationMode::LIVE
-            );
-
-            if (!$testMode) {
-                $query->orHaving('give_donationmeta_attach_meta_mode.meta_value', '=', '');
+                DonationMode::TEST
+                );
             }
-        } elseif ($testMode){
+        } elseif ($testMode) {
             $query->where('give_donationmeta_attach_meta_mode.meta_value', DonationMode::TEST);
         } else {
             $query->whereIsNull('give_donationmeta_attach_meta_mode.meta_value')
-                ->orWhere('give_donationmeta_attach_meta_mode.meta_value', DonationMode::LIVE)
-                ->orWhere('give_donationmeta_attach_meta_mode.meta_value', DonationMode::TEST, '<>');
+            ->orWhere('give_donationmeta_attach_meta_mode.meta_value', DonationMode::TEST, '<>');
         }
 
-
-
         return [
             $query,
             $dependencies,