From 2f803e47146493406b3254717feb8f8200050673 Mon Sep 17 00:00:00 2001
From: Son NK <>
Date: Wed, 16 Dec 2020 18:51:14 +0100
Subject: [PATCH] refactoring: move template to folder

---
 email_handler.py                                          | 8 ++++----
 .../{ => bounce}/automatic-disable-alias.html             | 0
 .../{ => bounce}/automatic-disable-alias.txt              | 0
 .../emails/transactional/{ => bounce}/bounced-email.html  | 0
 .../emails/transactional/{ => bounce}/bounced-email.txt   | 0
 5 files changed, 4 insertions(+), 4 deletions(-)
 rename templates/emails/transactional/{ => bounce}/automatic-disable-alias.html (100%)
 rename templates/emails/transactional/{ => bounce}/automatic-disable-alias.txt (100%)
 rename templates/emails/transactional/{ => bounce}/bounced-email.html (100%)
 rename templates/emails/transactional/{ => bounce}/bounced-email.txt (100%)

diff --git a/email_handler.py b/email_handler.py
index d25fda98..fd3b9725 100644
--- a/email_handler.py
+++ b/email_handler.py
@@ -1235,7 +1235,7 @@ def handle_bounce(contact: Contact, alias: Alias, msg: Message, user: User):
             user.email,
             f"Email from {contact.website_email} to {alias.email} cannot be delivered to your inbox",
             render(
-                "transactional/bounced-email.txt",
+                "transactional/bounce/bounced-email.txt",
                 alias=alias,
                 website_email=contact.website_email,
                 disable_alias_link=disable_alias_link,
@@ -1243,7 +1243,7 @@ def handle_bounce(contact: Contact, alias: Alias, msg: Message, user: User):
                 mailbox_email=mailbox.email,
             ),
             render(
-                "transactional/bounced-email.html",
+                "transactional/bounce/bounced-email.html",
                 alias=alias,
                 website_email=contact.website_email,
                 disable_alias_link=disable_alias_link,
@@ -1265,14 +1265,14 @@ def handle_bounce(contact: Contact, alias: Alias, msg: Message, user: User):
             user.email,
             f"Alias {alias.email} has been disabled due to second undelivered email from {contact.website_email}",
             render(
-                "transactional/automatic-disable-alias.txt",
+                "transactional/bounce/automatic-disable-alias.txt",
                 alias=alias,
                 website_email=contact.website_email,
                 refused_email_url=refused_email_url,
                 mailbox_email=mailbox.email,
             ),
             render(
-                "transactional/automatic-disable-alias.html",
+                "transactional/bounce/automatic-disable-alias.html",
                 alias=alias,
                 website_email=contact.website_email,
                 refused_email_url=refused_email_url,
diff --git a/templates/emails/transactional/automatic-disable-alias.html b/templates/emails/transactional/bounce/automatic-disable-alias.html
similarity index 100%
rename from templates/emails/transactional/automatic-disable-alias.html
rename to templates/emails/transactional/bounce/automatic-disable-alias.html
diff --git a/templates/emails/transactional/automatic-disable-alias.txt b/templates/emails/transactional/bounce/automatic-disable-alias.txt
similarity index 100%
rename from templates/emails/transactional/automatic-disable-alias.txt
rename to templates/emails/transactional/bounce/automatic-disable-alias.txt
diff --git a/templates/emails/transactional/bounced-email.html b/templates/emails/transactional/bounce/bounced-email.html
similarity index 100%
rename from templates/emails/transactional/bounced-email.html
rename to templates/emails/transactional/bounce/bounced-email.html
diff --git a/templates/emails/transactional/bounced-email.txt b/templates/emails/transactional/bounce/bounced-email.txt
similarity index 100%
rename from templates/emails/transactional/bounced-email.txt
rename to templates/emails/transactional/bounce/bounced-email.txt