1 files changed, 4 insertions, 1 deletions
diff --git a/app/models/concerns/expirable.rb b/app/models/concerns/expirable.rb
index e029ada84f0..5975ea23723 100644
--- a/app/models/concerns/expirable.rb
+++ b/app/models/concerns/expirable.rb
@@ -6,7 +6,10 @@ module Expirable
   DAYS_TO_EXPIRE = 7
 
   included do
-    scope :expired, -> { where('expires_at <= ?', Time.current) }
+    scope :not, ->(scope) { where(scope.arel.constraints.reduce(:and).not) }
+
+    scope :expired, -> { where('expires_at IS NOT NULL AND expires_at <= ?', Time.current) }
+    scope :not_expired, -> { self.not(expired) }
   end
 
   def expired?