mirror of
https://github.com/bookwyrm-social/bookwyrm.git
synced 2024-11-23 18:11:09 +00:00
Limit page availability to earliest completed readthrough / shelving
This commit is contained in:
parent
8de2bca2c5
commit
357eddf16e
2 changed files with 54 additions and 10 deletions
|
@ -14,12 +14,14 @@
|
||||||
{% if user == summary_user %}
|
{% if user == summary_user %}
|
||||||
<div class="columns">
|
<div class="columns">
|
||||||
{% with year=paginated_years|first %}
|
{% with year=paginated_years|first %}
|
||||||
|
{% if year %}
|
||||||
<div class="column">
|
<div class="column">
|
||||||
<a href="{% url 'annual-summary' summary_user.localname year %}">
|
<a href="{% url 'annual-summary' summary_user.localname year %}">
|
||||||
<span class="icon icon-arrow-left" aria-hidden="true"></span>
|
<span class="icon icon-arrow-left" aria-hidden="true"></span>
|
||||||
{{ year }}
|
{{ year }}
|
||||||
</a>
|
</a>
|
||||||
</div>
|
</div>
|
||||||
|
{% endif %}
|
||||||
{% endwith %}
|
{% endwith %}
|
||||||
|
|
||||||
{% with year=paginated_years|last %}
|
{% with year=paginated_years|last %}
|
||||||
|
|
|
@ -27,14 +27,6 @@ class AnnualSummary(View):
|
||||||
def get(self, request, username, year):
|
def get(self, request, username, year):
|
||||||
"""get response"""
|
"""get response"""
|
||||||
|
|
||||||
if not is_year_available(year):
|
|
||||||
raise Http404(f"The summary for {year} is unavailable")
|
|
||||||
|
|
||||||
paginated_years = (
|
|
||||||
int(year) - 1,
|
|
||||||
int(year) + 1 if is_year_available(int(year) + 1) else None,
|
|
||||||
)
|
|
||||||
|
|
||||||
user = get_user_from_username(request.user, username)
|
user = get_user_from_username(request.user, username)
|
||||||
|
|
||||||
year_key = None
|
year_key = None
|
||||||
|
@ -50,6 +42,14 @@ class AnnualSummary(View):
|
||||||
if not request_key or request_key != year_key:
|
if not request_key or request_key != year_key:
|
||||||
raise Http404(f"The summary for {year} is unavailable")
|
raise Http404(f"The summary for {year} is unavailable")
|
||||||
|
|
||||||
|
if not is_year_available(user, year):
|
||||||
|
raise Http404(f"The summary for {year} is unavailable")
|
||||||
|
|
||||||
|
paginated_years = (
|
||||||
|
int(year) - 1 if is_year_available(user, int(year) - 1) else None,
|
||||||
|
int(year) + 1 if is_year_available(user, int(year) + 1) else None,
|
||||||
|
)
|
||||||
|
|
||||||
# get data
|
# get data
|
||||||
read_book_ids_in_year = get_read_book_ids_in_year(user, year)
|
read_book_ids_in_year = get_read_book_ids_in_year(user, year)
|
||||||
|
|
||||||
|
@ -171,12 +171,13 @@ def get_annual_summary_year():
|
||||||
return None
|
return None
|
||||||
|
|
||||||
|
|
||||||
def is_year_available(year):
|
def is_year_available(user, year):
|
||||||
"""return boolean"""
|
"""return boolean"""
|
||||||
|
|
||||||
|
earliest_year = get_earliest_year(user)
|
||||||
today = date.today()
|
today = date.today()
|
||||||
year = int(year)
|
year = int(year)
|
||||||
if year < today.year:
|
if year < today.year and year >= earliest_year:
|
||||||
return True
|
return True
|
||||||
if year == today.year and today >= date(today.year, 12, FIRST_DAY):
|
if year == today.year and today >= date(today.year, 12, FIRST_DAY):
|
||||||
return True
|
return True
|
||||||
|
@ -184,6 +185,36 @@ def is_year_available(year):
|
||||||
return False
|
return False
|
||||||
|
|
||||||
|
|
||||||
|
def get_earliest_year(user):
|
||||||
|
"""return the earliest finish_date or shelved_date year for user books in read shelf"""
|
||||||
|
|
||||||
|
read_shelfbooks = models.ShelfBook.objects.filter(user__id=user.id).filter(
|
||||||
|
shelf__identifier__exact="read"
|
||||||
|
)
|
||||||
|
read_shelfbooks_list = list(read_shelfbooks.values("book", "shelved_date"))
|
||||||
|
|
||||||
|
book_dates = []
|
||||||
|
|
||||||
|
for book in read_shelfbooks_list:
|
||||||
|
earliest_finished = (
|
||||||
|
models.ReadThrough.objects.filter(user__id=user.id)
|
||||||
|
.filter(book_id=book["book"])
|
||||||
|
.exclude(finish_date__exact=None)
|
||||||
|
.order_by("finish_date")
|
||||||
|
.values("finish_date")
|
||||||
|
.first()
|
||||||
|
)
|
||||||
|
|
||||||
|
if earliest_finished:
|
||||||
|
book_dates.append(
|
||||||
|
min(earliest_finished["finish_date"], book["shelved_date"])
|
||||||
|
)
|
||||||
|
else:
|
||||||
|
book_dates.append(book["shelved_date"])
|
||||||
|
|
||||||
|
return min(book_dates).year
|
||||||
|
|
||||||
|
|
||||||
def get_read_book_ids_in_year(user, year):
|
def get_read_book_ids_in_year(user, year):
|
||||||
"""return an ordered QuerySet of the read book ids"""
|
"""return an ordered QuerySet of the read book ids"""
|
||||||
|
|
||||||
|
@ -196,6 +227,17 @@ def get_read_book_ids_in_year(user, year):
|
||||||
.values_list("book", flat=True)
|
.values_list("book", flat=True)
|
||||||
)
|
)
|
||||||
return read_book_ids_in_year
|
return read_book_ids_in_year
|
||||||
|
models.ReadThrough.objects.filter(user__id=user.id)
|
||||||
|
.filter(book_id=book[0])
|
||||||
|
.exists()
|
||||||
|
)
|
||||||
|
if not has_other_year_readthrough and book[1].year == int(year):
|
||||||
|
# No readthrough but shelved this year
|
||||||
|
book_dates.append(book)
|
||||||
|
|
||||||
|
book_dates = sorted(book_dates, key=lambda tup: tup[1])
|
||||||
|
|
||||||
|
return [book[0] for book in book_dates]
|
||||||
|
|
||||||
|
|
||||||
def get_books_from_shelfbooks(books_ids):
|
def get_books_from_shelfbooks(books_ids):
|
||||||
|
|
Loading…
Reference in a new issue