Add None / Any options to reaction filter in issues / MRs API

2 files changed, 52 insertions, 10 deletions

diff --git a/app/finders/issuable_finder.rb b/app/finders/issuable_finder.rb
index 92aaa9c6b29..27a850b2603 100644
--- a/app/finders/issuable_finder.rb
+++ b/app/finders/issuable_finder.rb
@@ -244,15 +244,6 @@ class IssuableFinder
     params[:assignee_username].present?
   end
 
-  def filter_by_no_assignee?
-    # Assignee_id takes precedence over assignee_username
-    [NONE, FILTER_NONE].include?(params[:assignee_id].to_s.downcase) || params[:assignee_username].to_s == NONE
-  end
-
-  def filter_by_any_assignee?
-    params[:assignee_id].to_s.downcase == FILTER_ANY
-  end
-
   # rubocop: disable CodeReuse/ActiveRecord
   def assignee
     return @assignee if defined?(@assignee)
@@ -418,6 +409,15 @@ class IssuableFinder
   end
   # rubocop: enable CodeReuse/ActiveRecord
 
+  def filter_by_no_assignee?
+    # Assignee_id takes precedence over assignee_username
+    [NONE, FILTER_NONE].include?(params[:assignee_id].to_s.downcase) || params[:assignee_username].to_s == NONE
+  end
+
+  def filter_by_any_assignee?
+    params[:assignee_id].to_s.downcase == FILTER_ANY
+  end
+
   # rubocop: disable CodeReuse/ActiveRecord
   def by_author(items)
     if author
@@ -480,12 +480,26 @@ class IssuableFinder
 
   def by_my_reaction_emoji(items)
     if params[:my_reaction_emoji].present? && current_user
-      items = items.awarded(current_user, params[:my_reaction_emoji])
+      if filter_by_no_reaction?
+        items = items.not_awarded(current_user)
+      elsif filter_by_any_reaction?
+        items = items.awarded_any(current_user)
+      else
+        items = items.awarded(current_user, params[:my_reaction_emoji])
+      end
     end
 
     items
   end
 
+  def filter_by_no_reaction?
+    params[:my_reaction_emoji].to_s.downcase == FILTER_NONE
+  end
+
+  def filter_by_any_reaction?
+    params[:my_reaction_emoji].to_s.downcase == FILTER_ANY
+  end
+
   def label_names
     if labels?
       params[:label_name].is_a?(String) ? params[:label_name].split(',') : params[:label_name]
diff --git a/app/models/concerns/awardable.rb b/app/models/concerns/awardable.rb
index 6f29c92d176..25b14eb110c 100644
--- a/app/models/concerns/awardable.rb
+++ b/app/models/concerns/awardable.rb
@@ -28,6 +28,34 @@ module Awardable
       where(sql, user_id: user.id, name: name, awardable_type: self.name)
     end
 
+    def awarded_any(user)
+      sql = <<~EOL
+        EXISTS (
+          SELECT TRUE
+          FROM award_emoji
+          WHERE user_id = :user_id AND
+                awardable_type = :awardable_type AND
+                awardable_id = #{self.arel_table.name}.id
+        )
+      EOL
+
+      where(sql, user_id: user.id, awardable_type: self.name)
+    end
+
+    def not_awarded(user)
+      sql = <<~EOL
+        NOT EXISTS (
+          SELECT TRUE
+          FROM award_emoji
+          WHERE user_id = :user_id AND
+                awardable_type = :awardable_type AND
+                awardable_id = #{self.arel_table.name}.id
+        )
+      EOL
+
+      where(sql, user_id: user.id, awardable_type: self.name)
+    end
+
     def order_upvotes_desc
       order_votes_desc(AwardEmoji::UPVOTE_NAME)
     end