Fix mongoid any_of selector error in filtered_by_group scope - MONGOI…

…D-4887
simukappu · Aug 12, 2020 · d4792db · d4792db
1 parent bba7dfd
commit d4792db
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/lib/activity_notification/orm/mongoid/notification.rb b/lib/activity_notification/orm/mongoid/notification.rb
@@ -140,7 +140,9 @@ class Notification
         scope :filtered_by_group,                 ->(group) {
           group.present? ?
             where(group_id: group.id, group_type: group.class.name) :
-            any_of({ :group_id.exists => false, :group_type.exists => false }, { group_id: nil, group_type: nil })
+            Gem::Version.new(::Mongoid::VERSION) >= Gem::Version.new('7.1.0') ?
+              where(:group_id.exists => false, :group_type.exists => false).or(group_id: nil, group_type: nil) :
+              any_of({ :group_id.exists => false, :group_type.exists => false }, { group_id: nil, group_type: nil })
         }
 
         # Selects filtered notifications later than specified time.