Browse Source

rebase

pull/1022/head
Kat 4 years ago
parent
commit
053b3995d9
  1. 11
      app/models/scheme.rb
  2. 2
      spec/helpers/schemes_helper_spec.rb
  3. 2
      spec/requests/schemes_controller_spec.rb

11
app/models/scheme.rb

@ -233,15 +233,4 @@ class Scheme < ApplicationRecord
def reactivating_soon? def reactivating_soon?
status == :reactivating_soon status == :reactivating_soon
end 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 end

2
spec/helpers/schemes_helper_spec.rb

@ -2,7 +2,7 @@ require "rails_helper"
RSpec.describe SchemesHelper do RSpec.describe SchemesHelper do
describe "Active periods" do describe "Active periods" do
let(:scheme) { FactoryBot.create(:scheme) } let(:scheme) { FactoryBot.create(:scheme, created_at: Time.zone.today) }
before do before do
Timecop.freeze(2022, 10, 10) Timecop.freeze(2022, 10, 10)

2
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 context "when signed in as a data coordinator" do
let(:user) { FactoryBot.create(:user, :data_coordinator) } 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!(:location) { FactoryBot.create(:location, scheme:) }
let(:deactivation_date) { Time.utc(2022, 10, 10) } let(:deactivation_date) { Time.utc(2022, 10, 10) }
let!(:lettings_log) { FactoryBot.create(:lettings_log, :sh, location:, scheme:, startdate:, owning_organisation: user.organisation) } let!(:lettings_log) { FactoryBot.create(:lettings_log, :sh, location:, scheme:, startdate:, owning_organisation: user.organisation) }

Loading…
Cancel
Save