From cf5f46c0a81fc06480d5e70b4343e3e634d6274a Mon Sep 17 00:00:00 2001 From: natdeanlewissoftwire Date: Fri, 11 Aug 2023 12:11:02 +0100 Subject: [PATCH] feat: remove unnecessary logs --- .../data_protection_confirmation_import_service.rb | 2 +- .../imports/lettings_logs_field_import_service.rb | 6 +++--- app/services/imports/organisation_import_service.rb | 3 +-- app/services/imports/scheme_import_service.rb | 2 +- .../imports/scheme_location_import_service.rb | 2 +- app/services/imports/user_import_service.rb | 4 ++-- lib/tasks/full_import.rake | 12 ++++++++++++ 7 files changed, 21 insertions(+), 10 deletions(-) diff --git a/app/services/imports/data_protection_confirmation_import_service.rb b/app/services/imports/data_protection_confirmation_import_service.rb index 0ee936433..4a65e3f79 100644 --- a/app/services/imports/data_protection_confirmation_import_service.rb +++ b/app/services/imports/data_protection_confirmation_import_service.rb @@ -51,7 +51,7 @@ module Imports end def log_dpc_already_present(org) - @logger.warn("Data protection confirmation for #{org.name} with id #{org.id} is already present, skipping.") + # Continue end def log_org_must_exist diff --git a/app/services/imports/lettings_logs_field_import_service.rb b/app/services/imports/lettings_logs_field_import_service.rb index e65625445..6aaac63a7 100644 --- a/app/services/imports/lettings_logs_field_import_service.rb +++ b/app/services/imports/lettings_logs_field_import_service.rb @@ -27,7 +27,7 @@ module Imports if record.present? if record.offered.present? - @logger.info("lettings log #{record.id} has a value for offered, skipping update") + # Continue else offered = safe_string_as_integer(xml_doc, "Q20") record.update!(offered:) @@ -106,7 +106,7 @@ module Imports record.update!(mrcdate: major_repairs_date, majorrepairs: major_repairs) @logger.info("lettings log #{record.id}'s major repair value has been updated'") elsif record.majorrepairs.present? - @logger.info("lettings log #{record.id} has a value for major repairs, skipping update") + # Continue end else @logger.warn("Could not find record matching legacy ID #{old_id}") @@ -124,7 +124,7 @@ module Imports if tenant_code.present? && record.tenancycode.blank? record.update!(tenancycode: tenant_code) else - @logger.info("lettings log #{record.id} has a value for tenancycode, skipping update") + # Continue end else @logger.warn("Could not find record matching legacy ID #{old_id}") diff --git a/app/services/imports/organisation_import_service.rb b/app/services/imports/organisation_import_service.rb index 1ec1575bc..2748ff36f 100644 --- a/app/services/imports/organisation_import_service.rb +++ b/app/services/imports/organisation_import_service.rb @@ -37,8 +37,7 @@ module Imports old_visible_id:, ) rescue ActiveRecord::RecordNotUnique - name = organisation_field_value(xml_document, "name") - @logger.warn("Organisation #{name} is already present with old visible ID #{old_visible_id}, skipping.") + # Continue rescue ActiveRecord::RecordInvalid @logger.error("Organisation #{old_visible_id}: Failed to import") raise diff --git a/app/services/imports/scheme_import_service.rb b/app/services/imports/scheme_import_service.rb index b0b8f3ceb..d07ed9d14 100644 --- a/app/services/imports/scheme_import_service.rb +++ b/app/services/imports/scheme_import_service.rb @@ -15,7 +15,7 @@ module Imports old_visible_id: attributes["old_visible_id"], ) else - @logger.warn("Scheme with legacy ID #{attributes['old_id']} is not approved (#{attributes['status']}), skipping") + # Continue end rescue ActiveRecord::RecordInvalid @logger.error("Scheme #{attributes['old_visible_id']}: Failed to import") diff --git a/app/services/imports/scheme_location_import_service.rb b/app/services/imports/scheme_location_import_service.rb index e01cd1106..1e2108243 100644 --- a/app/services/imports/scheme_location_import_service.rb +++ b/app/services/imports/scheme_location_import_service.rb @@ -114,7 +114,7 @@ module Imports confirm_scheme_or_location(location) location.save! && location rescue ActiveRecord::RecordNotUnique - @logger.warn("Location is already present with legacy ID #{attributes['location_old_id']}, skipping") + # Continue rescue ActiveRecord::RecordInvalid @logger.error("Location #{attributes['location_old_id']}: Failed to import") raise diff --git a/app/services/imports/user_import_service.rb b/app/services/imports/user_import_service.rb index b0fe32bef..57d49b7ad 100644 --- a/app/services/imports/user_import_service.rb +++ b/app/services/imports/user_import_service.rb @@ -18,9 +18,9 @@ module Imports deleted = user_field_value(xml_document, "deleted") if LegacyUser.find_by(old_user_id:) - @logger.warn("User #{name} with old user id #{old_user_id} is already present, skipping.") + # Continue elsif deleted == "true" - @logger.warn("User #{name} with old user id #{old_user_id} is deleted, skipping.") + # Continue elsif (user = User.find_by(email:, organisation:)) is_dpo = user.is_data_protection_officer? || is_dpo?(user_field_value(xml_document, "user-type")) role = highest_role(user.role, role(user_field_value(xml_document, "user-type"))) diff --git a/lib/tasks/full_import.rake b/lib/tasks/full_import.rake index 28af8c4dc..3d10630bc 100644 --- a/lib/tasks/full_import.rake +++ b/lib/tasks/full_import.rake @@ -110,3 +110,15 @@ namespace :import do desc "Run a full import for the institutions listed in the named file on s3" task :full, %i[institutions_csv_name] => %i[environment initial logs trigger_invites generate_reports] end + +require 'benchmark' + +class Rake::Task + def execute_with_benchmark(*args) + bm = Benchmark.measure { execute_without_benchmark(*args) } + puts " #{name} --> #{bm}" + end + + alias_method :execute_without_benchmark, :execute + alias_method :execute, :execute_with_benchmark +end