Merge pull request #1094 from alphagov/fix-modified-date

Correctly assign updated date to links

Author: brucebolt

app/services/ckan/v26/link_mapper.rb

@@ -7,7 +7,7 @@ def call(resource, dataset)
           format: resource.get("format"),
           name: build_name(resource),
           created_at: build_created_at(resource, dataset),
-          updated_at: build_created_at(resource, dataset),
+          updated_at: build_updated_at(resource, dataset),
           type: build_type(resource),
           dataset_id: dataset.id,
         }
@@ -22,6 +22,13 @@ def build_created_at(resource, dataset)
         dataset.created_at
       end
 
+      def build_updated_at(resource, dataset)
+        updated = resource.get("metadata_modified")
+        return updated if updated.present?
+
+        dataset.updated_at
+      end
+
       def build_name(resource)
         name = resource.get("name")
         description = resource.get("description")

spec/factories/ckan_v26_resource.rb

@@ -5,6 +5,7 @@
     name { "Resource locator" }
     description { "Resource locator" }
     created { "2016-04-05T09:48:43.164470" }
+    metadata_modified { "2017-04-05T09:48:43.164470" }
     resource_type { "file" }
 
     initialize_with do

spec/services/ckan/v26/link_mapper_spec.rb

@@ -12,7 +12,7 @@
       expect(attributes[:format]).to eq resource.get("format")
       expect(attributes[:name]).to eq resource.get("name")
       expect(attributes[:created_at]).to eq resource.get("created")
-      expect(attributes[:updated_at]).to eq resource.get("created")
+      expect(attributes[:updated_at]).to eq resource.get("metadata_modified")
       expect(attributes[:type]).to eq "Datafile"
     end
 
@@ -38,7 +38,12 @@
       resource = build :ckan_v26_resource, created: ""
       attributes = subject.call(resource, dataset)
       expect(attributes[:created_at]).to eq dataset.created_at
-      expect(attributes[:updated_at]).to eq dataset.created_at
+    end
+
+    it "uses the dataset modified time if the resource has none" do
+      resource = build :ckan_v26_resource, metadata_modified: ""
+      attributes = subject.call(resource, dataset)
+      expect(attributes[:updated_at]).to eq dataset.updated_at
     end
   end
 end