Implement search with PostgreSQL trigrams
Signed-off-by: Thomas Citharel <tcit@tcit.fr> Rename function to reflect that we only get one result Signed-off-by: Thomas Citharel <tcit@tcit.fr> Add loggers and make Ecto call parallels during search Signed-off-by: Thomas Citharel <tcit@tcit.fr> Implement trigrams for events & replace pg similarity operator % with <% Signed-off-by: Thomas Citharel <tcit@tcit.fr> Fix tests Signed-off-by: Thomas Citharel <tcit@tcit.fr>
This commit is contained in:
55
test/mobilizon_web/api/search_test.exs
Normal file
55
test/mobilizon_web/api/search_test.exs
Normal file
@@ -0,0 +1,55 @@
|
||||
defmodule MobilizonWeb.API.SearchTest do
|
||||
use ExUnit.Case, async: false
|
||||
|
||||
alias Mobilizon.Events
|
||||
alias Mobilizon.Events.Event
|
||||
alias Mobilizon.Actors
|
||||
alias Mobilizon.Actors.Actor
|
||||
alias Mobilizon.Service.ActivityPub
|
||||
alias MobilizonWeb.API.Search
|
||||
|
||||
import Mock
|
||||
|
||||
test "search an user by username" do
|
||||
with_mock ActivityPub,
|
||||
find_or_make_actor_from_nickname: fn "toto@domain.tld" -> {:ok, %Actor{id: 1}} end do
|
||||
assert {:ok, %Actor{id: 1}} == Search.search("toto@domain.tld")
|
||||
assert_called(ActivityPub.find_or_make_actor_from_nickname("toto@domain.tld"))
|
||||
end
|
||||
end
|
||||
|
||||
test "search something by URL" do
|
||||
with_mock ActivityPub,
|
||||
fetch_object_from_url: fn "https://social.tcit.fr/users/tcit" -> {:ok, %Actor{id: 1}} end do
|
||||
assert {:ok, %Actor{id: 1}} == Search.search("https://social.tcit.fr/users/tcit")
|
||||
assert_called(ActivityPub.fetch_object_from_url("https://social.tcit.fr/users/tcit"))
|
||||
end
|
||||
end
|
||||
|
||||
test "search everything" do
|
||||
with_mocks([
|
||||
{Actors, [], [find_actors_by_username_or_name: fn "toto", 1, 10 -> [%Actor{}] end]},
|
||||
{Events, [], [find_events_by_name: fn "toto", 1, 10 -> [%Event{}] end]}
|
||||
]) do
|
||||
assert {:ok, [%Event{}, %Actor{}]} = Search.search("toto")
|
||||
assert_called(Actors.find_actors_by_username_or_name("toto", 1, 10))
|
||||
assert_called(Events.find_events_by_name("toto", 1, 10))
|
||||
end
|
||||
end
|
||||
|
||||
test "search actors" do
|
||||
with_mock Actors,
|
||||
find_actors_by_username_or_name: fn "toto", 1, 10 -> [%Actor{}] end do
|
||||
assert {:ok, [%Actor{}]} = Search.search_actors("toto")
|
||||
assert_called(Actors.find_actors_by_username_or_name("toto", 1, 10))
|
||||
end
|
||||
end
|
||||
|
||||
test "search events" do
|
||||
with_mock Events,
|
||||
find_events_by_name: fn "toto", 1, 10 -> [%Event{}] end do
|
||||
assert {:ok, [%Event{}]} = Search.search_events("toto")
|
||||
assert_called(Events.find_events_by_name("toto", 1, 10))
|
||||
end
|
||||
end
|
||||
end
|
||||
@@ -88,35 +88,6 @@ defmodule MobilizonWeb.Resolvers.EventResolverTest do
|
||||
assert json_response(res, 200)["data"]["createEvent"]["title"] == "come to my event"
|
||||
end
|
||||
|
||||
test "search_events_and_actors/3 finds events and actors", %{conn: conn, actor: actor} do
|
||||
event = insert(:event, title: "test")
|
||||
|
||||
query = """
|
||||
{
|
||||
search(search: "test") {
|
||||
...on Event {
|
||||
title,
|
||||
uuid,
|
||||
__typename
|
||||
},
|
||||
...on Actor {
|
||||
preferredUsername,
|
||||
__typename
|
||||
}
|
||||
}
|
||||
}
|
||||
"""
|
||||
|
||||
res =
|
||||
conn
|
||||
|> get("/api", AbsintheHelpers.query_skeleton(query, "search"))
|
||||
|
||||
assert hd(json_response(res, 200)["data"]["search"])["uuid"] == to_string(event.uuid)
|
||||
|
||||
assert hd(tl(json_response(res, 200)["data"]["search"]))["preferredUsername"] ==
|
||||
actor.preferred_username
|
||||
end
|
||||
|
||||
test "list_events/3 returns events", context do
|
||||
event = insert(:event)
|
||||
|
||||
|
||||
109
test/mobilizon_web/resolvers/search_resolver_test.exs
Normal file
109
test/mobilizon_web/resolvers/search_resolver_test.exs
Normal file
@@ -0,0 +1,109 @@
|
||||
defmodule MobilizonWeb.Resolvers.SearchResolverTest do
|
||||
use MobilizonWeb.ConnCase
|
||||
alias MobilizonWeb.AbsintheHelpers
|
||||
import Mobilizon.Factory
|
||||
|
||||
setup %{conn: conn} do
|
||||
user = insert(:user)
|
||||
|
||||
{:ok, conn: conn, user: user}
|
||||
end
|
||||
|
||||
test "search_events_and_actors/3 finds events and actors with basic search", %{
|
||||
conn: conn,
|
||||
user: user
|
||||
} do
|
||||
actor = insert(:actor, user: user, preferred_username: "test")
|
||||
event = insert(:event, title: "test")
|
||||
|
||||
query = """
|
||||
{
|
||||
search(search: "test") {
|
||||
...on Event {
|
||||
title,
|
||||
uuid,
|
||||
__typename
|
||||
},
|
||||
...on Actor {
|
||||
preferredUsername,
|
||||
__typename
|
||||
}
|
||||
}
|
||||
}
|
||||
"""
|
||||
|
||||
res =
|
||||
conn
|
||||
|> get("/api", AbsintheHelpers.query_skeleton(query, "search"))
|
||||
|
||||
assert hd(json_response(res, 200)["data"]["search"])["uuid"] == to_string(event.uuid)
|
||||
|
||||
assert hd(tl(json_response(res, 200)["data"]["search"]))["preferredUsername"] ==
|
||||
actor.preferred_username
|
||||
end
|
||||
|
||||
test "search_events_and_actors/3 finds events and actors with word search", %{
|
||||
conn: conn,
|
||||
user: user
|
||||
} do
|
||||
actor = insert(:actor, user: user, preferred_username: "toto", name: "I like pineapples")
|
||||
event = insert(:event, title: "Pineapple fashion week")
|
||||
|
||||
# Elaborate query
|
||||
query = """
|
||||
{
|
||||
search(search: "pineapple") {
|
||||
...on Event {
|
||||
title,
|
||||
uuid,
|
||||
__typename
|
||||
},
|
||||
...on Actor {
|
||||
preferredUsername,
|
||||
__typename
|
||||
}
|
||||
}
|
||||
}
|
||||
"""
|
||||
|
||||
res =
|
||||
conn
|
||||
|> get("/api", AbsintheHelpers.query_skeleton(query, "search"))
|
||||
|
||||
assert hd(json_response(res, 200)["data"]["search"])["uuid"] == to_string(event.uuid)
|
||||
|
||||
assert hd(tl(json_response(res, 200)["data"]["search"]))["preferredUsername"] ==
|
||||
actor.preferred_username
|
||||
end
|
||||
|
||||
test "search_events_and_actors/3 finds events and actors with accented search", %{
|
||||
conn: conn,
|
||||
user: user
|
||||
} do
|
||||
insert(:actor, user: user, preferred_username: "toto", name: "Torréfaction")
|
||||
event = insert(:event, title: "Tour du monde des cafés")
|
||||
|
||||
# Elaborate query
|
||||
query = """
|
||||
{
|
||||
search(search: "café") {
|
||||
...on Event {
|
||||
title,
|
||||
uuid,
|
||||
__typename
|
||||
},
|
||||
...on Actor {
|
||||
preferredUsername,
|
||||
__typename
|
||||
}
|
||||
}
|
||||
}
|
||||
"""
|
||||
|
||||
res =
|
||||
conn
|
||||
|> get("/api", AbsintheHelpers.query_skeleton(query, "search"))
|
||||
|
||||
assert hd(json_response(res, 200)["data"]["search"])["uuid"] == to_string(event.uuid)
|
||||
end
|
||||
end
|
||||
Reference in New Issue
Block a user