1 files changed, 7 insertions, 1 deletions
diff --git a/app/models/achievements/user_achievement.rb b/app/models/achievements/user_achievement.rb
index 885ec660cc9..bc5d10923d7 100644
--- a/app/models/achievements/user_achievement.rb
+++ b/app/models/achievements/user_achievement.rb
@@ -8,10 +8,16 @@ module Achievements
     belongs_to :awarded_by_user,
                 class_name: 'User',
                 inverse_of: :awarded_user_achievements,
-                optional: true
+                optional: false
     belongs_to :revoked_by_user,
                 class_name: 'User',
                 inverse_of: :revoked_user_achievements,
                 optional: true
+
+    scope :not_revoked, -> { where(revoked_by_user_id: nil) }
+
+    def revoked?
+      revoked_by_user_id.present?
+    end
   end
 end