Merge branch 'engwan/gitlab-ce-44012-filter-reactions-none-any'

1 files changed, 16 insertions, 2 deletions

diff --git a/app/models/concerns/awardable.rb b/app/models/concerns/awardable.rb
index 6f29c92d176..60b7ec2815c 100644
--- a/app/models/concerns/awardable.rb
+++ b/app/models/concerns/awardable.rb
@@ -13,13 +13,13 @@ module Awardable
   end
 
   class_methods do
-    def awarded(user, name)
+    def awarded(user, name = nil)
       sql = <<~EOL
         EXISTS (
           SELECT TRUE
           FROM award_emoji
           WHERE user_id = :user_id AND
-                name = :name AND
+                #{"name = :name AND" if name.present?}
                 awardable_type = :awardable_type AND
                 awardable_id = #{self.arel_table.name}.id
         )
@@ -28,6 +28,20 @@ module Awardable
       where(sql, user_id: user.id, name: name, 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