+
`;
+ list.querySelectorAll('[data-notification-link]').forEach((link) => {
+ link.addEventListener('click', onNotificationLinkClick);
+ });
+
list.querySelectorAll('#markAsRead').forEach(button => {
button.addEventListener('click', function() {
- markAsRead(button.dataset.notificationId);
+ markAsReadAndFetch(button.dataset.notificationId);
});
});
@@ -64,19 +71,38 @@
});
}
+ function onNotificationLinkClick(event) {
+ event.preventDefault();
+
+ const link = event.target;
+ const url = link.href;
+ const button = link.parentElement.querySelector('button');
+ const id = button.dataset.notificationId;
+
+ markAsRead(id)
+ .then(() => { document.location.href = url; })
+ .catch(() => { document.location.href = url; });
+ }
+
function markAsRead(id) {
- fetch(`/blog/api/notifications/${id}/mark_as_read/`, {
+ return fetch(`/notifications/api/notifications/${id}/mark_as_read/`, {
method: 'POST',
headers: {
'Content-Type': 'application/json',
'X-CSRFToken': getCookie('csrftoken')
}
- })
- .then(() => fetchNotifications());
+ });
+ }
+
+
+ function markAsReadAndFetch(id) {
+ return markAsRead(id)
+ .then(() => fetchNotifications())
+ .catch(() => fetchNotifications());
}
function markAllAsRead() {
- fetch(`/blog/api/notifications/mark_all_as_read/`, {
+ fetch(`/notifications/api/notifications/mark_all_as_read/`, {
method: 'POST',
headers: {
'Content-Type': 'application/json',
diff --git a/src/notifications/urls.py b/src/notifications/urls.py
index ae9b37a..ae85b8b 100644
--- a/src/notifications/urls.py
+++ b/src/notifications/urls.py
@@ -1,4 +1,5 @@
from django.urls import path, include
+from django.views.generic import TemplateView
from rest_framework.routers import DefaultRouter
from .views import NotificationViewSet
@@ -6,5 +7,10 @@
router.register(r"notifications", NotificationViewSet, basename="notification")
urlpatterns = [
- path("", include(router.urls)),
+ path(
+ "",
+ TemplateView.as_view(template_name="notifications/all-notifications.html"),
+ name="all_notifications",
+ ),
+ path("api/", include(router.urls)),
]
diff --git a/src/notifications/views.py b/src/notifications/views.py
index 6086251..59dd710 100644
--- a/src/notifications/views.py
+++ b/src/notifications/views.py
@@ -13,7 +13,7 @@ class NotificationViewSet(viewsets.ModelViewSet):
def list(self, request):
logger.debug("NotificationViewSet.list() called")
- queryset = self.get_queryset()
+ queryset = self.get_unread_queryset()
serializer = self.get_serializer(queryset, many=True)
return Response(serializer.data)
@@ -23,6 +23,10 @@ def get_queryset(self):
"-created_at"
)
+ def get_unread_queryset(self):
+ logger.debug(f"get_unread_queryset called for user: {self.request.user}")
+ return self.get_queryset().filter(read=False)
+
@action(detail=True, methods=["post"])
def mark_as_read(self, request, pk=None):
logger.debug(f"mark_as_read called for notification {pk}")
@@ -31,9 +35,15 @@ def mark_as_read(self, request, pk=None):
notification.save()
return Response({"status": "notification marked as read"})
- # mark all as read for the current user
@action(detail=False, methods=["post"])
def mark_all_as_read(self, request):
logger.debug("mark_all_as_read called")
Notification.objects.filter(user=request.user).update(read=True)
return Response({"status": "all notifications marked as read"})
+
+ @action(detail=False, methods=["get"])
+ def all(self, request):
+ logger.debug("all_notifications called")
+ queryset = self.get_queryset()
+ serializer = self.get_serializer(queryset, many=True)
+ return Response(serializer.data)