From b93620e7a2a88e4fe410148b108a1a4ecc11b5f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ses=C3=B3stris=20Vieira?= Date: Tue, 27 Feb 2024 13:48:46 -0300 Subject: [PATCH] =?UTF-8?q?Sanitiza=20e-mails=20de=20=C3=B3rg=C3=A3os=20pa?= =?UTF-8?q?ra=20exporta=C3=A7=C3=A3o.=20Gertiq=20#176350?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- requirements/requirements.txt | 1 + sigi/apps/casas/admin.py | 5 +- .../casas/jobs/daily/sanitiza_email_orgao.py | 105 ++++++++++++++++++ 3 files changed, 110 insertions(+), 1 deletion(-) create mode 100644 sigi/apps/casas/jobs/daily/sanitiza_email_orgao.py diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 022fd2c..3111fc6 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -1,6 +1,7 @@ cron-converter==1.0.2 dnspython==2.3.0 docutils==0.20.1 +email_validator==2.1.1 gunicorn==20.1.0 ibge==0.0.5 ipython==8.14.0 diff --git a/sigi/apps/casas/admin.py b/sigi/apps/casas/admin.py index 9840379..c008716 100644 --- a/sigi/apps/casas/admin.py +++ b/sigi/apps/casas/admin.py @@ -1,3 +1,4 @@ +from email_validator import validate_email, EmailNotValidError from django.contrib import admin from django.contrib.contenttypes.admin import GenericTabularInline from django.template.loader import render_to_string @@ -44,7 +45,9 @@ class OrgaoExportResourceContato(LabeledResourse): def export(self, queryset=None, *args, **kwargs): if queryset is not None: - queryset = queryset.exclude(email="") + queryset = queryset.exclude(email="").filter( + email__regex=r"([A-Za-z0-9]+[.\-_])*[A-Za-z0-9]+@[A-Za-z0-9-]+(\.[A-Z|a-z]{2,})+" + ) return super().export(queryset, *args, **kwargs) diff --git a/sigi/apps/casas/jobs/daily/sanitiza_email_orgao.py b/sigi/apps/casas/jobs/daily/sanitiza_email_orgao.py new file mode 100644 index 0000000..460b0ef --- /dev/null +++ b/sigi/apps/casas/jobs/daily/sanitiza_email_orgao.py @@ -0,0 +1,105 @@ +from django.db.models import Q +from django.contrib.auth.models import User +from django.utils.translation import gettext as _ +from django_extensions.management.jobs import DailyJob +from sigi.apps.casas.models import Orgao +from sigi.apps.servidores.models import Servidor +from sigi.apps.utils.management.jobs import JobReportMixin +from email_validator import validate_email, EmailNotValidError + + +class Job(JobReportMixin, DailyJob): + help = ( + "Sanitiza sintaxe dos e-mails dos órgãos cadastrados, " + "removendo os que não são válidos" + ) + + def do_job(self): + self.report_data = [] + corrigidos = [] + apagados = [] + total_corrigido = 0 + total_apagado = 0 + queryset = Orgao.objects.exclude(email="") + for orgao in queryset: + email = orgao.email + tentar = True + limpar = False + while tentar: + try: + mail_info = validate_email( + email, check_deliverability=False + ) + email = mail_info.normalized + tentar = False + except EmailNotValidError as e: + msg = str(e) + if msg == "An email address cannot end with a period.": + email = email[:-1] + elif ( + msg + == "An email address cannot have a period immediately after the @-sign." + ): + email = email.replace("@.", "@") + elif ( + msg + == "An email address cannot have two periods in a row." + ): + email = email.replace("..", ".") + elif msg.startswith( + "The part after the @-sign contains invalid characters:" + ): + email = email.replace(msg[-3:-2], "") + else: + tentar = False + limpar = True + apagados.append( + _( + f"{orgao.email} do órgão {orgao.nome} " + f"({orgao.id}) foi excluído porque não " + f"pode ser corrigido: {str(e)}" + ) + ) + if limpar: + orgao.email = "" + orgao.save() + total_apagado += 1 + elif orgao.email != email: + corrigidos.append( + _( + f"{orgao.email} corrigido para {email} do órgão " + f"{orgao.nome} ({orgao.id})" + ) + ) + total_corrigido += 1 + orgao.email = email + orgao.save() + + self.report_data.extend( + [ + _("RESUMO"), + "------", + "", + ] + ) + self.report_data.append(_(f"E-mails verificados: {queryset.count()}")) + self.report_data.append(_(f"E-mails corrigidos.: {total_corrigido}")) + self.report_data.append(_(f"E-mails apagados...: {total_apagado}")) + self.report_data.extend( + [ + "", + _("E-MAILS CORRIGIDOS"), + "------------------", + "", + ] + ) + self.report_data.extend(corrigidos) + self.report_data.extend( + [ + "", + _("E-MAILS APAGADOS"), + "----------------", + "", + ] + ) + self.report_data.extend(apagados)