hotfix beneficiary email

dora/orientations/admin.py

@@ -34,7 +34,7 @@ class OrientationAdmin(admin.ModelAdmin):
     )
     date_hierarchy = "creation_date"
     ordering = ("-id",)
-    readonly_fields = ("query_id", "original_service_name")
+    readonly_fields = ("query_id", "query_expires_at", "original_service_name")
     filter_horizontal = ("rejection_reasons",)
     inlines = [SentContactEmailInline]
 

dora/orientations/emails.py

@@ -26,8 +26,8 @@ def beneficiaries_has_alternate_contact_methods(orientation):
     )
 
 
-def send_orientation_created_emails(orientation):
-    context = {
+def _orientation_created_ctx(orientation) -> dict:
+    return {
         "data": orientation,
         "ContactPreference": ContactPreference,
         "support_email": settings.SUPPORT_EMAIL,
@@ -40,7 +40,18 @@ def send_orientation_created_emails(orientation):
             for a in orientation.beneficiary_attachments
         ],
     }
-    # Structure porteuse
+
+
+# e-mails envoyés lors de la création de l'orientation :
+# pour les liens expirés pour la structure,
+# il y a un besoin de renvoyer un e-mail du groupe séparément, d'où la séparation
+# ça permettra de tester unitairement les e-mails par ailleurs...
+
+
+def send_orientation_created_to_structure(orientation, context=None):
+    if not context:
+        context = _orientation_created_ctx(orientation)
+
     send_mail(
         f"{'[Envoyée - Structure porteuse] ' if debug else ''}Nouvelle demande d’orientation reçue",
         orientation.get_contact_email(),
@@ -52,15 +63,25 @@ def send_orientation_created_emails(orientation):
         tags=["orientation"],
         reply_to=[orientation.prescriber.email],
     )
-    # Prescripteur
+
+
+def send_orientation_created_to_prescriber(orientation, context=None):
+    if not context:
+        context = _orientation_created_ctx(orientation)
+
     send_mail(
         f"{'[Envoyée - Prescripteur] ' if debug else ''}Votre demande a bien été transmise !",
         orientation.prescriber.email,
         mjml2html(render_to_string("orientation-created-prescriber.mjml", context)),
         tags=["orientation"],
         reply_to=[orientation.get_contact_email()],
     )
-    # Référent
+
+
+def send_orientation_created_to_referent(orientation, context=None):
+    if not context:
+        context = _orientation_created_ctx(orientation)
+
     if (
         orientation.referent_email
         and orientation.referent_email != orientation.prescriber.email
@@ -72,7 +93,12 @@ def send_orientation_created_emails(orientation):
             tags=["orientation"],
             reply_to=[orientation.prescriber.email],
         )
-    # Bénéficiaire
+
+
+def send_orientation_created_to_beneficiary(orientation, context=None):
+    if not context:
+        context = _orientation_created_ctx(orientation)
+
     if orientation.beneficiary_email:
         send_mail(
             f"{'[Envoyée - Bénéficiaire] ' if debug else ''}Une orientation a été effectuée en votre nom",
@@ -89,6 +115,22 @@ def send_orientation_created_emails(orientation):
         )
 
 
+def send_orientation_created_emails(orientation, cc=None):
+    context = _orientation_created_ctx(orientation)
+
+    # Structure porteuse
+    send_orientation_created_to_structure(orientation, context)
+
+    # Prescripteur
+    send_orientation_created_to_prescriber(orientation, context)
+
+    # Référent
+    send_orientation_created_to_referent(orientation, context)
+
+    # Bénéficiaire
+    send_orientation_created_to_beneficiary(orientation, context)
+
+
 def send_orientation_accepted_emails(
     orientation, prescriber_message, beneficiary_message
 ):

dora/orientations/migrations/0006_sentcontactemail.py

@@ -30,7 +30,7 @@ class Migration(migrations.Migration):
                         choices=[
                             ("BÉNÉFICIAIRE", "Bénéficiaire"),
                             ("PRESCRIPTEUR", "Prescripteur"),
-                            ("RÉFÉRENT", "Réfeérent"),
+                            ("RÉFÉRENT", "Référent"),
                         ],
                         max_length=20,
                     ),
@@ -42,7 +42,7 @@ class Migration(migrations.Migration):
                             choices=[
                                 ("BÉNÉFICIAIRE", "Bénéficiaire"),
                                 ("PRESCRIPTEUR", "Prescripteur"),
-                                ("RÉFÉRENT", "Réfeérent"),
+                                ("RÉFÉRENT", "Référent"),
                             ],
                             max_length=20,
                         ),

dora/orientations/migrations/0009_orientation_query_expires_at_and_more.py

@@ -0,0 +1,50 @@
+# Generated by Django 4.2.12 on 2024-05-08 14:59
+
+from django.db import migrations, models
+
+import dora.orientations.models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("orientations", "0008_orientation_di_contact_email_and_more"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="orientation",
+            name="query_expires_at",
+            field=models.DateTimeField(
+                default=dora.orientations.models._orientation_query_expiration_date,
+                verbose_name="expiration du lien de la demande",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="orientation",
+            name="creation_date",
+            field=models.DateTimeField(
+                auto_now_add=True, verbose_name="date de création"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="orientation",
+            name="processing_date",
+            field=models.DateTimeField(
+                blank=True, null=True, verbose_name="date de traitement"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="orientation",
+            name="status",
+            field=models.CharField(
+                choices=[
+                    ("OUVERTE", "Ouverte / En cours de traitement"),
+                    ("VALIDÉE", "Validée"),
+                    ("REFUSÉE", "Refusée"),
+                ],
+                default="OUVERTE",
+                max_length=10,
+                verbose_name="statut",
+            ),
+        ),
+    ]

dora/orientations/models.py

@@ -1,13 +1,21 @@
+import hashlib
+import logging
 import uuid
 
+from dateutil.relativedelta import relativedelta
 from django.conf import settings
 from django.contrib.postgres.fields import ArrayField
 from django.db import models
+from django.utils import timezone
 
 from dora.core.models import EnumModel
 from dora.services.models import Service
 from dora.structures.models import Structure
 
+ORIENTATION_QUERY_LINK_TTL_DAY = 8
+
+logger = logging.getLogger("dora.logs.core")
+
 
 class ContactPreference(models.TextChoices):
     PHONE = "TELEPHONE", "Téléphone"
@@ -27,6 +35,11 @@ class Meta:
         verbose_name_plural = "Motifs de refus"
 
 
+def _orientation_query_expiration_date():
+    # lu quelque part: les lambdas sont moyennement appréciées dans les migrations
+    return timezone.now() + relativedelta(days=ORIENTATION_QUERY_LINK_TTL_DAY)
+
+
 class Orientation(models.Model):
     id = models.BigAutoField(
         auto_created=True,
@@ -37,6 +50,11 @@ class Orientation(models.Model):
 
     query_id = models.UUIDField(default=uuid.uuid4, editable=False, db_index=True)
 
+    query_expires_at = models.DateTimeField(
+        default=_orientation_query_expiration_date,
+        verbose_name="expiration du lien de la demande",
+    )
+
     # Infos bénéficiaires
     requirements = ArrayField(
         models.CharField(max_length=480),
@@ -140,12 +158,17 @@ class Orientation(models.Model):
         RejectionReason, verbose_name="Motifs de refus de l'orientation", blank=True
     )
 
-    creation_date = models.DateTimeField(auto_now_add=True, editable=False)
-    processing_date = models.DateTimeField(blank=True, null=True)
+    creation_date = models.DateTimeField(
+        auto_now_add=True, editable=False, verbose_name="date de création"
+    )
+    processing_date = models.DateTimeField(
+        blank=True, null=True, verbose_name="date de traitement"
+    )
     status = models.CharField(
         max_length=10,
         choices=OrientationStatus.choices,
         default=OrientationStatus.PENDING,
+        verbose_name="statut",
     )
     last_reminder_email_sent = models.DateTimeField(blank=True, null=True)
 
@@ -157,8 +180,15 @@ def save(self, *args, **kwargs):
     def __str__(self):
         return f"Orientation #{self.id}"
 
+    def get_query_id_hash(self) -> str:
+        return hashlib.sha256(
+            f"{self.query_id}{self.query_expires_at}{settings.SECRET_KEY}".encode(
+                "utf8"
+            )
+        ).hexdigest()
+
     def get_magic_link(self):
-        return self.get_frontend_url()
+        return f"{settings.FRONTEND_URL}/orientations?token={self.query_id}&h={self.get_query_id_hash()}"
 
     def get_absolute_url(self):
         return self.get_frontend_url()
@@ -241,11 +271,30 @@ def get_service_frontend_url(self):
         else:
             return ""
 
+    def refresh_query_expiration_date(self):
+        # on ne régénère le lien que si il est expiré
+        if self.query_expired:
+            self.query_expires_at = _orientation_query_expiration_date()
+            self.save()
+            logger.info(
+                "orientation:refresh_link",
+                {
+                    "legal": True,
+                    "reason": "lien expiré",
+                    "queryId": str(self.query_id),
+                    "ttlInDays": ORIENTATION_QUERY_LINK_TTL_DAY,
+                },
+            )
+
+    @property
+    def query_expired(self) -> bool:
+        return timezone.now() > self.query_expires_at
+
 
 class ContactRecipient(models.TextChoices):
     BENEFICIARY = "BÉNÉFICIAIRE", "Bénéficiaire"
     PRESCRIBER = "PRESCRIPTEUR", "Prescripteur"
-    REFERENT = "RÉFÉRENT", "Réfeérent"
+    REFERENT = "RÉFÉRENT", "Référent"
 
 
 class SentContactEmail(models.Model):

dora/orientations/tests/conftest.py

@@ -0,0 +1,13 @@
+import pytest
+from model_bakery.random_gen import gen_email
+
+from dora.core.test_utils import make_orientation
+
+from ..models import Orientation
+
+
+@pytest.fixture
+def orientation() -> Orientation:
+    # l'e-mail bénéficiaire est optionel dans la génération,
+    # mais on veut vérifier l'envoi d'e-mail vers tous les destinataires
+    return make_orientation(beneficiary_email=gen_email)