Update save method and use transaction on email sending logic

Author: sudip-khanal

docker-compose.yml

@@ -22,7 +22,6 @@ x-server: &base_server_setup
     APP_HTTP_PROTOCOL: ${APP_HTTP_PROTOCOL:-http}
     SESSION_COOKIE_DOMAIN: ${SESSION_COOKIE_DOMAIN:-localhost}
     #Email
-    EMAIL_BACKEND : ${EMAIL_BACKEND:-SMTP} 
     DEFAULT_FROM_EMAIL : ${DEFAULT_FROM_EMAIL:-fake}
     EMAIL_HOST : ${EMAIL_HOST:-fake}
     EMAIL_PORT : ${EMAIL_PORT:-1025}

main/settings.py

@@ -79,8 +79,7 @@
     CELERY_RESULT_SERIALIZER=(str, "json"),
     CELERY_TIMEZONE=(str, "UTC"),
     # Email
-    EMAIL_BACKEND=str,
-    # -- SMTP
+    EMAIL_BACKEND=(str, "django.core.mail.backends.smtp.EmailBackend"),
     EMAIL_HOST=str,
     EMAIL_USE_SSL=(bool, False),
     EMAIL_PORT=int,
@@ -333,9 +332,8 @@
     STATIC_ROOT = env("DJANGO_STATIC_ROOT")
     MEDIA_ROOT = env("DJANGO_MEDIA_ROOT")
 # Email
-EMAIL_BACKEND = env("EMAIL_BACKEND").upper()
 if env("EMAIL_HOST_USER"):
-    EMAIL_BACKEND = "django.core.mail.backends.smtp.EmailBackend"
+    EMAIL_BACKEND = env("EMAIL_BACKEND")
     EMAIL_HOST = env("EMAIL_HOST")
     EMAIL_PORT = env("EMAIL_PORT")
     EMAIL_HOST_USER = env("EMAIL_HOST_USER")

user/serializers.py

@@ -8,8 +8,11 @@
 
 from main.token import TokenManager
 from user.models import User
-from user.tasks import resend_account_activation_task, send_account_creation_email_task
-from user.utils import send_password_reset_email
+from user.tasks import (
+    resend_account_activation_task,
+    send_account_creation_email_task,
+    send_password_reset_email_task,
+)
 
 
 class LoginSerializer(serializers.Serializer):
@@ -97,7 +100,7 @@ def save(self, **_):
         user.department = self.validated_data["department"]
         user.set_password(self.validated_data["password"])
         user.is_active = True
-        user.save()
+        user.save(update_fields=("first_name", "last_name", "department", "password", "is_active"))
         return user
 
 
@@ -117,7 +120,7 @@ def validate(self, attrs):
     def save(self, **_):
         assert isinstance(self.validated_data, dict)
         user_id = self.validated_data["user_id"]
-        resend_account_activation_task.delay(user_id)
+        transaction.on_commit(lambda: resend_account_activation_task.delay(user_id))
 
 
 class UserActivationSerializer(serializers.Serializer):
@@ -164,13 +167,13 @@ def validate(self, attrs):
             raise serializers.ValidationError(gettext("User with that email doesn't exists!!"))
         return {
             **attrs,
-            "user": user,
+            "user_id": user.id,
         }
 
     def save(self, **_):
         assert isinstance(self.validated_data, dict)
-        user = self.validated_data["user"]
-        send_password_reset_email(user=user)
+        user_id = self.validated_data["user_id"]
+        transaction.on_commit(lambda: send_password_reset_email_task.delay(user_id))
 
 
 class UserPasswordResetConfirmSerializer(serializers.Serializer):

user/tasks.py

@@ -4,7 +4,11 @@
 from django.contrib.auth import get_user_model
 from django.shortcuts import get_object_or_404
 
-from user.utils import resend_account_activation, send_account_creation_email
+from user.utils import (
+    resend_account_activation,
+    send_account_creation_email,
+    send_password_reset_email,
+)
 
 User = get_user_model()
 
@@ -28,3 +32,10 @@ def resend_account_activation_task(user_id):
         f"Invitation resent to {user.email}"
     else:
         logger.error(f"User with this {user.email} is already active")
+
+
+@shared_task
+def send_password_reset_email_task(user_id):
+    user = get_object_or_404(User, id=user_id)
+    send_password_reset_email(user)
+    logger.info(f"Password reset email sent to {user.email}")

user/utils.py

@@ -5,14 +5,10 @@
 
 from main.permalink import Permalink
 from main.token import TokenManager
-from user.models import User
 
 
 def send_account_creation_email(user):
-    # user = User.objects.filter(id=user_id).first()  # Fetch the user instance
-    # if not user:
-    #     print(f"User with ID {user_id} not found")
-    #     return
+
     uid = urlsafe_base64_encode(force_bytes(user.pk))
     token = TokenManager.account_registration_token_generator.make_token(user)
     activation_url = Permalink.user_activation(uid, token)
@@ -33,7 +29,7 @@ def resend_account_activation(user):
     send_mail(subject, message, settings.EMAIL_HOST_USER, [user.email])
 
 
-def send_password_reset_email(user: User):
+def send_password_reset_email(user):
 
     uid = urlsafe_base64_encode(force_bytes(user.pk))
     token = TokenManager.password_reset_token_generator.make_token(user)