From 33d6ed60a4af1d66f4365c16dc9af7fe33ddc426 Mon Sep 17 00:00:00 2001 From: Gerhard Schlager Date: Mon, 14 Feb 2022 18:10:35 +0100 Subject: [PATCH] DEV: Don't import year of birth (#15937) The cakeday plugin doesn't use the year. --- script/bulk_import/base.rb | 5 +++++ script/import_scripts/base.rb | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/script/bulk_import/base.rb b/script/bulk_import/base.rb index 3b0efbc1c91..ab01e0c9bcd 100644 --- a/script/bulk_import/base.rb +++ b/script/bulk_import/base.rb @@ -431,6 +431,11 @@ class BulkImport::Base user[:last_emailed_at] ||= NOW user[:created_at] ||= NOW user[:updated_at] ||= user[:created_at] + + if (date_of_birth = user[:date_of_birth]).is_a?(Date) && date_of_birth.year != 1904 + user[:date_of_birth] = Date.new(1904, date_of_birth.month, date_of_birth.day) + end + user end diff --git a/script/import_scripts/base.rb b/script/import_scripts/base.rb index 7cd7961cfcb..2f076adc2fb 100644 --- a/script/import_scripts/base.rb +++ b/script/import_scripts/base.rb @@ -332,6 +332,10 @@ class ImportScripts::Base opts[:import_mode] = true opts[:last_emailed_at] = opts.fetch(:last_emailed_at, Time.now) + if (date_of_birth = opts[:date_of_birth]).is_a?(Date) && date_of_birth.year != 1904 + opts[:date_of_birth] = Date.new(1904, date_of_birth.month, date_of_birth.day) + end + u = User.new(opts) (opts[:custom_fields] || {}).each { |k, v| u.custom_fields[k] = v } u.custom_fields["import_id"] = import_id