From f7f88f31234978607067c05facf538beddeec04e Mon Sep 17 00:00:00 2001 From: Kat Date: Fri, 2 Dec 2022 15:54:24 +0000 Subject: [PATCH] extract resolve method and fix attribute nme --- app/controllers/lettings_logs_controller.rb | 2 +- app/models/form.rb | 2 +- app/models/lettings_log.rb | 4 ++++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/controllers/lettings_logs_controller.rb b/app/controllers/lettings_logs_controller.rb index 030b9aacd..40560fca8 100644 --- a/app/controllers/lettings_logs_controller.rb +++ b/app/controllers/lettings_logs_controller.rb @@ -116,7 +116,7 @@ private end def resolve_logs! - if @log&.unresolved && @log.location.present? && @log.scheme.present? && @log&.update(unresolved: false) + if @log&.unresolved && @log.location.present? && @log.scheme.present? && @log&.resolve! unresolved_logs_count_for_user = current_user.lettings_logs.unresolved.created_by(current_user).count flash.now[:notice] = helpers.flash_notice_for_resolved_logs(unresolved_logs_count_for_user) end diff --git a/app/models/form.rb b/app/models/form.rb index f597c8c0e..c39eba2a2 100644 --- a/app/models/form.rb +++ b/app/models/form.rb @@ -88,7 +88,7 @@ class Form end def unresolved_log_path - "#{form_type}_#{unresolved_log_redirect_page_id}_path" + "#{type}_#{unresolved_log_redirect_page_id}_path" end def next_incomplete_section_redirect_path(subsection, log) diff --git a/app/models/lettings_log.rb b/app/models/lettings_log.rb index e79c0287d..610ddbd75 100644 --- a/app/models/lettings_log.rb +++ b/app/models/lettings_log.rb @@ -513,6 +513,10 @@ class LettingsLog < Log [needstype, renewal, rent_type, startdate, owning_organisation_id, created_by_id].all?(&:present?) end + def resolve! + update(unresolved: false) + end + private PIO = PostcodeService.new