fix
This commit is contained in:
@@ -16,6 +16,7 @@ class BaseAutoevaluationSerializer(serializers.ModelSerializer):
|
||||
value_determined = ListReferenceitemSerializer(read_only=True)
|
||||
property_rights = ListReferenceitemSerializer(read_only=True)
|
||||
form_ownership = ListReferenceitemSerializer(read_only=True)
|
||||
user = serializers.SerializerMethodField(method_name="get_user", read_only=True)
|
||||
|
||||
class Meta:
|
||||
model = AutoEvaluationModel
|
||||
@@ -48,8 +49,19 @@ class BaseAutoevaluationSerializer(serializers.ModelSerializer):
|
||||
"rate_type",
|
||||
"property_rights",
|
||||
"form_ownership",
|
||||
"user",
|
||||
]
|
||||
|
||||
def get_user(self, obj):
|
||||
request = self.context.get('request')
|
||||
return {
|
||||
"id": obj.user.id,
|
||||
"phone": obj.user.phone,
|
||||
"first_name": obj.user.first_name,
|
||||
"last_name": obj.user.last_name,
|
||||
"avatar": request.build_absolute_uri(obj.user.avatar.url) if obj.user.avatar else None
|
||||
}
|
||||
|
||||
|
||||
class ListAutoevaluationSerializer(BaseAutoevaluationSerializer):
|
||||
class Meta(BaseAutoevaluationSerializer.Meta):
|
||||
@@ -317,7 +329,6 @@ class CreateAutoevaluationSerializer(serializers.ModelSerializer):
|
||||
|
||||
def validate(self, attrs):
|
||||
owner_type = attrs.get("object_owner_type")
|
||||
|
||||
if owner_type == 1:
|
||||
required_fields = {
|
||||
"object_owner_individual_person_f_name": "Ismi",
|
||||
@@ -343,10 +354,15 @@ class CreateAutoevaluationSerializer(serializers.ModelSerializer):
|
||||
|
||||
return attrs
|
||||
|
||||
def create(self, validated_data):
|
||||
user = self.context.get('request').user
|
||||
validated_data['user'] = user
|
||||
return super().create(validated_data)
|
||||
|
||||
|
||||
class AutoEvaluationAppraisersSerializer(serializers.Serializer):
|
||||
ids = serializers.ListField(child=serializers.IntegerField())
|
||||
|
||||
|
||||
def validate(self, data):
|
||||
if not data.get("ids"):
|
||||
raise serializers.ValidationError("Appraisers IDs are required.")
|
||||
|
||||
Reference in New Issue
Block a user