Merge pull request #77 from unicef/change_email_settings

change default email

Author: domdinicola

src/country_workspace/config/__init__.py

@@ -168,9 +168,22 @@ class Group(Enum):
     "KOBO_MASTER_API_TOKEN": (str, "", "", False, "Kobo API master token"),
     "KOBO_PROJECT_VIEW_ID": (str, "", "", False, "Kobo project view ID"),
     "KOBO_API_TOKEN": (str, "", "", False, "Kobo API token"),
-    "MAILJET_API_URL": (str, "", "", False, "Mailjet API URL"),
+    "MAILJET_API_URL": (
+        str,
+        "https://api.mailjet.com/v3.1/",
+        "https://api.mailjet.com/v3.1/",
+        False,
+        "Mailjet API URL",
+    ),
     "MAILJET_API_KEY": (str, "", "", False, "Mailjet API key"),
     "MAILJET_SECRET_KEY": (str, "", "", False, "Mailjet API secret key"),
+    "DEFAULT_FROM_EMAIL": (
+        str,
+        "hope-workspace@mail.unicef.org",
+        "hope-workspace@mail.unicef.org",
+        False,
+        "Default sending email address",
+    ),
     "IGNORE_RECIPIENT_STATUS": (bool, False, True),
     "IGNORE_UNSUPPORTED_FEATURES": (bool, False, True),
     "REQUESTS_TIMEOUT": (int, 30, 30),

src/country_workspace/config/fragments/mail.py

@@ -1,15 +1,15 @@
 from .. import env
 
-DEFAULT_FROM_EMAIL = "hope@unicef.org"
+DEFAULT_FROM_EMAIL = env("DEFAULT_FROM_EMAIL")
 SERVER_EMAIL = "root@localhost"
 EMAIL_BACKEND = "django.core.mail.backends.console.EmailBackend"
 
 ANYMAIL = {
-    "MAILJET_API_URL": env("MAILJET_API_URL", default="https://api.mailjet.com/v3.1/"),
+    "MAILJET_API_URL": env("MAILJET_API_URL"),
     "MAILJET_API_KEY": (MAILJET_API_KEY := env("MAILJET_API_KEY")),
     "MAILJET_SECRET_KEY": (MAILJET_SECRET_KEY := env("MAILJET_SECRET_KEY")),
-    "IGNORE_RECIPIENT_STATUS": env("IGNORE_RECIPIENT_STATUS", default=True),
-    "IGNORE_UNSUPPORTED_FEATURES": env("IGNORE_UNSUPPORTED_FEATURES", default=True),
-    "REQUESTS_TIMEOUT": env("REQUESTS_TIMEOUT", default=30),
-    "DEBUG_API_REQUESTS": env("DEBUG_API_REQUESTS", default=False),
+    "IGNORE_RECIPIENT_STATUS": env("IGNORE_RECIPIENT_STATUS"),
+    "IGNORE_UNSUPPORTED_FEATURES": env("IGNORE_UNSUPPORTED_FEATURES"),
+    "REQUESTS_TIMEOUT": env("REQUESTS_TIMEOUT"),
+    "DEBUG_API_REQUESTS": env("DEBUG_API_REQUESTS"),
 }