Skip to content

Commit

Permalink
Merge pull request #3394 from matthewmincher/feature/user-shelf-previ…
Browse files Browse the repository at this point in the history
…ew-order

Order user shelf previews by book shelved date
  • Loading branch information
mouse-reeve authored Aug 28, 2024
2 parents 4123478 + f6eb4f4 commit 904aa6c
Show file tree
Hide file tree
Showing 2 changed files with 39 additions and 1 deletion.
36 changes: 36 additions & 0 deletions bookwyrm/tests/views/test_user.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
""" test for app action functionality """
from unittest.mock import patch

import datetime

from django.contrib.auth.models import AnonymousUser
from django.http.response import Http404
from django.template.response import TemplateResponse
Expand All @@ -12,6 +14,11 @@
from bookwyrm.tests.validate_html import validate_html


def make_date(*args):
"""helper function to easily generate a date obj"""
return datetime.datetime(*args, tzinfo=datetime.timezone.utc)


class UserViews(TestCase):
"""view user and edit profile"""

Expand All @@ -36,6 +43,10 @@ def setUpTestData(cls):
cls.book = models.Edition.objects.create(
title="test", parent_work=models.Work.objects.create(title="test work")
)
cls.book_recently_shelved = models.Edition.objects.create(
title="recently shelved",
parent_work=models.Work.objects.create(title="recent shelved"),
)
with (
patch("bookwyrm.models.activitypub_mixin.broadcast_task.apply_async"),
patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"),
Expand All @@ -45,6 +56,14 @@ def setUpTestData(cls):
book=cls.book,
user=cls.local_user,
shelf=cls.local_user.shelf_set.first(),
shelved_date=make_date(2020, 10, 21),
)

models.ShelfBook.objects.create(
book=cls.book_recently_shelved,
user=cls.local_user,
shelf=cls.local_user.shelf_set.first(),
shelved_date=make_date(2024, 7, 1),
)
models.SiteSettings.objects.create()

Expand Down Expand Up @@ -119,6 +138,23 @@ def test_user_page_blocked(self):
with self.assertRaises(Http404):
view(request, "rat")

def test_user_page_activity_sorted(self):
"""the most recently shelved book should be displayed first"""
view = views.User.as_view()
request = self.factory.get("")
request.user = self.local_user
with patch("bookwyrm.views.user.is_api_request") as is_api:
is_api.return_value = False
result = view(request, "mouse")

self.assertIsInstance(result, TemplateResponse)
self.assertEqual(result.status_code, 200)

first_shelf = result.context_data["shelves"][0]
first_book = first_shelf["books"][0]

self.assertEqual(first_book, self.book_recently_shelved)

def test_followers_page(self):
"""there are so many views, this just makes sure it LOADS"""
view = views.Relationships.as_view()
Expand Down
4 changes: 3 additions & 1 deletion bookwyrm/views/user.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,9 @@ def get(self, request, username):
{
"name": user_shelf.name,
"local_path": user_shelf.local_path,
"books": user_shelf.books.all()[:3],
"books": user_shelf.books.order_by(
"-shelfbook__shelved_date"
).all()[:3],
"size": user_shelf.books.count(),
}
)
Expand Down

0 comments on commit 904aa6c

Please sign in to comment.