verifying email

Author: ayushsinghal90

email_config/services.py

@@ -57,3 +57,11 @@ def get_by_email(self, email):
         except Exception as e:
             logger.error(f"Error fetching contact: {str(e)}", exc_info=True)
             raise BaseError("Error while fetching branch contact", original_exception=e)
+
+    def verify(self, email):
+        """
+        Verifies if email is blocked.
+        """
+        blocked_email = self.get_by_email(email)
+        if blocked_email:
+            raise BaseError("Email is blocked")

user/services/email_verify.py

@@ -6,18 +6,23 @@
 from commons.clients.mail_client import MailClient
 from commons.clients.redis_client import RedisClient
 from commons.enums import RedisKey
+from email_config.services import BlockedEmailService
 from mail_template.config import TEMPLATE_TYPE_CONFIG
 from mail_template.enum import TemplateType
 
 
 class EmailVerifyService:
-    def __init__(self, redis_client=None, mail_client=None):
+    def __init__(self, redis_client=None, mail_client=None, blocked_email_service=None):
         self.redis_client = redis_client or RedisClient()
         self.mail_client = mail_client or MailClient()
+        self.blocked_email_service = blocked_email_service or BlockedEmailService()
 
     def send_code(self, data):
         email = data.get("email")
 
+        # Check if the email is blocked
+        self.blocked_email_service.verify(email)
+
         # Generate a 6-digit random code
         code = f"{self.get_code()}"
 
@@ -45,6 +50,9 @@ def verify(self, data):
         email = data.get("email")
         code = data.get("code")
 
+        # Check if the email is blocked
+        self.blocked_email_service.verify(email)
+
         stored_code = self.redis_client.get(f"{RedisKey.EMAIL_VERIFICATION}:{email}")
         if stored_code is None or stored_code != code:
             return False

user/services/user.py

@@ -5,15 +5,17 @@
 
 from commons.exceptions.BaseError import BaseError
 from commons.service.BaseService import BaseService
+from email_config.services import BlockedEmailService
 from ..serializers import RegisterSerializer
 
 User = get_user_model()
 logger = logging.getLogger(__name__)
 
 
 class UserService(BaseService):
-    def __init__(self):
+    def __init__(self, blocked_email_service=None):
         super().__init__(User)
+        self.blocked_email_service = blocked_email_service or BlockedEmailService()
 
     def get_or_create(self, user_data):
         try:
@@ -32,6 +34,7 @@ def get_or_create(self, user_data):
 
     def get_by_email(self, email):
         try:
+            self.blocked_email_service.verify(email)
             return User.objects.filter(email=email).first()
         except Exception as e:
             logger.error("Error while updating branch location", exc_info=True)