From cb3076a48a6353fdd7eb919a851c7874418a215b Mon Sep 17 00:00:00 2001
From: ygm1881 <2302253692@qq.com>
Date: Sat, 7 May 2022 00:35:52 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E4=BA=86=E4=B8=80=E4=BA=9B?=
 =?UTF-8?q?=E5=B0=8F=E5=B0=8F=E7=9A=84=E9=80=BB=E8=BE=91=E5=AE=8C=E5=96=84?=
 =?UTF-8?q?,=E6=8A=8Aget=5Ferror=5Fmsg=E7=9A=84=E5=AD=97=E5=85=B8=E6=94=BE?=
 =?UTF-8?q?=E5=88=B0=E4=BA=86=E5=87=BD=E6=95=B0=E5=A4=96=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Apps/enroll/serializers.py |  9 +++++--
 Apps/enroll/views.py       | 32 ++++++++++++------------
 utils/get_error_msg.py     | 51 +++++++++++++++++++-------------------
 3 files changed, 49 insertions(+), 43 deletions(-)

diff --git a/Apps/enroll/serializers.py b/Apps/enroll/serializers.py
index 90fe84e..ea9e8ae 100644
--- a/Apps/enroll/serializers.py
+++ b/Apps/enroll/serializers.py
@@ -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):
diff --git a/Apps/enroll/views.py b/Apps/enroll/views.py
index ace3ac6..246f0ac 100644
--- a/Apps/enroll/views.py
+++ b/Apps/enroll/views.py
@@ -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:
diff --git a/utils/get_error_msg.py b/utils/get_error_msg.py
index 01262e9..b233c7b 100644
--- a/utils/get_error_msg.py
+++ b/utils/get_error_msg.py
@@ -1,29 +1,30 @@
+error_set = {
+    "20000": "成功",
+    "50000": "意外错误",
+    "50403": "Forbidden",
+    "40000": "请求方法错误",
+    "40001": "JSON解析错误",
 
+    "45030": "信息不存在",
+    "45032": "邮箱验证码过期",
+    "44031": "邮箱验证码错误",
+    "44032": "请先发送验证码",
+    "43032": "该邮箱已存在",
+    "43033": "该手机号码已存在",
+    "42033": "手机号码不合规",
+    "42034": "姓名过长",
+    "42035": "说的太多啦",
+    "42036": "该字段不合规",
+    "42032": "邮箱过长",
+    "44033": "请勿频繁发送验证码",
+    "44036": "请输入正确格式的邮箱",
+
+    "40002": "非法字符",
+    "40003": "弹幕过长",
+    "40004": "输入不能为空",
+    "40005": "返回评论数为0",
+    "40006": "",
+}
 def get_error_msg(code="20000"):
-    error_set = {
-        "20000": "成功",
-        "50000": "意外错误",
-        "50403": "Forbidden",
-        "40000": "请求方法错误",
-        "40001": "JSON解析错误",
 
-        "45030": "信息不存在",
-        "45032": "邮箱验证码过期",
-        "44031": "邮箱验证码错误",
-        "44032": "请先发送验证码",
-        "43032": "该邮箱已存在",
-        "43033": "该手机号码已存在",
-        "42033": "手机号码不合规",
-        "42034": "姓名过长",
-        "42035": "说的太多啦",
-        "42032": "邮箱过长",
-        "44033": "请勿频繁发送验证码",
-        "44036": "请输入正确格式的邮箱",
-
-        "40002": "非法字符",
-        "40003": "弹幕过长",
-        "40004": "输入不能为空",
-        "40005": "返回评论数为0",
-        "40006": "",
-    }
     return error_set.get(str(code))