PROJ-1962-Ajouter-le-portail-sur-report-contact-mails (#335)

CyberCRI · Dec 11, 2024 · 5dc4776 · 5dc4776
1 parent cadc0b9
commit 5dc4776
Show file tree

Hide file tree

Showing 11 changed files with 80 additions and 27 deletions.
diff --git a/apps/emailing/templates/abuse.html b/apps/emailing/templates/abuse.html
@@ -15,9 +15,11 @@
                     </mj-text>
 
                     <mj-text>
-                        URL: <span style="color: #444444">{{ url }}</span>
+                        URL: <a href="{{ url }}" ="color: #444444">{{ url }}</span>
+                    </mj-text>
+                    <mj-text font-size="14px" color="#444444">
+                        On portal : <a href="{{ organization_url }}" style="#444444">{{ organization_url }}</a>
                     </mj-text>
-
 
                     <mj-divider border-color="#F45E43"></mj-divider>
 

diff --git a/apps/emailing/templates/abuse.txt b/apps/emailing/templates/abuse.txt
@@ -1,5 +1,5 @@
 Subject: {{ title }}
 From: {{ reported_by }}
 URL: {{ url }}
-
+From portal {{ organization_url }}
 {{ message|safe }}
diff --git a/apps/emailing/templates/bug.html b/apps/emailing/templates/bug.html
@@ -15,9 +15,11 @@
                     </mj-text>
 
                     <mj-text>
-                        URL: <span style="color: #444444">{{ url }}</span>
+                        URL: <a href="{{ url }}" ="color: #444444">{{ url }}</span>
+                    </mj-text>
+                    <mj-text font-size="14px" color="#444444">
+                        On portal : <a href="{{ organization_url }}" style="#444444">{{ organization_url }}</a>
                     </mj-text>
-
 
                     <mj-divider border-color="#F45E43"></mj-divider>
 

diff --git a/apps/emailing/templates/bug.txt b/apps/emailing/templates/bug.txt
@@ -1,5 +1,5 @@
 Subject: {{ title }}
 From: {{ reported_by }}
 URL: {{ url }}
-
+From portal {{ organization_url }}
 {{ message|safe }}
diff --git a/apps/emailing/templates/contact_us.html b/apps/emailing/templates/contact_us.html
@@ -14,6 +14,9 @@
                         From: <span style="color: #444444">{{ email }}</span>
                     </mj-text>
 
+                    <mj-text font-size="14px" color="#444444">
+                        On portal : <a href="{{ organization_url }}" style="#444444">{{ organization_url }}</a>
+                    </mj-text>
 
                     <mj-divider border-color="#F45E43"></mj-divider>
 

diff --git a/apps/emailing/templates/contact_us.txt b/apps/emailing/templates/contact_us.txt
@@ -1,4 +1,4 @@
 Subject: {{ subject }}
 From: {{ email }}
-
+From portal {{ organization_url }}
 {{ content|safe }}
diff --git a/apps/notifications/tests/views/test_contact_us.py b/apps/notifications/tests/views/test_contact_us.py
@@ -6,11 +6,17 @@
 from rest_framework import status
 
 from apps.commons.test import JwtAPITestCase, TestRoles
+from apps.organizations.factories import OrganizationFactory
 
 faker = Faker()
 
 
 class ContactTestCase(JwtAPITestCase):
+    @classmethod
+    def setUpTestData(cls):
+        super().setUpTestData()
+        cls.organization = OrganizationFactory()
+
     @parameterized.expand(
         [
             (TestRoles.ANONYMOUS,),
@@ -26,6 +32,8 @@ def test_contact_us(self, role, send_email):
             "content": faker.text(),
             "email": faker.email(),
         }
-        response = self.client.post(reverse("Contact-us"), data=payload)
+        response = self.client.post(
+            reverse("Contact-us", args=(self.organization.code,)), data=payload
+        )
         self.assertEqual(response.status_code, status.HTTP_200_OK, response.content)
         send_email.assert_called_once()
diff --git a/apps/notifications/tests/views/test_report.py b/apps/notifications/tests/views/test_report.py
@@ -6,11 +6,17 @@
 from rest_framework import status
 
 from apps.commons.test import JwtAPITestCase, TestRoles
+from apps.organizations.factories import OrganizationFactory
 
 faker = Faker()
 
 
 class ReportTestCase(JwtAPITestCase):
+    @classmethod
+    def setUpTestData(cls):
+        super().setUpTestData()
+        cls.organization = OrganizationFactory()
+
     @parameterized.expand(
         [
             (TestRoles.ANONYMOUS,),
@@ -27,7 +33,9 @@ def test_bug_report(self, role, send_email):
             "reported_by": faker.email(),
             "url": faker.url(),
         }
-        response = self.client.post(reverse("Report-bug"), data=payload)
+        response = self.client.post(
+            reverse("Report-bug", args=(self.organization.code,)), data=payload
+        )
         self.assertEqual(response.status_code, status.HTTP_200_OK, response.content)
         send_email.assert_called_once()
 
@@ -47,6 +55,8 @@ def test_abuse_report(self, role, send_email):
             "reported_by": faker.email(),
             "url": faker.url(),
         }
-        response = self.client.post(reverse("Report-abuse"), data=payload)
+        response = self.client.post(
+            reverse("Report-abuse", args=(self.organization.code,)), data=payload
+        )
         self.assertEqual(response.status_code, status.HTTP_200_OK, response.content)
         send_email.assert_called_once()
diff --git a/apps/notifications/urls.py b/apps/notifications/urls.py
@@ -1,18 +1,31 @@
-from django.urls import include, path
 from rest_framework.routers import SimpleRouter
 
-from . import views
+from apps.commons.urls import organization_router_register
+
+from .views import (
+    ContactViewSet,
+    NotificationSettingsViewSet,
+    NotificationsViewSet,
+    ReportViewSet,
+)
 
 router = SimpleRouter()
-router.register(r"report", views.ReportViewSet, basename="Report")
-router.register(r"contact", views.ContactViewSet, basename="Contact")
-router.register(r"notification", views.NotificationsViewSet, basename="Notification")
+
+router.register(r"notification", NotificationsViewSet, basename="Notification")
 router.register(
     r"notifications-setting",
-    views.NotificationSettingsViewSet,
+    NotificationSettingsViewSet,
     basename="NotificationSettings",
 )
-
-urlpatterns = [
-    path(r"", include(router.urls)),
-]
+organization_router_register(
+    router,
+    r"report",
+    ReportViewSet,
+    basename="Report",
+)
+organization_router_register(
+    router,
+    r"contact",
+    ContactViewSet,
+    basename="Contact",
+)
diff --git a/apps/notifications/views.py b/apps/notifications/views.py
@@ -3,6 +3,7 @@
 
 from django.conf import settings
 from django.db import transaction
+from django.shortcuts import get_object_or_404
 from drf_spectacular.utils import extend_schema
 from rest_framework import status, viewsets
 from rest_framework.decorators import action
@@ -16,6 +17,7 @@
 from apps.commons.views import ListViewSet, MultipleIDViewsetMixin
 from apps.emailing.tasks import send_email_task
 from apps.emailing.utils import render_message
+from apps.organizations.models import Organization
 from apps.organizations.permissions import HasOrganizationPermission
 
 from .models import Notification, NotificationSettings
@@ -83,15 +85,19 @@ class ReportViewSet(viewsets.GenericViewSet):
 
     @extend_schema(request=EmailReportSerializer)
     @action(detail=False, methods=["POST"])
-    def abuse(self, request: Request):
+    def abuse(self, request: Request, *args, **kwargs):
         """Allow to send an abuse report email."""
+        organization_code = self.kwargs.get("organization_code", None)
+        organization = get_object_or_404(Organization, code=organization_code)
         serializer = EmailReportSerializer(
             data=request.data, context={"request": request}
         )
         serializer.is_valid(raise_exception=True)
 
         text_content, html_content = render_message(
-            "abuse", **serializer.validated_data
+            "abuse",
+            organization_url=organization.website_url,
+            **serializer.validated_data,
         )
         send_email_task.delay(
             f"[Abuse] {serializer.validated_data['title']}",
@@ -104,14 +110,20 @@ def abuse(self, request: Request):
 
     @extend_schema(request=EmailReportSerializer)
     @action(detail=False, methods=["POST"])
-    def bug(self, request: Request):
+    def bug(self, request: Request, *args, **kwargs):
         """Allow to send a bug report email."""
+        organization_code = self.kwargs.get("organization_code", None)
+        organization = get_object_or_404(Organization, code=organization_code)
         serializer = EmailReportSerializer(
             data=request.data, context={"request": request}
         )
         serializer.is_valid(raise_exception=True)
 
-        text_content, html_content = render_message("bug", **serializer.validated_data)
+        text_content, html_content = render_message(
+            "bug",
+            organization_url=organization.website_url,
+            **serializer.validated_data,
+        )
         send_email_task.delay(
             f"[Bug] {serializer.validated_data['title']}",
             text_content,
@@ -130,13 +142,17 @@ class ContactViewSet(viewsets.GenericViewSet):
 
     @extend_schema(request=ContactSerializer)
     @action(detail=False, methods=["POST"])
-    def us(self, request: Request):
+    def us(self, request: Request, *args, **kwargs):
         """Allow to send an abuse report email."""
+        organization_code = self.kwargs.get("organization_code", None)
+        organization = get_object_or_404(Organization, code=organization_code)
         serializer = ContactSerializer(data=request.data, context={"request": request})
         serializer.is_valid(raise_exception=True)
 
         text_content, html_content = render_message(
-            "contact_us", **serializer.validated_data
+            "contact_us",
+            organization_url=organization.website_url,
+            **serializer.validated_data,
         )
         send_email_task.delay(
             f"[Contact] {serializer.validated_data['subject']}",

diff --git a/projects/urls.py b/projects/urls.py
@@ -57,7 +57,6 @@ def redirect_to_swagger(request):
 urlpatterns_v1 = [
     path("", include(router.urls)),
     path("", include("apps.accounts.urls")),
-    path("", include("apps.notifications.urls")),
     path("", include("apps.organizations.urls")),
     path("", include("apps.emailing.urls")),
     path("healthz/", include(("apps.healthcheck.urls", "healthcheck"))),