From 3bbc0c526d3d48fbea771495b358118db1d6bb96 Mon Sep 17 00:00:00 2001 From: Kat Date: Thu, 24 Nov 2022 10:34:34 +0000 Subject: [PATCH] rebase --- app/models/scheme.rb | 11 ----------- spec/helpers/schemes_helper_spec.rb | 2 +- spec/requests/schemes_controller_spec.rb | 2 +- 3 files changed, 2 insertions(+), 13 deletions(-) diff --git a/app/models/scheme.rb b/app/models/scheme.rb index 24966f5ea..fce696bb6 100644 --- a/app/models/scheme.rb +++ b/app/models/scheme.rb @@ -233,15 +233,4 @@ class Scheme < ApplicationRecord def reactivating_soon? status == :reactivating_soon end - - def status_during(date) - return if date.blank? - - closest_reactivation = scheme_deactivation_periods.reverse.find { |period| period.reactivation_date.present? && date.between?(period.deactivation_date, period.reactivation_date - 1.day) } - return { status: :reactivating_soon, date: closest_reactivation.reactivation_date, deactivation_date: closest_reactivation.deactivation_date } if closest_reactivation.present? - return { status: :activating_soon, date: available_from } if available_from.present? && available_from > date - - open_deactivation = scheme_deactivation_periods.deactivations_without_reactivation.first - return { status: :deactivated, date: open_deactivation.deactivation_date } if open_deactivation.present? && open_deactivation.deactivation_date <= date - end end diff --git a/spec/helpers/schemes_helper_spec.rb b/spec/helpers/schemes_helper_spec.rb index 96f472457..b1e9f9c96 100644 --- a/spec/helpers/schemes_helper_spec.rb +++ b/spec/helpers/schemes_helper_spec.rb @@ -2,7 +2,7 @@ require "rails_helper" RSpec.describe SchemesHelper do describe "Active periods" do - let(:scheme) { FactoryBot.create(:scheme) } + let(:scheme) { FactoryBot.create(:scheme, created_at: Time.zone.today) } before do Timecop.freeze(2022, 10, 10) diff --git a/spec/requests/schemes_controller_spec.rb b/spec/requests/schemes_controller_spec.rb index 4de927f8f..0769e15c6 100644 --- a/spec/requests/schemes_controller_spec.rb +++ b/spec/requests/schemes_controller_spec.rb @@ -1767,7 +1767,7 @@ RSpec.describe SchemesController, type: :request do context "when signed in as a data coordinator" do let(:user) { FactoryBot.create(:user, :data_coordinator) } - let!(:scheme) { FactoryBot.create(:scheme, owning_organisation: user.organisation) } + let!(:scheme) { FactoryBot.create(:scheme, owning_organisation: user.organisation, created_at: Time.zone.today) } let!(:location) { FactoryBot.create(:location, scheme:) } let(:deactivation_date) { Time.utc(2022, 10, 10) } let!(:lettings_log) { FactoryBot.create(:lettings_log, :sh, location:, scheme:, startdate:, owning_organisation: user.organisation) }