Add new gateway url to servers (#879)

* Rename central testing workflow * Add new gateway_url field to servers * Add new gateway_url field to html templates * Rename wrongly named module migration * Set gateway_url for existing servers * Add gateway url to JSON encoder * Fix configurator tests * Fix seeds * Add gateway url to controller test params * Format elixir code * fix tests once again * Add gateway url to arena server's show --------- Co-authored-by: tvillegas98 <[email protected]>
lambdaclass · Aug 23, 2024 · df42baa · df42baa
1 parent fa09285
commit df42baa
Show file tree

Hide file tree

Showing 11 changed files with 52 additions and 7 deletions.
diff --git a/.github/workflows/central-europe-testing-deploy.yml b/.github/workflows/central-europe-testing-deploy.yml
@@ -1,4 +1,4 @@
-name: "[CENTRAL-EUROPE] Deploy to Europe Central testing"
+name: "[CENTRAL-TESTING] Deploy to Europe Central testing"
 on:
   workflow_dispatch:
 

diff --git a/...nfigurator/lib/configurator_web/controllers/arena_server_html/arena_server_form.html.heex b/...nfigurator/lib/configurator_web/controllers/arena_server_html/arena_server_form.html.heex
@@ -5,6 +5,16 @@
   <.input field={f[:name]} type="text" label="Name" />
   <.input field={f[:ip]} type="text" label="Ip" />
   <.input field={f[:url]} type="text" label="Url" />
+  <.input
+    field={f[:gateway_url]}
+    type="select"
+    label="Gateway Url"
+    prompt="Choose a value"
+    options={[
+      "https://central-europe-testing.championsofmirra.com",
+      "https://central-europe-staging.championsofmirra.com"
+    ]}
+  />
   <.input
     field={f[:status]}
     type="select"

diff --git a/apps/configurator/lib/configurator_web/controllers/arena_server_html/index.html.heex b/apps/configurator/lib/configurator_web/controllers/arena_server_html/index.html.heex
@@ -11,6 +11,7 @@
   <:col :let={arena_server} label="Name"><%= arena_server.name %></:col>
   <:col :let={arena_server} label="Ip"><%= arena_server.ip %></:col>
   <:col :let={arena_server} label="Url"><%= arena_server.url %></:col>
+  <:col :let={arena_server} label="Gateway Url"><%= arena_server.gateway_url %></:col>
   <:col :let={arena_server} label="Status"><%= arena_server.status %></:col>
   <:col :let={arena_server} label="Environment"><%= arena_server.environment %></:col>
   <:action :let={arena_server}>

diff --git a/apps/configurator/lib/configurator_web/controllers/arena_server_html/show.html.heex b/apps/configurator/lib/configurator_web/controllers/arena_server_html/show.html.heex
@@ -12,6 +12,7 @@
   <:item title="Name"><%= @arena_server.name %></:item>
   <:item title="Ip"><%= @arena_server.ip %></:item>
   <:item title="Url"><%= @arena_server.url %></:item>
+  <:item title="Gateway Url"><%= @arena_server.gateway_url %></:item>
   <:item title="Status"><%= @arena_server.status %></:item>
   <:item title="Environment"><%= @arena_server.environment %></:item>
 </.list>

diff --git a/apps/configurator/test/configurator/configuration_test.exs b/apps/configurator/test/configurator/configuration_test.exs
@@ -82,7 +82,14 @@ defmodule Configurator.ConfigurationTest do
     end
 
     test "create_arena_server/1 with valid data creates a arena_server" do
-      valid_attrs = %{name: "some name", ip: "some ip", url: "some url", status: :active, environment: :production}
+      valid_attrs = %{
+        name: "some name",
+        ip: "some ip",
+        url: "some url",
+        gateway_url: "some GATEWAY url",
+        status: :active,
+        environment: :production
+      }
 
       assert {:ok, %ArenaServer{} = arena_server} = Configuration.create_arena_server(valid_attrs)
       assert arena_server.name == "some name"

diff --git a/apps/configurator/test/configurator_web/controllers/arena_server_controller_test.exs b/apps/configurator/test/configurator_web/controllers/arena_server_controller_test.exs
@@ -7,11 +7,19 @@ defmodule ConfiguratorWeb.ArenaServerControllerTest do
 
   setup [:create_authenticated_conn]
 
-  @create_attrs %{name: "some name", ip: "some ip", url: "some url", status: :active, environment: :production}
+  @create_attrs %{
+    name: "some name",
+    ip: "some ip",
+    url: "some url",
+    gateway_url: "some gateway url",
+    status: :active,
+    environment: :production
+  }
   @update_attrs %{
     name: "some updated name",
     ip: "some updated ip",
     url: "some updated url",
+    gateway_url: "some updated GATEWAY url",
     status: :inactive,
     environment: :development
   }

diff --git a/apps/configurator/test/support/fixtures/configuration_fixtures.ex b/apps/configurator/test/support/fixtures/configuration_fixtures.ex
@@ -64,6 +64,7 @@ defmodule Configurator.ConfigurationFixtures do
         ip: "some ip",
         name: "some name",
         url: "some url",
+        gateway_url: "some GATEWAY url",
         status: :active,
         environment: :production
       })

diff --git a/apps/game_backend/lib/game_backend/arena_servers/arena_server.ex b/apps/game_backend/lib/game_backend/arena_servers/arena_server.ex
@@ -5,11 +5,12 @@ defmodule GameBackend.ArenaServers.ArenaServer do
   use GameBackend.Schema
   import Ecto.Changeset
 
-  @derive {Jason.Encoder, only: [:name, :ip, :url, :status, :environment]}
+  @derive {Jason.Encoder, only: [:name, :ip, :url, :gateway_url, :status, :environment]}
   schema "arena_servers" do
     field(:name, :string)
     field(:ip, :string)
     field(:url, :string)
+    field(:gateway_url, :string)
     field(:status, Ecto.Enum, values: [:active, :inactive])
     field(:environment, Ecto.Enum, values: [:production, :development, :staging])
 
@@ -19,7 +20,7 @@ defmodule GameBackend.ArenaServers.ArenaServer do
   @doc false
   def changeset(arena_server, attrs) do
     arena_server
-    |> cast(attrs, [:name, :ip, :url, :status, :environment])
-    |> validate_required([:name, :url, :status, :environment])
+    |> cast(attrs, [:name, :ip, :url, :status, :environment, :gateway_url])
+    |> validate_required([:name, :url, :status, :environment, :gateway_url])
   end
 end
diff --git a/apps/game_backend/priv/repo/migrations/20240801203531_create_arena_servers.exs b/apps/game_backend/priv/repo/migrations/20240801203531_create_arena_servers.exs
@@ -1,4 +1,4 @@
-defmodule Configurator.Repo.Migrations.CreateArenaServers do
+defmodule GameBackend.Repo.Migrations.CreateArenaServers do
   use Ecto.Migration
 
   def change do

diff --git a/...me_backend/priv/repo/migrations/20240823152743_add_gateway_url_field_to_arena_servers.exs b/...me_backend/priv/repo/migrations/20240823152743_add_gateway_url_field_to_arena_servers.exs
@@ -0,0 +1,14 @@
+defmodule GameBackend.Repo.Migrations.AddGatewayUrlFieldToArenaServers do
+  use Ecto.Migration
+
+  def change do
+    alter table(:arena_servers) do
+      add :gateway_url, :string
+    end
+
+    execute("""
+    UPDATE arena_servers arena_server
+    SET gateway_url = 'https://central-europe-staging.championsofmirra.com';
+    """, "")
+  end
+end
diff --git a/priv/repo/seeds.exs b/priv/repo/seeds.exs
@@ -3068,6 +3068,7 @@ brazil_arena_server =
     name: "BRAZIL",
     ip: "",
     url: "arena-brazil-staging.championsofmirra.com",
+    gateway_url: "https://central-europe-staging.championsofmirra.com",
     status: "active",
     environment: "production"
   }
@@ -3079,6 +3080,7 @@ europe_arena_server =
     name: "EUROPE",
     ip: "",
     url: "arena-europe-testing.championsofmirra.com",
+    gateway_url: "https://central-europe-staging.championsofmirra.com",
     status: "active",
     environment: "production"
   }