From c716a52aae310559601c0c329b9ed03a5a4eeaba Mon Sep 17 00:00:00 2001 From: Mojca Lorber Date: Thu, 12 Mar 2020 12:19:25 +0100 Subject: [PATCH 1/2] Fix bug with date format when importing to inventory --- app/models/repository_date_time_value_base.rb | 2 +- .../repository_import_parser/importer.rb | 2 +- .../repository_date_time_value_base_spec.rb | 33 +++++++++++++++++++ 3 files changed, 35 insertions(+), 2 deletions(-) diff --git a/app/models/repository_date_time_value_base.rb b/app/models/repository_date_time_value_base.rb index 941cf1564..160543d62 100644 --- a/app/models/repository_date_time_value_base.rb +++ b/app/models/repository_date_time_value_base.rb @@ -26,7 +26,7 @@ class RepositoryDateTimeValueBase < ApplicationRecord end def self.import_from_text(text, attributes, options = {}) - date_format = options.dig(:user, :settings, :date_format) || Constants::DEFAULT_DATE_FORMAT + date_format = options[:user].settings[:date_format] || Constants::DEFAULT_DATE_FORMAT new(attributes.merge(data: DateTime.strptime(text, date_format))) rescue ArgumentError nil diff --git a/app/utilities/repository_import_parser/importer.rb b/app/utilities/repository_import_parser/importer.rb index 72855c8c7..4da4d325c 100644 --- a/app/utilities/repository_import_parser/importer.rb +++ b/app/utilities/repository_import_parser/importer.rb @@ -137,7 +137,7 @@ module RepositoryImportParser cell_value = column.data_type.constantize.import_from_text( value, cell_value_attributes, - user: @user.as_json + user: @user ) next if cell_value.nil? diff --git a/spec/models/repository_date_time_value_base_spec.rb b/spec/models/repository_date_time_value_base_spec.rb index a178cfaf0..a722060a4 100644 --- a/spec/models/repository_date_time_value_base_spec.rb +++ b/spec/models/repository_date_time_value_base_spec.rb @@ -39,4 +39,37 @@ describe RepositoryDateTimeValueBase, type: :model do end end end + + describe 'self.import_from_text' do + let(:user) { create :user } + let(:date_string1) { '2020-01-22' } + let(:date_string2) { '01-22-2020' } + let(:date_string3) { '01/22/2020' } + let(:test_date) { Date.parse('2020-01-22') } + let(:attributes) { {} } + + it 'takes date format from user settings 1' do + user.settings[:date_format] = '%Y-%m-%d' + user.save + result = RepositoryDateTimeValueBase.import_from_text(date_string1, attributes, user: user) + expect(result).to respond_to(:data) + expect(result.data).to eq(test_date) + end + + it 'takes date format from user settings 2' do + user.settings[:date_format] = '%m-%d-%Y' + user.save + result = RepositoryDateTimeValueBase.import_from_text(date_string2, attributes, user: user) + expect(result).to respond_to(:data) + expect(result.data).to eq(test_date) + end + + it 'takes default date format when there is no user settings' do + user.settings[:date_format] = nil + user.save + result = RepositoryDateTimeValueBase.import_from_text(date_string3, attributes, user: user) + expect(result).to respond_to(:data) + expect(result.data).to eq(test_date) + end + end end From 8dac5effbe81935331585540b6c1aa5f34e5a94e Mon Sep 17 00:00:00 2001 From: Mojca Lorber Date: Fri, 13 Mar 2020 14:57:26 +0100 Subject: [PATCH 2/2] Another fix --- app/models/repository_date_time_value_base.rb | 2 +- .../repository_import_parser/importer.rb | 3 +-- .../repository_date_time_value_base_spec.rb | 15 ++++++++++++--- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/app/models/repository_date_time_value_base.rb b/app/models/repository_date_time_value_base.rb index 160543d62..941cf1564 100644 --- a/app/models/repository_date_time_value_base.rb +++ b/app/models/repository_date_time_value_base.rb @@ -26,7 +26,7 @@ class RepositoryDateTimeValueBase < ApplicationRecord end def self.import_from_text(text, attributes, options = {}) - date_format = options[:user].settings[:date_format] || Constants::DEFAULT_DATE_FORMAT + date_format = options.dig(:user, :settings, :date_format) || Constants::DEFAULT_DATE_FORMAT new(attributes.merge(data: DateTime.strptime(text, date_format))) rescue ArgumentError nil diff --git a/app/utilities/repository_import_parser/importer.rb b/app/utilities/repository_import_parser/importer.rb index 4da4d325c..f016bf2cc 100644 --- a/app/utilities/repository_import_parser/importer.rb +++ b/app/utilities/repository_import_parser/importer.rb @@ -133,11 +133,10 @@ module RepositoryImportParser repository_cell_attributes: { repository_row: row[:repository_row], repository_column: column, importing: true } } - cell_value = column.data_type.constantize.import_from_text( value, cell_value_attributes, - user: @user + @user.as_json(root: true, only: :settings).deep_symbolize_keys ) next if cell_value.nil? diff --git a/spec/models/repository_date_time_value_base_spec.rb b/spec/models/repository_date_time_value_base_spec.rb index a722060a4..4761dbb1e 100644 --- a/spec/models/repository_date_time_value_base_spec.rb +++ b/spec/models/repository_date_time_value_base_spec.rb @@ -51,7 +51,10 @@ describe RepositoryDateTimeValueBase, type: :model do it 'takes date format from user settings 1' do user.settings[:date_format] = '%Y-%m-%d' user.save - result = RepositoryDateTimeValueBase.import_from_text(date_string1, attributes, user: user) + result = RepositoryDateTimeValueBase + .import_from_text(date_string1, + attributes, + user.as_json(root: true, only: :settings).deep_symbolize_keys) expect(result).to respond_to(:data) expect(result.data).to eq(test_date) end @@ -59,7 +62,10 @@ describe RepositoryDateTimeValueBase, type: :model do it 'takes date format from user settings 2' do user.settings[:date_format] = '%m-%d-%Y' user.save - result = RepositoryDateTimeValueBase.import_from_text(date_string2, attributes, user: user) + result = RepositoryDateTimeValueBase + .import_from_text(date_string2, + attributes, + user.as_json(root: true, only: :settings).deep_symbolize_keys) expect(result).to respond_to(:data) expect(result.data).to eq(test_date) end @@ -67,7 +73,10 @@ describe RepositoryDateTimeValueBase, type: :model do it 'takes default date format when there is no user settings' do user.settings[:date_format] = nil user.save - result = RepositoryDateTimeValueBase.import_from_text(date_string3, attributes, user: user) + result = RepositoryDateTimeValueBase + .import_from_text(date_string3, + attributes, + user.as_json(root: true, only: :settings).deep_symbolize_keys) expect(result).to respond_to(:data) expect(result.data).to eq(test_date) end