mirror of
https://github.com/lemeow125/StudE-Backend.git
synced 2025-06-28 16:25:44 +08:00
Fixed user serializer still using django default user
This commit is contained in:
parent
05d9dbd296
commit
e567b5d399
4 changed files with 50 additions and 12 deletions
|
@ -1,9 +1,13 @@
|
|||
from djoser.serializers import UserCreateSerializer as BaseUserRegistrationSerializer
|
||||
from djoser.serializers import UserSerializer as BaseUserSerializer
|
||||
from django.core import exceptions as django_exceptions
|
||||
from rest_framework import exceptions as drf_exceptions
|
||||
from rest_framework import serializers
|
||||
from accounts.models import CustomUser
|
||||
from student_status.serializers import StudentStatusSerializer
|
||||
from student_status.models import StudentStatus
|
||||
from rest_framework.settings import api_settings
|
||||
from django.contrib.auth.password_validation import validate_password
|
||||
|
||||
|
||||
class CustomUserSerializer(BaseUserSerializer):
|
||||
|
@ -15,20 +19,38 @@ class CustomUserSerializer(BaseUserSerializer):
|
|||
fields = ('username', 'email', 'password',
|
||||
'student_id_number', 'year_level', 'semester', 'course', 'subjects', 'avatar', 'first_name', 'last_name', 'is_banned', 'user_status')
|
||||
|
||||
# The model from your custom user
|
||||
|
||||
class UserRegistrationSerializer(BaseUserRegistrationSerializer):
|
||||
class Meta(BaseUserRegistrationSerializer.Meta):
|
||||
fields = ('username', 'email', 'password',
|
||||
'student_id_number', 'year_level', 'semester', 'course', 'subjects', 'avatar', 'first_name', 'last_name')
|
||||
|
||||
class UserRegistrationSerializer(serializers.ModelSerializer):
|
||||
email = serializers.EmailField(required=True)
|
||||
student_id_number = serializers.CharField(required=True)
|
||||
password = serializers.CharField(write_only=True)
|
||||
|
||||
class Meta:
|
||||
model = CustomUser # Use your custom user model here
|
||||
fields = ('username', 'email', 'password', 'student_id_number',
|
||||
'year_level', 'semester', 'course', 'subjects', 'avatar',
|
||||
'first_name', 'last_name')
|
||||
|
||||
def validate(self, attrs):
|
||||
user = self.Meta.model(**attrs)
|
||||
password = attrs.get("password")
|
||||
try:
|
||||
validate_password(password, user)
|
||||
except django_exceptions.ValidationError as e:
|
||||
serializer_error = serializers.as_serializer_error(e)
|
||||
raise serializers.ValidationError(
|
||||
{"password": serializer_error[api_settings.NON_FIELD_ERRORS_KEY]}
|
||||
)
|
||||
|
||||
return super().validate(attrs)
|
||||
|
||||
def create(self, validated_data):
|
||||
# Get the user's year_level and semester from the user model instance
|
||||
user = self.Meta.model(**validated_data)
|
||||
user.set_password(validated_data['password'])
|
||||
user.save()
|
||||
|
||||
# Create a new user using the base serializer's create() method
|
||||
user = super().create(validated_data)
|
||||
|
||||
# Create a student_status object for the user
|
||||
StudentStatus.objects.create(
|
||||
user=user,
|
||||
active=False,
|
||||
|
@ -36,5 +58,4 @@ class UserRegistrationSerializer(BaseUserRegistrationSerializer):
|
|||
y=None,
|
||||
subject=None
|
||||
)
|
||||
|
||||
return user
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue