nrd.li/akkoma
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fix migrate

Browse source
This commit is contained in:
Maksim Pechnikov 2019-10-23 11:54:52 +03:00
parent 9a4afbd2a0
commit aa64b3108b
2 changed files with 10 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/pleroma/marker.ex
View file

@ -56,8 +56,9 @@ def multi_set_unread_count(multi, %User{} = user, "notifications") do
where: q.user_id == ^user.id,
select: %{
timeline: "notifications",
user_id: ^user.id,
unread_count: fragment("SUM( CASE WHEN seen = false THEN 1 ELSE 0 END ) as unread_count")
user_id: type(^user.id, :string),
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)
}
)

18
priv/repo/migrations/20191021113356_add_unread_to_marker.exs
View file

@ -25,25 +25,21 @@ def update_markers do
select: %{
timeline: "notifications",
user_id: q.user_id,
unread_count: fragment("COUNT(*) FILTER (WHERE seen = false) as unread_count"),
last_read_id: fragment("(MAX(id) FILTER (WHERE seen = true)::text) as last_read_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)
},
group_by: [q.user_id]
)
|> Repo.all()
|> Enum.reduce(Ecto.Multi.new(), fn attrs, multi ->
marker =
Pleroma.Marker
|> struct(attrs)
|> Ecto.Changeset.change()
multi
|> Ecto.Multi.insert(attrs[:user_id], marker,
|> Enum.each(fn attrs ->
Pleroma.Marker
|> struct(attrs)
|> Ecto.Changeset.change()
|> Pleroma.Repo.insert(
returning: true,
on_conflict: {:replace, [:last_read_id, :unread_count]},
conflict_target: [:user_id, :timeline]
)
end)
|> Pleroma.Repo.transaction()
end
end