From eef12c857990f2d8fae55a49d8b192c7ca3a57b4 Mon Sep 17 00:00:00 2001
From: bobbyvish <bobbyvishwakarma114@gmail.com>
Date: Wed, 6 Nov 2024 14:39:50 +0530
Subject: [PATCH] chore(email): adjust email configuration to reduce spam

---
 accounts/api/views.py                                         | 4 ++--
 accounts/views.py                                             | 2 +-
 env.example                                                   | 1 +
 goodtimes/settings/base.py                                    | 1 +
 manage_communications/views.py                                | 2 +-
 manage_events/api/views.py                                    | 2 +-
 manage_events/management/commands/manager_report.py           | 2 +-
 .../accounts/customer/account_transfer_email_template.html    | 2 +-
 8 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/accounts/api/views.py b/accounts/api/views.py
index 26cf063..f48fa32 100644
--- a/accounts/api/views.py
+++ b/accounts/api/views.py
@@ -123,7 +123,7 @@ class RegistrationEmailView(APIView):
             email_service = EmailService(
                 subject="Good Times - OTP",
                 to=[email],
-                from_email=settings.EMAIL_HOST_USER,
+                from_email=settings.DEFAULT_FROM_EMAIL,
             )
             email_service.load_template(
                 "otp/otp.html", context={"OTP": otp, "action": "Register"}
@@ -322,7 +322,7 @@ class OtpRequestView(APIView):
             email_service = EmailService(
                 subject="Good Times - OTP",
                 to=[email],
-                from_email=settings.EMAIL_HOST_USER,
+                from_email=settings.DEFAULT_FROM_EMAIL,
             )
             email_service.load_template(
                 "otp/otp.html", context={"OTP": otp, "action": "Login"}
diff --git a/accounts/views.py b/accounts/views.py
index 11258d3..1f36689 100644
--- a/accounts/views.py
+++ b/accounts/views.py
@@ -1017,7 +1017,7 @@ class CustomerTransferView(LoginRequiredMixin, generic.View):
         email_service = EmailService(
             subject="Your Exclusive Account Access Details with Good Times!",
             to=principal_obj.email,
-            from_email=settings.EMAIL_HOST_USER,
+            from_email=settings.DEFAULT_FROM_EMAIL,
         )
 
         # Send the email
diff --git a/env.example b/env.example
index 7c8ebed..dc80c69 100644
--- a/env.example
+++ b/env.example
@@ -23,6 +23,7 @@ EMAIL_PORT=
 EMAIL_HOST_USER=
 EMAIL_HOST_PASSWORD=
 EMAIL_USE_TLS=
+DEFAULT_FROM_EMAIL=
 
 GOOGLE_MAPS_API_KEY=
 
diff --git a/goodtimes/settings/base.py b/goodtimes/settings/base.py
index d0dde01..5d57fd3 100644
--- a/goodtimes/settings/base.py
+++ b/goodtimes/settings/base.py
@@ -239,6 +239,7 @@ EMAIL_HOST_USER = env.str("EMAIL_HOST_USER")
 EMAIL_HOST_PASSWORD = env.str("EMAIL_HOST_PASSWORD")
 EMAIL_PORT = env.str("EMAIL_PORT")
 EMAIL_USE_TLS = True
+DEFAULT_FROM_EMAIL = env.str("DEFAULT_FROM_EMAIL")
 
 
 # LOGGING
diff --git a/manage_communications/views.py b/manage_communications/views.py
index 6cdaeba..a1a2108 100644
--- a/manage_communications/views.py
+++ b/manage_communications/views.py
@@ -56,7 +56,7 @@ class ContactUsReplyView(LoginRequiredMixin, generic.View):
                     to=[
                         email,
                     ],
-                    from_email=settings.EMAIL_HOST_USER,
+                    from_email=settings.DEFAULT_FROM_EMAIL,
                 )
                 print("email_service: ", email_service)
                 email_service.load_template(
diff --git a/manage_events/api/views.py b/manage_events/api/views.py
index 7ce903f..6c135c1 100644
--- a/manage_events/api/views.py
+++ b/manage_events/api/views.py
@@ -165,7 +165,7 @@ class CreateVenueApi(APIView):
 #     email_service = EmailService(
 #         subject="Good Times - Report",
 #         to=[user.email],
-#         from_email=settings.EMAIL_HOST_USER,
+#         from_email=settings.DEFAULT_FROM_EMAIL,
 #     )
 #     email_service.attach(filename, buffer.getvalue(), "application/pdf")
 
diff --git a/manage_events/management/commands/manager_report.py b/manage_events/management/commands/manager_report.py
index 8da35e6..5e8778e 100644
--- a/manage_events/management/commands/manager_report.py
+++ b/manage_events/management/commands/manager_report.py
@@ -27,7 +27,7 @@ class Command(BaseCommand):
             subject="Monthly Event Report",
             body="Please find the attached report for the last month.",
             to=[email],
-            from_email=settings.EMAIL_HOST_USER,
+            from_email=settings.DEFAULT_FROM_EMAIL,
         )
         email_message.attach(filename, pdf_data, "application/pdf")
         email_message.send()
diff --git a/templates/accounts/customer/account_transfer_email_template.html b/templates/accounts/customer/account_transfer_email_template.html
index 3c9423a..42fea12 100644
--- a/templates/accounts/customer/account_transfer_email_template.html
+++ b/templates/accounts/customer/account_transfer_email_template.html
@@ -26,6 +26,6 @@
   <p>We sincerely hope your experience with Good Times has been delightful thus far and look forward to continuing to exceed your expectations!</p>
   <p>Warmest regards,</p>
   Good Times<br>
-  {{ settings.EMAIL_HOST_USER }}</p>
+  {{ settings.DEFAULT_FROM_EMAIL }}</p>
 </body>
 </html>
\ No newline at end of file