修改了部门详情的model,
添加了对数据库数据输出前的格式验证
This commit is contained in:
+50
-51
@@ -1,27 +1,32 @@
|
||||
import re
|
||||
|
||||
from rest_framework import serializers
|
||||
from history.models import *
|
||||
from django.core.validators import int_list_validator
|
||||
|
||||
|
||||
class DepartmentSerializer(serializers.HyperlinkedModelSerializer):
|
||||
class Meta:
|
||||
model = Department
|
||||
fields = ('did', 'department_en', 'department', 'part', 'title', 'content')
|
||||
def validate_department(value):
|
||||
reg = re.compile(r'^[\u4e00-\u9fa5A-Za-z]*$')
|
||||
if not reg.match(value):
|
||||
raise serializers.ValidationError("部门名称中只能输入汉字或英文")
|
||||
|
||||
def validate_department(self, value):
|
||||
reg = re.compile(r'^[\u4e00-\u9fa5A-Za-z]*$')
|
||||
if not reg.match(value):
|
||||
raise serializers.ValidationError("只能输入汉字")
|
||||
return value
|
||||
|
||||
def validate_department_en(self, value):
|
||||
reg = re.compile(r'^[A-Za-z]*$')
|
||||
if not reg.match(value):
|
||||
raise serializers.ValidationError("只能输入英文")
|
||||
return value
|
||||
def validate_department_en(value):
|
||||
reg = re.compile(r'^[A-Za-z][A-Za-z\s]*$')
|
||||
if not reg.match(value):
|
||||
raise serializers.ValidationError("部门英文名称中只能输入英文")
|
||||
|
||||
|
||||
def name_validate(value):
|
||||
reg = re.compile(r'^[\u4e00-\u9fa5A-Za-z]*$')
|
||||
if not reg.match(value):
|
||||
raise serializers.ValidationError("姓名只能输入汉字或英文")
|
||||
|
||||
#
|
||||
# def validate_avatar(value):
|
||||
# s = str(value)
|
||||
# return s
|
||||
|
||||
|
||||
class DepartmentSerializer(serializers.Serializer):
|
||||
did = serializers.IntegerField(required=True, error_messages={"blank": '部门ID不能为空', "invalid": '类型错误'})
|
||||
department = serializers.CharField(max_length=10, required=True, trim_whitespace=True,
|
||||
validators=[validate_department],
|
||||
@@ -29,11 +34,17 @@ class DepartmentSerializer(serializers.HyperlinkedModelSerializer):
|
||||
department_en = serializers.CharField(max_length=30, required=True, trim_whitespace=True,
|
||||
validators=[validate_department_en],
|
||||
error_messages={"max_length": '长度过长', "blank": '部门英文名称不能为空'})
|
||||
part = serializers.IntegerField(required=True, error_messages={"blank": '不能为空'}) # 区分同意部分不同段落
|
||||
title = serializers.CharField(required=False, trim_whitespace=True, max_length=30,
|
||||
error_messages={"max_length": '题目过长'})
|
||||
content = serializers.CharField(max_length=600, required=True, trim_whitespace=True,
|
||||
content = serializers.CharField(max_length=800, required=True, trim_whitespace=True,
|
||||
error_messages={"max_length": '内容过长', "blank": '内容不能为空'})
|
||||
introduction = serializers.CharField(max_length=800, required=True, trim_whitespace=True,
|
||||
error_messages={"max_length": '内容过长', "blank": '内容不能为空'})
|
||||
|
||||
# class Meta:
|
||||
# model = Department
|
||||
# fields = ('did', 'department_en', 'department', '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)
|
||||
@@ -47,21 +58,7 @@ class DepartmentSerializer(serializers.HyperlinkedModelSerializer):
|
||||
|
||||
|
||||
class MembersSerializer(serializers.HyperlinkedModelSerializer):
|
||||
class Meta:
|
||||
model = Members
|
||||
fields = ('id', 'did', 'department', 'grade', 'name', 'motto', 'avatar')
|
||||
|
||||
def name_validate(self, value):
|
||||
reg = re.compile(r'^[\u4e00-\u9fa5A-Za-z]*$')
|
||||
if not reg.match(value):
|
||||
raise serializers.ValidationError("只能输入汉字或英文")
|
||||
return value
|
||||
|
||||
def validate_avatar(self, value):
|
||||
s = str(value)
|
||||
return s
|
||||
|
||||
id = serializers.IntegerField()
|
||||
did = serializers.IntegerField(required=True, error_messages={"blank": '部门ID不能为空', "invalid": '类型错误'})
|
||||
department = serializers.CharField(max_length=10, required=True, trim_whitespace=True,
|
||||
error_messages={"max_length": '部门名称过长', "blank": '部门名称不能为空'})
|
||||
@@ -71,7 +68,14 @@ class MembersSerializer(serializers.HyperlinkedModelSerializer):
|
||||
error_messages={"blank": '姓名不能为空', "max_length": '姓名过长'})
|
||||
motto = serializers.CharField(required=False, trim_whitespace=True, max_length=25, validators=[name_validate],
|
||||
error_messages={"max_length": '座右铭过长'})
|
||||
avatar = serializers.ImageField(validators=[name_validate])
|
||||
# avatar = serializers.ImageField(validators=[validate_avatar])
|
||||
|
||||
class Meta:
|
||||
model = Members
|
||||
fields = ('did', 'department', '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)
|
||||
@@ -84,16 +88,7 @@ class MembersSerializer(serializers.HyperlinkedModelSerializer):
|
||||
return instance
|
||||
|
||||
|
||||
class HistorySerializer(serializers.HyperlinkedModelSerializer):
|
||||
class Meta:
|
||||
model = History
|
||||
fields = ('grade', 'did', 'department')
|
||||
|
||||
def validate_department(self, value):
|
||||
reg = re.compile(r'^[\u4e00-\u9fa5A-Za-z]*$')
|
||||
if not reg.match(value):
|
||||
raise serializers.ValidationError("只能输入汉字")
|
||||
return value
|
||||
class HistorySerializer(serializers.Serializer):
|
||||
|
||||
grade = serializers.IntegerField(required=True, min_value=2001, max_value=2022,
|
||||
error_messages={"max_value": '年级数过大', "blank": "年级数不能为空", "min_value": '年级数过小'})
|
||||
@@ -102,9 +97,13 @@ class HistorySerializer(serializers.HyperlinkedModelSerializer):
|
||||
validators=[validate_department],
|
||||
error_messages={"max_length": '部门名称过长', "blank": '部门名称不能为空'})
|
||||
|
||||
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
|
||||
# class Meta:
|
||||
# model = History
|
||||
# fields = ('grade', 'did', 'department')
|
||||
#
|
||||
# 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
|
||||
|
||||
Reference in New Issue
Block a user