From 3daff26aef0e32e9a22d6e7933c59c1e372e8d8e Mon Sep 17 00:00:00 2001 From: kiosion Date: Tue, 7 Nov 2023 23:14:15 -0400 Subject: [PATCH] fix: No idea why this was broken but ok --- elixir-api/lib/routes/api/v1/inc.ex | 27 ++++++++++++++----- svelte-app/src/lib/store.ts | 3 ++- .../routes/api/[[version]]/mutate/+server.ts | 9 ++++--- 3 files changed, 27 insertions(+), 12 deletions(-) diff --git a/elixir-api/lib/routes/api/v1/inc.ex b/elixir-api/lib/routes/api/v1/inc.ex index f7d11ba32..687f968a4 100644 --- a/elixir-api/lib/routes/api/v1/inc.ex +++ b/elixir-api/lib/routes/api/v1/inc.ex @@ -10,9 +10,12 @@ defmodule Router.Api.V1.Inc do |> send_resp(200, "") end - @spec handle_inc(Plug.Conn.t(), binary(), map()) :: Plug.Conn.t() - def handle_inc(conn, id, body) when is_map(body) do - if body["target"] == "views" do + @spec handle_inc(Plug.Conn.t(), binary(), binary()) :: Plug.Conn.t() + def handle_inc(conn, id, target) when is_binary(target) do + Logger.info("Incrementing view count for #{id}") + Logger.info("Incrementing for target: #{target}") + + if target == "views" do query = "*[_id == '#{id}'][0]" {:ok, _pid} = try_increment_view_count(query) @@ -21,7 +24,7 @@ defmodule Router.Api.V1.Inc do case result do :ok -> conn - |> json_res(200, %{code: 200, message: "OK", data: %{id: id, target: "views"}}) + |> json_res(200, %{code: 200, data: %{id: id, target: "views"}}) :error -> conn @@ -37,16 +40,26 @@ defmodule Router.Api.V1.Inc do end end - def handle_inc(conn, _id, _body), + def handle_inc(conn, _id, _target), do: conn |> error_res(400, "Bad Request", "Invalid body content") post "/:id" do if is_binary(conn.params["id"]) do try do - handle_inc(conn, conn.params["id"], conn.body_params) + {:ok, body, _conn} = read_body(conn) + + # No fucking clue why this isn't working with *just* `read_body/1` + # Do not have the energy so this shall do for now. + decoded_body = + case Poison.decode(body) do + {:ok, decoded_body} when is_map(decoded_body) -> decoded_body + _ -> conn.body_params + end + + handle_inc(conn, conn.params["id"], decoded_body["target"]) rescue e -> - IO.puts("caught error: #{inspect(e)}") + Logger.error("Failed to increment view count: #{inspect(e)}") conn |> error_res(400, "Bad Request", "Invalid body content") end else diff --git a/svelte-app/src/lib/store.ts b/svelte-app/src/lib/store.ts index 543750168..4b3f92c46 100644 --- a/svelte-app/src/lib/store.ts +++ b/svelte-app/src/lib/store.ts @@ -101,7 +101,8 @@ const incViews = (fetch: RouteFetch, doc: DocumentRegistry[keyof DocumentRegistr method: 'POST', body: JSON.stringify({ id: doc._id, - action: 'inc' + action: 'inc', + field: 'views' }) }); } catch (e) { diff --git a/svelte-app/src/routes/api/[[version]]/mutate/+server.ts b/svelte-app/src/routes/api/[[version]]/mutate/+server.ts index 1d7e2eef9..9015d7677 100644 --- a/svelte-app/src/routes/api/[[version]]/mutate/+server.ts +++ b/svelte-app/src/routes/api/[[version]]/mutate/+server.ts @@ -20,13 +20,13 @@ export const POST = (async ({ request }) => { body: JSON.stringify({ target: 'views' }) }) .then((res) => res.json()) - .catch((e) => ({ error: e })); + .catch((e) => ({ message: e })); - if (remoteRes.message || remoteRes.error) { + if (remoteRes.code !== 200 || remoteRes.message) { return endpointResponse( { status: remoteRes.code ?? 500, - error: remoteRes.message ?? remoteRes.error, + error: remoteRes.message ?? 'Unknown error', detail: remoteRes.detail }, remoteRes.code ?? 500 @@ -34,7 +34,8 @@ export const POST = (async ({ request }) => { } return endpointResponse({ - status: 200 + status: 200, + data: { id: remoteRes.data.id, views: remoteRes.data.views } }); } default: {