Merge pull request #3352 from nulib/deploy/staging

Deploy v7.2.6 to production
nulib · May 17, 2023 · 1685b1c · 1685b1c
2 parents 6ba69df + cc077d2
commit 1685b1c
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 2 deletions.
diff --git a/app/lib/meadow/pipeline/actions/extract_exif_metadata.ex b/app/lib/meadow/pipeline/actions/extract_exif_metadata.ex
@@ -55,7 +55,7 @@ defmodule Meadow.Pipeline.Actions.ExtractExifMetadata do
     extracted_metadata =
       case file_set.extracted_metadata do
         nil -> %{exif: exif_metadata}
-        map -> Map.put(map, :exif, exif_metadata)
+        map -> map |> Map.delete("exif") |> Map.put(:exif, exif_metadata)
       end
 
     FileSets.update_file_set(file_set, %{extracted_metadata: extracted_metadata})

diff --git a/app/mix.exs b/app/mix.exs
@@ -3,7 +3,7 @@ Code.require_file("lib/env.ex")
 defmodule Meadow.MixProject do
   use Mix.Project
 
-  @app_version "7.2.5"
+  @app_version "7.2.6"
 
   def project do
     [

diff --git a/app/test/pipeline/actions/extract_exif_metadata_test.exs b/app/test/pipeline/actions/extract_exif_metadata_test.exs
@@ -215,5 +215,24 @@ defmodule Meadow.Pipeline.Actions.ExtractExifMetadataTest do
 
       assert log =~ ~r/already complete without overwriting/
     end
+
+    test "key collision", %{exif_file_set_id: file_set_id} do
+      with file_set <- FileSets.get_file_set!(file_set_id) do
+        extracted_metadata = put_in(file_set.extracted_metadata, ["exif", "value"], "bogus")
+        FileSets.update_file_set(file_set, %{extracted_metadata: extracted_metadata})
+      end
+
+      with %{extracted_metadata: subject} <- FileSets.get_file_set!(file_set_id) do
+        assert get_in(subject, ["exif", "value"]) == "bogus"
+      end
+
+      assert {:ok, %{id: ^file_set_id}, %{}} =
+               send_test_message(ExtractExifMetadata, %{file_set_id: file_set_id}, %{})
+
+      FileSets.get_file_set!(file_set_id)
+      |> Map.get(:extracted_metadata)
+      |> get_in(["exif", "value"])
+      |> assert_maps_equal(@exif, @keys)
+    end
   end
 end