Logo personnalisé d'un JDD : ajout timestamp dans nom de fichier (#4040)

etalab · Jul 8, 2024 · dce2db1 · dce2db1
1 parent c23eaa5
commit dce2db1
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/apps/transport/lib/jobs/custom_logo_conversion_job.ex b/apps/transport/lib/jobs/custom_logo_conversion_job.ex
@@ -7,13 +7,14 @@ defmodule Transport.Jobs.CustomLogoConversionJob do
   use Oban.Worker, max_attempts: 3
 
   @impl Oban.Worker
-  def perform(%Oban.Job{args: %{"datagouv_id" => datagouv_id, "path" => path}}) do
+  def perform(%Oban.Job{args: %{"datagouv_id" => datagouv_id, "path" => path}, inserted_at: %DateTime{} = inserted_at}) do
     %DB.Dataset{datagouv_id: datagouv_id} = DB.Repo.get_by!(DB.Dataset, datagouv_id: datagouv_id)
     local_path = Path.join(System.tmp_dir!(), path)
     extension = local_path |> Path.extname() |> String.downcase()
+    timestamp = DateTime.to_unix(inserted_at)
 
-    logo_filename = "#{datagouv_id}#{extension}"
-    full_logo_filename = "#{datagouv_id}_full#{extension}"
+    logo_filename = "#{datagouv_id}.#{timestamp}#{extension}"
+    full_logo_filename = "#{datagouv_id}_full.#{timestamp}#{extension}"
     logo_path = Path.join(System.tmp_dir!(), logo_filename)
     full_logo_path = Path.join(System.tmp_dir!(), full_logo_filename)
 

diff --git a/apps/transport/test/transport/jobs/custom_logo_conversion_job_test.exs b/apps/transport/test/transport/jobs/custom_logo_conversion_job_test.exs
@@ -16,8 +16,10 @@ defmodule Transport.Test.Transport.Jobs.CustomLogoConversionJobTest do
     remote_path = "#{Ecto.UUID.generate()}.png"
     local_path = Path.join(System.tmp_dir!(), remote_path)
 
-    logo_filename = "#{datagouv_id}.png"
-    full_logo_filename = "#{datagouv_id}_full.png"
+    inserted_at = DateTime.utc_now()
+    inserted_at_unix = DateTime.to_unix(inserted_at)
+    logo_filename = "#{datagouv_id}.#{inserted_at_unix}.png"
+    full_logo_filename = "#{datagouv_id}_full.#{inserted_at_unix}.png"
 
     Transport.ExAWS.Mock
     |> expect(:request!, fn %ExAws.S3.Download{
@@ -44,7 +46,12 @@ defmodule Transport.Test.Transport.Jobs.CustomLogoConversionJobTest do
 
     Transport.Test.S3TestUtils.s3_mocks_delete_object(Transport.S3.bucket_name(:logos), remote_path)
 
-    assert :ok == perform_job(CustomLogoConversionJob, %{"datagouv_id" => datagouv_id, "path" => remote_path})
+    assert :ok ==
+             perform_job(
+               CustomLogoConversionJob,
+               %{"datagouv_id" => datagouv_id, "path" => remote_path},
+               inserted_at: inserted_at
+             )
 
     refute File.exists?(local_path)
     expected_logo_url = Transport.S3.permanent_url(:logos, logo_filename)