Merge pull request #6072 from manyfold3d/fix-datapackage-tag-parsing

Fix datapackage tag parsing

Author: Floppy

app/jobs/scan/model/parse_metadata_job.rb

@@ -137,8 +137,6 @@ def attributes_from_datapackage(model)
       data.delete(:model_files)&.each do |file|
         model.model_files.find_by(filename: file.delete(:filename))&.update(file)
       end
-      # Merge in to main lists
-      tag_list.concat data.delete(:tag_list) if data.key?(:tag_list)
       # Done
       data.compact_blank
     else

spec/jobs/scan/model/parse_metadata_job_spec.rb

@@ -466,6 +466,21 @@
       end
     end
 
+    context "with tags in datapackage" do
+      before do
+        allow(Model).to receive(:find).with(model.id).and_return(model)
+        allow(model).to receive_messages(
+          model_files: instance_double(ActiveRecord::Relation, find_by: nil),
+          valid_preview_files: [],
+          datapackage_content: {"keywords" => ["test", "datapackage"]}
+        )
+      end
+
+      it "merges tags from datapackage" do
+        expect { described_class.perform_now(model.id) }.to change { model.reload.tag_list }.from(["!new"]).to(["!new", "test", "datapackage"])
+      end
+    end
+
     context "with already-set notes" do
       before do
         model.update!(notes: "already set")