From bf307aa376f2422fa41728ef85e211ee9e22be60 Mon Sep 17 00:00:00 2001 From: Kat Date: Wed, 10 May 2023 08:48:02 +0100 Subject: [PATCH] Don't run deduplication on staging --- app/services/bulk_upload/sales/year2022/row_parser.rb | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/app/services/bulk_upload/sales/year2022/row_parser.rb b/app/services/bulk_upload/sales/year2022/row_parser.rb index b7ecd63bd..e66ef74ee 100644 --- a/app/services/bulk_upload/sales/year2022/row_parser.rb +++ b/app/services/bulk_upload/sales/year2022/row_parser.rb @@ -285,7 +285,7 @@ class BulkUpload::Sales::Year2022::RowParser validate :validate_created_by_related, on: :after_log validate :validate_relevant_collection_window, on: :after_log validate :validate_incomplete_soft_validations, on: :after_log - validate :validate_if_log_already_exists, on: :after_log + validate :validate_if_log_already_exists, on: :after_log, if: -> { FeatureToggle.bulk_upload_duplicate_log_check_enabled? } def self.question_for_field(field) QUESTIONS[field] @@ -592,7 +592,7 @@ private attributes["othtype"] = field_85 - attributes["owning_organisation_id"] = owning_organisation_id + attributes["owning_organisation"] = owning_organisation attributes["created_by"] = created_by || bulk_upload.user attributes["hhregres"] = hhregres attributes["hhregresstill"] = hhregresstill @@ -804,10 +804,6 @@ private Organisation.find_by_id_on_multiple_fields(field_92) end - def owning_organisation_id - owning_organisation&.id - end - def created_by @created_by ||= User.find_by(email: field_93) end