From 22ad619cf0ee8ee6cc22d723a885fc2dab5962f1 Mon Sep 17 00:00:00 2001 From: Kat Date: Thu, 27 Jun 2024 15:59:29 +0100 Subject: [PATCH] Allow adding rent periods to organisations --- spec/factories/organisation.rb | 10 ++++++++++ spec/services/bulk_upload/lettings/log_creator_spec.rb | 2 +- .../bulk_upload/lettings/year2023/row_parser_spec.rb | 2 +- .../bulk_upload/lettings/year2024/row_parser_spec.rb | 2 +- 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/spec/factories/organisation.rb b/spec/factories/organisation.rb index c65533b3d..c42a9d6a2 100644 --- a/spec/factories/organisation.rb +++ b/spec/factories/organisation.rb @@ -14,6 +14,16 @@ FactoryBot.define do with_dsa { true } end + transient do + rent_periods { [] } + end + + after(:create) do |organisation, evaluator| + evaluator.rent_periods.each do |rent_period| + organisation.organisation_rent_periods << build(:organisation_rent_period, rent_period:) + end + end + after(:create) do |org, evaluator| if evaluator.with_dsa create( diff --git a/spec/services/bulk_upload/lettings/log_creator_spec.rb b/spec/services/bulk_upload/lettings/log_creator_spec.rb index 842e0b066..85cf310f6 100644 --- a/spec/services/bulk_upload/lettings/log_creator_spec.rb +++ b/spec/services/bulk_upload/lettings/log_creator_spec.rb @@ -3,7 +3,7 @@ require "rails_helper" RSpec.describe BulkUpload::Lettings::LogCreator do subject(:service) { described_class.new(bulk_upload:, path: "") } - let(:owning_org) { create(:organisation, old_visible_id: 123) } + let(:owning_org) { create(:organisation, old_visible_id: 123, rent_periods: [2]) } let(:user) { create(:user, organisation: owning_org) } let(:bulk_upload) { create(:bulk_upload, :lettings, user:) } diff --git a/spec/services/bulk_upload/lettings/year2023/row_parser_spec.rb b/spec/services/bulk_upload/lettings/year2023/row_parser_spec.rb index 37291cf08..ee8675bd3 100644 --- a/spec/services/bulk_upload/lettings/year2023/row_parser_spec.rb +++ b/spec/services/bulk_upload/lettings/year2023/row_parser_spec.rb @@ -10,7 +10,7 @@ RSpec.describe BulkUpload::Lettings::Year2023::RowParser do let(:user) { create(:user, organisation: owning_org) } let(:owning_org) { create(:organisation, :with_old_visible_id) } - let(:managing_org) { create(:organisation, :with_old_visible_id) } + let(:managing_org) { create(:organisation, :with_old_visible_id, rent_periods: [4]) } let(:scheme) { create(:scheme, :with_old_visible_id, owning_organisation: owning_org) } let(:location) { create(:location, :with_old_visible_id, scheme:) } diff --git a/spec/services/bulk_upload/lettings/year2024/row_parser_spec.rb b/spec/services/bulk_upload/lettings/year2024/row_parser_spec.rb index 4df484416..175925cac 100644 --- a/spec/services/bulk_upload/lettings/year2024/row_parser_spec.rb +++ b/spec/services/bulk_upload/lettings/year2024/row_parser_spec.rb @@ -10,7 +10,7 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do let(:user) { create(:user, organisation: owning_org) } let(:owning_org) { create(:organisation, :with_old_visible_id) } - let(:managing_org) { create(:organisation, :with_old_visible_id) } + let(:managing_org) { create(:organisation, :with_old_visible_id, rent_periods: [4, 1]) } let(:scheme) { create(:scheme, :with_old_visible_id, owning_organisation: owning_org) } let(:location) { create(:location, :with_old_visible_id, scheme:) }