✨(signature) allow to create mailbox signature

Author: sdemagny

src/backend/core/admin.py

@@ -656,6 +656,7 @@ class MessageTemplateAdmin(admin.ModelAdmin):
         "name",
         "type",
         "is_forced",
+        "is_default",
         "is_active",
         "mailbox",
         "maildomain",
@@ -664,6 +665,7 @@ class MessageTemplateAdmin(admin.ModelAdmin):
     list_filter = (
         "type",
         "is_forced",
+        "is_default",
         "created_at",
     )
     autocomplete_fields = ("mailbox", "maildomain")

src/backend/core/api/openapi.json

@@ -6632,6 +6632,11 @@
                         "default": false,
                         "description": "Set as forced template"
                     },
+                    "is_default": {
+                        "type": "boolean",
+                        "default": false,
+                        "description": "Set as default template (auto-loaded when composing a new message)"
+                    },
                     "created_at": {
                         "type": "string",
                         "format": "date-time",
@@ -6688,6 +6693,11 @@
                         "type": "boolean",
                         "default": false,
                         "description": "Set as forced template"
+                    },
+                    "is_default": {
+                        "type": "boolean",
+                        "default": false,
+                        "description": "Set as default template (auto-loaded when composing a new message)"
                     }
                 },
                 "required": [
@@ -7006,6 +7016,11 @@
                         "type": "boolean",
                         "default": false,
                         "description": "Set as forced template"
+                    },
+                    "is_default": {
+                        "type": "boolean",
+                        "default": false,
+                        "description": "Set as default template (auto-loaded when composing a new message)"
                     }
                 }
             },
@@ -7072,6 +7087,11 @@
                         "readOnly": true,
                         "description": "Whether this template is forced; no other template of the same type can be used in the same scope"
                     },
+                    "is_default": {
+                        "type": "boolean",
+                        "readOnly": true,
+                        "description": "Whether this template is the default; it will be automatically loaded when composing a new message"
+                    },
                     "created_at": {
                         "type": "string",
                         "format": "date-time",
@@ -7092,6 +7112,7 @@
                     "html_body",
                     "id",
                     "is_active",
+                    "is_default",
                     "is_forced",
                     "name",
                     "raw_body",

src/backend/core/api/serializers.py

@@ -334,6 +334,7 @@ class Meta:
             "type",
             "is_active",
             "is_forced",
+            "is_default",
             "created_at",
             "updated_at",
         ]
@@ -1366,6 +1367,11 @@ class MessageTemplateSerializer(serializers.ModelSerializer):
     is_forced = serializers.BooleanField(
         required=False, default=False, help_text="Set as forced template"
     )
+    is_default = serializers.BooleanField(
+        required=False,
+        default=False,
+        help_text="Set as default template (auto-loaded when composing a new message)",
+    )
     html_body = serializers.CharField(required=False)
     text_body = serializers.CharField(required=False)
     raw_body = serializers.CharField(required=False)
@@ -1381,6 +1387,7 @@ class Meta:
             "type",
             "is_active",
             "is_forced",
+            "is_default",
             "created_at",
             "updated_at",
         ]

src/backend/core/api/viewsets/message_template.py

@@ -1,6 +1,6 @@
 """API ViewSet for message templates."""
 
-from django.db.models import Q
+from django.db.models import Case, IntegerField, Q, When
 from django.utils.functional import cached_property
 
 from drf_spectacular.utils import (
@@ -156,7 +156,8 @@ class AvailableMailboxMessageTemplateViewSet(
 
     def get_queryset(self):
         """Get message templates active for a mailbox and its domain.
-        If a forced template exists for a template type, user can only see it."""
+        If a forced template exists for a template type, user can only see it.
+        Mailbox-level templates are returned before domain-level templates."""
         mailbox = get_object_or_404(Mailbox, id=self.kwargs["mailbox_id"])
         # get active message templates for mailbox and its domain
         queryset = MessageTemplate.objects.filter(
@@ -174,6 +175,16 @@ def get_queryset(self):
             if forced_active_templates.exists():
                 queryset = forced_active_templates
 
+        # Order by scope: mailbox templates first, then domain templates
+        # This ensures mailbox-level defaults take priority over domain-level
+        queryset = queryset.annotate(
+            scope_order=Case(
+                When(mailbox__isnull=False, then=0),  # Mailbox templates first
+                default=1,  # Domain templates second
+                output_field=IntegerField(),
+            )
+        ).order_by("scope_order", "-is_default", "-created_at")
+
         return queryset.distinct()
 
     @extend_schema(

src/backend/core/migrations/0014_messagetemplate_is_default_and_more.py

@@ -0,0 +1,34 @@
+# Generated by Django 5.1.13 on 2026-01-09 09:27
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('core', '0013_thread_is_trashed'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='messagetemplate',
+            name='is_default',
+            field=models.BooleanField(default=False, help_text='Whether this template is the default; it will be automatically loaded when composing a new message', verbose_name='is default'),
+        ),
+        migrations.AddIndex(
+            model_name='messagetemplate',
+            index=models.Index(fields=['mailbox', 'type', 'is_default'], name='messages_me_mailbox_3bb022_idx'),
+        ),
+        migrations.AddIndex(
+            model_name='messagetemplate',
+            index=models.Index(fields=['maildomain', 'type', 'is_default'], name='messages_me_maildom_d8eb5d_idx'),
+        ),
+        migrations.AddConstraint(
+            model_name='messagetemplate',
+            constraint=models.UniqueConstraint(condition=models.Q(('is_default', True)), fields=('mailbox', 'type'), name='uniq_default_template_mailbox_type'),
+        ),
+        migrations.AddConstraint(
+            model_name='messagetemplate',
+            constraint=models.UniqueConstraint(condition=models.Q(('is_default', True)), fields=('maildomain', 'type'), name='uniq_default_template_maildomain_type'),
+        ),
+    ]

src/backend/core/models.py

@@ -1790,6 +1790,14 @@ class MessageTemplate(BaseModel):
         ),
     )
 
+    is_default = models.BooleanField(
+        _("is default"),
+        default=False,
+        help_text=_(
+            "Whether this template is the default; it will be automatically loaded when composing a new message"
+        ),
+    )
+
     class Meta:
         db_table = "messages_messagetemplate"
         verbose_name = _("message template")
@@ -1812,20 +1820,33 @@ class Meta:
                 condition=models.Q(is_forced=True),
                 name="uniq_forced_template_maildomain_type",
             ),
+            models.UniqueConstraint(
+                fields=("mailbox", "type"),
+                condition=models.Q(is_default=True),
+                name="uniq_default_template_mailbox_type",
+            ),
+            models.UniqueConstraint(
+                fields=("maildomain", "type"),
+                condition=models.Q(is_default=True),
+                name="uniq_default_template_maildomain_type",
+            ),
         ]
         indexes = [
             models.Index(fields=("mailbox", "type", "is_active")),
             models.Index(fields=("maildomain", "type", "is_active")),
+            models.Index(fields=("mailbox", "type", "is_default")),
+            models.Index(fields=("maildomain", "type", "is_default")),
         ]
 
     def __str__(self):
         return f"{self.name} ({self.get_type_display()})"
 
     def save(self, *args, **kwargs):
-        """If the template is forced, unforce all other templates of the same type
-        in the same scope (mailbox or maildomain)
-        only one forced template is allowed per type and scope"""
+        """If the template is forced or default, unset other templates of the same type
+        in the same scope (mailbox or maildomain).
+        Only one forced/default template is allowed per type and scope."""
         with transaction.atomic():
+            # Handle is_forced: only one forced template per type and scope
             if self.is_forced:
                 qs = (
                     MessageTemplate.objects.select_for_update()
@@ -1837,6 +1858,20 @@ def save(self, *args, **kwargs):
                 elif self.maildomain_id:
                     qs = qs.filter(maildomain_id=self.maildomain_id)
                 qs.update(is_forced=False)
+
+            # Handle is_default: only one default template per type and scope
+            if self.is_default:
+                qs = (
+                    MessageTemplate.objects.select_for_update()
+                    .filter(type=self.type, is_default=True)
+                    .exclude(id=self.id)
+                )
+                if self.mailbox_id:
+                    qs = qs.filter(mailbox_id=self.mailbox_id)
+                elif self.maildomain_id:
+                    qs = qs.filter(maildomain_id=self.maildomain_id)
+                qs.update(is_default=False)
+
             super().save(*args, **kwargs)
 
     def clean(self):
@@ -1849,9 +1884,10 @@ def clean(self):
             raise ValidationError(
                 {"__all__": "Mailbox and maildomain cannot be linked together"}
             )
-        # if user desactivate a forced template, the template is no longer forced
+        # if user deactivates a template, it should no longer be forced or default
         if not self.is_active:
             self.is_forced = False
+            self.is_default = False
         super().clean()
 
     @property

src/backend/core/tests/api/test_admin_maildomains_message_template.py

@@ -739,6 +739,46 @@ def test_forced_template_becomes_inactive(self, user, maildomain, admin_detail_u
         assert signature.is_forced is False
         assert signature.is_active is False
 
+    def test_default_template_becomes_inactive(self, user, maildomain, admin_detail_url):
+        """Test that when a default template is updated to be inactive, it should also become non-default."""
+        factories.MailDomainAccessFactory(
+            maildomain=maildomain,
+            user=user,
+            role=models.MailDomainAccessRoleChoices.ADMIN,
+        )
+
+        # Create a default signature template
+        signature = factories.MessageTemplateFactory(
+            name="Default Signature Template",
+            html_body="<p>Default signature content</p>",
+            text_body="Default signature content",
+            type=enums.MessageTemplateTypeChoices.SIGNATURE,
+            maildomain=maildomain,
+            is_default=True,
+            is_active=True,
+        )
+
+        assert signature.is_default is True
+        assert signature.is_active is True
+
+        # Update template to be inactive
+        client = APIClient()
+        client.force_authenticate(user=user)
+
+        data = {"is_active": False}
+
+        response = client.patch(
+            admin_detail_url(signature.id),
+            data,
+            format="json",
+        )
+        assert response.status_code == status.HTTP_200_OK
+
+        # Verify that template is no longer default and is inactive
+        signature.refresh_from_db()
+        assert signature.is_default is False
+        assert signature.is_active is False
+
     def test_is_forced_maildomain(self, user, maildomain, admin_detail_url):
         """Test that updating a template to forced sets others to not forced for the same maildomain and type."""
         factories.MailDomainAccessFactory(
@@ -790,6 +830,57 @@ def test_is_forced_maildomain(self, user, maildomain, admin_detail_url):
         assert signature1.is_forced is False
         assert signature2.is_forced is True
 
+    def test_is_default_maildomain(self, user, maildomain, admin_detail_url):
+        """Test that updating a template to default sets others to not default for the same maildomain and type."""
+        factories.MailDomainAccessFactory(
+            maildomain=maildomain,
+            user=user,
+            role=models.MailDomainAccessRoleChoices.ADMIN,
+        )
+
+        # Create signature template as default
+        signature1 = factories.MessageTemplateFactory(
+            name="Default Signature Template",
+            html_body="<p>Default signature content</p>",
+            text_body="Default signature content",
+            type=enums.MessageTemplateTypeChoices.SIGNATURE,
+            maildomain=maildomain,
+            is_default=True,
+        )
+
+        # Create second signature template as not default
+        signature2 = factories.MessageTemplateFactory(
+            name="Second Signature Template",
+            html_body="<p>Second signature content</p>",
+            text_body="Second signature content",
+            type=enums.MessageTemplateTypeChoices.SIGNATURE,
+            maildomain=maildomain,
+            is_default=False,
+        )
+
+        assert signature1.is_default is True
+        assert signature2.is_default is False
+
+        # Update second template to be default
+        client = APIClient()
+        client.force_authenticate(user=user)
+
+        data = {"is_default": True}
+
+        response = client.patch(
+            admin_detail_url(signature2.id),
+            data,
+            format="json",
+        )
+        assert response.status_code == status.HTTP_200_OK
+
+        # Verify that first template is no longer default
+        signature1.refresh_from_db()
+        signature2.refresh_from_db()
+
+        assert signature1.is_default is False
+        assert signature2.is_default is True
+
 
 class TestAdminMailDomainMessageTemplateDelete:
     """Test delete operations for MessageTemplateViewSet."""