summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLain Soykaf <lain@lain.com>2023-11-12 16:43:50 +0400
committerLain Soykaf <lain@lain.com>2023-11-12 16:43:50 +0400
commit59018d73c366d9297efe83d290c717d1a3e4756a (patch)
tree2d310d26f8763279f7f9fe854dd4c444d1d7f676
parenta1a25029da74949a79c73d400b6f2bc0bf1dc01a (diff)
B Meilisearch: Update to current API responses.pleroma-meilisearch
-rw-r--r--lib/pleroma/search/meilisearch.ex5
-rw-r--r--test/pleroma/search/meilisearch_test.exs21
2 files changed, 20 insertions, 6 deletions
diff --git a/lib/pleroma/search/meilisearch.ex b/lib/pleroma/search/meilisearch.ex
index eed9fca1c..2bff663e8 100644
--- a/lib/pleroma/search/meilisearch.ex
+++ b/lib/pleroma/search/meilisearch.ex
@@ -76,7 +76,7 @@ defmodule Pleroma.Search.Meilisearch do
) do
:ok
else
- _ -> :error
+ _ -> {:error, "Could not remove from index"}
end
end
@@ -159,8 +159,7 @@ defmodule Pleroma.Search.Meilisearch do
[maybe_search_data]
)
- with {:ok, res} <- result,
- true <- Map.has_key?(res, "updateId") do
+ with {:ok, %{"status" => "enqueued"}} <- result do
# Added successfully
:ok
else
diff --git a/test/pleroma/search/meilisearch_test.exs b/test/pleroma/search/meilisearch_test.exs
index 3a267385d..39592c5f8 100644
--- a/test/pleroma/search/meilisearch_test.exs
+++ b/test/pleroma/search/meilisearch_test.exs
@@ -34,7 +34,15 @@ defmodule Pleroma.Search.MeilisearchTest do
# To make sure that the worker is called
send(self(), "posted_to_meilisearch")
- json(%{updateId: 1})
+
+ %{
+ "enqueuedAt" => "2023-11-12T12:36:46.927517Z",
+ "indexUid" => "objects",
+ "status" => "enqueued",
+ "taskUid" => 6,
+ "type" => "documentAdditionOrUpdate"
+ }
+ |> json()
end)
Config
@@ -103,12 +111,19 @@ defmodule Pleroma.Search.MeilisearchTest do
Jason.decode!(body)
)
- json(%{updateId: 1})
+ %{
+ "enqueuedAt" => "2023-11-12T12:36:46.927517Z",
+ "indexUid" => "objects",
+ "status" => "enqueued",
+ "taskUid" => 6,
+ "type" => "documentAdditionOrUpdate"
+ }
+ |> json()
%{method: :delete, url: "http://127.0.0.1:7700/indexes/objects/documents/" <> id} ->
send(self(), "called_delete")
assert String.length(id) > 1
- json(%{updateId: 2})
+ json(%{})
end)
Config