From d0e5aa59529cd2a9a7db163cc696991958e86e50 Mon Sep 17 00:00:00 2001 From: Marie PUPO JEAMMET Date: Thu, 12 Feb 2026 17:53:46 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=9A(exceptions)=20move=20invitation-re?= =?UTF-8?q?lated=20exception=20to=20core?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit move invitation-related from mailbox_manager to core, as it will be useful for teams too --- src/backend/{mailbox_manager => core}/exceptions.py | 0 src/backend/core/models.py | 5 +---- src/backend/core/tests/test_models_invitations.py | 3 +-- src/backend/mailbox_manager/api/client/viewsets.py | 2 +- src/backend/mailbox_manager/models.py | 2 +- 5 files changed, 4 insertions(+), 8 deletions(-) rename src/backend/{mailbox_manager => core}/exceptions.py (100%) diff --git a/src/backend/mailbox_manager/exceptions.py b/src/backend/core/exceptions.py similarity index 100% rename from src/backend/mailbox_manager/exceptions.py rename to src/backend/core/exceptions.py diff --git a/src/backend/core/models.py b/src/backend/core/models.py index 82b365e..4c24662 100644 --- a/src/backend/core/models.py +++ b/src/backend/core/models.py @@ -32,12 +32,11 @@ from timezone_field import TimeZoneField from treebeard.mp_tree import MP_Node, MP_NodeManager from core.enums import WebhookProtocolChoices, WebhookStatusChoices +from core.exceptions import EmailAlreadyKnownException from core.plugins.registry import registry as plugin_hooks_registry from core.utils.webhooks import webhooks_synchronizer from core.validators import get_field_validators_from_setting -from core.exceptions import EmailAlreadyKnownException - logger = getLogger(__name__) current_dir = os.path.dirname(os.path.abspath(__file__)) @@ -1006,8 +1005,6 @@ class BaseInvitation(BaseModel): self.clean() self.updated_at = timezone.now() - - @property def is_expired(self): """Calculate if invitation is still valid or has expired.""" diff --git a/src/backend/core/tests/test_models_invitations.py b/src/backend/core/tests/test_models_invitations.py index 73fe414..e441591 100644 --- a/src/backend/core/tests/test_models_invitations.py +++ b/src/backend/core/tests/test_models_invitations.py @@ -16,8 +16,7 @@ from faker import Faker from freezegun import freeze_time from core import factories, models - -from mailbox_manager.exceptions import EmailAlreadyKnownException +from core.exceptions import EmailAlreadyKnownException pytestmark = pytest.mark.django_db diff --git a/src/backend/mailbox_manager/api/client/viewsets.py b/src/backend/mailbox_manager/api/client/viewsets.py index 9269e6e..f6429a7 100644 --- a/src/backend/mailbox_manager/api/client/viewsets.py +++ b/src/backend/mailbox_manager/api/client/viewsets.py @@ -10,11 +10,11 @@ from rest_framework.response import Response from core import models as core_models from core.api.client.serializers import UserSerializer +from core.exceptions import EmailAlreadyKnownException from mailbox_manager import enums, models from mailbox_manager.api import permissions from mailbox_manager.api.client import serializers -from mailbox_manager.exceptions import EmailAlreadyKnownException from mailbox_manager.utils.dimail import DimailAPIClient diff --git a/src/backend/mailbox_manager/models.py b/src/backend/mailbox_manager/models.py index 10f7fba..4999141 100644 --- a/src/backend/mailbox_manager/models.py +++ b/src/backend/mailbox_manager/models.py @@ -17,8 +17,8 @@ from django.utils.text import slugify from django.utils.translation import get_language, gettext, override from django.utils.translation import gettext_lazy as _ -from core.models import BaseInvitation, BaseModel, Organization, User from core.exceptions import EmailAlreadyKnownException +from core.models import BaseInvitation, BaseModel, Organization, User from mailbox_manager.enums import ( MailboxStatusChoices,