From 4494c1bafced91b0de5ba525be5d095d1f7da947 Mon Sep 17 00:00:00 2001 From: baarkerlounger Date: Tue, 2 Nov 2021 09:33:38 +0000 Subject: [PATCH] Extract method --- app/controllers/case_logs_controller.rb | 2 +- app/validations/soft_validations.rb | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app/controllers/case_logs_controller.rb b/app/controllers/case_logs_controller.rb index 268d1b9b3..f8bef385a 100644 --- a/app/controllers/case_logs_controller.rb +++ b/app/controllers/case_logs_controller.rb @@ -58,7 +58,7 @@ class CaseLogsController < ApplicationController @case_log = CaseLog.find(params[:id]) @case_log.page = params[:case_log][:page] responses_for_page = responses_for_page(@case_log.page) - if @case_log.update(responses_for_page) && (@case_log.soft_errors.empty? || @case_log.soft_errors_overridden?) + if @case_log.update(responses_for_page) && @case_log.has_no_unresolved_soft_errors? redirect_path = get_next_page_path(form, @case_log.page, @case_log) redirect_to(send(redirect_path, @case_log)) else diff --git a/app/validations/soft_validations.rb b/app/validations/soft_validations.rb index 37bcd3e56..b62490130 100644 --- a/app/validations/soft_validations.rb +++ b/app/validations/soft_validations.rb @@ -1,4 +1,8 @@ module SoftValidations + def has_no_unresolved_soft_errors? + soft_errors.empty? || soft_errors_overridden? + end + def soft_errors {}.merge(net_income_validations) end