From 53189bcbe46590a8ae1d246a4be5a7ac7df04e1a Mon Sep 17 00:00:00 2001 From: Kat Date: Tue, 25 Jul 2023 16:10:52 +0100 Subject: [PATCH] mark organisations as merged --- app/services/merge/merge_organisations_service.rb | 6 +++--- spec/services/merge/merge_organisations_service_spec.rb | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/app/services/merge/merge_organisations_service.rb b/app/services/merge/merge_organisations_service.rb index 87c0aef63..3d922e8d7 100644 --- a/app/services/merge/merge_organisations_service.rb +++ b/app/services/merge/merge_organisations_service.rb @@ -16,9 +16,9 @@ class Merge::MergeOrganisationsService merge_schemes_and_locations(merging_organisation) merge_lettings_logs(merging_organisation) merge_sales_logs(merging_organisation) + mark_organisation_as_merged(merging_organisation) end @absorbing_organisation.save! - mark_organisations_as_merged Rails.logger.info(@users_success_message) Rails.logger.info(@schemes_success_message) rescue ActiveRecord::RecordInvalid => e @@ -99,8 +99,8 @@ private end end - def mark_organisations_as_merged - # @merging_organisations.update_all(merge_date: Time.zone.today) + def mark_organisation_as_merged(merging_organisation) + merging_organisation.update(merge_date: Time.zone.today) end def merge_boolean_organisation_attribute(attribute) diff --git a/spec/services/merge/merge_organisations_service_spec.rb b/spec/services/merge/merge_organisations_service_spec.rb index 3382c5d24..9ec6144b7 100644 --- a/spec/services/merge/merge_organisations_service_spec.rb +++ b/spec/services/merge/merge_organisations_service_spec.rb @@ -22,10 +22,11 @@ RSpec.describe Merge::MergeOrganisationsService do expect(merging_organisation_user.organisation).to eq(absorbing_organisation) end - xit "sets merge date on merged organisation" do + it "sets merge date on merged organisation" do merge_organisations_service.call - expect(merging_organisation.merge_date).to eq(Time.zone.today) + merging_organisation.reload + expect(merging_organisation.merge_date.to_date).to eq(Time.zone.today) end it "combines organisation data" do