From d48a3ff67753d22b88ba0bfa95dd6892b2cb2a48 Mon Sep 17 00:00:00 2001 From: Sabrina Demagny Date: Sun, 2 Feb 2025 22:29:45 +0100 Subject: [PATCH] =?UTF-8?q?=E2=9C=A8(domains)=20add=20action=20required=20?= =?UTF-8?q?status=20on=20MailDomain?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Create a new domain status to handle cases where action is required from an external domain owner for a domain to be fully functional. --- CHANGELOG.md | 2 +- src/backend/locale/fr_FR/LC_MESSAGES/django.po | 14 +++++++++----- src/backend/mailbox_manager/enums.py | 1 + .../migrations/0017_alter_maildomain_status.py | 18 ++++++++++++++++++ src/backend/mailbox_manager/models.py | 2 +- 5 files changed, 30 insertions(+), 7 deletions(-) create mode 100644 src/backend/mailbox_manager/migrations/0017_alter_maildomain_status.py diff --git a/CHANGELOG.md b/CHANGELOG.md index 9d85894..73ea7d6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ and this project adheres to ### Added +- ✨(domains) add action required status on MailDomain - ✨(dimail) send pending mailboxes upon domain activation ### Fixed @@ -17,7 +18,6 @@ and this project adheres to - 🚑️(plugins) fix name from SIRET specific case #674 - 🐛(api) restrict mailbox sync to enabled domains - ## [1.10.1] - 2025-01-27 ### Added diff --git a/src/backend/locale/fr_FR/LC_MESSAGES/django.po b/src/backend/locale/fr_FR/LC_MESSAGES/django.po index 82696e5..97ebe81 100644 --- a/src/backend/locale/fr_FR/LC_MESSAGES/django.po +++ b/src/backend/locale/fr_FR/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: lasuite-people\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-02-03 10:25+0000\n" +"POT-Creation-Date: 2025-02-03 10:27+0000\n" "PO-Revision-Date: 2024-01-03 23:15\n" "Last-Translator: \n" "Language-Team: French\n" @@ -69,7 +69,7 @@ msgstr "" msgid "Failure" msgstr "En échec" -#: core/enums.py:24 mailbox_manager/enums.py:21 mailbox_manager/enums.py:30 +#: core/enums.py:24 mailbox_manager/enums.py:21 mailbox_manager/enums.py:31 msgid "Pending" msgstr "En attente" @@ -568,18 +568,22 @@ msgstr "" msgid "Viewer" msgstr "Lecteur" -#: mailbox_manager/enums.py:22 mailbox_manager/enums.py:31 +#: mailbox_manager/enums.py:22 mailbox_manager/enums.py:32 msgid "Enabled" msgstr "Actif" -#: mailbox_manager/enums.py:23 mailbox_manager/enums.py:32 +#: mailbox_manager/enums.py:23 mailbox_manager/enums.py:33 msgid "Failed" msgstr "En échec" -#: mailbox_manager/enums.py:24 mailbox_manager/enums.py:33 +#: mailbox_manager/enums.py:24 mailbox_manager/enums.py:34 msgid "Disabled" msgstr "Désactivé" +#: mailbox_manager/enums.py:25 +msgid "Action required" +msgstr "Action requise" + #: mailbox_manager/models.py:35 msgid "Mail domain" msgstr "Domaine de messagerie" diff --git a/src/backend/mailbox_manager/enums.py b/src/backend/mailbox_manager/enums.py index 9fca937..6238d0a 100644 --- a/src/backend/mailbox_manager/enums.py +++ b/src/backend/mailbox_manager/enums.py @@ -22,6 +22,7 @@ class MailDomainStatusChoices(models.TextChoices): ENABLED = "enabled", _("Enabled") FAILED = "failed", _("Failed") DISABLED = "disabled", _("Disabled") + ACTION_REQUIRED = "action_required", _("Action required") class MailboxStatusChoices(models.TextChoices): diff --git a/src/backend/mailbox_manager/migrations/0017_alter_maildomain_status.py b/src/backend/mailbox_manager/migrations/0017_alter_maildomain_status.py new file mode 100644 index 0000000..837b558 --- /dev/null +++ b/src/backend/mailbox_manager/migrations/0017_alter_maildomain_status.py @@ -0,0 +1,18 @@ +# Generated by Django 5.1.5 on 2025-02-03 12:59 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('mailbox_manager', '0016_alter_mailbox_domain'), + ] + + operations = [ + migrations.AlterField( + model_name='maildomain', + name='status', + field=models.CharField(choices=[('pending', 'Pending'), ('enabled', 'Enabled'), ('failed', 'Failed'), ('disabled', 'Disabled'), ('action_required', 'Action required')], default='pending', max_length=20), + ), + ] diff --git a/src/backend/mailbox_manager/models.py b/src/backend/mailbox_manager/models.py index 19cafa4..f122e31 100644 --- a/src/backend/mailbox_manager/models.py +++ b/src/backend/mailbox_manager/models.py @@ -25,7 +25,7 @@ class MailDomain(BaseModel): ) slug = models.SlugField(null=False, blank=False, unique=True, max_length=80) status = models.CharField( - max_length=10, + max_length=20, default=MailDomainStatusChoices.PENDING, choices=MailDomainStatusChoices.choices, )