django-codenerix-email 4.0.39__tar.gz → 4.0.40__tar.gz

{django_codenerix_email-4.0.39 → django_codenerix_email-4.0.40}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django_codenerix_email
-Version: 4.0.39
+Version: 4.0.40
 Summary: Codenerix Email is a module that enables CODENERIX to set send emails in a general manner.
 Home-page: https://github.com/codenerix/django-codenerix-email
 Author: Juan Miguel Taboada Godoy <juanmi@juanmitaboada.com>, Juan Soler Ruiz <soleronline@gmail.com>

{django_codenerix_email-4.0.39 → django_codenerix_email-4.0.40}/codenerix_email/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "4.0.39"
+__version__ = "4.0.40"
 
 __authors__ = [
     "Juan Miguel Taboada Godoy <juanmi@juanmitaboada.com>",

{django_codenerix_email-4.0.39 → django_codenerix_email-4.0.40}/codenerix_email/forms.py

@@ -94,7 +94,7 @@ class EmailMessageForm(GenModelForm):
         return [
             (
                 _("Details"),
-                6,
+                4,
                 ["uuid", 3],
                 ["created", 3],
                 ["updated", 3],
@@ -102,20 +102,27 @@ class EmailMessageForm(GenModelForm):
                 ["eto", 3],
                 ["subject", 3],
                 ["opened", 3],
-                ["content_subtype", 3],
             ),
             (
                 _("System"),
-                6,
+                4,
                 ["sending", 3],
                 ["sent", 3],
                 ["error", 3],
-                ["retries", 3],
-                ["priority", 3],
                 ["log", 3],
+                ["content_subtype", 3],
                 ["unsubscribe_url", 3],
                 ["headers", 3],
             ),
+            (
+                _("Status"),
+                4,
+                ["retries", 3],
+                ["priority", 3],
+                ["bounces_total", 3],
+                ["bounces_soft", 3],
+                ["bounces_hard", 3],
+            ),
             (
                 _("Body"),
                 12,

{django_codenerix_email-4.0.39 → django_codenerix_email-4.0.40}/codenerix_email/management/commands/emails_recv.py

@@ -453,7 +453,8 @@ class Command(BaseCommand):
                             if self.verbose:
                                 self.stdout.write(
                                     self.style.SUCCESS(
-                                        f"Deleted email with IMAP ID: {imap_id}"
+                                        "Deleted email with "
+                                        f"IMAP ID: {imap_id}"
                                     )
                                 )
 
@@ -487,6 +488,10 @@ class Command(BaseCommand):
                     # Save the received email
                     email_received.save()
 
+                    # Recalculate the email status if linked to a sent email
+                    if email_message:
+                        email_message.recalculate_bounces()
+
                     # Count created or overwritten
                     if overwriting:
                         overwrite_count += 1
@@ -543,7 +548,7 @@ class Command(BaseCommand):
                             )
                         )
                 elif getattr(settings, "IMAP_EMAIL_SEEN", True):
-                    # Mark the message as read otherwise (to avoid reprocessing)
+                    # Mark the message as read otherwise (avoids reprocessing)
                     server.add_flags(imap_id, [b"\\Seen"])
 
         return (created_count, overwrite_count)

django_codenerix_email-4.0.40/codenerix_email/migrations/0015_emailmessage_bounces_hard_emailmessage_bounces_soft_and_more.py

@@ -0,0 +1,28 @@
+# Generated by Django 5.2.7 on 2025-10-14 05:10
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('codenerix_email', '0014_emailreceived'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='emailmessage',
+            name='bounces_hard',
+            field=models.PositiveIntegerField(default=0, verbose_name='Hard bounces'),
+        ),
+        migrations.AddField(
+            model_name='emailmessage',
+            name='bounces_soft',
+            field=models.PositiveIntegerField(default=0, verbose_name='Soft bounces'),
+        ),
+        migrations.AddField(
+            model_name='emailmessage',
+            name='bounces_total',
+            field=models.PositiveIntegerField(default=0, verbose_name='Total bounces'),
+        ),
+    ]

{django_codenerix_email-4.0.39 → django_codenerix_email-4.0.40}/codenerix_email/models.py

@@ -114,6 +114,34 @@ class EmailMessage(CodenerixModel):
         _("Unsubscribe URL"), blank=True, null=True
     )
     headers = models.JSONField(_("Headers"), blank=True, null=True)
+    bounces_soft = models.PositiveIntegerField(
+        _("Soft bounces"), blank=False, null=False, default=0
+    )
+    bounces_hard = models.PositiveIntegerField(
+        _("Hard bounces"), blank=False, null=False, default=0
+    )
+    bounces_total = models.PositiveIntegerField(
+        _("Total bounces"), blank=False, null=False, default=0
+    )
+
+    def recalculate_bounces(self):
+        bounces_soft = self.receiveds.filter(bounce_type=BOUNCE_SOFT).count()
+        bounces_hard = self.receiveds.filter(bounce_type=BOUNCE_HARD).count()
+        bounces_total = self.receiveds.filter(
+            bounce_type__isnull=False
+        ).count()
+        changed = False
+        if self.bounces_soft != bounces_soft:
+            self.bounces_soft = bounces_soft
+            changed = True
+        if self.bounces_hard != bounces_hard:
+            self.bounces_hard = bounces_hard
+            changed = True
+        if self.bounces_total != bounces_total:
+            self.bounces_total = bounces_total
+            changed = True
+        if changed:
+            self.save()
 
     def __fields__(self, info):
         fields = []
@@ -127,6 +155,7 @@ class EmailMessage(CodenerixModel):
         # fields.append(("efrom", _("From")))
         fields.append(("eto", _("To")))
         fields.append(("subject", _("Subject")))
+        fields.append(("bounces_total", _("Bounces")))
         fields.append(("retries", _("Retries")))
         fields.append(("next_retry", _("Next retry")))
         fields.append(("pk", _("ID")))
@@ -169,7 +198,6 @@ class EmailMessage(CodenerixModel):
         return {
             "sent": (_("Sent"), lambda x: mailstatus(x), mailoptions),
             "uuid": (_("UUID"), lambda x: Q(uuid__icontains=x), "input"),
-            "priority": (_("Priority"), lambda x: Q(priority=x), "input"),
             "opened": (
                 _("Opened"),
                 lambda x: ~Q(opened__isnull=x),
@@ -177,25 +205,12 @@ class EmailMessage(CodenerixModel):
             ),
             # "efrom": (_("From"), lambda x: Q(efrom__icontains=x), "input"),
             "eto": (_("To"), lambda x: Q(eto__icontains=x), "input"),
-            "retries": (_("Retries"), lambda x: Q(retries=x), "input"),
             "pk": (_("ID"), lambda x: Q(pk=x), "input"),
         }
 
     def __unicode__(self):
         return "{} ({})".format(self.eto, self.pk)
 
-    @property
-    def bounces_soft(self):
-        return self.receiveds.filter(bounce_type=BOUNCE_SOFT).count()
-
-    @property
-    def bounces_hard(self):
-        return self.receiveds.filter(bounce_type=BOUNCE_HARD).count()
-
-    @property
-    def bounces_total(self):
-        return self.receiveds.filter(bounce_type__isnull=False).count()
-
     def clean(self):
         if not isinstance(self.headers, dict):
             raise ValidationError(_("HEADERS must be a Dictionary"))

{django_codenerix_email-4.0.39 → django_codenerix_email-4.0.40}/codenerix_email/static/codenerix_email/emailmessages_rows.html

@@ -14,7 +14,7 @@
 </td>
 <td>{{row.eto|codenerix}}</td>
 <td><nobr>{{row.subject|codenerix}}</nobr></td>
-<td class="text-nowrap">{{row.bounces_total_count|codenerix}}</td>
+<td class="text-nowrap">{{row.bounces_total|codenerix}}</td>
 <td><center>{{row.retries|codenerix}}</center></td>
 <td class="text-nowrap">{{row.next_retry|codenerix}}</td>
 <td><center>{{row.pk|codenerix}}</center></td>

{django_codenerix_email-4.0.39 → django_codenerix_email-4.0.40}/codenerix_email/views.py

@@ -28,7 +28,7 @@ from django.shortcuts import get_object_or_404
 from django.utils.translation import gettext as _
 from django.conf import settings
 from django.http import HttpRequest, Http404
-from django.db.models import Q, Count
+from django.db.models import Q
 
 from codenerix.multiforms import MultiForm  # type: ignore
 from codenerix.views import (  # type: ignore
@@ -40,15 +40,12 @@ from codenerix.views import (  # type: ignore
     GenDelete,
     GenDetail,
     GenDetailModal,
-    SearchFilters,
 )
 from codenerix_email.models import (
     EmailTemplate,
     EmailMessage,
     EmailReceived,
     MODELS,
-    BOUNCE_SOFT,
-    BOUNCE_HARD,
 )
 from codenerix_email.forms import (
     EmailTemplateForm,
@@ -106,7 +103,7 @@ class EmailFollow(View):
             # Return an image of 1x1 pixel
             return HttpResponse(
                 base64.b64decode(
-                    "R0lGODlhAQABAIAAAP///wAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw=="
+                    "R0lGODlhAQABAIAAAP///wAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw=="  # noqa: E501
                 ),
                 content_type="image/gif",
             )
@@ -186,90 +183,6 @@ class EmailMessageList(GenList):
         "menu": ["codenerix_email", "emailmessages"],
         "bread": [_("Emails"), _("Email Messages")],
     }
-    annotations = {
-        # "bounces_soft_count": Count(
-        #     "receiveds__pk", filter=Q(receiveds__bounce_type=BOUNCE_SOFT)
-        # ),
-        # "bounces_hard_count": Count(
-        #     "receiveds__pk", filter=Q(receiveds__bounce_type=BOUNCE_HARD)
-        # ),
-        "bounces_total_count": Count(
-            "receiveds__pk", filter=Q(receiveds__bounce_type__isnull=False)
-        ),
-    }
-
-    def __fields__(self, info):
-        fields = []
-        fields.append(("sending", None))
-        fields.append(("error", None))
-        fields.append(("sent", _("Send")))
-        fields.append(("priority", _("Priority")))
-        fields.append(("created", _("Created")))
-        fields.append(("updated", _("Updated")))
-        fields.append(("opened", _("Opened")))
-        # fields.append(("efrom", _("From")))
-        fields.append(("eto", _("To")))
-        fields.append(("subject", _("Subject")))
-        fields.append(("bounces_total_count", _("Bounces")))
-        # fields.append(("bounces_soft_count", _("Soft bounces")))
-        # fields.append(("bounces_hard_count", _("Hard bounces")))
-        fields.append(("retries", _("Retries")))
-        fields.append(("next_retry", _("Next retry")))
-        fields.append(("pk", _("ID")))
-        fields.append(("uuid", _("UUID")))
-        fields.append(("unsubscribe_url", _("Unsubscribe")))
-        fields.append(("content_subtype", _("Content Subtype")))
-        return fields
-
-    def __searchF__(self, info):  # noqa: N802
-        def mailstatus(x):
-            if x == "D":
-                return Q(error=False, sent=True)
-            elif x == "P":
-                return Q(error=False, sent=False, sending=False)
-            elif x == "S":
-                return Q(error=False, sent=False, sending=True)
-            elif x == "E":
-                return Q(error=True)
-            else:
-                return Q()
-
-        mailoptions = [
-            ("D", _("Sent")),  # Sent - Done
-            ("P", _("Pending")),  # Pending - Pending
-            ("S", _("Sending")),  # Sending - Sending
-            ("E", _("Error")),  # Error - Error
-        ]
-
-        return {
-            "sent": (_("Sent"), lambda x: mailstatus(x), mailoptions),
-            "uuid": (_("UUID"), lambda x: Q(uuid__icontains=x), "input"),
-            "priority": (_("Priority"), lambda x: Q(priority=x), "input"),
-            "opened": (
-                _("Opened"),
-                lambda x: ~Q(opened__isnull=x),
-                [(True, _("Yes")), (False, _("No"))],
-            ),
-            # "efrom": (_("From"), lambda x: Q(efrom__icontains=x), "input"),
-            "eto": (_("To"), lambda x: Q(eto__icontains=x), "input"),
-            "retries": (_("Retries"), lambda x: Q(retries=x), "input"),
-            "pk": (_("ID"), lambda x: Q(pk=x), "input"),
-            "bounces_total_count": (
-                _("Bounces"),
-                SearchFilters.number("bounces_total_count"),
-                "input",
-            ),
-            "bounces_soft_count": (
-                _("Soft bounces"),
-                SearchFilters.number("bounces_soft_count"),
-                "input",
-            ),
-            "bounces_hard_count": (
-                _("Hard bounces"),
-                SearchFilters.number("bounces_hard_count"),
-                "input",
-            ),
-        }
 
 
 class EmailMessageCreate(GenCreate):

{django_codenerix_email-4.0.39 → django_codenerix_email-4.0.40}/django_codenerix_email.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django-codenerix-email
-Version: 4.0.39
+Version: 4.0.40
 Summary: Codenerix Email is a module that enables CODENERIX to set send emails in a general manner.
 Home-page: https://github.com/codenerix/django-codenerix-email
 Author: Juan Miguel Taboada Godoy <juanmi@juanmitaboada.com>, Juan Soler Ruiz <soleronline@gmail.com>

{django_codenerix_email-4.0.39 → django_codenerix_email-4.0.40}/django_codenerix_email.egg-info/SOURCES.txt

@@ -2,6 +2,7 @@ LICENSE
 MANIFEST.in
 README.rst
 setup.py
+codenerix_email/.models.py.swp
 codenerix_email/__init__.py
 codenerix_email/admin.py
 codenerix_email/apps.py
@@ -1638,6 +1639,7 @@ codenerix_email/migrations/0011_alter_emailmessage_content_subtype_and_more.py
 codenerix_email/migrations/0012_emailmessage_unsubscribe_url.py
 codenerix_email/migrations/0013_emailmessage_headers.py
 codenerix_email/migrations/0014_emailreceived.py
+codenerix_email/migrations/0015_emailmessage_bounces_hard_emailmessage_bounces_soft_and_more.py
 codenerix_email/migrations/__init__.py
 codenerix_email/migrations/__pycache__/0001_initial.cpython-310.pyc
 codenerix_email/migrations/__pycache__/0001_initial.cpython-311.pyc
@@ -1685,6 +1687,7 @@ codenerix_email/migrations/__pycache__/0013_emailmessage_headers.cpython-310.pyc
 codenerix_email/migrations/__pycache__/0013_emailmessage_headers.cpython-311.pyc
 codenerix_email/migrations/__pycache__/0014_emailreceived.cpython-310.pyc
 codenerix_email/migrations/__pycache__/0014_emailreceived.cpython-311.pyc
+codenerix_email/migrations/__pycache__/0015_emailmessage_bounces_hard_emailmessage_bounces_soft_and_more.cpython-311.pyc
 codenerix_email/migrations/__pycache__/__init__.cpython-310.pyc
 codenerix_email/migrations/__pycache__/__init__.cpython-311.pyc
 codenerix_email/migrations/__pycache__/__init__.cpython-35.pyc