From 83abbb5f6c672bcd9209e7bd7e4b7ab0c8b73682 Mon Sep 17 00:00:00 2001
From: Jonathan Weth <git@jonathanweth.de>
Date: Sun, 24 Jan 2021 11:30:58 +0100
Subject: [PATCH] Move unread notifications query set to a property of the
person object
---
aleksis/core/models.py | 10 ++++++++++
aleksis/core/util/core_helpers.py | 2 +-
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/aleksis/core/models.py b/aleksis/core/models.py
index 8927844a4..85b16b1e2 100644
--- a/aleksis/core/models.py
+++ b/aleksis/core/models.py
@@ -245,6 +245,16 @@ class Person(ExtensibleModel):
)
]
+ @property
+ def unread_notifications(self) -> QuerySet:
+ """Get all unread notifications for this person."""
+ return self.notifications.filter(read=False)
+
+ @property
+ def unread_notifications_count(self) -> int:
+ """Return the count of unread notifications for this person."""
+ return self.unread_notifications.count()
+
def save(self, *args, **kwargs):
super().save(*args, **kwargs)
diff --git a/aleksis/core/util/core_helpers.py b/aleksis/core/util/core_helpers.py
index 11811b78a..9e9a90faf 100644
--- a/aleksis/core/util/core_helpers.py
+++ b/aleksis/core/util/core_helpers.py
@@ -408,4 +408,4 @@ def queryset_rules_filter(
def unread_notifications_badge(request: HttpRequest) -> int:
"""Generate badge content with the number of unread notifications."""
- return request.user.person.notifications.all().filter(read=False).count()
+ return request.user.person.unread_notifications_count
--
GitLab