From 34dd42cc55df4c51b27535749148658ce56f1436 Mon Sep 17 00:00:00 2001 From: Kat Date: Mon, 21 Nov 2022 17:04:31 +0000 Subject: [PATCH] Refactor --- app/controllers/locations_controller.rb | 4 ++-- app/helpers/locations_helper.rb | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/controllers/locations_controller.rb b/app/controllers/locations_controller.rb index fd9738467..90430db6b 100644 --- a/app/controllers/locations_controller.rb +++ b/app/controllers/locations_controller.rb @@ -43,7 +43,7 @@ class LocationsController < ApplicationController end def deactivate - if LocationDeactivationPeriod.create!(location_id: @location.id, deactivation_date: params[:deactivation_date]) && update_affected_logs + if @location.location_deactivation_periods.create!(location_id: @location.id, deactivation_date: params[:deactivation_date]) && reset_location_and_scheme_for_logs! flash[:notice] = deactivate_success_notice end redirect_to scheme_location_path(@scheme, @location) @@ -213,7 +213,7 @@ private end end - def update_affected_logs + def reset_location_and_scheme_for_logs! @location.lettings_logs.filter_by_before_startdate(params[:deactivation_date].to_time).update!(location: nil, scheme: nil) end diff --git a/app/helpers/locations_helper.rb b/app/helpers/locations_helper.rb index db4830f87..6dbf90da7 100644 --- a/app/helpers/locations_helper.rb +++ b/app/helpers/locations_helper.rb @@ -77,7 +77,8 @@ private end def is_nested?(inner, outer) - return false if inner == outer || [inner.deactivation_date, inner.reactivation_date, outer.deactivation_date, outer.reactivation_date].any?(&:blank?) + return false if inner == outer + return false if [inner.deactivation_date, inner.reactivation_date, outer.deactivation_date, outer.reactivation_date].any?(&:blank?) [inner.deactivation_date, inner.reactivation_date].all? { |date| date.between?(outer.deactivation_date, outer.reactivation_date) } end