From 7fa5c4ce95a2d2fa9d2a0a7dab346a416773793a Mon Sep 17 00:00:00 2001 From: Kat Date: Fri, 6 Jan 2023 12:31:04 +0000 Subject: [PATCH] refactor --- app/services/imports/lettings_logs_import_service.rb | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/app/services/imports/lettings_logs_import_service.rb b/app/services/imports/lettings_logs_import_service.rb index 0628a1f3d..1d5ddfca3 100644 --- a/app/services/imports/lettings_logs_import_service.rb +++ b/app/services/imports/lettings_logs_import_service.rb @@ -246,7 +246,7 @@ module Imports apply_date_consistency!(attributes) apply_household_consistency!(attributes) - create_organisation_relationship(attributes) + create_organisation_relationship!(attributes) lettings_log = save_lettings_log(attributes, previous_status) compute_differences(lettings_log, attributes) @@ -683,16 +683,12 @@ module Imports end end - def create_organisation_relationship(attributes) + def create_organisation_relationship!(attributes) parent_organisation_id = attributes["owning_organisation_id"] child_organisation_id = attributes["managing_organisation_id"] - return if parent_organisation_id == child_organisation_id || organisation_relationship_exists?(parent_organisation_id, child_organisation_id) + return if parent_organisation_id == child_organisation_id - OrganisationRelationship.create!(parent_organisation_id:, child_organisation_id:) - end - - def organisation_relationship_exists?(parent_organisation_id, child_organisation_id) - OrganisationRelationship.find_by(parent_organisation_id:, child_organisation_id:).present? + OrganisationRelationship.find_or_create_by!(parent_organisation_id:, child_organisation_id:) end end end