users fix

Author: koshakkkq

mailing/migrations/0005_alter_mailingschema_name.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.2.3 on 2023-10-01 14:48
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("mailing", "0004_alter_mailingschema_schema"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="mailingschema",
+            name="name",
+            field=models.CharField(max_length=100, unique=True),
+        ),
+    ]

mailing/utils.py

@@ -7,15 +7,14 @@
 from django.template.loader import render_to_string
 
 from users.models import CustomUser
-from .models import MailingSchema
 
 
 class MailSender:
     @staticmethod
     def send(
         users: django.db.models.QuerySet | List[CustomUser],
         subject: str,
-        mailing_schema_id: id,
+        template_path: str,
         template_context: Union[
             Dict,
             List,
@@ -27,16 +26,15 @@ def send(
         Throws an error if template render is unsuccessful.
         Args:
             users: - The list of users who should receive the email.
-            mailing_schema_id: PK of MailingSchema model.
+            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 = {}
 
-        schema = MailingSchema.objects.get(pk=mailing_schema_id)
-        template_path = pathlib.Path(schema.template.path).absolute()
+        template_path = pathlib.Path(template_path).absolute()
         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]

mailing/views.py

@@ -10,7 +10,7 @@
 
 class SendMailView(APIView):
     def post(self, request):
-        users = request.POST["users"]
+        users = request.POST["users[]"]
         schema_id = request.POST["schemas"]
         subject = request.POST["subject"]
         mail_schema = MailingSchema.objects.get(pk=schema_id)
@@ -20,7 +20,7 @@ def post(self, request):
             if key_in_post in request.POST:
                 context[key] = request.POST[key_in_post]
         users_to_send = CustomUser.objects.filter(pk__in=users)
-        MailSender.send(users_to_send, subject, schema_id)
+        MailSender.send(users_to_send, subject, mail_schema.template.path)
         return JsonResponse({"detail": "ok"})
 
 

partner_programs/admin.py

@@ -52,11 +52,10 @@ def get_urls(self):
         return custom_urls + default_urls
 
     def mailing(self, request, partner_program):
-        print("kekekekekek")
         profiles = PartnerProgramUserProfile.objects.filter(
             partner_program=partner_program
         )
-        users = [profile.user for profile in profiles]
+        users = [profile.user for profile in profiles if profile.user is not None]
         return MailingTemplateRender().render_template(request, None, users, None)
 
     def changeform_view(self, request, object_id=None, form_url="", extra_context=None):

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

@@ -1 +1 @@
-<div>Kek</div>
+Some text

templates/mailing/mail_schema.html

@@ -18,10 +18,10 @@
     Выберите пользователей для отправки:
     <div class="checkselect">
         {%  for user in picked_users %}
-            <label><input type="checkbox" name="users" value="{{ user.id }}" checked>{{ user.title }}</label>
+            <label><input type="checkbox" name="users[]" value="{{ user.id }}" checked>{{ user.title }}</label>
         {% endfor %}
         {%  for user in unpicked_users %}
-            <label><input type="checkbox" name="users" value="{{ user.id }}">{{ user.title }}</label>
+            <label><input type="checkbox" name="users[]" value="{{ user.id }}">{{ user.title }}</label>
         {% endfor %}
     </div>
     <br>