ensured proper audit logs when lifting warnings / suspensions

Author: Oaphi

app/controllers/mod_warning_controller.rb

@@ -70,7 +70,11 @@ def lift
     @warning.update(active: false, read: false)
     @user.community_user.update is_suspended: false, suspension_public_comment: nil, suspension_end: nil
 
-    audit_warning('suspension_lift', @warning)
+    audit_warning('warning_lift', @warning)
+
+    if @warning.suspension?
+      audit_warning('suspension_lift', @warning)
+    end
 
     flash[:success] = 'The warning or suspension has been lifted. Please consider adding an annotation ' \
                       'explaining your reasons.'

app/models/mod_warning.rb

@@ -10,8 +10,16 @@ class ModWarning < ApplicationRecord
   scope :active, -> { where(active: true) }
   scope :to, ->(user) { where(community_user: user.community_user) }
 
+  # Was the warning issued with a suspension?
+  # @return [Boolean] check result
+  def suspension?
+    is_suspension
+  end
+
+  # Is the suspension issued with the warning still active?
+  # @return [Boolean] check result
   def suspension_active?
-    active && is_suspension && !suspension_end.past?
+    active && suspension? && !suspension_end.past?
   end
 
   def body_as_html

test/controllers/mod_warning_controller_test.rb

@@ -97,6 +97,9 @@ class ModWarningControllerTest < ActionController::TestCase
     assert_response(:found)
     warning.reload
     assert_not warning.active
+
+    assert_audit_log('warning_lift', related: warning)
+    assert_audit_log('suspension_lift', related: warning)
   end
 
   private