Merge pull request #3945 from nulib/fix-api-url

Fix download_url api path
nulib · May 3, 2024 · 9886a60 · 9886a60
2 parents a74b49e + 2a7fbd9
commit 9886a60
Showing 1 changed file with 6 additions and 9 deletions.
diff --git a/app/lib/meadow/data/file_sets.ex b/app/lib/meadow/data/file_sets.ex
@@ -214,23 +214,20 @@ defmodule Meadow.Data.FileSets do
  end
 
  def derivative_key(file_set) do
-  Path.join([
-  "derivatives",
-  Pairtree.derivative_path(file_set.id)
-  ])
+ Path.join([
+ "derivatives",
+ Pairtree.derivative_path(file_set.id)
+ ])
  end
 
  def download_uri_for(%FileSet{id: id, role: %{id: "X"}}), do: download_uri(id)
  def download_uri_for(%FileSet{id: id, role: %{id: "A"}}), do: download_uri(id)
  def download_uri_for(_), do: nil
 
  defp download_uri(id) do
- with uri <- URI.parse(Application.get_env(:meadow, :dc_api) |> get_in([:v2, "base_url"])) do
- uri
- |> URI.merge("file-sets/" <> id <> "/download")
- |> URI.to_string()
+ api_url = Application.get_env(:meadow, :dc_api) |> get_in([:v2, "base_url"])
+ "#{api_url}/file-sets/#{id}/download"
  end
-end
 
  defp multi_update(file_set_updates) do
  file_set_updates