修复了大部分5月6日学长们发现的bug。

移除了.venv和.idea文件夹。
对数据表进行了重构,部门部分代码重构by 老孟
初步将错误信息硬编码移除
添加了requirements
给新生增加了性别
This commit is contained in:
ladeng07
2022-05-11 02:34:49 +08:00
parent 9c960aa1da
commit a1f83fefcd
13 changed files with 271 additions and 292 deletions
+10 -10
View File
@@ -3,7 +3,7 @@ from rest_framework.validators import UniqueValidator
from apps.enroll.models import NewMember, EmailVerifyRecord
from apps.history.models import Department
import time
from utils.get_error_msg import get_error_msg
from utils.get_msg import get_msg
class DepartmentSerializer(serializers.ModelSerializer):
@@ -21,16 +21,16 @@ class NewMemberSerializer(serializers.ModelSerializer):
email = serializers.EmailField(validators=[
UniqueValidator(
queryset=NewMember.objects.all(),
message=get_error_msg(43032)
message=get_msg(43032)
)
])
phone_number = serializers.CharField(validators=[
UniqueValidator(
queryset=NewMember.objects.all(),
message=get_error_msg(43033)
message=get_msg(43033)
),
],
max_length=11, error_messages={"max_length": get_error_msg(42033)}
max_length=11, error_messages={"max_length": get_msg(42033)}
)
class Meta:
@@ -40,17 +40,17 @@ class NewMemberSerializer(serializers.ModelSerializer):
extra_kwargs = {
"name": {
"error_messages": {
"max_length": get_error_msg(42034)
"max_length": get_msg(42034)
}
},
"major": {
"error_messages": {
"max_length": get_error_msg(42035)
"max_length": get_msg(42035)
}
},
"department_cn": {
"error_messages": {
"invalid_choice": get_error_msg(42036)
"invalid_choice": get_msg(42036)
}
},
@@ -72,8 +72,8 @@ class SendEmailSerializer(serializers.Serializer):
email = serializers.EmailField(max_length=50,
validators=[UniqueValidator(
queryset=NewMember.objects.all(),
message=get_error_msg(43032))],
error_messages={"max_length": get_error_msg(42032), "invalid": get_error_msg(44036)})
message=get_msg(43032))],
error_messages={"max_length": get_msg(42032), "invalid": get_msg(44036)})
def validate_email(self, data):
@@ -85,7 +85,7 @@ class SendEmailSerializer(serializers.Serializer):
now = time.time()
# print(f"now={now},send={send_time}")
if now - send_time < 120:
raise serializers.ValidationError(code="verification_code", detail=get_error_msg(44033))
raise serializers.ValidationError(code="verification_code", detail=get_msg(44033))
else:
# print(oj.email)
oj.delete()