pleroma

commit: 3e66723f7e35a2f49d7cdd54a261dd9078defee2
parent: e91f867cc9f372da2262a3ac95a23bc12266595a
Author: kaniini <nenolod@gmail.com>
Date:   Sat, 26 Jan 2019 15:57:02 +0000

Merge branch 'join-in-preloads' into 'develop'

Join on preloads to avoid N+1 queries

See merge request pleroma/pleroma!714
Diffstat:
M
lib/pleroma/notification.ex
6
++++--
M
lib/pleroma/plugs/oauth_plug.ex
7
++++++-

2 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/lib/pleroma/notification.ex b/lib/pleroma/notification.ex
@@ -35,7 +35,8 @@ defmodule Pleroma.Notification do
         n in Notification,
         where: n.user_id == ^user.id,
         order_by: [desc: n.id],
-        preload: [:activity],
+        join: activity in assoc(n, :activity),
+        preload: [activity: activity],
         limit: 20
       )
 
@@ -66,7 +67,8 @@ defmodule Pleroma.Notification do
       from(
         n in Notification,
         where: n.id == ^id,
-        preload: [:activity]
+        join: activity in assoc(n, :activity),
+        preload: [activity: activity]
       )
 
     notification = Repo.one(query)
diff --git a/lib/pleroma/plugs/oauth_plug.ex b/lib/pleroma/plugs/oauth_plug.ex
@@ -33,7 +33,12 @@ defmodule Pleroma.Plugs.OAuthPlug do
   #
   @spec fetch_user_and_token(String.t()) :: {:ok, User.t(), Token.t()} | nil
   defp fetch_user_and_token(token) do
-    query = from(q in Token, where: q.token == ^token, preload: [:user])
+    query =
+      from(t in Token,
+        where: t.token == ^token,
+        join: user in assoc(t, :user),
+        preload: [user: user]
+      )
 
     with %Token{user: %{info: %{deactivated: false} = _} = user} = token_record <- Repo.one(query) do
       {:ok, user, token_record}