refactoring 1

Author: koshakkkq

mailing/constants.py

@@ -0,0 +1,7 @@
+default_mailing_schema = {
+    "key_with_default_value": {
+        "title": "Ключ с стандартным значением.",
+        "default": "Значение",
+    },
+    "default_key": {"title": "Просто ключ."},
+}

mailing/models.py

@@ -3,17 +3,18 @@
 
 from django.core.validators import FileExtensionValidator
 from django.db import models
+from .constants import default_mailing_schema
 
 
 def get_template_path(instance, filename):
     ext = filename.split(".")[-1]
     filename = "%s.%s" % (uuid.uuid4(), ext)
-    return os.path.join("templates/email", filename)
+    return os.path.join("templates/mailing/emails", filename)
 
 
 class MailingSchema(models.Model):
     name = models.CharField(max_length=100, unique=True)
-    schema = models.JSONField(default=dict, null=True, blank=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"])],

mailing/urls.py

@@ -1,11 +1,15 @@
 from django.urls import path
 
-from mailing.views import MailingSchemaView, template_fields, SendMailView
+from mailing.views import TemplateFieldsView, MailingSchemaView, SendMailView
 
 app_name = "mailing"
 
 urlpatterns = [
     path("mail", MailingSchemaView.as_view()),
-    path("template_fileds/<int:schema_id>/", template_fields, name="template_fields"),
+    path(
+        "template_fileds/<int:schema_id>/",
+        TemplateFieldsView.as_view(),
+        name="template_fields",
+    ),
     path("send_email", SendMailView.as_view(), name="send_mail"),
 ]

mailing/utils.py

@@ -9,46 +9,51 @@
 from users.models import CustomUser
 
 
-class MailSender:
-    @staticmethod
-    def send(
-        users: django.db.models.QuerySet | List[CustomUser],
-        subject: str,
-        template_path: str,
-        template_context: Union[
-            Dict,
-            List,
-        ] = None,
-        connection=None,
-    ) -> None:
-        """
-        Begin mailing to specified users, sending rendered template with template_text arg.
-        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
-            subject: Subject of mail.
-            template_context: Context for template render.
-            connection: Connection to mail backend
-        """
-        if template_context is None:
-            template_context = {}
+def send_mail(
+    user: CustomUser,
+    subject: str,
+    template_path: str,
+    template_context: Union[
+        Dict,
+        List,
+    ] = None,
+    connection=None,
+):
+    return send_mails_mass([user], subject, template_path, template_context, connection)
 
-        template_path = pathlib.Path(template_path).absolute()
+
+def send_mails_mass(
+    users: django.db.models.QuerySet,
+    subject: str,
+    template_path: str,
+    template_context: Union[
+        Dict,
+        List,
+    ] = None,
+    connection=None,
+) -> None:
+    """
+    Begin mailing to specified users, sending rendered template with template_text arg.
+    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
+        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()
+    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)
-        emails = [user.email for user in users]
-        data = [
-            (subject, plain_msg, None, [recipient_email], html_msg)
-            for recipient_email in emails
-        ]
-
-        connection = connection or mail.get_connection()
-        messages = []
-        for subject, message, sender, recipient, html_msg in data:
-            msg = EmailMultiAlternatives(
-                subject, message, sender, recipient, connection=connection
-            )
-            msg.attach_alternative(html_msg, "text/html")
-            messages.append(msg)
-        return connection.send_messages(messages)
+        msg = EmailMultiAlternatives(
+            subject, plain_msg, None, [user.email], connection=connection
+        )
+        msg.attach_alternative(html_msg, "text/html")
+        messages.append(msg)
+    return connection.send_messages(messages)

mailing/views.py

@@ -4,7 +4,7 @@
 from rest_framework.views import APIView
 
 from users.models import CustomUser
-from .utils import MailSender
+from .utils import send_mails_mass
 from .models import MailingSchema
 
 
@@ -15,12 +15,12 @@ def post(self, request):
         subject = request.POST["subject"]
         mail_schema = MailingSchema.objects.get(pk=schema_id)
         context = {}
-        for key in mail_schema.schema:
-            key_in_post = "field-" + key
+        for variable_name in mail_schema.schema:
+            key_in_post = "field-" + variable_name
             if key_in_post in request.POST:
-                context[key] = request.POST[key_in_post]
+                context[variable_name] = request.POST[key_in_post]
         users_to_send = CustomUser.objects.filter(pk__in=users)
-        MailSender.send(users_to_send, subject, mail_schema.template.path)
+        send_mails_mass(users_to_send, subject, mail_schema.template.path)
         return JsonResponse({"detail": "ok"})
 
 
@@ -29,44 +29,48 @@ def get(self, request):
         return MailingTemplateRender().render_template(request)
 
 
-def template_fields(request, schema_id):
-    return JsonResponse(
-        dict(MailingTemplateRender().get_template_fields_context(schema_id))
-    )
+class TemplateFieldsView(APIView):
+    def get(self, request, schema_id):
+        return JsonResponse(
+            dict(MailingTemplateRender().get_template_fields_context(schema_id))
+        )
 
 
 class MailingTemplateRender:
     template_name = "templates/mailing/mail_schema.html"
 
+    @classmethod
     def render_template(
-        self,
+        cls,
         request,
         schema_id: int | None = None,
         picked_users: list[CustomUser] | django.db.models.QuerySet = None,
         unpicked_users: list[CustomUser] | django.db.models.QuerySet = None,
     ):
         return render(
             request,
-            self.template_name,
-            self._get_context(
+            cls.template_name,
+            cls._get_context(
                 schema_id,
                 picked_users,
                 unpicked_users,
             ),
         )
 
+    @classmethod
     def _get_context(
-        self,
+        cls,
         schema_id: int | None = None,
         picked_users: list[CustomUser] | django.db.models.QuerySet = None,
         unpicked_users: list[CustomUser] | django.db.models.QuerySet = None,
     ):
-        context = self._get_schema_context(schema_id)
-        context += self._get_users_context(picked_users, unpicked_users)
-        context += self.get_template_fields_context(schema_id)
+        context = cls._get_schema_context(schema_id)
+        context += cls._get_users_context(picked_users, unpicked_users)
+        context += cls.get_template_fields_context(schema_id)
         return dict(context)
 
-    def _get_schema_context(self, schema_id: int | None = None):
+    @classmethod
+    def _get_schema_context(cls, schema_id: int | None = None):
         all_schemas = MailingSchema.objects.all()
         context = {"schemas": []}
 
@@ -77,8 +81,9 @@ def _get_schema_context(self, schema_id: int | None = None):
             )
         return list(context.items())
 
+    @classmethod
     def _get_users_context(
-        self,
+        cls,
         picked_users: list[CustomUser] | django.db.models.QuerySet = None,
         unpicked_users: list[CustomUser] | django.db.models.QuerySet = None,
     ):
@@ -88,19 +93,21 @@ def _get_users_context(
             unpicked_users = []
         context = {"picked_users": [], "unpicked_users": []}
         for user in picked_users:
-            context["picked_users"].append(self._user_to_dict_for_template(user, True))
+            context["picked_users"].append(cls._user_to_dict_for_template(user, True))
         for user in unpicked_users:
-            context["unpicked_users"].append(self._user_to_dict_for_template(user, False))
+            context["unpicked_users"].append(cls._user_to_dict_for_template(user, False))
         return list(context.items())
 
-    def _user_to_dict_for_template(self, user, picked):
+    @classmethod
+    def _user_to_dict_for_template(cls, user, picked):
         return {
             "id": user.id,
             "picked": picked,
             "title": str(user),
         }
 
-    def get_template_fields_context(self, schema_id):
+    @classmethod
+    def get_template_fields_context(cls, schema_id):
         context = {"template_fields": []}
         if schema_id is None:
             return list(context.items())

templates/email/bb91facb-1180-423c-9f4d-eed03ad99655.html

@@ -1 +1,4 @@
-Some text
+<div>
+    kek lol
+    {{ user.first_name }}
+</div>

templates/mailing/emails/33e403a7-88cb-4daf-a28a-8b42c7a8d45e.html

@@ -0,0 +1 @@
+<div>Kek</div>