进行了一些小小的逻辑完善,把get_error_msg的字典放到了函数外面

This commit is contained in:
ygm1881
2022-05-07 00:35:52 +08:00
parent f328a0e2b6
commit cb3076a48a
3 changed files with 49 additions and 43 deletions
+7 -2
View File
@@ -34,7 +34,7 @@ class NewMemberSerializer(serializers.ModelSerializer):
class Meta:
model = NewMember
exclude = ["id", "schedule"]
exclude = ["id", "status"]
extra_kwargs = {
"name": {
@@ -47,6 +47,11 @@ class NewMemberSerializer(serializers.ModelSerializer):
"max_length": get_error_msg(42035)
}
},
"department": {
"error_messages": {
"invalid_choice": get_error_msg(42036)
}
},
}
@@ -56,7 +61,7 @@ class NewMemberScheduleSerializer(serializers.ModelSerializer):
class Meta:
model = NewMember
fields = ["name", "email", "schedule"]
fields = ["name", "email", "status"]
class SendEmailSerializer(serializers.Serializer):
+16 -16
View File
@@ -39,24 +39,24 @@ class SignUpView(GenericAPIView):
data = request.data
serializer = self.get_serializer(data=data)
code = data['verification_code']
# print(f"code={code}")
try:
oj = EmailVerifyRecord.objects.get(email=data['email'])
send_time = str(oj.send_time).split('+')[0].split('.')[0]
send_time = time.mktime(time.strptime(send_time, '%Y-%m-%d %X'))
now = time.time()
if now - send_time > 120:
return Response(
{"code": 40000, "msg": {"verification_code": get_error_msg(45032)}},
status=status.HTTP_400_BAD_REQUEST)
if code != oj.code:
return Response({"code": 45032, "msg": {"verification_code": get_error_msg(44031)}},
status=status.HTTP_400_BAD_REQUEST)
except EmailVerifyRecord.DoesNotExist:
return Response({"code": 44032, "msg": {"verification_code": get_error_msg(44032)}},
status=status.HTTP_400_BAD_REQUEST)
ret = serializer.is_valid(raise_exception=False)
if ret:
# print(f"code={code}")
try:
oj = EmailVerifyRecord.objects.get(email=data['email'])
send_time = str(oj.send_time).split('+')[0].split('.')[0]
send_time = time.mktime(time.strptime(send_time, '%Y-%m-%d %X'))
now = time.time()
if now - send_time > 120:
return Response(
{"code": 40000, "msg": {"verification_code": get_error_msg(45032)}},
status=status.HTTP_400_BAD_REQUEST)
if code != oj.code:
return Response({"code": 45031, "msg": {"verification_code": get_error_msg(44031)}},
status=status.HTTP_400_BAD_REQUEST)
except EmailVerifyRecord.DoesNotExist:
return Response({"code": 44032, "msg": {"verification_code": get_error_msg(44032)}},
status=status.HTTP_400_BAD_REQUEST)
serializer.save()
return Response({"code": 20000, "msg": get_error_msg(20000)})
else: