0001-commands-human-duration-in-unused-account-email-4052.patch

Valentin Deniaud, 16 mars 2020 16:26

Voir les différences: en ligne côte à côte

Subject: [PATCH] commands: human duration in unused account email (#40521)

 .../management/commands/clean-unused-accounts.py  | 15 ++++++++-------
 .../authentic2/unused_account_alert_body.txt      |  2 +-
 .../authentic2/unused_account_delete_body.txt     |  2 +-
 tests/test_commands.py                            | 12 ++++++++++++
 4 files changed, 22 insertions(+), 9 deletions(-)

     import datetime
     from django.contrib.auth import get_user_model
     from django.contrib.humanize.templatetags.humanize import naturaltime
     from django.core.management.base import BaseCommand, CommandError
     from django.core.mail import send_mail
     from django.utils.timezone import now
-...
                     b = n - datetime.timedelta(days=threshold - options['period'])
                     for user in users.filter(last_login__lt=b, last_login__gte=a):
                         logger.info('%s last login %d days ago, sending alert', user, threshold)
                         self.send_alert(user, threshold, clean_threshold - threshold)
                         self.send_alert(user, clean_threshold - threshold)
             threshold = n - datetime.timedelta(days=clean_threshold)
             for user in users.filter(last_login__lt=threshold):
                 d = n - user.last_login
                 logger.info('%s last login %d days ago, deleting user', user, d.days)
                 self.delete_user(user, clean_threshold)
                 self.delete_user(user)
         def send_alert(self, user, threshold, clean_threshold):
         def send_alert(self, user, clean_threshold):
             ctx = {
                 'user': user,
                 'threshold': threshold,
                 'clean_threshold': clean_threshold
                 'clean_threshold': clean_threshold,
                 'last_login_date': naturaltime(user.last_login)
+            }
             self.send_mail('authentic2/unused_account_alert', user, ctx)
-...
                 except Exception:
                     logger.exception('email sending failure')
         def delete_user(self, user, threshold):
         def delete_user(self, user):
             ctx = {
                 'user': user,
                 'threshold': threshold
                 'last_login_date': naturaltime(user.last_login)
+            }
             self.send_mail('authentic2/unused_account_delete', user, ctx)
             if not self.fake:

src/authentic2/templates/authentic2/unused_account_alert_body.txt
1	1	{% load i18n %}{% autoescape off %}{% blocktrans %}Hi {{ user }},
2	2
3		You have not logged since {{ threshold }} days. In {{ clean_threshold }} days your account
	3	Your last logging was {{ last_login_date }}. In {{ clean_threshold }} days your account
4	4	will be deleted.{% endblocktrans %}{% endautoescape %}

src/authentic2/templates/authentic2/unused_account_delete_body.txt
1	1	{% load i18n %}{% autoescape off %}{% blocktrans %}Hi {{ user }},
2	2
3		You have not logged since {{ threshold }} days so your account has been deleted.{% endblocktrans %}{% endautoescape %}
	3	Since your last logging was {{ last_login_date }}, your account has been deleted.{% endblocktrans %}{% endautoescape %}

     import importlib
     import json
     import pytest
     from django.core import management
     from django.utils import six
     from django.utils.timezone import now
-...
         assert DeletedUser.objects.get(user=simple_user)
     @pytest.mark.parametrize("threshold,formatted",
                              [(730, '2\xa0years'), (500, '1\xa0year'), (65, '2\xa0months')])
     def test_clean_unused_account_human_duration_format(simple_user, mailoutbox, threshold, formatted):
         simple_user.last_login = now() - datetime.timedelta(days=threshold + 1)
         simple_user.save()
         management.call_command('clean-unused-accounts', threshold)
         mail = mailoutbox[0]
         assert formatted in mail.body
     def test_cleanupauthentic(db):
         management.call_command('cleanupauthentic')
+    -

Projet

Général

Profil

Produits Entr'ouvert » Authentic 2

0001-commands-human-duration-in-unused-account-email-4052.patch