Skip to content
This repository was archived by the owner on Jan 24, 2025. It is now read-only.

Commit 9c1d61c

Browse files
authored
Merge pull request #1226 from alphagov/truncate-metadata_date
metadata_date should be in the form YYYY-MM-DD
2 parents b2e16ea + 9992698 commit 9c1d61c

File tree

4 files changed

+9
-5
lines changed

4 files changed

+9
-5
lines changed

app/models/ckan/v26/package.rb

+6-2
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,13 @@ def get(key)
99
@package[key]
1010
end
1111

12-
def get_extra(key)
12+
def get_extra(key, max_length = 0)
1313
@extras ||= hashify(@package["extras"] || [])
14-
@extras[key]
14+
if max_length.positive? && @extras[key].present?
15+
@extras[key][0, max_length]
16+
else
17+
@extras[key]
18+
end
1519
end
1620

1721
def get_harvest(key)

app/services/ckan/v26/inspire_mapper.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ def call(package)
1414
harvest_object_id: package.get_extra("harvest_object_id") || package.get_harvest("harvest_object_id"),
1515
harvest_source_reference: package.get_extra("harvest_source_reference"),
1616
import_source: package.get_extra("import_source"),
17-
metadata_date: package.get_extra("metadata-date"),
17+
metadata_date: package.get_extra("metadata-date", 10),
1818
metadata_language: package.get_extra("metadata-language"),
1919
provider: package.get_extra("provider"),
2020
resource_type: package.get_extra("resource-type"),

spec/factories/ckan_v26_package.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
add_attribute("harvest_object_id") { SecureRandom.uuid }
4040
add_attribute("harvest_source_reference") { SecureRandom.uuid }
4141
add_attribute("import_source") { "harvest" }
42-
add_attribute("metadata-date") { "2018-06-05" }
42+
add_attribute("metadata-date") { "2018-06-05T11:00:00" }
4343
add_attribute("metadata-language") { "eng" }
4444
add_attribute("provider") { "" }
4545
add_attribute("resource-type") { "dataset" }

spec/services/ckan/v26/inspire_mapper_spec.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
expect(attributes[:harvest_object_id]).to eq package.get_extra("harvest_object_id")
1919
expect(attributes[:harvest_source_reference]).to eq package.get_extra("harvest_source_reference")
2020
expect(attributes[:import_source]).to eq package.get_extra("import_source")
21-
expect(attributes[:metadata_date]).to eq package.get_extra("metadata-date")
21+
expect(attributes[:metadata_date]).to eq package.get_extra("metadata-date", 10)
2222
expect(attributes[:metadata_language]).to eq package.get_extra("metadata-language")
2323
expect(attributes[:provider]).to eq package.get_extra("provider")
2424
expect(attributes[:resource_type]).to eq package.get_extra("resource-type")

0 commit comments

Comments
 (0)