sam/pleroma
sam/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fix format

Browse source
This commit is contained in:
Maksim Pechnikov 2019-10-31 17:36:59 +03:00
parent 58da7f6620
commit 1b3a942a84
2 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/mix/tasks/pleroma/marker.ex
View file

@ -1,10 +1,10 @@
defmodule Mix.Tasks.Pleroma.Marker do
use Mix.Task
import Mix.Pleroma
import Ecto.Query
alias Pleroma.Repo
alias Pleroma.Notification
alias Pleroma.Repo
def run(["update_markers"]) do
start_pleroma()
@ -15,7 +15,7 @@ def run(["update_markers"]) do
user_id: q.user_id,
unread_count: fragment("SUM( CASE WHEN seen = false THEN 1 ELSE 0 END )"),
last_read_id:
type(fragment("MAX( CASE WHEN seen = true THEN id ELSE null END )"), :string)
type(fragment("MAX( CASE WHEN seen = true THEN id ELSE null END )"), :string)
},
group_by: [q.user_id]
)
@ -26,8 +26,8 @@ def run(["update_markers"]) do
|> Ecto.Changeset.change()
|> Pleroma.Repo.insert(
returning: true,
on_conflict: {:replace, [:last_read_id, :unread_count]},
conflict_target: [:user_id, :timeline]
on_conflict: {:replace, [:last_read_id, :unread_count]},
conflict_target: [:user_id, :timeline]
)
end)

18
test/web/mastodon_api/controllers/marker_controller_test.exs
View file

@ -26,13 +26,13 @@ test "gets markers with correct scopes", %{conn: conn} do
|> json_response(200)
assert response == %{
"notifications" => %{
"last_read_id" => "69420",
"updated_at" => NaiveDateTime.to_iso8601(marker.updated_at),
"version" => 0,
"pleroma" => %{ "unread_count" => 7 }
}
}
"notifications" => %{
"last_read_id" => "69420",
"updated_at" => NaiveDateTime.to_iso8601(marker.updated_at),
"version" => 0,
"pleroma" => %{"unread_count" => 7}
}
}
end
test "gets markers with missed scopes", %{conn: conn} do
@ -72,7 +72,7 @@ test "creates a marker with correct scopes", %{conn: conn} do
"last_read_id" => "69420",
"updated_at" => _,
"version" => 0,
"pleroma" => %{ "unread_count" => 0 }
"pleroma" => %{"unread_count" => 0}
}
} = response
end
@ -102,7 +102,7 @@ test "updates exist marker", %{conn: conn} do
"last_read_id" => "69888",
"updated_at" => NaiveDateTime.to_iso8601(marker.updated_at),
"version" => 0,
"pleroma" => %{ "unread_count" => 0 }
"pleroma" => %{"unread_count" => 0}
}
}
end