Merge pull request #927 from CommitChange/add-supporter-cte

Add supporters CTE to QuerySupporters

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(