Merge branch 'feat/project-notif-counts' of https://github.com/etchegom/recommandations-collaboratives into feat/notif-navigation-project#805

Author: Jeremy-Bojko

recoco/apps/home/static/home/css/dsfr/custom-dsfr.scss

@@ -53,18 +53,19 @@
 \* ˍˍˍˍ */
 
 a {
-  text-decoration: none !important;
+  text-decoration: none;
 
   &.btn,
   &.button,
   &.nav-link,
   &.link-secondary {
-    text-decoration: none !important;
+    text-decoration: none;
   }
 }
 
 p a {
   text-decoration: underline;
+  color: #0000EE;
 }
 
 p {

recoco/apps/projects/models.py

@@ -154,7 +154,6 @@ def for_user(self, user):
 
 class ProjectQuerySet(models.QuerySet):
     def with_unread_notifications(self, user_id: int):
-
         notification_query = Notification.objects.filter(
             recipient_id=user_id,
             target_object_id=Cast(OuterRef("pk"), output_field=models.CharField()),
@@ -185,7 +184,7 @@ def with_unread_notifications(self, user_id: int):
             conversation_notifications_count=Subquery(
                 notification_query.filter(
                     action_object_content_type=ContentType.objects.get_for_model(Note),
-                    # action_object__public=True,
+                    action_notes__public=True,
                 )
                 .unread()
                 .order_by()
@@ -195,7 +194,7 @@ def with_unread_notifications(self, user_id: int):
             private_conversation_notifications_count=Subquery(
                 notification_query.filter(
                     action_object_content_type=ContentType.objects.get_for_model(Note),
-                    # action_object__public=False,
+                    action_notes__public=False,
                 )
                 .unread()
                 .order_by()

recoco/apps/projects/tests/test_models.py

@@ -9,11 +9,15 @@
 
 import pytest
 from django.conf import settings
+from django.contrib.contenttypes.models import ContentType
 from django.contrib.sites import models as sites
 from django.utils import timezone
 from model_bakery import baker
+from notifications.models import Notification
 
+from recoco.apps.projects.models import Note
 from recoco.apps.tasks import models as task_models
+from recoco.apps.tasks.models import Task, TaskFollowup
 
 from .. import models
 
@@ -111,4 +115,60 @@ def test_projectsite_queryset():
         assert project.project_sites.current().site == site
 
 
+@pytest.mark.django_db
+def test_project_queryset_unread_notifications():
+    project = baker.make(models.Project)
+    user = baker.make(settings.AUTH_USER_MODEL)
+    public_note = baker.make(Note, project=project, public=True)
+    private_note = baker.make(Note, project=project, public=False)
+
+    project_ct = ContentType.objects.get_for_model(models.Project)
+    task_ct = ContentType.objects.get_for_model(Task)
+    task_followup_ct = ContentType.objects.get_for_model(TaskFollowup)
+    note_ct = ContentType.objects.get_for_model(Note)
+
+    baker.make(
+        Notification,
+        recipient=user,
+        target_object_id=project.id,
+        target_content_type=project_ct,
+        unread=True,
+        action_object_content_type=task_ct,
+    )
+    baker.make(
+        Notification,
+        recipient=user,
+        target_object_id=project.id,
+        target_content_type=project_ct,
+        unread=True,
+        action_object_content_type=task_followup_ct,
+    )
+    baker.make(
+        Notification,
+        recipient=user,
+        target_object_id=project.id,
+        target_content_type=project_ct,
+        unread=True,
+        action_object_content_type=note_ct,
+        action_object_object_id=public_note.id,
+    )
+    baker.make(
+        Notification,
+        recipient=user,
+        target_object_id=project.id,
+        target_content_type=project_ct,
+        unread=True,
+        action_object_content_type=note_ct,
+        action_object_object_id=private_note.id,
+    )
+
+    annotated_project = models.Project.objects.with_unread_notifications(
+        user.id
+    ).first()
+    assert annotated_project.action_notifications_count == 2
+    assert annotated_project.conversation_notifications_count == 1
+    assert annotated_project.private_conversation_notifications_count == 1
+    assert annotated_project.document_notifications_count == 0
+
+
 # eof