Add origin host on topic creation (#40)

* Add migration

* Create dummy implementation

* Saving topic with origin host attribute

* Formatting

* Formatting test

* Fix test

AUTHORS.md

@@ -2,4 +2,5 @@ Thank you!
 * Imanol Cea (@lonamiaec)
 * Enrique Palenque (@epalenque)
 * Juanjo Ponz (@jjponz)
-* Santiago Lanús (@sanntt)
+* Santiago Lanús (@sanntt)
+* Sergio Revilla (@elreplicante)

lib/postoffice/application.ex

@@ -8,6 +8,7 @@ defmodule Postoffice.Application do
   def start(_type, _args) do
     # List all child processes to be supervised
     Postoffice.MetricsSetup.setup()
+
     children = [
       # Start the Ecto repository
       Postoffice.Repo,
@@ -25,7 +26,6 @@ defmodule Postoffice.Application do
     # for other strategies and supported options
     opts = [strategy: :one_for_one, name: Postoffice.Supervisor]
     Supervisor.start_link(children, opts)
-
   end
 
   # Tell Phoenix to update the endpoint configuration

lib/postoffice/messaging/topic.ex

@@ -4,6 +4,7 @@ defmodule Postoffice.Messaging.Topic do
 
   schema "topics" do
     field :name, :string, null: false
+    field :origin_host, :string, null: true
 
     has_many :consumers, Postoffice.Messaging.Publisher
     has_many :messages, Postoffice.Messaging.Message
@@ -14,8 +15,8 @@ defmodule Postoffice.Messaging.Topic do
   @doc false
   def changeset(message, attrs) do
     message
-    |> cast(attrs, [:name])
-    |> validate_required([:name])
+    |> cast(attrs, [:name, :origin_host])
+    |> validate_required([:name, :origin_host])
     |> unique_constraint(:name)
   end
 end

lib/postoffice_web/endpoint.ex

@@ -32,9 +32,9 @@ defmodule PostofficeWeb.Endpoint do
   # this means its contents can be read but not tampered with.
   # Set :encryption_salt if you would also like to encrypt it.
   plug Plug.Session,
-  store: :cookie,
-  key: "_my_app_key",
-  signing_salt: "To8iCTxd"
+    store: :cookie,
+    key: "_my_app_key",
+    signing_salt: "To8iCTxd"
 
   PostofficeWeb
   plug PostofficeWeb.Metrics.Exporter

priv/repo/migrations/20200203152705_add_origin_host_to_topic.exs

@@ -0,0 +1,9 @@
+defmodule Postoffice.Repo.Migrations.AddOriginHostToTopic do
+  use Ecto.Migration
+
+  def change do
+    alter table(:topics) do
+      add :origin_host, :string, null: true
+    end
+  end
+end

test/postoffice/handlers/http_test.exs

@@ -20,7 +20,8 @@ defmodule Postoffice.Handlers.HttpTest do
     initial_message: 0
   }
   @valid_topic_attrs %{
-    name: "test"
+    name: "test",
+    origin_host: "example.com"
   }
 
   setup [:set_mox_from_context, :verify_on_exit!]

test/postoffice/handlers/pubsub_test.exs

@@ -22,7 +22,8 @@ defmodule Postoffice.Handlers.PubsubTest do
     initial_message: 0
   }
   @valid_topic_attrs %{
-    name: "test-publisher"
+    name: "test-publisher",
+    origin_host: "example.com"
   }
   setup [:set_mox_from_context, :verify_on_exit!]
 

test/postoffice/messaging_test.exs

@@ -6,7 +6,8 @@ defmodule Postoffice.MessagingTest do
   alias Postoffice.Fixtures
 
   @second_topic_attrs %{
-    name: "test2"
+    name: "test2",
+    origin_host: "example2.com"
   }
 
   @disabled_publisher_attrs %{

test/postoffice_web/controllers/api/message_controller_test.exs

@@ -16,13 +16,13 @@ defmodule PostofficeWeb.Api.MessageControllerTest do
   }
 
   def fixture(:message) do
-    {:ok, topic} = Messaging.create_topic(%{name: "test", id: 1})
+    {:ok, topic} = Messaging.create_topic(%{name: "test", origin_host: "example.com", id: 1})
     {:ok, message} = Messaging.create_message(topic, @create_attrs)
     message
   end
 
   setup %{conn: conn} do
-    {:ok, _topic} = Messaging.create_topic(%{name: "test"})
+    {:ok, _topic} = Messaging.create_topic(%{name: "test", origin_host: "example.com"})
     {:ok, conn: put_req_header(conn, "accept", "application/json")}
   end
 

test/postoffice_web/controllers/api/publisher_controller_test.exs

@@ -48,7 +48,8 @@ defmodule PostofficeWeb.Api.PublisherControllerTest do
   }
 
   @valid_topic_attrs %{
-    name: "test"
+    name: "test",
+    origin_host: "example.com"
   }
 
   setup %{conn: conn} do

test/postoffice_web/controllers/api/topic_controller_test.exs

@@ -1,31 +1,60 @@
 defmodule PostofficeWeb.Api.TopicControllerTest do
   use PostofficeWeb.ConnCase
 
+  import Ecto.Query, warn: false
+
   alias Postoffice.Messaging
   alias Postoffice.Messaging.Topic
   alias Postoffice.Repo
 
   @create_attrs %{
-    name: "test"
+    name: "test",
+    origin_host: "example.com"
   }
-  @invalid_attrs %{name: ""}
+
+  @topic_without_name %{name: "", origin_host: "example.com"}
+  @topic_without_origin_host %{name: "test", origin_host: ""}
 
   setup %{conn: conn} do
     {:ok, conn: put_req_header(conn, "accept", "application/json")}
   end
 
+  defp get_last_topic() do
+    from(t in Topic, order_by: [desc: :id], limit: 1)
+    |> Repo.one()
+  end
+
   describe "create topic" do
     test "renders created topic information when data is valid", %{conn: conn} do
       conn = post(conn, Routes.api_topic_path(conn, :create), @create_attrs)
+
       created_topic = json_response(conn, 201)["data"]
+
       assert created_topic["name"] == "test"
     end
 
-    test "renders errors when data is invalid", %{conn: conn} do
-      conn = post(conn, Routes.api_topic_path(conn, :create), @invalid_attrs)
+    test "creates the topic when data is valid", %{conn: conn} do
+      conn
+      |> post(Routes.api_topic_path(conn, :create), @create_attrs)
+
+      created_topic = get_last_topic()
+
+      assert created_topic.name == "test"
+      assert created_topic.origin_host == "example.com"
+    end
+
+    test "renders errors when name is invalid", %{conn: conn} do
+      conn = post(conn, Routes.api_topic_path(conn, :create), @topic_without_name)
+
       assert json_response(conn, 400)["data"]["errors"] == %{"name" => ["can't be blank"]}
     end
 
+    test "renders errors when origin_host is invalid", %{conn: conn} do
+      conn = post(conn, Routes.api_topic_path(conn, :create), @topic_without_origin_host)
+
+      assert json_response(conn, 400)["data"]["errors"] == %{"origin_host" => ["can't be blank"]}
+    end
+
     test "do not create topic in case it already exists", %{conn: conn} do
       {:ok, _topic} = Messaging.create_topic(@create_attrs)
 

test/postoffice_web/controllers/topic_controller_test.exs

@@ -23,12 +23,12 @@ defmodule PostofficeWeb.TopicControllerTest do
       |> html_response(200) =~ topic.name
     end
   end
-  
+
   describe "create topics" do
     test "can access to topics list", %{conn: conn} do
 
-      conn
-      |> post(Routes.topic_path(conn, :create, [topic: %{name: "Test Topic"}]))
+      assert conn
+      |> post(Routes.topic_path(conn, :create, [topic: %{name: "Test Topic", origin_host: "example.com"}]))
       |> redirected_to() == "/topics"
     end
   end

test/support/fixtures.ex

@@ -6,7 +6,8 @@ defmodule Postoffice.Fixtures do
   alias Postoffice.Messaging
 
   @topic_attrs %{
-    name: "test"
+    name: "test",
+    origin_host: "example.com"
   }
 
   @message_attrs %{