From 32b547322293a99a7470477c7fc5b6c424216fcd Mon Sep 17 00:00:00 2001 From: Owen Date: Wed, 18 Dec 2024 11:51:55 +0100 Subject: [PATCH] file server images in prod and internet sourced images in other environments --- lib/mocks/images.ex | 11 +++++++++++ lib/plantid_discord_bot/cogs/plantnet.ex | 17 ++++++----------- 2 files changed, 17 insertions(+), 11 deletions(-) create mode 100644 lib/mocks/images.ex diff --git a/lib/mocks/images.ex b/lib/mocks/images.ex new file mode 100644 index 0000000..2a54f32 --- /dev/null +++ b/lib/mocks/images.ex @@ -0,0 +1,11 @@ +defmodule PlantIdDiscordBotTest.Mocks.PlantNet.Images do + @moduledoc """ + Mocks images passed to the PlantNet API. This means that the response will not be the images you have uploaded, but rather the response from the images below. + """ + def images() do + [ + "https://upload.wikimedia.org/wikipedia/commons/f/ff/Prunus_cerasifera_A.jpg", + "https://le-jardin-de-pascal.com/2195113-large_default/prunus-cerasifera-atropurpurea-prunier-myrobolan-nigra.jpg" + ] + end +end diff --git a/lib/plantid_discord_bot/cogs/plantnet.ex b/lib/plantid_discord_bot/cogs/plantnet.ex index 35762a2..6a04819 100644 --- a/lib/plantid_discord_bot/cogs/plantnet.ex +++ b/lib/plantid_discord_bot/cogs/plantnet.ex @@ -52,17 +52,12 @@ defmodule PlantIdDiscordBot.Cog.PlantNet do }) end - # TODO use actual image data - image1 = - "https://upload.wikimedia.org/wikipedia/commons/f/ff/Prunus_cerasifera_A.jpg" - - image2 = - "https://le-jardin-de-pascal.com/2195113-large_default/prunus-cerasifera-atropurpurea-prunier-myrobolan-nigra.jpg" - - images = [image1, image2] - - # production: - # images = Enum.map(saved_images, fn {:ok, filename} -> "#{@fileserver_url}/#{filename}" end) + images = + if Mix.env() in [:test, :dev] do + PlantIdDiscordBotTest.Mocks.PlantNet.Images.images() + else + Enum.map(saved_images, fn {:ok, filename} -> "#{@fileserver_url}/#{filename}" end) + end Logger.debug(Enum.join(images, ", "))