From b0c3cce35be46a8028fc99f9507a23e7624ea1d6 Mon Sep 17 00:00:00 2001
From: Eric Schultz <eric@commitchange.com>
Date: Wed, 25 Sep 2024 13:27:32 -0500
Subject: [PATCH] Add supporters CTE to QuerySupporters

---
 app/legacy_lib/query_supporters.rb | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/app/legacy_lib/query_supporters.rb b/app/legacy_lib/query_supporters.rb
index d38156c95..3f37b50a2 100644
--- a/app/legacy_lib/query_supporters.rb
+++ b/app/legacy_lib/query_supporters.rb
@@ -160,6 +160,12 @@ def self._full_search(np_id, query)
   #   return new_supporters
   # end
 
+  def self.supporters(np_id)
+    Qx.select('supporters.*')
+      .from(:supporters)
+      .where("supporters.nonprofit_id = $id and deleted != 'true'", id: np_id )
+  end
+
   def self.undeleted_supporters(np_id)
     
     Qx.select('id')
@@ -212,6 +218,7 @@ def self.full_filter_expr(np_id, query)
     expr = Qx.select('supporters.id')
       .with(:nonprofits, Qx.select("*").from(:nonprofits).where("id = $id", id: np_id.to_i))
       .with(:tag_masters, Qx.select("*").from(:tag_masters).where("nonprofit_id = $id AND NOT deleted", id: np_id.to_i))
+      .with(:supporters, supporters(np_id))
       .from(:supporters)
       .join('nonprofits', 'nonprofits.id=supporters.nonprofit_id')
       .where(