Restructure code base for API requests/responses

lib/architex_web/federation/controllers/query_controller.ex

@@ -7,29 +7,7 @@ defmodule ArchitexWeb.Federation.QueryController do
 
   alias Architex.{Repo, Account}
   alias Architex.Types.UserId
-
-  defmodule ProfileRequest do
-    use Ecto.Schema
-
-    import Ecto.Changeset
-
-    @primary_key false
-    embedded_schema do
-      field :user_id, UserId
-      field :field, :string
-    end
-
-    def validate(params) do
-      %__MODULE__{}
-      |> cast(params, [:user_id, :field])
-      |> validate_required([:user_id])
-      |> validate_inclusion(:field, ["displayname", "avatar_url"])
-      |> then(fn
-        %Ecto.Changeset{valid?: true} = cs -> {:ok, apply_changes(cs)}
-        _ -> :error
-      end)
-    end
-  end
+  alias ArchitexWeb.Federation.Request.Profile
 
   @doc """
   Performs a query to get profile information, such as a display name or avatar,
@@ -38,9 +16,8 @@ defmodule ArchitexWeb.Federation.QueryController do
   Action for GET /_matrix/federation/v1/query/profile.
   """
   def profile(conn, params) do
-    with {:ok,
-          %ProfileRequest{user_id: %UserId{localpart: localpart, domain: domain}, field: field}} <-
-           ProfileRequest.validate(params) do
+    with {:ok, %Profile{user_id: %UserId{localpart: localpart, domain: domain}, field: field}} <-
+           Profile.parse(params) do
       if domain == Architex.server_name() do
         case Repo.one(from a in Account, where: a.localpart == ^localpart) do
           %Account{displayname: displayname, avatar_url: avatar_url} ->

lib/architex_web/federation/http_client.ex

@@ -7,7 +7,7 @@ defmodule ArchitexWeb.Federation.HTTPClient do
   use Tesla
 
   alias ArchitexWeb.Endpoint
-  alias ArchitexWeb.Federation.Request.GetSigningKeys
+  alias ArchitexWeb.Federation.Response.GetSigningKeys
   alias ArchitexWeb.Federation.Middleware.SignRequest
   alias ArchitexWeb.Router.Helpers, as: RouteHelpers
 

lib/architex_web/federation/request/get_signing_keys.ex

@@ -1,41 +0,0 @@
-defmodule ArchitexWeb.Federation.Request.GetSigningKeys do
-  use ArchitexWeb.Request
-
-  @type t :: %__MODULE__{
-          server_name: String.t(),
-          verify_keys: %{optional(String.t()) => %{String.t() => String.t()}},
-          old_verify_keys: %{optional(String.t()) => map()},
-          signatures: %{optional(String.t()) => %{optional(String.t()) => String.t()}},
-          valid_until_ts: integer()
-        }
-
-  @primary_key false
-  embedded_schema do
-    field :server_name, :string
-    field :verify_keys, {:map, {:map, :string}}
-    field :old_verify_keys, {:map, :map}
-    field :signatures, {:map, {:map, :string}}
-    field :valid_until_ts, :integer
-  end
-
-  def changeset(data, params) do
-    data
-    |> cast(params, [:server_name, :verify_keys, :old_verify_keys, :signatures, :valid_until_ts])
-    |> validate_required([:server_name, :verify_keys, :valid_until_ts])
-    |> Architex.validate_change_truthy(:verify_keys, fn map ->
-      Enum.all?(map, fn {_, map} ->
-        is_map_key(map, "key")
-      end)
-    end)
-    |> Architex.validate_change_truthy(:old_verify_keys, fn map ->
-      Enum.all?(map, fn
-        {_, %{"key" => key, "expired_ts" => expired_ts}}
-        when is_binary(key) and is_integer(expired_ts) ->
-          true
-
-        _ ->
-          false
-      end)
-    end)
-  end
-end