Add some tests

Also add a unicity constraint on the followers table

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
This commit is contained in:
Thomas Citharel 2018-08-03 10:16:22 +02:00
parent 115d1d1a3e
commit e1e9b0fc11
9 changed files with 157 additions and 16 deletions

View File

@ -197,6 +197,11 @@ defmodule Eventos.Actors.Actor do
end end
end end
@doc """
Get followers from an actor
If actor A and C both follow actor B, actor B's followers are A and C
"""
def get_followers(%Actor{id: actor_id} = _actor) do def get_followers(%Actor{id: actor_id} = _actor) do
Repo.all( Repo.all(
from( from(
@ -208,6 +213,11 @@ defmodule Eventos.Actors.Actor do
) )
end end
@doc """
Get followings from an actor
If actor A follows actor B and C, actor A's followings are B and B
"""
def get_followings(%Actor{id: actor_id} = _actor) do def get_followings(%Actor{id: actor_id} = _actor) do
Repo.all( Repo.all(
from( from(

View File

@ -19,5 +19,6 @@ defmodule Eventos.Actors.Follower do
member member
|> cast(attrs, [:score, :approved, :target_actor_id, :actor_id]) |> cast(attrs, [:score, :approved, :target_actor_id, :actor_id])
|> validate_required([:score, :approved, :target_actor_id, :actor_id]) |> validate_required([:score, :approved, :target_actor_id, :actor_id])
|> unique_constraint(:target_actor_id, name: :followers_actor_target_actor_unique_index)
end end
end end

View File

@ -32,14 +32,18 @@ defmodule EventosWeb.GroupController do
end end
def join(conn, %{"name" => group_name, "actor_name" => actor_name}) do def join(conn, %{"name" => group_name, "actor_name" => actor_name}) do
with group <- Actors.get_group_by_name(group_name), with %Actor{} = group <- Actors.get_group_by_name(group_name),
actor <- Actors.get_local_actor_by_name(actor_name), %Actor{} = actor <- Actors.get_local_actor_by_name(actor_name),
%Member{} = member <- %Member{} = member <-
Actors.create_member(%{"parent_id" => group.id, "actor_id" => actor.id}) do Actors.create_member(%{"parent_id" => group.id, "actor_id" => actor.id}) do
conn conn
|> put_status(:created) |> put_status(:created)
|> render(EventosWeb.MemberView, "member.json", member: member) |> render(EventosWeb.MemberView, "member.json", member: member)
else else
nil ->
conn
|> put_status(:not_found)
|> render(EventosWeb.ErrorView, "not_found.json", details: "group or actor doesn't exist")
err -> err ->
require Logger require Logger
Logger.debug(inspect(err)) Logger.debug(inspect(err))

View File

@ -12,6 +12,13 @@ defmodule EventosWeb.ErrorView do
%{errors: "Invalid request"} %{errors: "Invalid request"}
end end
def render("not_found.json", %{details: details}) do
%{
msg: "Resource not found",
details: details,
}
end
def render("500.html", _assigns) do def render("500.html", _assigns) do
"Internal server error" "Internal server error"
end end

View File

@ -322,10 +322,13 @@ defmodule Eventos.Service.ActivityPub.Utils do
Converts PEM encoded keys to a public key representation Converts PEM encoded keys to a public key representation
""" """
def pem_to_public_key(pem) do def pem_to_public_key(pem) do
[private_key_code] = :public_key.pem_decode(pem) [key_code] = :public_key.pem_decode(pem)
private_key = :public_key.pem_entry_decode(private_key_code) key = :public_key.pem_entry_decode(key_code)
{:RSAPrivateKey, _, modulus, exponent, _, _, _, _, _, _, _} = private_key case key do
{:RSAPublicKey, modulus, exponent} {:RSAPrivateKey, _, modulus, exponent, _, _, _, _, _, _, _} ->
{:RSAPublicKey, modulus, exponent}
{:RSAPublicKey, modulus, exponent} -> {:RSAPublicKey, modulus, exponent}
end
end end
@doc """ @doc """

View File

@ -0,0 +1,11 @@
defmodule Eventos.Repo.Migrations.MakeFollowerTableUnique do
use Ecto.Migration
def up do
create unique_index(:followers, [:actor_id, :target_actor_id], name: :followers_actor_target_actor_unique_index)
end
def down do
drop index(:followers, [:actor_id, :target_actor_id], name: :followers_actor_target_actor_unique_index)
end
end

View File

@ -64,6 +64,65 @@ defmodule Eventos.ActorsTest do
assert events = [event] assert events = [event]
end end
test "get_actor_by_name/1 returns a local actor", %{actor: actor} do
actor_found = Actors.get_actor_by_name(actor.preferred_username)
assert actor_found = actor
end
test "get_local_actor_by_name_with_everything!/1 returns the local actor with it's organized events", %{
actor: actor
} do
assert Actors.get_local_actor_by_name_with_everything(actor.preferred_username).organized_events == []
event = insert(:event, organizer_actor: actor)
events = Actors.get_local_actor_by_name_with_everything(actor.preferred_username).organized_events
assert events = [event]
end
test "get_actor_by_name_with_everything!/1 returns the local actor with it's organized events", %{
actor: actor
} do
assert Actors.get_actor_by_name_with_everything(actor.preferred_username).organized_events == []
event = insert(:event, organizer_actor: actor)
events = Actors.get_actor_by_name_with_everything(actor.preferred_username).organized_events
assert events = [event]
end
test "get_or_fetch_by_url/1 returns the local actor for the url", %{
actor: actor
} do
assert Actors.get_or_fetch_by_url(actor.url).preferred_username == actor.preferred_username
assert Actors.get_or_fetch_by_url(actor.url).domain == nil
end
@remote_account_url "https://social.tcit.fr/users/tcit"
@remote_account_username "tcit"
@remote_account_domain "social.tcit.fr"
test "get_or_fetch_by_url/1 returns the remote actor for the url" do
assert %Actor{preferred_username: @remote_account_username, domain: @remote_account_domain} = Actors.get_or_fetch_by_url(@remote_account_url)
end
test "test find_local_by_username/1 returns local actors with similar usernames", %{actor: actor} do
actor2 = insert(:actor)
actors = Actors.find_local_by_username("thomas")
assert actors = [actor, actor2]
end
test "test find_actors_by_username/1 returns actors with similar usernames", %{actor: actor} do
%Actor{} = actor2 = Actors.get_or_fetch_by_url(@remote_account_url)
actors = Actors.find_actors_by_username("t")
assert actors = [actor, actor2]
end
test "test get_public_key_for_url/1 with local actor", %{actor: actor} do
assert Actor.get_public_key_for_url(actor.url) == actor.keys |> Eventos.Service.ActivityPub.Utils.pem_to_public_key()
end
@remote_actor_key {:RSAPublicKey, 20890513599005517665557846902571022168782075040010449365706450877170130373892202874869873999284399697282332064948148602583340776692090472558740998357203838580321412679020304645826371196718081108049114160630664514340729769453281682773898619827376232969899348462205389310883299183817817999273916446620095414233374619948098516821650069821783810210582035456563335930330252551528035801173640288329718719895926309416142129926226047930429802084560488897717417403272782469039131379953278833320195233761955815307522871787339192744439894317730207141881699363391788150650217284777541358381165360697136307663640904621178632289787, 65537}
test "test get_public_key_for_url/1 with remote actor" do
require Logger
assert Actor.get_public_key_for_url(@remote_account_url) == @remote_actor_key
end
test "create_actor/1 with valid data creates a actor" do test "create_actor/1 with valid data creates a actor" do
assert {:ok, %Actor{} = actor} = Actors.create_actor(@valid_attrs) assert {:ok, %Actor{} = actor} = Actors.create_actor(@valid_attrs)
assert actor.summary == "some description" assert actor.summary == "some description"
@ -276,6 +335,7 @@ defmodule Eventos.ActorsTest do
describe "followers" do describe "followers" do
alias Eventos.Actors.Follower alias Eventos.Actors.Follower
alias Eventos.Actors.Actor
@valid_attrs %{approved: true, score: 42} @valid_attrs %{approved: true, score: 42}
@update_attrs %{approved: false, score: 43} @update_attrs %{approved: false, score: 43}
@ -284,11 +344,15 @@ defmodule Eventos.ActorsTest do
setup do setup do
actor = insert(:actor) actor = insert(:actor)
target_actor = insert(:actor) target_actor = insert(:actor)
follower = insert(:follower, actor: actor, target_actor: target_actor) {:ok, actor: actor, target_actor: target_actor}
{:ok, follower: follower, actor: actor, target_actor: target_actor}
end end
test "get_follower!/1 returns the follower with given id", %{follower: follower} do defp create_follower(%{actor: actor, target_actor: target_actor}) do
insert(:follower, actor: actor, target_actor: target_actor)
end
test "get_follower!/1 returns the follower with given id", context do
follower = create_follower(context)
follower_fetched = Actors.get_follower!(follower.id) follower_fetched = Actors.get_follower!(follower.id)
assert follower_fetched = follower assert follower_fetched = follower
end end
@ -305,6 +369,24 @@ defmodule Eventos.ActorsTest do
assert {:ok, %Follower{} = follower} = Actors.create_follower(valid_attrs) assert {:ok, %Follower{} = follower} = Actors.create_follower(valid_attrs)
assert follower.approved == true assert follower.approved == true
assert follower.score == 42 assert follower.score == 42
actor_followings = Actor.get_followings(actor)
assert actor_followings = [target_actor]
actor_followers = Actor.get_followers(target_actor)
assert actor_followers = [actor]
end
test "create_follower/1 with valid data but same actors fails to create a follower", %{
actor: actor,
target_actor: target_actor
} do
create_follower(%{actor: actor, target_actor: target_actor})
valid_attrs =
@valid_attrs
|> Map.put(:actor_id, actor.id)
|> Map.put(:target_actor_id, target_actor.id)
assert {:error, _follower} = Actors.create_follower(valid_attrs)
end end
test "create_follower/1 with invalid data returns error changeset", %{ test "create_follower/1 with invalid data returns error changeset", %{
@ -319,25 +401,29 @@ defmodule Eventos.ActorsTest do
assert {:error, %Ecto.Changeset{}} = Actors.create_follower(invalid_attrs) assert {:error, %Ecto.Changeset{}} = Actors.create_follower(invalid_attrs)
end end
test "update_follower/2 with valid data updates the follower", %{follower: follower} do test "update_follower/2 with valid data updates the follower", context do
follower = create_follower(context)
assert {:ok, follower} = Actors.update_follower(follower, @update_attrs) assert {:ok, follower} = Actors.update_follower(follower, @update_attrs)
assert %Follower{} = follower assert %Follower{} = follower
assert follower.approved == false assert follower.approved == false
assert follower.score == 43 assert follower.score == 43
end end
test "update_follower/2 with invalid data returns error changeset", %{follower: follower} do test "update_follower/2 with invalid data returns error changeset", context do
follower = create_follower(context)
assert {:error, %Ecto.Changeset{}} = Actors.update_follower(follower, @invalid_attrs) assert {:error, %Ecto.Changeset{}} = Actors.update_follower(follower, @invalid_attrs)
follower_fetched = Actors.get_follower!(follower.id) follower_fetched = Actors.get_follower!(follower.id)
assert follower = follower_fetched assert follower = follower_fetched
end end
test "delete_follower/1 deletes the follower", %{follower: follower} do test "delete_follower/1 deletes the follower", context do
follower = create_follower(context)
assert {:ok, %Follower{}} = Actors.delete_follower(follower) assert {:ok, %Follower{}} = Actors.delete_follower(follower)
assert_raise Ecto.NoResultsError, fn -> Actors.get_follower!(follower.id) end assert_raise Ecto.NoResultsError, fn -> Actors.get_follower!(follower.id) end
end end
test "change_follower/1 returns a follower changeset", %{follower: follower} do test "change_follower/1 returns a follower changeset", context do
follower = create_follower(context)
assert %Ecto.Changeset{} = Actors.change_follower(follower) assert %Ecto.Changeset{} = Actors.change_follower(follower)
end end
end end

View File

@ -115,5 +115,18 @@ defmodule EventosWeb.ActorControllerTest do
"role" => 0 "role" => 0
} }
end end
test "join non existent group", %{conn: conn, user: user, actor: actor} do
conn = auth_conn(conn, user)
conn =
post(conn, group_path(conn, :join, "mygroup@nonexistent.tld"), %{
"actor_name" => actor.preferred_username
})
resp = json_response(conn, 404)
assert resp = %{msg: "Resource not found", details: "group or actor doesn't exist"}
end
end end
end end

View File

@ -12,13 +12,12 @@ defmodule EventosWeb.FollowerControllerTest do
setup %{conn: conn} do setup %{conn: conn} do
actor = insert(:actor) actor = insert(:actor)
target_actor = insert(:actor) target_actor = insert(:actor)
follower = insert(:follower, actor: actor, target_actor: target_actor)
{:ok, {:ok,
conn: put_req_header(conn, "accept", "application/json"), conn: put_req_header(conn, "accept", "application/json"),
actor: actor, actor: actor,
target_actor: target_actor, target_actor: target_actor
follower: follower} }
end end
describe "create follower" do describe "create follower" do
@ -46,6 +45,7 @@ defmodule EventosWeb.FollowerControllerTest do
end end
describe "update follower" do describe "update follower" do
setup [:create_follower]
test "renders follower when data is valid", %{ test "renders follower when data is valid", %{
conn: conn, conn: conn,
follower: %Follower{id: id} = follower follower: %Follower{id: id} = follower
@ -64,6 +64,7 @@ defmodule EventosWeb.FollowerControllerTest do
end end
describe "delete follower" do describe "delete follower" do
setup [:create_follower]
test "deletes chosen follower", %{conn: conn, follower: follower} do test "deletes chosen follower", %{conn: conn, follower: follower} do
conn = delete(conn, follower_path(conn, :delete, follower)) conn = delete(conn, follower_path(conn, :delete, follower))
assert response(conn, 204) assert response(conn, 204)
@ -73,4 +74,9 @@ defmodule EventosWeb.FollowerControllerTest do
end) end)
end end
end end
defp create_follower(%{actor: actor, target_actor: target_actor}) do
follower = insert(:follower, actor: actor, target_actor: target_actor)
[follower: follower]
end
end end