Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
## [Unreleased]
* no unreleased changes *
* Adds option to format value to Time *

## 11.3.1/ 2025-09-02
### Enhancement
Expand Down
12 changes: 8 additions & 4 deletions lib/ndr_import/mapper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ module Strings
RAWTEXT_NAME = 'rawtext_name'.freeze
REPLACE = 'replace'.freeze
STANDARD_MAPPING = 'standard_mapping'.freeze
TIME = 'time'.freeze
UNPACK_PATTERN = 'unpack_pattern'.freeze
VALIDATES = 'validates'.freeze
ZIP_ORDER = 'zip_order'.freeze
Expand Down Expand Up @@ -203,12 +204,15 @@ def field_zippable?(field_mapping, data_field)

def mapped_value(original_value, field_mapping)
if field_mapping.include?(Strings::FORMAT)
return nil if original_value.blank?

expected_format = field_mapping[Strings::FORMAT]
begin
return original_value.blank? ? nil : original_value.to_date(field_mapping[Strings::FORMAT])
return Time.strptime(original_value, expected_format) if field_mapping[Strings::TIME]

original_value.to_date(expected_format)
rescue ArgumentError => e
e2 = ArgumentError.new("#{e} value #{original_value.inspect}")
e2.set_backtrace(e.backtrace)
raise e2
raise ArgumentError, "#{e.message} value #{original_value.inspect}", e.backtrace
end
elsif field_mapping.include?(Strings::CLEAN)
return nil if original_value.blank?
Expand Down
22 changes: 22 additions & 0 deletions test/mapper_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -345,6 +345,14 @@ def setup
- field: field_two
YML

time_format_mapping = YAML.safe_load <<-YML
- column: time_field
mappings:
- field: time_field
format: "%Y-%m-%dT%H:%M:%S%:z"
time: true
YML

test 'map should return a number' do
assert_equal '1', TestMapper.new.mapped_value('A', map_mapping)
end
Expand Down Expand Up @@ -749,4 +757,18 @@ def setup
}
assert_equal expected_mapped_line, mapped_line
end

test 'should format time' do
expected_value = Time.new(2025, 6, 1, 10, 15, 36, '+01:00')
actual_value = TestMapper.new.mapped_line(['2025-06-01T10:15:36+01:00'], time_format_mapping)['time_field']
assert_equal expected_value, actual_value
end

test 'should raise an error with invalid time format' do
exception = assert_raise(ArgumentError) do
TestMapper.new.mapped_line(['2025-06-01T10:15:36'], time_format_mapping)
end

assert exception.message.starts_with? 'invalid date or strptime format'
end
end
Loading