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

移除了.venv和.idea文件夹。
对数据表进行了重构，部门部分代码重构by 老孟
初步将错误信息硬编码移除
添加了requirements
给新生增加了性别

apps/history/admin.py

@@ -5,3 +5,4 @@ from .models import *
 admin.site.register(Department)
 admin.site.register(History)
 admin.site.register(Members)
+#admin.site.register(DepartmentName)

apps/history/serializers.py

@@ -1,27 +1,24 @@
 import re
 from rest_framework import serializers
-
 from apps.history import *
 from apps.history.models import Department, Members, History
 
 
-# def validate_department(value):
-#     reg = re.compile(r'^[\u4e00-\u9fa5A-Za-z]*$')
-#     if not reg.match(value):
-#         raise serializers.ValidationError("42011-部门名称中只能输入汉字或英文")
-#
-#
-# def validate_department_en(value):
-#     reg = re.compile(r'^[A-Za-z][A-Za-z\s]*$')
-#     if not reg.match(value):
-#         raise serializers.ValidationError("42010-部门英文名称中只能输入英文")
-#
-#
-# def name_validate(value):
-#     reg = re.compile(r'^[\u4e00-\u9fa5A-Za-z]*$')
-#     if not reg.match(value):
-#         raise serializers.ValidationError("42012-姓名只能输入汉字或英文")
+def validate_department(value):
+    reg = re.compile(r'^[\u4e00-\u9fa5A-Za-z]*$')
+    if not reg.match(value):
+        raise serializers.ValidationError("42011-部门名称中只能输入汉字或英文")
 
+def validate_department_en(value):
+    reg = re.compile(r'^[A-Za-z][A-Za-z\s]*$')
+    if not reg.match(value):
+        raise serializers.ValidationError("42010-部门英文名称中只能输入英文")
+
+
+def name_validate(value):
+    reg = re.compile(r'^[\u4e00-\u9fa5A-Za-z]*$')
+    if not reg.match(value):
+        raise serializers.ValidationError("42012-姓名只能输入汉字或英文")
 
 #
 # def validate_avatar(value):
@@ -29,188 +26,91 @@ from apps.history.models import Department, Members, History
 #     return s
 
 
-# class DepartmentSerializer(serializers.Serializer):
-#     did = serializers.IntegerField(required=True, error_messages={"blank": '41010-部门ID不能为空', "invalid": '42020-类型错误'})
-#     department_cn = serializers.CharField(max_length=10, required=True, trim_whitespace=True,
-#                                           validators=[validate_department],
-#                                           error_messages={"max_length": '42021-部门名称长度过长', "blank": '41011-部门名称不能为空'})
-#     department_en = serializers.CharField(max_length=30, required=True, trim_whitespace=True,
-#                                           validators=[validate_department_en],
-#                                           error_messages={"max_length": '42022-部门英文名称长度过长',
-#                                                           "blank": '41012-部门英文名称不能为空'})
-#     content = serializers.CharField(max_length=800, required=True, trim_whitespace=True,
-#                                     error_messages={"max_length": '42023-内容过长', "blank": '41013-内容不能为空'})
-#     introduction = serializers.CharField(max_length=800, required=True, trim_whitespace=True,
-#                                          error_messages={"max_length": '42024-介绍内容过长', "blank": '41014-介绍内容不能为空'})
-#
-#     # class Meta:
-#     #     model = Department
-#     #     fields = ('did', 'department_en', 'department_cn', 'part', 'title', 'content')
-#
-#     def create(self, validated_data):
-#         return Department.objects.create(**validated_data)
-#
-#     def update(self, instance, validated_data):
-#         instance.content = validated_data.get("content", instance.content)
-#         instance.department_cn = validated_data.get("department_cn", instance.department_cn)
-#         instance.department_en = validated_data.get("department_en", instance.department_en)
-#         instance.id = validated_data.get("id", instance.id)
-#         instance.title = validated_data.get("title", instance.title)
-#         instance.part = validated_data.get("part", instance.part)
-#         instance.save()
-#         return instance
+class DepartmentSerializer(serializers.Serializer):
+    did = serializers.IntegerField(required=True, error_messages={"blank": '41010-部门ID不能为空', "invalid": '42020-类型错误'})
+    department = serializers.CharField(max_length=10, required=True, trim_whitespace=True,
+                                       validators=[validate_department],
+                                       error_messages={"max_length": '42021-部门名称长度过长', "blank": '41011-部门名称不能为空'})
+    department_en = serializers.CharField(max_length=30, required=True, trim_whitespace=True,
+                                          validators=[validate_department_en],
+                                          error_messages={"max_length": '42022-部门英文名称长度过长',
+                                                          "blank": '41012-部门英文名称不能为空'})
+    content = serializers.CharField(max_length=800, required=True, trim_whitespace=True,
+                                    error_messages={"max_length": '42023-内容过长', "blank": '41013-内容不能为空'})
+    introduction = serializers.CharField(max_length=800, required=True, trim_whitespace=True,
+                                         error_messages={"max_length": '42024-介绍内容过长', "blank": '41014-介绍内容不能为空'})
 
-class DepartmentSerializer(serializers.ModelSerializer):
-    class Meta:
-        model = Department
-        fields = "__all__"
+    # class Meta:
+    #     model = Department
+    #     fields = ('did', 'department_en', 'department', 'part', 'title', 'content')
 
-        extra_kwargs = {
-            "department_cn": {
-                "error_messages": {
-                    "max_length": '42021-部门名称长度过长',
-                    "blank": '41011-部门名称不能为空'
-                }
-            },
-            "department_en": {
-                "error_messages": {
-                    "max_length": '42022-部门英文名称长度过长',
-                    "blank": '41012-部门英文名称不能为空'
-                }
-            },
-            "content": {
-                "error_messages": {
-                    "max_length": '42023-内容过长',
-                    "blank": '41013-内容不能为空'
-                }
-            },
-            "introduction": {
-                "error_messages": {
-                    "max_length": '42024-介绍内容过长',
-                    "blank": '41014-介绍内容不能为空'
-                }
-            }
-        }
+    def create(self, validated_data):
+        return Department.objects.create(**validated_data)
 
-    def validate_department_cn(self, data):
-        reg = re.compile(r'^[\u4e00-\u9fa5A-Za-z]*$')
-        if not reg.match(data):
-            raise serializers.ValidationError("42011-部门名称中只能输入汉字或英文")
-        return data
-
-    def validate_department_en(self, data):
-        reg = re.compile(r'^[A-Za-z][A-Za-z\s]*$')
-        if not reg.match(data):
-            raise serializers.ValidationError("42010-部门英文名称中只能输入英文")
-        return data
-
-    def validate_name(self, data):
-        reg = re.compile(r'^[\u4e00-\u9fa5A-Za-z]*$')
-        if not reg.match(data):
-            raise serializers.ValidationError("42012-姓名只能输入汉字或英文")
-        return data
+    def update(self, instance, validated_data):
+        instance.content = validated_data.get("content", instance.content)
+        instance.department = validated_data.get("department", instance.department)
+        instance.department_en = validated_data.get("department_en", instance.department_en)
+        instance.id = validated_data.get("id", instance.id)
+        instance.title = validated_data.get("title", instance.title)
+        instance.part = validated_data.get("part", instance.part)
+        instance.save()
+        return instance
 
 
-# class MembersSerializer(serializers.HyperlinkedModelSerializer):
-#     did = serializers.IntegerField(required=True, error_messages={"blank": '41010-部门ID不能为空', "invalid": '42020-类型错误'})
-#     department = serializers.CharField(max_length=10, required=True, trim_whitespace=True,
-#                                        error_messages={"max_length": '42021-部门名称过长', "blank": '41011-部门名称不能为空'})
-#     grade = serializers.IntegerField(required=True, min_value=2001, max_value=2022,
-#                                      error_messages={"max_value": '42025-年级数过大', "blank": "41015-年级数不能为空",
-#                                                      "min_value": '42026-年级数过小'})
-#     name = serializers.CharField(required=True, trim_whitespace=True, max_length=6,
-#                                  error_messages={"blank": '41016-姓名不能为空', "max_length": '42027-姓名过长'})
-#     motto = serializers.CharField(required=False, trim_whitespace=True, max_length=25, validators=[name_validate],
-#                                   error_messages={"max_length": '42028-座右铭过长'})
-#
-#     # avatar = serializers.ImageField(validators=[validate_avatar])
-#
-#     class Meta:
-#         model = Members
-#         fields = ('did', 'department_cn', 'grade', 'name', 'motto')
-#
-#     def create(self, validated_data):
-#         return Members.objects.create(**validated_data)
-#
-#     def update(self, instance, validated_data):
-#         instance.did = validated_data.get("did", instance.did)
-#         instance.department_cn = validated_data.get("department_cn", instance.department_cn)
-#         instance.grade = validated_data.get("grade", instance.grade)
-#         instance.name = validated_data.get("name", instance.name)
-#         instance.motto = validated_data.get("motto", instance.motto)
-#         instance.avatar = validated_data.get("avatar", instance.avatar)
-#         instance.save()
-#         return instance
+class MembersSerializer(serializers.HyperlinkedModelSerializer):
 
-class MembersSerializer(serializers.ModelSerializer):
-    department = serializers.CharField(source="department.department_cn")
+    did = serializers.IntegerField(required=True, error_messages={"blank": '41010-部门ID不能为空', "invalid": '42020-类型错误'})
+    department = serializers.CharField(max_length=10, required=True, trim_whitespace=True,
+                                       error_messages={"max_length": '42021-部门名称过长', "blank": '41011-部门名称不能为空'})
+    grade = serializers.IntegerField(required=True, min_value=2001, max_value=2022,
+                                     error_messages={"max_value": '42025-年级数过大', "blank": "41015-年级数不能为空",
+                                                     "min_value": '42026-年级数过小'})
+    name = serializers.CharField(required=True, trim_whitespace=True, max_length=6,
+                                 error_messages={"blank": '41016-姓名不能为空', "max_length": '42027-姓名过长'})
+    motto = serializers.CharField(required=False, trim_whitespace=True, max_length=25, validators=[name_validate],
+                                  error_messages={"max_length": '42028-座右铭过长'})
+    # avatar = serializers.ImageField(validators=[validate_avatar])
 
     class Meta:
         model = Members
         fields = ('did', 'department', 'grade', 'name', 'motto')
 
-        extra_kwargs = {
-            "did": {
-                "error_messages": {
-                    "blank": '41010-部门ID不能为空',
-                    "invalid": '42020-类型错误'
-                }
-            },
-            "department": {
-                "error_messages": {
-                    "max_length": '42021-部门名称过长',
-                    "blank": '41011-部门名称不能为空'
-                }
-            },
-            "grade": {
-                "error_messages": {
-                    "max_value": '42025-年级数过大',
-                    "blank": "41015-年级数不能为空",
-                    "min_value": '42026-年级数过小'
-                }
-            },
-            "name": {
-                "error_messages": {
-                    "blank": '41016-姓名不能为空',
-                    "max_length": '42027-姓名过长'
-                }
-            },
-            "motto": {
-                "error_messages": {
-                    "max_length": '42028-座右铭过长'
-                }
-            }
+    def create(self, validated_data):
+        return Members.objects.create(**validated_data)
 
-        }
+    def update(self, instance, validated_data):
+        instance.did = validated_data.get("did", instance.did)
+        instance.department = validated_data.get("department", instance.department)
+        instance.grade = validated_data.get("grade", instance.grade)
+        instance.name = validated_data.get("name", instance.name)
+        instance.motto = validated_data.get("motto", instance.motto)
+        instance.avatar = validated_data.get("avatar", instance.avatar)
+        instance.save()
+        return instance
 
 
-# class HistorySerializer(serializers.Serializer):
-#     grade = serializers.IntegerField(required=True, min_value=2001, max_value=2022,
-#                                      error_messages={"max_value": '42025-年级数过大', "blank": "41015-年级数不能为空",
-#                                                      "min_value": '42026-年级数过小'})
-#     did = serializers.IntegerField(required=True, error_messages={"blank": '41010-部门ID不能为空', "invalid": '42020-类型错误'})
-#     department = serializers.CharField(max_length=10, required=True, trim_whitespace=True,
-#                                        validators=[validate_department],
-#                                        error_messages={"max_length": '42021-部门名称过长', "blank": '41011-部门名称不能为空'})
-#
-#     # class Meta:
-#     #     model = History
-#     #     fields = ('grade', 'did', 'department_cn')
-#     #
-#
-#     def create(self, validated_data):
-#         return History.objects.create(**validated_data)
-#
-#     def update(self, instance, validated_data):
-#         instance.department_cn = validated_data.get("department_cn", instance.department_cn)
-#         instance.grade = validated_data.get("grade", instance.grade)
-#         instance.did = validated_data.get("did", instance.did)
-#         instance.save()
-#         return instance
+class HistorySerializer(serializers.Serializer):
 
-class HistorySerializer(serializers.ModelSerializer):
-    department = serializers.CharField(source="department.department_cn")
+    grade = serializers.IntegerField(required=True, min_value=2001, max_value=2022,
+                                     error_messages={"max_value": '42025-年级数过大', "blank": "41015-年级数不能为空",
+                                                     "min_value": '42026-年级数过小'})
+    did = serializers.IntegerField(required=True, error_messages={"blank": '41010-部门ID不能为空', "invalid": '42020-类型错误'})
+    department = serializers.CharField(max_length=10, required=True, trim_whitespace=True,
+                                       validators=[validate_department],
+                                       error_messages={"max_length": '42021-部门名称过长', "blank": '41011-部门名称不能为空'})
 
-    class Meta:
-        model = History
-        fields = ('years', 'department')
+    # class Meta:
+    #     model = History
+    #     fields = ('grade', 'did', 'department')
+    #
+
+    def create(self, validated_data):
+        return History.objects.create(**validated_data)
+
+    def update(self, instance, validated_data):
+        instance.department = validated_data.get("department", instance.department)
+        instance.grade = validated_data.get("grade", instance.grade)
+        instance.did = validated_data.get("did", instance.did)
+        instance.save()
+        return instance