From 8556a649d58a7291db6942a2594533f9b8c06165 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 15 Dec 2022 17:45:02 +0100
Subject: Fix changing domain block severity not undoing individual account
 effects (#22135)

* Fix changing domain block severity not undoing individual account effects

Fixes #22133

* Add tests
---
 app/controllers/api/v1/admin/domain_blocks_controller.rb | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'app/controllers/api/v1/admin/domain_blocks_controller.rb')

diff --git a/app/controllers/api/v1/admin/domain_blocks_controller.rb b/app/controllers/api/v1/admin/domain_blocks_controller.rb
index df5b1b3fc..8b77e9717 100644
--- a/app/controllers/api/v1/admin/domain_blocks_controller.rb
+++ b/app/controllers/api/v1/admin/domain_blocks_controller.rb
@@ -40,10 +40,8 @@ class Api::V1::Admin::DomainBlocksController < Api::BaseController
 
   def update
     authorize @domain_block, :update?
-    @domain_block.update(domain_block_params)
-    severity_changed = @domain_block.severity_changed?
-    @domain_block.save!
-    DomainBlockWorker.perform_async(@domain_block.id, severity_changed)
+    @domain_block.update!(domain_block_params)
+    DomainBlockWorker.perform_async(@domain_block.id, @domain_block.severity_previously_changed?)
     log_action :update, @domain_block
     render json: @domain_block, serializer: REST::Admin::DomainBlockSerializer
   end
-- 
cgit