django-codenerix-email 4.0.26__py2.py3-none-any.whl → 4.0.28__py2.py3-none-any.whl

codenerix_email/__init__.py

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

codenerix_email/management/commands/test_email.py

@@ -18,13 +18,16 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import json
 
 from django.core.management.base import BaseCommand
 from django.conf import settings
+from django.utils import timezone
 
 from codenerix_lib.debugger import Debugger
-from codenerix_email.models import EmailMessage
+from codenerix_email.models import EmailMessage, EmailTemplate  # type: ignore
 from codenerix_email import __version__
+from django.core.management import CommandError
 
 
 class Command(BaseCommand, Debugger):
@@ -32,28 +35,145 @@ class Command(BaseCommand, Debugger):
     # Show this when the user types help
     help = "Test"
 
+    def add_arguments(self, parser):
+        parser.add_argument(
+            "--email",
+            type=str,
+            help="Email",
+            default=None,
+        )
+        parser.add_argument(
+            "--template",
+            type=str,
+            help="Template CID",
+            default=None,
+        )
+        parser.add_argument(
+            "--context",
+            type=str,
+            help="Context as JSON",
+            default="{}",
+        )
+        parser.add_argument(
+            "--language",
+            type=str,
+            help="Language",
+            default=None,
+        )
+        parser.add_argument(
+            "--stdout",
+            action="store_true",
+            help="Print to stdout",
+            default=False,
+        )
+
     def handle(self, *args, **options):
 
         # Autoconfigure Debugger
         self.set_name("CODENERIX-EMAIL")
         self.set_debug()
 
-        message = """Hello,
+        # Get arguments
+        email = options["email"]
+        template = options["template"]
+        context_str = options["context"]
+        language = options["language"]
+        stdout = options["stdout"]
+
+        # Read context
+        try:
+            context = json.loads(context_str)
+        except json.JSONDecodeError:
+            raise CommandError(
+                "Context is not a valid JSON string: {}".format(context_str)
+            )
+
+        # If no template is provided, use the default one
+        if template is None:
 
-this email has been sent using Django Codenerix Email.
+            # Get the default template
+            message = """Hello,
+
+This email has been sent using Django Codenerix Email.
 
 Best regards, Codenerix Team
 
 --
-Django Codenerix Email v{}""".format(
-            __version__
-        )
+Django Codenerix Email v{}
+""".format(
+                __version__
+            )
 
-        for name, email in settings.ADMINS:
-            email_message = EmailMessage()
+            def email_message_factory(context, language):
+                email_message = EmailMessage()
+                email_message.subject = "[Codenerix Email] Test"
+                email_message.body = message
+                return email_message
+
+        else:
+            # Get the template
+            try:
+                template = EmailTemplate.objects.get(cid=template)
+            except EmailTemplate.DoesNotExist:
+                raise CommandError(
+                    "Template with CID {} does not exist.".format(template)
+                )
+
+            # Render the template
+            def email_message_factory(context, language):
+                return template.get_email(context, language)
+
+        # If no email is provided, send to all admins
+        if email is None:
+
+            # Send email to all admins
+            for name, email in settings.ADMINS:
+                email_message = email_message_factory(context, language)
+                email_message.efrom = settings.DEFAULT_FROM_EMAIL
+                email_message.eto = email
+
+                # Prepare message ID info
+                ecid = email_message.uuid.hex
+                edomain = settings.EMAIL_FROM.split("@")[-1]
+                ets = int(timezone.now().timestamp())
+                email_message.headers = {
+                    "Message-ID": f"<{ecid}-{ets}@{edomain}>",
+                    "X-Codenerix-Email": "Test",
+                }
+
+                if stdout:
+                    self.debug(
+                        f"Sending email to {name} <{email}> "
+                        f"with subject: {email_message.subject}:\n"
+                        f"{email_message.body}",
+                        color="white",
+                    )
+                else:
+                    email_message.save()
+                    email_message.send(legacy=False, silent=False)
+        else:
+
+            # Send email to the specified address
+            email_message = email_message_factory(context, language)
             email_message.efrom = settings.DEFAULT_FROM_EMAIL
             email_message.eto = email
-            email_message.subject = "[Codenerix Email] Test"
-            email_message.body = message
-            email_message.save()
-            email_message.send(legacy=False, silent=False)
+
+            # Prepare message ID info
+            ecid = email_message.uuid.hex
+            edomain = settings.EMAIL_FROM.split("@")[-1]
+            ets = int(timezone.now().timestamp())
+            email_message.headers = {
+                "Message-ID": f"<{ecid}-{ets}@{edomain}>",
+                "X-Codenerix-Email": "Test",
+            }
+
+            if stdout:
+                self.debug(
+                    f"Sending email to {name} <{email}> "
+                    f"with subject: {email_message.subject}:\n"
+                    f"{email_message.body}",
+                    color="white",
+                )
+            else:
+                email_message.save()
+                email_message.send(legacy=False, silent=False)

codenerix_email/models.py

@@ -49,8 +49,10 @@ CONTENT_SUBTYPES = (
 )
 
 
-def ensure_header(headers, key, value):
-    if key not in headers:
+def ensure_header(headers, key, value, headers_keys=None):
+    if headers_keys is None:
+        headers_keys = [k.lower() for k in headers.keys()]
+    if key.lower() not in headers_keys:
         headers[key] = value
     return headers
 
@@ -186,13 +188,34 @@ class EmailMessage(CodenerixModel, Debugger):
         # Get headers
         headers = self.headers or {}
 
+        # Header keys
+        headers_keys = [k.lower() for k in headers.keys()]
+
         # Ensure unsubscribe headers
         if self.unsubscribe_url:
             ensure_header(
-                headers, "List-Unsubscribe", f"<{self.unsubscribe_url}>"
+                headers,
+                "List-Unsubscribe",
+                f"<{self.unsubscribe_url}>",
+                headers_keys,
             )
             ensure_header(
-                headers, "List-Unsubscribe-Post", "List-Unsubscribe=One-Click"
+                headers,
+                "List-Unsubscribe-Post",
+                "List-Unsubscribe=One-Click",
+                headers_keys,
+            )
+
+        # Prepare message ID info
+        if "Message-ID".lower() not in headers_keys:
+            ecid = self.uuid.hex
+            edomain = settings.EMAIL_FROM.split("@")[-1]
+            ets = int(timezone.now().timestamp())
+            ensure_header(
+                headers,
+                "Message-ID",
+                f"<{ecid}-{ets}@{edomain}>",
+                headers_keys,
             )
 
         # Return headers
@@ -552,6 +575,7 @@ class EmailTemplate(CodenerixModel):
         e.body = Template(getattr(self, lang).body).render(Context(context))
         e.efrom = Template(self.efrom).render(Context(context))
         e.content_subtype = self.content_subtype
+
         return e
 
     def clean(self):

{django_codenerix_email-4.0.26.dist-info → django_codenerix_email-4.0.28.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django-codenerix-email
-Version: 4.0.26
+Version: 4.0.28
 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.26.dist-info → django_codenerix_email-4.0.28.dist-info}/RECORD

@@ -1,8 +1,8 @@
-codenerix_email/__init__.py,sha256=M3A78yUx3AaCW46s7jU8eN9xu7YwE9kC-6q3ed2m4Ow,149
+codenerix_email/__init__.py,sha256=66Cjo2WMXgWsnDzpzHwEX-3w3I4qNbFO3idUIGXJCkI,149
 codenerix_email/admin.py,sha256=o3b-MaD7xsWeta0yfU9YNeKBmHQIcmHqXmP2t-hrrWc,1208
 codenerix_email/apps.py,sha256=WXqu1XQibDDyCvvQYt2JbTK4GIpW8BNv5DCbRJS2mmk,149
 codenerix_email/forms.py,sha256=oVI58ZfDPr2aoA41xPS8yeU5H_JsYXwiEzWVMMnxM7A,4187
-codenerix_email/models.py,sha256=SimsoQ1g0f-woPlUTnEEo1ejjkSn8QL3ACKHWx876RU,20442
+codenerix_email/models.py,sha256=KFm5rtco_rS2IVM9bfFwqyLT6TinQYKzSc9JZnoWr4A,21170
 codenerix_email/urls.py,sha256=QYrSJdhCp2PLrcfv_Y7X4OzxqQ0Q2-z7ObDPE-_WLdw,2595
 codenerix_email/urls_frontend.py,sha256=DG5WS_fGQJC9sezNebPwG-E_WtUWy3Kwz4VUxh82xuc,873
 codenerix_email/views.py,sha256=zLYLQk8oZ-0OIjDxTF-N3gSi91_JFcybkfWqYm67A3g,4858
@@ -13,11 +13,11 @@ codenerix_email/management/__pycache__/__init__.cpython-35.pyc,sha256=sBoEWs6zdI
 codenerix_email/management/__pycache__/__init__.cpython-39.pyc,sha256=uPXklfliVd3b8pLOJQT9ZeKcqmJMrGychvt68BsPulY,168
 codenerix_email/management/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 codenerix_email/management/commands/send_emails.py,sha256=hotzGEkuDILwKgZgHFOaSCeAZDIyoPcM7VDs3Z-5Vvg,7950
-codenerix_email/management/commands/test_email.py,sha256=MfVTF9YGBw_cqBm3cHMCyUbp58jJ8fidzW7hA_e7IEA,1688
+codenerix_email/management/commands/test_email.py,sha256=eAFdNrSq83SHKUjkXbbtfd5AtZjC5MZLbSfMH9F0Cbk,5633
 codenerix_email/management/commands/__pycache__/__init__.cpython-310.pyc,sha256=3-VfdLuaiBIg4KTIy7GETYTt2-AbfCU0vlH6fFZx7_M,189
 codenerix_email/management/commands/__pycache__/__init__.cpython-311.pyc,sha256=yiqmtIhQMYXWx7g7XT-mvQNgGu_X2ymasWvVxIqPsBE,211
 codenerix_email/management/commands/__pycache__/send_emails.cpython-311.pyc,sha256=xh2ontFVtLWHZOoVf1YJrNbBNPtIyV2KQEk5Bf6mY_c,6884
-codenerix_email/management/commands/__pycache__/test_email.cpython-310.pyc,sha256=a5WztN9QeGbv4AlIf6XC1PtEXwbrW9cIFsljjTt3lA8,1227
+codenerix_email/management/commands/__pycache__/test_email.cpython-310.pyc,sha256=5X7qBWFWs7AsNgTo1DyQE0zi5gtLxiFIcwdnboZIUSg,3154
 codenerix_email/migrations/0001_initial.py,sha256=Rp6noz8vjtGi4f4qc2w_es_VV9PmO7WvVfv666mu9xE,3511
 codenerix_email/migrations/0002_auto_20170502_1043.py,sha256=-zoc4RuZFXJA1Fw8ECCVqAg-PYfku3yxdtYNyXPI3LM,2369
 codenerix_email/migrations/0003_auto_20170921_1206.py,sha256=ncVdyZJ616vQpllGdaPbFS0n9qKfDP-TuVA5HkbPf4I,656
@@ -81,8 +81,8 @@ codenerix_email/migrations/__pycache__/__init__.cpython-311.pyc,sha256=RbbUUEhcJ
 codenerix_email/migrations/__pycache__/__init__.cpython-35.pyc,sha256=2g70xiMW6oJNkIpRM-0Dr5h7AUac-3xyCXPONxp9BBw,147
 codenerix_email/migrations/__pycache__/__init__.cpython-39.pyc,sha256=qNj2NH0YvoWPnCKxkVZPsEFsbM05y7t1njMskNISdVQ,168
 codenerix_email/static/codenerix_email/partials/emailmessages_rows.html,sha256=U0YDiFe-JaHri0VFv84jNbpbjgQXX0BVkg66FQybanw,2135
-django_codenerix_email-4.0.26.dist-info/LICENSE,sha256=IXMIpi75XsrJt1Sznt4EftT9c_4X0C9eqK4tHhH8H48,11339
-django_codenerix_email-4.0.26.dist-info/METADATA,sha256=p6d2Du2CBK8kLVK2L25JTpGpjNijnEdb0JR4oz3eC7c,2640
-django_codenerix_email-4.0.26.dist-info/WHEEL,sha256=z9j0xAa_JmUKMpmz72K0ZGALSM_n-wQVmGbleXx2VHg,110
-django_codenerix_email-4.0.26.dist-info/top_level.txt,sha256=lljSA0iKE_UBEM5gIrGQwioC_i8Jjnp-aR1LFElENgw,16
-django_codenerix_email-4.0.26.dist-info/RECORD,,
+django_codenerix_email-4.0.28.dist-info/LICENSE,sha256=IXMIpi75XsrJt1Sznt4EftT9c_4X0C9eqK4tHhH8H48,11339
+django_codenerix_email-4.0.28.dist-info/METADATA,sha256=iGuhXhJ4QsB56T-5w8WeGHwyEYDFdylYgrhbgqFglEs,2640
+django_codenerix_email-4.0.28.dist-info/WHEEL,sha256=z9j0xAa_JmUKMpmz72K0ZGALSM_n-wQVmGbleXx2VHg,110
+django_codenerix_email-4.0.28.dist-info/top_level.txt,sha256=lljSA0iKE_UBEM5gIrGQwioC_i8Jjnp-aR1LFElENgw,16
+django_codenerix_email-4.0.28.dist-info/RECORD,,