进行了一些小小的逻辑完善,把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: class Meta:
model = NewMember model = NewMember
exclude = ["id", "schedule"] exclude = ["id", "status"]
extra_kwargs = { extra_kwargs = {
"name": { "name": {
@@ -47,6 +47,11 @@ class NewMemberSerializer(serializers.ModelSerializer):
"max_length": get_error_msg(42035) "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: class Meta:
model = NewMember model = NewMember
fields = ["name", "email", "schedule"] fields = ["name", "email", "status"]
class SendEmailSerializer(serializers.Serializer): class SendEmailSerializer(serializers.Serializer):
+3 -3
View File
@@ -39,6 +39,8 @@ class SignUpView(GenericAPIView):
data = request.data data = request.data
serializer = self.get_serializer(data=data) serializer = self.get_serializer(data=data)
code = data['verification_code'] code = data['verification_code']
ret = serializer.is_valid(raise_exception=False)
if ret:
# print(f"code={code}") # print(f"code={code}")
try: try:
oj = EmailVerifyRecord.objects.get(email=data['email']) oj = EmailVerifyRecord.objects.get(email=data['email'])
@@ -50,13 +52,11 @@ class SignUpView(GenericAPIView):
{"code": 40000, "msg": {"verification_code": get_error_msg(45032)}}, {"code": 40000, "msg": {"verification_code": get_error_msg(45032)}},
status=status.HTTP_400_BAD_REQUEST) status=status.HTTP_400_BAD_REQUEST)
if code != oj.code: if code != oj.code:
return Response({"code": 45032, "msg": {"verification_code": get_error_msg(44031)}}, return Response({"code": 45031, "msg": {"verification_code": get_error_msg(44031)}},
status=status.HTTP_400_BAD_REQUEST) status=status.HTTP_400_BAD_REQUEST)
except EmailVerifyRecord.DoesNotExist: except EmailVerifyRecord.DoesNotExist:
return Response({"code": 44032, "msg": {"verification_code": get_error_msg(44032)}}, return Response({"code": 44032, "msg": {"verification_code": get_error_msg(44032)}},
status=status.HTTP_400_BAD_REQUEST) status=status.HTTP_400_BAD_REQUEST)
ret = serializer.is_valid(raise_exception=False)
if ret:
serializer.save() serializer.save()
return Response({"code": 20000, "msg": get_error_msg(20000)}) return Response({"code": 20000, "msg": get_error_msg(20000)})
else: else:
+3 -2
View File
@@ -1,5 +1,3 @@
def get_error_msg(code="20000"):
error_set = { error_set = {
"20000": "成功", "20000": "成功",
"50000": "意外错误", "50000": "意外错误",
@@ -16,6 +14,7 @@ def get_error_msg(code="20000"):
"42033": "手机号码不合规", "42033": "手机号码不合规",
"42034": "姓名过长", "42034": "姓名过长",
"42035": "说的太多啦", "42035": "说的太多啦",
"42036": "该字段不合规",
"42032": "邮箱过长", "42032": "邮箱过长",
"44033": "请勿频繁发送验证码", "44033": "请勿频繁发送验证码",
"44036": "请输入正确格式的邮箱", "44036": "请输入正确格式的邮箱",
@@ -26,4 +25,6 @@ def get_error_msg(code="20000"):
"40005": "返回评论数为0", "40005": "返回评论数为0",
"40006": "", "40006": "",
} }
def get_error_msg(code="20000"):
return error_set.get(str(code)) return error_set.get(str(code))