refactor(Emails): enlève les logs en double suite à TemplateTransacti…

…onalSendLogs (#1357)
gip-inclusion · Jul 25, 2024 · b440362 · b440362
1 parent 88fa396
commit b440362
Show file tree

Hide file tree

Showing 3 changed files with 83 additions and 234 deletions.
diff --git a/lemarche/siaes/tasks.py b/lemarche/siaes/tasks.py
@@ -1,5 +1,4 @@
 from django.urls import reverse_lazy
-from django.utils import timezone
 from huey.contrib.djhuey import task
 
 from lemarche.conversations.models import TemplateTransactional
@@ -47,6 +46,8 @@ def send_completion_reminder_email_to_siae(siae):
                 "SIAE_USER_FIRST_NAME": siae_user.first_name,
                 "SIAE_ID": siae.id,
                 "SIAE_NAME": siae.name_display,
+                "SIAE_CONTACT_EMAIL": siae.contact_email,
+                "SIAE_SECTOR_COUNT": siae.sector_count,
                 "SIAE_URL": get_object_share_url(siae),
                 "SIAE_EDIT_URL": f"https://{get_domain_url()}{reverse_lazy('dashboard_siaes:siae_edit_contact', args=[siae.slug])}",  # noqa
             }
@@ -58,18 +59,3 @@ def send_completion_reminder_email_to_siae(siae):
                 recipient_content_object=siae_user,
                 parent_content_object=siae,
             )
-
-        # log email
-        log_item = {
-            "action": "email_completion_reminder",
-            "email_template": email_template.code,
-            "email_to": recipient_list,
-            # "email_body": email_body,
-            "email_timestamp": timezone.now().isoformat(),
-            "metadata": {
-                "sector_count": siae.sector_count,
-                "contact_email": True if len(siae.contact_email) else False,
-            },
-        }
-        siae.logs.append(log_item)
-        siae.save()
diff --git a/lemarche/www/dashboard_siaes/tasks.py b/lemarche/www/dashboard_siaes/tasks.py
@@ -1,5 +1,4 @@
 from django.urls import reverse_lazy
-from django.utils import timezone
 
 from lemarche.conversations.models import TemplateTransactional
 from lemarche.utils.emails import whitelist_recipient_list
@@ -35,17 +34,6 @@ def send_siae_user_request_email_to_assignee(siae_user_request):
             parent_content_object=siae_user_request,
         )
 
-        # log email
-        log_item = {
-            "action": "email_sent",
-            "email_template": email_template.code,
-            "email_to": recipient_email,
-            # "email_body": email_body,
-            "email_timestamp": timezone.now().isoformat(),
-        }
-        siae_user_request.logs.append(log_item)
-        siae_user_request.save()
-
 
 def send_siae_user_request_response_email_to_initiator(siae_user_request):
     """
@@ -81,17 +69,6 @@ def send_siae_user_request_response_email_to_initiator(siae_user_request):
                 parent_content_object=siae_user_request,
             )
 
-            # log email
-            log_item = {
-                "action": "email_sent",
-                "email_template": email_template.code,
-                "email_to": recipient_email,
-                # "email_body": email_body,
-                "email_timestamp": timezone.now().isoformat(),
-            }
-            siae_user_request.logs.append(log_item)
-            siae_user_request.save()
-
 
 def send_siae_user_request_reminder_3_days_emails(siae_user_request):
     """
@@ -129,17 +106,6 @@ def send_siae_user_request_reminder_3_days_email_to_assignee(siae_user_request):
             parent_content_object=siae_user_request,
         )
 
-        # log email
-        log_item = {
-            "action": "email_sent",
-            "email_template": email_template.code,
-            "email_to": recipient_email,
-            # "email_body": email_body,
-            "email_timestamp": timezone.now().isoformat(),
-        }
-        siae_user_request.logs.append(log_item)
-        siae_user_request.save()
-
 
 def send_siae_user_request_reminder_3_days_email_to_initiator(siae_user_request):
     email_template = TemplateTransactional.objects.get(code="SIAEUSERREQUEST_REMINDER_1_INITIATOR")
@@ -166,17 +132,6 @@ def send_siae_user_request_reminder_3_days_email_to_initiator(siae_user_request)
             parent_content_object=siae_user_request,
         )
 
-        # log email
-        log_item = {
-            "action": "email_sent",
-            "email_template": email_template.code,
-            "email_to": recipient_email,
-            # "email_body": email_body,
-            "email_timestamp": timezone.now().isoformat(),
-        }
-        siae_user_request.logs.append(log_item)
-        siae_user_request.save()
-
 
 def send_siae_user_request_reminder_8_days_emails(siae_user_request):
     """
@@ -214,17 +169,6 @@ def send_siae_user_request_reminder_8_days_email_to_assignee(siae_user_request):
             parent_content_object=siae_user_request,
         )
 
-        # log email
-        log_item = {
-            "action": "email_sent",
-            "email_template": email_template.code,
-            "email_to": recipient_email,
-            # "email_body": email_body,
-            "email_timestamp": timezone.now().isoformat(),
-        }
-        siae_user_request.logs.append(log_item)
-        siae_user_request.save()
-
 
 def send_siae_user_request_reminder_8_days_email_to_initiator(siae_user_request):
     email_template = TemplateTransactional.objects.get(code="SIAEUSERREQUEST_REMINDER_2_INITIATOR")
@@ -251,14 +195,3 @@ def send_siae_user_request_reminder_8_days_email_to_initiator(siae_user_request)
             recipient_content_object=siae_user_request.initiator,
             parent_content_object=siae_user_request,
         )
-
-        # log email
-        log_item = {
-            "action": "email_sent",
-            "email_template": email_template.code,
-            "email_to": recipient_email,
-            # "email_body": email_body,
-            "email_timestamp": timezone.now().isoformat(),
-        }
-        siae_user_request.logs.append(log_item)
-        siae_user_request.save()