ITStudio_OUC/ITShowPlatform
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
移除了.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
Download Patch File Download Diff File Expand all files Collapse all files
apps/enroll/serializers.py
+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()
apps/enroll/views.py
+13 -10
View File
@@ -7,7 +7,8 @@ from apps.enroll.serializers import DepartmentSerializer, NewMemberSerializer, N
from rest_framework import status
from rest_framework.views import APIView
from apps.enroll.email import send_code_email
from utils.get_error_msg import get_error_msg
from django.views.decorators.csrf import csrf_exempt
from utils.get_msg import get_msg
import re
import time
@@ -22,8 +23,8 @@ class DepartmentMessageView(GenericAPIView):
serializer = self.get_serializer(instance=self.get_queryset(), many=True)
# print(request.query_params)
if request.query_params:
return Response({"code": 40000, "msg": get_error_msg("40000")})
return Response({"code": 20000, "msg": get_error_msg("20000"), "data": serializer.data})
return Response({"code": 40000, "msg": get_msg("40000")})
return Response({"code": 20000, "msg": get_msg("20000"), "data": serializer.data})
class SignUpView(GenericAPIView):
@@ -36,6 +37,7 @@ class SignUpView(GenericAPIView):
serializer_class = NewMemberSerializer
queryset = NewMember.objects.all()
@csrf_exempt
def post(self, request):
data = request.data
serializer = self.get_serializer(data=data)
@@ -50,16 +52,16 @@ class SignUpView(GenericAPIView):
now = time.time()
if now - send_time > 120:
return Response(
{"code": 40000, "msg": {"verification_code": get_error_msg(45032)}},
{"code": 40000, "msg": {"verification_code": get_msg(45032)}},
status=status.HTTP_400_BAD_REQUEST)
if code != oj.code:
return Response({"code": 45031, "msg": {"verification_code": get_error_msg(44031)}},
return Response({"code": 45031, "msg": {"verification_code": get_msg(44031)}},
status=status.HTTP_400_BAD_REQUEST)
except EmailVerifyRecord.DoesNotExist:
return Response({"code": 44032, "msg": {"verification_code": get_error_msg(44032)}},
return Response({"code": 44032, "msg": {"verification_code": get_msg(44032)}},
status=status.HTTP_400_BAD_REQUEST)
serializer.save()
return Response({"code": 20000, "msg": get_error_msg(20000)})
return Response({"code": 20000, "msg": get_msg(20000)})
else:
error = {}
for (i, j) in zip(serializer.errors.keys(), serializer.errors.values()):
@@ -76,15 +78,16 @@ class SignUpView(GenericAPIView):
else:
queryset = self.get_queryset().get(id=-1)
except NewMember.DoesNotExist:
return Response({"code": 40000, "msg": get_error_msg(45030)})
return Response({"code": 40000, "msg": get_msg(45030)})
serializer = NewMemberScheduleSerializer(instance=queryset)
return Response({"code": 20000, "msg": get_error_msg(20000), "data": serializer.data})
return Response({"code": 20000, "msg": get_msg(20000), "data": serializer.data})
class SendEmailView(APIView):
"""发送邮件"""
@csrf_exempt
def post(self, request):
data = request.data
serializer = SendEmailSerializer(data=data)
@@ -93,7 +96,7 @@ class SendEmailView(APIView):
if ret:
# serializer.save()
send_code_email(data.get("email"))
return Response({"code": 20000, "msg": get_error_msg(20000)})
return Response({"code": 20000, "msg": get_msg(20000)})
else:
error = {}
for (i, j) in zip(serializer.errors.keys(), serializer.errors.values()):