{% trans "Importez un fichier au format CSV, avec sur la première colonne le login, sur la deuxième, le nom et prénom et enfin l'adresse email sur la troisième. Soit :
Login_1,Prénom/Nom_1,mail_1@machin.test
Login_2,Prénom/Nom_2,mail_2@bidule.test
...
" %}
@@ -114,7 +123,18 @@
| {{ v.base_username }} |
{{ v.full_name }} |
- {{ v.email }} |
+
+ {{ v.email }}
+ {% if v.has_valid_email %}
+
+
+
+ {% elif v.has_valid_email is False %}
+
+
+
+ {% endif %}
+ |
{% endfor %}
diff --git a/elections/utils.py b/elections/utils.py
index 90633e2..aa3cac3 100644
--- a/elections/utils.py
+++ b/elections/utils.py
@@ -1,5 +1,6 @@
import csv
import io
+import smtplib
import networkx as nx
import numpy as np
@@ -8,7 +9,7 @@ from networkx.algorithms.dag import ancestors, descendants
from django.contrib.auth import get_user_model
from django.contrib.auth.hashers import make_password
from django.core.exceptions import ValidationError
-from django.core.mail import EmailMessage # , get_connection
+from django.core.mail import EmailMessage
from django.core.validators import validate_email
from django.template.loader import render_to_string
from django.urls import reverse
@@ -378,13 +379,14 @@ def check_csv(csv_file):
return errors
-def send_mail(election, mail_form):
+def send_mail(election, subject, body):
"""Envoie le mail d'annonce de l'élection avec identifiants et mot de passe
aux votant·e·s, le mdp est généré en même temps que le mail est envoyé.
"""
User = get_user_model()
- voters = list(election.registered_voters.all())
+ # On n'envoie le mail qu'aux personnes qui n'en n'ont pas déjà reçu un
+ voters = list(election.registered_voters.exclude(has_valid_email=True))
e_url = reverse("election.view", args=[election.id])
url = f"https://vote.eleves.ens.fr{e_url}"
messages = []
@@ -392,18 +394,27 @@ def send_mail(election, mail_form):
password = generate_password()
v.password = make_password(password)
messages.append(
- EmailMessage(
- subject=mail_form.cleaned_data["objet"],
- body=mail_form.cleaned_data["message"].format(
- full_name=v.full_name,
- election_url=url,
- username=v.base_username,
- password=password,
+ (
+ EmailMessage(
+ subject=subject,
+ body=body.format(
+ full_name=v.full_name,
+ election_url=url,
+ username=v.base_username,
+ password=password,
+ ),
+ to=[v.email],
),
- to=[v.email],
+ v,
)
)
# get_connection(fail_silently=False).send_messages(messages)
- for m in messages:
- m.send()
- User.objects.bulk_update(voters, ["password"])
+ for (m, v) in messages:
+ try:
+ m.send()
+ except smtplib.SMTPException:
+ v.has_valid_email = False
+ else:
+ v.has_valid_email = True
+
+ User.objects.bulk_update(voters, ["password", "has_valid_email"])
diff --git a/elections/views.py b/elections/views.py
index ea8704a..d2b89a6 100644
--- a/elections/views.py
+++ b/elections/views.py
@@ -41,7 +41,8 @@ from .mixins import (
)
from .models import Election, Option, Question, Vote
from .staticdefs import MAIL_VOTE_DELETED, MAIL_VOTERS, QUESTION_TYPES, VOTE_RULES
-from .utils import create_users, send_mail
+from .tasks import send_election_mail
+from .utils import create_users
User = get_user_model()
@@ -158,7 +159,7 @@ class ElectionUploadVotersView(CreatorOnlyEditMixin, SuccessMessageMixin, FormVi
class ElectionMailVotersView(CreatorOnlyEditMixin, SuccessMessageMixin, FormView):
model = Election
form_class = VoterMailForm
- success_message = _("Mail d'annonce envoyé avec succès !")
+ success_message = _("Mail d'annonce en cours d'envoi !")
template_name = "elections/mail_voters.html"
def get_queryset(self):
@@ -181,9 +182,16 @@ class ElectionMailVotersView(CreatorOnlyEditMixin, SuccessMessageMixin, FormView
return super().post(request, *args, **kwargs)
def form_valid(self, form):
- self.object.sent_mail = True
- send_mail(self.object, form)
+ self.object.sent_mail = None
self.object.save()
+ send_election_mail.apply_async(
+ countdown=5,
+ kwargs={
+ "election_pk": self.object.pk,
+ "subject": form.cleaned_data["objet"],
+ "body": form.cleaned_data["message"],
+ },
+ )
return super().form_valid(form)
diff --git a/kadenios/celery.py b/kadenios/celery.py
index 0cefb00..19645dd 100644
--- a/kadenios/celery.py
+++ b/kadenios/celery.py
@@ -12,4 +12,6 @@ app.autodiscover_tasks()
@app.task(bind=True)
def debug_task(self):
- print(f"Request: {self.request!r}")
+ print(f"{'test'!r}")
+ return 3
+ # print(f"Request: {self.request!r}")