Rename :version_id path param due to override and fix warnings in code

apps/arena/lib/arena/configuration.ex

@@ -41,20 +41,6 @@ defmodule Arena.Configuration do
     end)
   end
 
-  # TODO: This is a placeholder because the above function needs to retrieve only 1 map params
-  # https://github.com/lambdaclass/mirra_backend/issues/1028
-  def get_current_map_configuration_for_configurator do
-    gateway_url = Application.get_env(:arena, :gateway_url)
-
-    {:ok, payload} =
-      Finch.build(:get, "#{gateway_url}/curse/configuration/current", [{"content-type", "application/json"}])
-      |> Finch.request(Arena.Finch)
-
-    Jason.decode!(payload.body, [{:keys, :atoms}])
-    |> Map.update!(:map, fn maps -> Enum.map(maps, fn map -> parse_map_config(map) end) end)
-    |> Map.get(:map)
-  end
-
   defp get_client_config() do
     {:ok, config_json} =
       Application.app_dir(:arena, "priv/client_config.json")

apps/configurator/lib/configurator_web/controllers/character_controller.ex

@@ -6,12 +6,12 @@ defmodule ConfiguratorWeb.CharacterController do
   alias GameBackend.Configuration
   alias GameBackend.Utils
 
-  def index(conn, %{"id" => version_id}) do
+  def index(conn, %{"version_id" => version_id}) do
     characters = Characters.get_curse_characters_by_version(version_id)
     render(conn, :index, characters: characters, version_id: version_id)
   end
 
-  def new(conn, %{"id" => version_id}) do
+  def new(conn, %{"version_id" => version_id}) do
     changeset = Ecto.Changeset.change(%Character{})
     version = Configuration.get_version!(version_id)
     skills = Utils.list_curse_skills_by_version_grouped_by_type(version.id)

apps/configurator/lib/configurator_web/controllers/consumable_item_controller.ex

@@ -5,12 +5,12 @@ defmodule ConfiguratorWeb.ConsumableItemController do
   alias GameBackend.Items.ConsumableItem
   alias GameBackend.Configuration
 
-  def index(conn, %{"id" => version_id}) do
+  def index(conn, %{"version_id" => version_id}) do
     consumable_items = Items.list_consumable_items_by_version(version_id)
     render(conn, :index, consumable_items: consumable_items, version_id: version_id)
   end
 
-  def new(conn, %{"id" => version_id}) do
+  def new(conn, %{"version_id" => version_id}) do
     changeset = Items.change_consumable_item(%ConsumableItem{})
     version = Configuration.get_version!(version_id)
     render(conn, :new, changeset: changeset, version: version)

apps/configurator/lib/configurator_web/controllers/game_configuration_controller.ex

@@ -4,12 +4,12 @@ defmodule ConfiguratorWeb.GameConfigurationController do
   alias GameBackend.Configuration
   alias GameBackend.CurseOfMirra.GameConfiguration
 
-  def index(conn, %{"id" => version_id}) do
+  def index(conn, %{"version_id" => version_id}) do
     game_configurations = Configuration.list_game_configurations_by_version(version_id)
     render(conn, :index, game_configurations: game_configurations, version_id: version_id)
   end
 
-  def new(conn, %{"id" => version_id}) do
+  def new(conn, %{"version_id" => version_id}) do
     changeset = Configuration.change_game_configuration(%GameConfiguration{})
     version = Configuration.get_version!(version_id)
     render(conn, :new, changeset: changeset, version: version)

apps/configurator/lib/configurator_web/controllers/map_configuration_controller.ex

@@ -5,12 +5,12 @@ defmodule ConfiguratorWeb.MapConfigurationController do
   alias GameBackend.CurseOfMirra.MapConfiguration
   alias GameBackend.Configuration
 
-  def index(conn, %{"id" => version_id}) do
+  def index(conn, %{"version_id" => version_id}) do
     map_configurations = Configuration.list_map_configurations_by_version(version_id)
     render(conn, :index, map_configurations: map_configurations, version_id: version_id)
   end
 
-  def new(conn, %{"id" => version_id}) do
+  def new(conn, %{"version_id" => version_id}) do
     changeset = Configuration.change_map_configuration(%MapConfiguration{})
     version = Configuration.get_version!(version_id)
     render(conn, :new, changeset: changeset, version: version)

apps/configurator/lib/configurator_web/controllers/skill_controller.ex

@@ -7,12 +7,12 @@ defmodule ConfiguratorWeb.SkillController do
   alias GameBackend.Utils
   alias GameBackend.Configuration
 
-  def index(conn, %{"id" => version_id}) do
+  def index(conn, %{"version_id" => version_id}) do
     skills = Skills.list_curse_skills_by_version(version_id)
     render(conn, :index, skills: skills, version_id: version_id)
   end
 
-  def new(conn, %{"id" => version_id}) do
+  def new(conn, %{"version_id" => version_id}) do
     changeset = Skills.change_skill(%Skill{mechanics: [%Mechanic{}]})
     version = Configuration.get_version!(version_id)
     render(conn, :new, changeset: changeset, version: version)

apps/configurator/lib/configurator_web/controllers/version_controller.ex

@@ -12,7 +12,6 @@ defmodule ConfiguratorWeb.VersionController do
   end
 
   def new(conn, _params) do
-    map_params = Arena.Configuration.get_current_map_configuration_for_configurator()
     last_version = GameBackend.Configuration.get_current_version()
     skills = Utils.list_curse_skills_by_version_grouped_by_type(last_version.id)
 
@@ -21,7 +20,7 @@ defmodule ConfiguratorWeb.VersionController do
       |> Map.put(:characters, schema_to_map(last_version.characters))
       |> Map.put(:consumable_items, schema_to_map(last_version.consumable_items))
       |> Map.put(:game_configuration, schema_to_map(last_version.game_configuration))
-      |> Map.put(:map_configurations, map_params)
+      |> Map.put(:map_configurations, schema_to_map(last_version.map_configurations))
       |> Map.put(:skills, schema_to_map(last_version.skills))
 
     changeset = Configuration.change_version(%Version{}, params)

apps/configurator/lib/configurator_web/router.ex

@@ -60,7 +60,7 @@ defmodule ConfiguratorWeb.Router do
       resources "/", VersionController
       put "/:id/current", VersionController, :mark_as_current
 
-      scope "/:id" do
+      scope "/:version_id" do
         resources "/characters", CharacterController
         resources "/skills", SkillController
         resources "/game_configurations", GameConfigurationController

apps/gateway/lib/gateway/controllers/curse_of_mirra/configuration_controller.ex

@@ -24,7 +24,9 @@ defmodule Gateway.Controllers.CurseOfMirra.ConfigurationController do
   end
 
   def get_characters_configuration(conn, _params) do
-    case Characters.get_curse_characters() do
+    version = Configuration.get_current_version()
+
+    case Characters.get_curse_characters_by_version(version.id) do
       [] ->
         {:error, :not_found}
 
@@ -44,12 +46,14 @@ defmodule Gateway.Controllers.CurseOfMirra.ConfigurationController do
   end
 
   def get_map_configurations(conn, _params) do
-    map_configuration = Configuration.list_map_configurations()
+    version = Configuration.get_current_version()
+    map_configuration = Configuration.list_map_configurations_by_version(version.id)
     send_resp(conn, 200, Jason.encode!(map_configuration))
   end
 
   def get_consumable_items_configuration(conn, _params) do
-    consumable_items = Items.list_consumable_items() |> Enum.filter(& &1.active)
+    version = Configuration.get_current_version()
+    consumable_items = Items.list_consumable_items_by_version(version.id) |> Enum.filter(& &1.active)
     send_resp(conn, 200, Jason.encode!(consumable_items))
   end