feat(users): normalize email identity storage
This commit is contained in:
@@ -1,9 +1,12 @@
|
||||
from django.contrib.auth.models import AbstractUser
|
||||
from django.db import models
|
||||
from django.db.models import Q
|
||||
from django.db.models.functions import Lower
|
||||
|
||||
from core.models.base import BaseModel
|
||||
from core.utils import calculate_age, common_datetime_str
|
||||
|
||||
from apps.users.email_identity import normalize_email_identity
|
||||
from apps.users.services.managers import UserManager
|
||||
|
||||
|
||||
@@ -11,7 +14,7 @@ class User(AbstractUser, BaseModel):
|
||||
username = None
|
||||
|
||||
mobile = models.CharField(max_length=11, unique=True)
|
||||
email = models.EmailField(blank=True, default="")
|
||||
email = models.EmailField(blank=True, null=True, default=None)
|
||||
|
||||
description = models.TextField(blank=True, default="")
|
||||
profile_picture = models.ImageField(upload_to="profile/users/", blank=True, null=True)
|
||||
@@ -41,11 +44,22 @@ class User(AbstractUser, BaseModel):
|
||||
def __str__(self):
|
||||
return self.full_name or self.mobile
|
||||
|
||||
def save(self, *args, **kwargs):
|
||||
self.email = normalize_email_identity(self.email)
|
||||
super().save(*args, **kwargs)
|
||||
|
||||
class Meta:
|
||||
verbose_name = "user"
|
||||
verbose_name_plural = "users"
|
||||
db_table = "user"
|
||||
ordering = ("-updated_at", "-created_at")
|
||||
constraints = (
|
||||
models.UniqueConstraint(
|
||||
Lower("email"),
|
||||
condition=Q(email__isnull=False),
|
||||
name="user_email_ci_uniq",
|
||||
),
|
||||
)
|
||||
indexes = (
|
||||
models.Index(fields=["id"], name="user_id_idx"),
|
||||
models.Index(fields=["mobile"], name="user_mobile_idx"),
|
||||
@@ -78,7 +92,7 @@ class UserSocialAccount(BaseModel):
|
||||
user = models.ForeignKey(User, on_delete=models.CASCADE, related_name="social_accounts")
|
||||
provider = models.CharField(max_length=32, choices=ProviderType.choices)
|
||||
provider_user_id = models.CharField(max_length=255)
|
||||
email = models.EmailField(blank=True, default="")
|
||||
email = models.EmailField(blank=True, null=True, default=None)
|
||||
email_verified = models.BooleanField(default=False)
|
||||
avatar_url = models.URLField(blank=True, default="")
|
||||
|
||||
@@ -100,3 +114,7 @@ class UserSocialAccount(BaseModel):
|
||||
|
||||
def __str__(self):
|
||||
return f"{self.provider}:{self.provider_user_id}"
|
||||
|
||||
def save(self, *args, **kwargs):
|
||||
self.email = normalize_email_identity(self.email)
|
||||
super().save(*args, **kwargs)
|
||||
|
||||
Reference in New Issue
Block a user