!drop when backend will be fixed

#303

Author: jbpenrath

src/backend/core/api/openapi.json

@@ -922,8 +922,9 @@ class ReadOnlyMessageTemplateSerializer(AbilitiesModelSerializer):
 
     kind = IntegerChoicesField(choices_class=models.MessageTemplateKindChoices)
     is_default = serializers.SerializerMethodField()
+    raw_blob = serializers.SerializerMethodField()
 
-    def get_is_default(self, obj):
+    def get_is_default(self, obj) -> bool:
         """Get is_default information."""
         maildomain_id = self.context.get("maildomain_id")
         mailbox_id = self.context.get("mailbox_id")
@@ -936,6 +937,10 @@ def get_is_default(self, obj):
         )
         return template.is_default if template else False
 
+    def get_raw_blob(self, obj) -> str | None:
+        """Get raw blob."""
+        return obj.raw_blob.get_content().decode("utf-8") if obj.raw_blob else None
+
     class Meta:
         model = models.MessageTemplate
         fields = [
@@ -951,7 +956,7 @@ class Meta:
             "created_at",
             "updated_at",
         ]
-        read_only_fields = ["id", "created_at", "updated_at"]
+        read_only_fields = ["id", "created_at", "updated_at", "raw_blob"]
 
 
 class MessageTemplateSerializer(AbilitiesModelSerializer):
@@ -969,6 +974,7 @@ class MessageTemplateSerializer(AbilitiesModelSerializer):
     is_default = serializers.BooleanField(
         required=False, default=False, help_text="Set as default template"
     )
+    raw_blob = serializers.SerializerMethodField()
 
     class Meta:
         model = models.MessageTemplate
@@ -987,7 +993,11 @@ class Meta:
             "maildomain_id",
             "is_default",
         ]
-        read_only_fields = ["id", "created_at", "updated_at"]
+        read_only_fields = ["id", "created_at", "updated_at", "raw_blob"]
+
+    def get_raw_blob(self, obj) -> str | None:
+        """Get raw blob."""
+        return obj.raw_blob.get_content().decode("utf-8") if obj.raw_blob else None
 
     def validate(self, attrs):
         """Validate template data."""
@@ -1021,8 +1031,17 @@ def create(self, validated_data):
         maildomain_id = validated_data.pop("maildomain_id", None)
         is_default = validated_data.pop("is_default", False)
 
+        # Create raw_blob relationship
+        if self.initial_data.get("raw_blob"):
+            blob = models.Blob.objects.create_blob(
+                content=self.initial_data.get("raw_blob", "").encode("utf-8"),
+                content_type="application/json",
+            )
+            validated_data["raw_blob"] = blob
+
         template = super().create(validated_data)
 
+
         # Create mailbox relationship
         if mailbox_id:
             mailbox = models.Mailbox.objects.get(id=mailbox_id)
@@ -1058,8 +1077,21 @@ def update(self, instance, validated_data):
         maildomain_id = validated_data.pop("maildomain_id", None)
         is_default = validated_data.pop("is_default", None)
 
+        if self.initial_data.get("raw_blob"):
+            try:
+                if instance.raw_blob:
+                    instance.raw_blob.delete()
+            except models.Blob.DoesNotExist:
+                pass
+            blob = models.Blob.objects.create_blob(
+                content=self.initial_data.get("raw_blob", "").encode("utf-8"),
+                content_type="application/json",
+            )
+            validated_data["raw_blob"] = blob
+
         template = super().update(instance, validated_data)
 
+
         # Update relationships if provided
         if mailbox_id is not None or maildomain_id is not None:
             # Handle mailbox relationship

src/backend/core/api/serializers.py

@@ -1,6 +1,7 @@
 """API ViewSet for message templates."""
 
 from django.db.models import Q
+from django.conf import settings
 
 from drf_spectacular.utils import OpenApiResponse, extend_schema
 from rest_framework import status, viewsets
@@ -71,7 +72,7 @@ def get_queryset_for_detail(self):
 
         # Filter by user permissions for regular users
         accessible_mailboxes = Mailbox.objects.filter(accesses__user=user)
-        accessible_maildomains = MailDomain.objects.filter(accesses__user=user)
+        accessible_maildomains = MailDomain.objects.filter(mailbox__accesses__user=user)
 
         return MessageTemplate.objects.filter(
             Q(template_mailboxes__mailbox__in=accessible_mailboxes)
@@ -93,8 +94,10 @@ def get_queryset_for_list(self):
             queryset = MessageTemplate.objects.all()
         elif mailbox_id:
             accessible_mailboxes = Mailbox.objects.filter(accesses__user=user)
+            accessible_maildomains = MailDomain.objects.filter(mailbox__accesses__user=user)
             queryset = MessageTemplate.objects.filter(
-                template_mailboxes__mailbox_id__in=accessible_mailboxes
+                Q(template_mailboxes__mailbox_id__in=accessible_mailboxes)
+                | Q(template_maildomains__maildomain_id__in=accessible_maildomains)
             )
         elif maildomain_id:
             accessible_maildomains = MailDomain.objects.filter(accesses__user=user)
@@ -105,7 +108,11 @@ def get_queryset_for_list(self):
         is_default = self.request.query_params.get("is_default")
         # filter by mailbox_id or maildomain_id
         if mailbox_id:
-            queryset = queryset.filter(template_mailboxes__mailbox_id=mailbox_id)
+            mailbox = Mailbox.objects.get(id=mailbox_id)
+            queryset = queryset.filter(
+                Q(template_mailboxes__mailbox_id=mailbox_id)
+                | Q(template_maildomains__maildomain_id=mailbox.domain_id)
+            )
             if is_default is not None:
                 is_default_bool = is_default.lower() in ("true", "1", "yes")
                 queryset = queryset.filter(
@@ -173,8 +180,14 @@ def render_template(self, request, pk=None):  # pylint: disable=unused-argument
 
         context = {
             "mailbox": str(mailbox),
-            "fullname": user.full_name,
+            "full_name": user.full_name,
         }
+        schema = settings.SCHEMA_CUSTOM_ATTRIBUTES_USER
+        schema_properties = schema.get("properties", {})
+
+        for field_key in schema_properties.keys():
+            context[field_key] = user.custom_attributes.get(field_key, "")
+
         try:
             rendered = template.render_template(context)
             return Response(rendered)

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

@@ -0,0 +1,19 @@
+# Generated by Django 5.1.8 on 2025-08-20 14:07
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('core', '0007_messagetemplate_raw_blob'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='blob',
+            name='mailbox',
+            field=models.ForeignKey(help_text='Mailbox that owns this blob', null=True, on_delete=django.db.models.deletion.CASCADE, related_name='blobs', to='core.mailbox'),
+        ),
+    ]

src/backend/core/migrations/0008_alter_blob_mailbox.py

@@ -0,0 +1,19 @@
+# Generated by Django 5.1.8 on 2025-08-20 14:07
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('core', '0008_alter_blob_mailbox'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='blob',
+            name='mailbox',
+            field=models.ForeignKey(blank=True, help_text='Mailbox that owns this blob', null=True, on_delete=django.db.models.deletion.CASCADE, related_name='blobs', to='core.mailbox'),
+        ),
+    ]

src/backend/core/migrations/0009_alter_blob_mailbox.py

@@ -482,52 +482,15 @@ def create_blob(
         Raises:
             ValueError: If content is empty
         """
-        if not content:
-            raise ValueError("Content cannot be empty")
-
-        # Calculate SHA256 hash of the original content
-        sha256_hash = hashlib.sha256(content).digest()
-
-        # Store the original size
-        original_size = len(content)
-
-        # Apply compression if requested
-        compressed_content = content
-        if compression == CompressionTypeChoices.ZSTD:
-            compressed_content = pyzstd.compress(
-                content, level_or_option=settings.MESSAGES_BLOB_ZSTD_LEVEL
-            )
-            logger.debug(
-                "Compressed blob from %d bytes to %d bytes (%.1f%% reduction)",
-                original_size,
-                len(compressed_content),
-                (1 - len(compressed_content) / original_size) * 100,
-            )
-        elif compression == CompressionTypeChoices.NONE:
-            compressed_content = content
-        else:
-            raise ValueError(f"Unsupported compression type: {compression}")
 
         # Create the blob
-        blob = Blob.objects.create(
-            sha256=sha256_hash,
-            size=original_size,
+        return Blob.objects.create_blob(
+            content=content,
             content_type=content_type,
             compression=compression,
-            raw_content=compressed_content,
             mailbox=self,
         )
 
-        logger.info(
-            "Created blob %s: %d bytes, %s compression, %s content type",
-            blob.id,
-            original_size,
-            compression.label,
-            content_type,
-        )
-
-        return blob
-
     def get_abilities(self, user):
         """
         Compute and return abilities for a given user on the mailbox.
@@ -1192,6 +1155,76 @@ def get_tokens_count(self) -> int:
         counted_text = f"{subject} {body}"
         return len(counted_text.split())
 
+class BlobManager(models.Manager):
+    """Custom Manager for Blob model."""
+
+    def create_blob(
+        self,
+        content: bytes,
+        content_type: str,
+        compression: Optional[CompressionTypeChoices] = CompressionTypeChoices.ZSTD,
+        **kwargs,
+    ) -> "Blob":
+        """
+        Create a new blob with automatic SHA256 calculation and compression.
+
+        Args:
+            content: Raw binary content to store
+            content_type: MIME type of the content
+            compression: Compression type to use (defaults to ZSTD)
+
+        Returns:
+            The created Blob instance
+
+        Raises:
+            ValueError: If content is empty
+        """
+        if not content:
+            raise ValueError("Content cannot be empty")
+
+        # Calculate SHA256 hash of the original content
+        sha256_hash = hashlib.sha256(content).digest()
+
+        # Store the original size
+        original_size = len(content)
+
+        # Apply compression if requested
+        compressed_content = content
+        if compression == CompressionTypeChoices.ZSTD:
+            compressed_content = pyzstd.compress(
+                content, level_or_option=settings.MESSAGES_BLOB_ZSTD_LEVEL
+            )
+            logger.debug(
+                "Compressed blob from %d bytes to %d bytes (%.1f%% reduction)",
+                original_size,
+                len(compressed_content),
+                (1 - len(compressed_content) / original_size) * 100,
+            )
+        elif compression == CompressionTypeChoices.NONE:
+            compressed_content = content
+        else:
+            raise ValueError(f"Unsupported compression type: {compression}")
+
+        # Create the blob
+        blob = Blob.objects.create(
+            sha256=sha256_hash,
+            size=original_size,
+            content_type=content_type,
+            compression=compression,
+            raw_content=compressed_content,
+            **kwargs,
+        )
+
+        logger.info(
+            "Created blob %s: %d bytes, %s compression, %s content type",
+            blob.id,
+            original_size,
+            compression.label,
+            content_type,
+        )
+
+        return blob
+
 
 class Blob(BaseModel):
     """
@@ -1231,11 +1264,15 @@ class Blob(BaseModel):
 
     mailbox = models.ForeignKey(
         "Mailbox",
+        blank=True,
+        null=True,
         on_delete=models.CASCADE,
         related_name="blobs",
         help_text=_("Mailbox that owns this blob"),
     )
 
+    objects = BlobManager()
+
     class Meta:
         db_table = "messages_blob"
         verbose_name = _("blob")

src/backend/core/models.py

@@ -9,6 +9,7 @@ export * from "./mailboxes/mailboxes";
 export * from "./mailbox-accesses/mailbox-accesses";
 export * from "./maildomains/maildomains";
 export * from "./admin-maildomain-user/admin-maildomain-user";
+export * from "./message-templates/message-templates";
 export * from "./mta/mta";
 export * from "./placeholders/placeholders";
 export * from "./tasks/tasks";