Dlr user settings in settings.py (#224)

Author: Brontes

django_project_base/notifications/base/channels/integrations/aws_ses.py

@@ -73,11 +73,11 @@ def parse_delivery_report(self, dlr: DeliveryReport):
 
     @property
     def delivery_report_username_setting_name(self) -> str:
-        return "aws-ses-email-dlr-user"
+        return "NOTIFICATIONS_AWS_SES_EMAIL_DLR_USER"
 
     @property
     def delivery_report_password_setting_name(self) -> str:
-        return "aws-ses-email-dlr-password"
+        return "NOTIFICATIONS_AWS_SES_EMAIL_DLR_PASSWORD"
 
     def ensure_dlr_user(self, project_slug: str):
         pass

django_project_base/notifications/base/channels/integrations/aws_sns_single_sms.py

@@ -63,11 +63,11 @@ def parse_delivery_report(self, dlr: DeliveryReport):
 
     @property
     def delivery_report_username_setting_name(self) -> str:
-        return "aws-sns-sms-dlr-user"
+        return "NOTIFICATIONS_AWS_SNS_SMS_DLR_USER"
 
     @property
     def delivery_report_password_setting_name(self) -> str:
-        return "aws-sns-sms-dlr-password"
+        return "NOTIFICATIONS_AWS_SNS_SMS_DLR_PASSWORD"
 
     def ensure_dlr_user(self, project_slug: str):
         pass

django_project_base/notifications/base/channels/integrations/nexmo_sms.py

@@ -66,11 +66,11 @@ def parse_delivery_report(self, dlr: DeliveryReport):
 
     @property
     def delivery_report_username_setting_name(self) -> str:
-        return "nexmo-sms-dlr-user"
+        return "NOTIFICATIONS_NEXMO_SMS_DLR_USER"
 
     @property
     def delivery_report_password_setting_name(self) -> str:
-        return "nexmo-sms-dlr-password"
+        return "NOTIFICATIONS_NEXMO_SMS_DLR_USER"
 
     def ensure_dlr_user(self, project_slug: str):
         pass

django_project_base/notifications/base/channels/integrations/t2.py

@@ -6,7 +6,7 @@
 import requests
 import swapper
 
-from django.conf import Settings
+from django.conf import Settings, settings
 from django.contrib.auth import get_user_model
 from requests.auth import HTTPBasicAuth
 from rest_framework.status import is_success
@@ -288,7 +288,7 @@ def ensure_credentials(self, settings: Optional[Settings] = None):
         self.settings = settings
         assert self.username, "NOTIFICATIONS_T2_USERNAME is required"
         assert self.password, "NOTIFICATIONS_T2_PASSWORD is required"
-        assert len(self.url) > 0, "NOTIFICATIONS_T2_PASSWORD is required"
+        assert len(self.url) > 0, "NOTIFICATIONS_SMS_API_URL is required"
 
     def client_send(self, sender: str, recipient: Recipient, msg: str, dlr_id: str):
         if not recipient.phone_number:
@@ -322,37 +322,37 @@ def parse_delivery_report(self, dlr: DeliveryReport):
 
     @property
     def delivery_report_username_setting_name(self) -> str:
-        return "t2-sms-dlr-user"
+        return "NOTIFICATIONS_T2_SMS_DLR_USER"
 
     @property
     def delivery_report_password_setting_name(self) -> str:
-        return "t2-sms-dlr-password"
+        return "NOTIFICATIONS_T2_SMS_DLR_PASSWORD"
 
     def ensure_dlr_user(self, project_slug: str):
         if project_slug and (
             project := swapper.load_model("django_project_base", "Project").objects.filter(slug=project_slug).first()
         ):
-            project_settings_model = swapper.load_model("django_project_base", "ProjectSettings")
-
-            username_setting = project_settings_model.objects.filter(
-                name=self.delivery_report_username_setting_name, project=project
-            ).first()
-
-            password_setting = project_settings_model.objects.filter(
-                name=self.delivery_report_password_setting_name, project=project
-            ).first()
-
-            assert username_setting
-            assert password_setting
-
-            user, user_created = get_user_model().objects.get_or_create(
-                username=username_setting.python_value,
-                email="[email protected]",
-                first_name=username_setting.python_value,
-                last_name=username_setting.python_value,
+            username = getattr(settings, self.delivery_report_username_setting_name, None)
+            password = getattr(settings, self.delivery_report_password_setting_name, None)
+            email = getattr(settings, "NOTIFICATIONS_T2_SMS_DLR_EMAIL", None)
+
+            assert username
+            assert password
+            assert email
+
+            user, user_created = get_user_model().objects.update_or_create(
+                email=email,
+                defaults=dict(
+                    is_active=True,
+                    is_staff=False,
+                    is_superuser=False,
+                    username=username,
+                    first_name=username,
+                    last_name=username,
+                ),
             )
-            if user_created:
-                user.set_password(password_setting.python_value)
+            if user_created or not user.check_password(password):
+                user.set_password(password)
                 user.save()
 
             ProjectMember = swapper.load_model("django_project_base", "ProjectMember")

django_project_base/notifications/migrations/0013_delete_dlr_settings.py

@@ -0,0 +1,36 @@
+# Generated by Django 5.1.7 on 2025-11-04 12:50
+
+import swapper
+
+from django.contrib.auth import get_user_model
+from django.db import migrations
+
+
+def delete_dlr_settings(apps, schema_editor):
+    ProjectModelSettings = swapper.load_model("django_project_base", "ProjectSettings")
+    ProjectModelSettings._base_manager.filter(
+        name__in=[
+            "aws-sns-sms-dlr-user",
+            "aws-sns-sms-dlr-password",
+            "aws-ses-email-dlr-user",
+            "aws-ses-email-dlr-password",
+            "nexmo-sms-dlr-user",
+            "nexmo-sms-dlr-password",
+            "t2-sms-dlr-user",
+            "t2-sms-dlr-password",
+        ]
+    ).delete()
+
+    get_user_model().objects.filter(
+        username__istartswith="t2-", username__iendswith="-username", email="[email protected]"
+    ).update(email="[email protected]")
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("notifications", "0012_djangoprojectbasenotification_done_and_more"),
+    ]
+
+    operations = [
+        migrations.RunPython(delete_dlr_settings),
+    ]

django_project_base/settings.py

@@ -84,6 +84,18 @@
         "default": "",
     },
     {"name": "IS_PHONE_NUMBER_ALLOWED_FUNCTION", "default": ""},
+    {"name": "NOTIFICATIONS_AWS_SES_EMAIL_DLR_USER", "default": None},
+    {"name": "NOTIFICATIONS_AWS_SES_EMAIL_DLR_PASSWORD", "default": None},
+    {"name": "NOTIFICATIONS_AWS_SES_EMAIL_DLR_EMAIL", "default": None},
+    {"name": "NOTIFICATIONS_AWS_SNS_SMS_DLR_USER", "default": None},
+    {"name": "NOTIFICATIONS_AWS_SNS_SMS_DLR_PASSWORD", "default": None},
+    {"name": "NOTIFICATIONS_AWS_SNS_SMS_DLR_EMAIL", "default": None},
+    {"name": "NOTIFICATIONS_NEXMO_SMS_DLR_USER", "default": None},
+    {"name": "NOTIFICATIONS_NEXMO_SMS_DLR_USER", "default": None},
+    {"name": "NOTIFICATIONS_NEXMO_SMS_DLR_EMAIL", "default": None},
+    {"name": "NOTIFICATIONS_T2_SMS_DLR_USER", "default": None},
+    {"name": "NOTIFICATIONS_T2_SMS_DLR_PASSWORD", "default": None},
+    {"name": "NOTIFICATIONS_T2_SMS_DLR_EMAIL", "default": None},
 )
 
 USER_CACHE_KEY = "django-user-{id}"