store mailing template in db, set verbose names for mailing app and models

Author: yakser

mailing/admin.py

@@ -8,3 +8,11 @@ class MailingSchemaAdmin(admin.ModelAdmin):
         "id",
         "name",
     )
+    list_display_links = (
+        "id",
+        "name",
+    )
+    search_fields = (
+        "id",
+        "name",
+    )

mailing/apps.py

@@ -4,3 +4,4 @@
 class MailingConfig(AppConfig):
     default_auto_field = "django.db.models.BigAutoField"
     name = "mailing"
+    verbose_name = "Рассылка"

mailing/constants.py

@@ -1,7 +1,8 @@
 default_mailing_schema = {
-    "key_with_default_value": {
-        "title": "Ключ с стандартным значением.",
-        "default": "Значение",
+    "title": {
+        "title": "Заголовок письма",
+        "default": "Рассылка | Procollab",
     },
-    "default_key": {"title": "Просто ключ."},
+    "text": {"title": "Основной текст письма"},
+    "button_text": {"title": "Текст кнопки", "default": "Кнопка"},
 }

mailing/migrations/0006_alter_mailingschema_schema_and_more.py

@@ -0,0 +1,33 @@
+# Generated by Django 4.2.3 on 2023-10-07 11:44
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("mailing", "0005_alter_mailingschema_name"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="mailingschema",
+            name="schema",
+            field=models.JSONField(
+                blank=True,
+                default={
+                    "default_key": {"title": "Просто ключ."},
+                    "key_with_default_value": {
+                        "default": "Значение",
+                        "title": "Ключ с стандартным значением.",
+                    },
+                },
+                null=True,
+            ),
+        ),
+        migrations.AlterField(
+            model_name="mailingschema",
+            name="template",
+            field=models.TextField(),
+        ),
+    ]

mailing/models.py

@@ -1,7 +1,6 @@
 import os
 import uuid
 
-from django.core.validators import FileExtensionValidator
 from django.db import models
 from .constants import default_mailing_schema
 
@@ -15,10 +14,11 @@ def get_template_path(instance, filename):
 class MailingSchema(models.Model):
     name = models.CharField(max_length=100, unique=True)
     schema = models.JSONField(default=default_mailing_schema, null=True, blank=True)
-    template = models.FileField(
-        upload_to=get_template_path,
-        validators=[FileExtensionValidator(allowed_extensions=["html"])],
-    )
+    template = models.TextField()
+
+    class Meta:
+        verbose_name = "Схема шаблона письма"
+        verbose_name_plural = "Схемы шаблонов писем"
 
     def __str__(self):
-        return self.name
+        return f"MailingSchema<{self.name}>"

mailing/utils.py

@@ -1,32 +1,31 @@
-import pathlib
-from typing import Union, List, Dict
+from typing import Dict, List, Union
 
 import django.db.models
 from django.contrib.auth import get_user_model
 from django.core import mail
 from django.core.mail import EmailMultiAlternatives
-from django.template.loader import render_to_string
+from django.template import Context, Template
 
 User = get_user_model()
 
 
 def send_mail(
     user: User,
     subject: str,
-    template_path: str,
+    template_string: str,
     template_context: Union[
         Dict,
         List,
     ] = None,
     connection=None,
 ):
-    return send_mass_mail([user], subject, template_path, template_context, connection)
+    return send_mass_mail([user], subject, template_string, template_context, connection)
 
 
 def send_mass_mail(
     users: django.db.models.QuerySet | List[User],
     subject: str,
-    template_path: str,
+    template_string: str,
     template_context: Union[
         Dict,
         List,
@@ -38,20 +37,21 @@ def send_mass_mail(
     Throws an error if template render is unsuccessful.
     Args:
         users: - The list of users who should receive the email.
-        template_path: str of template_path
+        template_string: str of template_path
         subject: Subject of mail.
         template_context: Context for template render.
         connection: Connection to mail backend
     """
     if template_context is None:
         template_context = {}
-    template_path = pathlib.Path(template_path).absolute()
+
     connection = connection or mail.get_connection()
+    template = Template(template_string)
     messages = []
     for user in users:
         template_context["user"] = user
-        html_msg = render_to_string(template_path, template_context)
-        plain_msg = render_to_string(template_path, template_context)
+        html_msg = template.render(Context(template_context))
+        plain_msg = template.render(Context(template_context))
         msg = EmailMultiAlternatives(
             subject, plain_msg, None, [user.email], connection=connection
         )

mailing/views.py

@@ -20,7 +20,7 @@ def post(self, request):
             if key_in_post in request.POST:
                 context[variable_name] = request.POST[key_in_post]
         users_to_send = CustomUser.objects.filter(pk__in=users)
-        send_mass_mail(users_to_send, subject, mail_schema.template.path)
+        send_mass_mail(users_to_send, subject, mail_schema.template, context)
         return JsonResponse({"detail": "ok"})