From c2101b10ed0bd6cc5d931d0589e59a7c7c4cfa18 Mon Sep 17 00:00:00 2001
From: Kat <katrina@kosiak.co.uk>
Date: Mon, 21 Nov 2022 09:20:34 +0000
Subject: [PATCH] lint

---
 app/models/location.rb                     | 10 ++++------
 spec/requests/locations_controller_spec.rb |  4 ++--
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/app/models/location.rb b/app/models/location.rb
index 30855cbcd..e16c01dbd 100644
--- a/app/models/location.rb
+++ b/app/models/location.rb
@@ -447,12 +447,10 @@ class Location < ApplicationRecord
       elsif reactivation_date_type == "other"
         errors.add(:reactivation_date, message: I18n.t("validations.location.toggle_date.invalid"))
       end
-    else
-      if !reactivation_date.between?(available_from, Time.zone.local(2200, 1, 1))
-        errors.add(:reactivation_date, message: I18n.t("validations.location.toggle_date.out_of_range", date: available_from.to_formatted_s(:govuk_date)))
-      elsif reactivation_date < recent_deactivation.deactivation_date
-        errors.add(:reactivation_date, message: I18n.t("validations.location.reactivation.before_deactivation", date: recent_deactivation.deactivation_date.to_formatted_s(:govuk_date)))
-      end
+    elsif !reactivation_date.between?(available_from, Time.zone.local(2200, 1, 1))
+      errors.add(:reactivation_date, message: I18n.t("validations.location.toggle_date.out_of_range", date: available_from.to_formatted_s(:govuk_date)))
+    elsif reactivation_date < recent_deactivation.deactivation_date
+      errors.add(:reactivation_date, message: I18n.t("validations.location.reactivation.before_deactivation", date: recent_deactivation.deactivation_date.to_formatted_s(:govuk_date)))
     end
   end
 
diff --git a/spec/requests/locations_controller_spec.rb b/spec/requests/locations_controller_spec.rb
index 9202ccf4e..15e198ac6 100644
--- a/spec/requests/locations_controller_spec.rb
+++ b/spec/requests/locations_controller_spec.rb
@@ -1241,14 +1241,14 @@ RSpec.describe LocationsController, type: :request do
       let!(:location) { FactoryBot.create(:location, scheme:, startdate: nil, created_at: Time.zone.local(2022, 4, 1)) }
       let(:deactivation_date) { Time.utc(2022, 10, 10) }
       let!(:lettings_log) { FactoryBot.create(:lettings_log, :sh, location:, scheme:, startdate:, owning_organisation: user.organisation) }
-      let(:startdate) {  Time.utc(2022, 10, 11) }
+      let(:startdate) { Time.utc(2022, 10, 11) }
       let(:add_deactivations) { nil }
 
       before do
         Timecop.freeze(Time.utc(2022, 10, 10))
         sign_in user
         add_deactivations
-        location.save
+        location.save!
         patch "/schemes/#{scheme.id}/locations/#{location.id}/new-deactivation", params:
       end