Move anntotated users quuery into suggested users module

bookwyrm/suggested_users.py

@@ -1,17 +1,16 @@
 """ store recommended follows in redis """
 import math
 from django.dispatch import receiver
-from django.db.models import signals, Q
+from django.db.models import signals, Count, Q
 
 from bookwyrm import models
 from bookwyrm.redis_store import RedisStore, r
-from bookwyrm.views.helpers import get_annotated_users
 
 
 class SuggestedUsers(RedisStore):
     """ suggested users for a user """
 
-    max_length = 10
+    max_length = 30
 
     def get_rank(self, obj):
         """ get computed rank """
@@ -25,7 +24,7 @@ class SuggestedUsers(RedisStore):
         """ calculate mutuals count and shared books count from rank """
         return {
             "mutuals": math.floor(rank),
-            "shared_books": int(1 / (-1 * (1 % rank - 1))),
+            "shared_books": int(1 / (-1 * (1 % rank - 1))) if rank else 0,
         }
 
     def get_objects_for_store(self, store):
@@ -83,6 +82,35 @@ class SuggestedUsers(RedisStore):
         return results
 
 
+def get_annotated_users(viewer, *args, **kwargs):
+    """ Users, annotated with things they have in common """
+    return (
+        models.User.objects.filter(discoverable=True, is_active=True, *args, **kwargs)
+        .exclude(Q(id__in=viewer.blocks.all()) | Q(blocks=viewer))
+        .annotate(
+            mutuals=Count(
+                "following",
+                filter=Q(
+                    ~Q(id=viewer.id),
+                    ~Q(id__in=viewer.following.all()),
+                    following__in=viewer.following.all(),
+                ),
+                distinct=True,
+            ),
+            shared_books=Count(
+                "shelfbook",
+                filter=Q(
+                    ~Q(id=viewer.id),
+                    shelfbook__book__parent_work__in=[
+                        s.book.parent_work for s in viewer.shelfbook_set.all()
+                    ],
+                ),
+                distinct=True,
+            ),
+        )
+    )
+
+
 suggested_users = SuggestedUsers()
 
 

bookwyrm/views/directory.py

@@ -6,7 +6,7 @@ from django.template.response import TemplateResponse
 from django.views import View
 from django.utils.decorators import method_decorator
 
-from .helpers import get_annotated_users
+from bookwyrm import suggested_users
 
 # pylint: disable=no-self-use
 @method_decorator(login_required, name="dispatch")
@@ -29,7 +29,7 @@ class Directory(View):
         if scope == "local":
             filters["local"] = True
 
-        users = get_annotated_users(request.user, **filters)
+        users = suggested_users.get_annotated_users(request.user, **filters)
         sort = request.GET.get("sort")
         if sort == "recent":
             users = users.order_by("-last_active_date")

bookwyrm/views/get_started.py

@@ -13,7 +13,6 @@ from django.views import View
 
 from bookwyrm import forms, models
 from bookwyrm.connectors import connector_manager
-from .helpers import get_suggested_users
 from .user import save_user_form
 
 
@@ -120,7 +119,7 @@ class GetStartedUsers(View):
         )
 
         if user_results.count() < 5:
-            suggested_users = get_suggested_users(request.user)
+            suggested_users = None#get_suggested_users(request.user)
 
         data = {
             "suggested_users": list(user_results) + list(suggested_users),

bookwyrm/views/helpers.py

@@ -190,47 +190,3 @@ def get_discover_books():
             .order_by("-review__published_date__max")[:6]
         )
     )
-
-
-def get_suggested_users(user):
-    """ bookwyrm users you don't already know """
-    return (
-        get_annotated_users(
-            user,
-            ~Q(id=user.id),
-            ~Q(followers=user),
-            ~Q(follower_requests=user),
-            bookwyrm_user=True,
-        )
-        .order_by("-mutuals", "-last_active_date")
-        .all()[:5]
-    )
-
-
-def get_annotated_users(viewer, *args, **kwargs):
-    """ Users, annotated with things they have in common """
-    return (
-        models.User.objects.filter(discoverable=True, is_active=True, *args, **kwargs)
-        .exclude(Q(id__in=viewer.blocks.all()) | Q(blocks=viewer))
-        .annotate(
-            mutuals=Count(
-                "following",
-                filter=Q(
-                    ~Q(id=viewer.id),
-                    ~Q(id__in=viewer.following.all()),
-                    following__in=viewer.following.all(),
-                ),
-                distinct=True,
-            ),
-            shared_books=Count(
-                "shelfbook",
-                filter=Q(
-                    ~Q(id=viewer.id),
-                    shelfbook__book__parent_work__in=[
-                        s.book.parent_work for s in viewer.shelfbook_set.all()
-                    ],
-                ),
-                distinct=True,
-            ),
-        )
-    )