From 7ee2eee4377f454fefbc66871fd9fdeb201d10dc Mon Sep 17 00:00:00 2001 From: xoliqberdiyev Date: Thu, 16 Apr 2026 15:07:52 +0500 Subject: [PATCH] some changes --- .../serializers/request/EvaluationRequest.py | 32 +++---------------- 1 file changed, 4 insertions(+), 28 deletions(-) diff --git a/core/apps/evaluation/serializers/request/EvaluationRequest.py b/core/apps/evaluation/serializers/request/EvaluationRequest.py index efd9228..6d85fe7 100644 --- a/core/apps/evaluation/serializers/request/EvaluationRequest.py +++ b/core/apps/evaluation/serializers/request/EvaluationRequest.py @@ -105,10 +105,10 @@ class CreateEvaluationrequestSerializer(serializers.ModelSerializer): allow_blank=True, ) - value_determined = serializers.IntegerField(required=False, allow_null=True) - rate_goal = serializers.IntegerField(required=False, allow_null=True) - property_rights = serializers.IntegerField(required=False, allow_null=True) - form_ownership = serializers.IntegerField(required=False, allow_null=True) + value_determined = serializers.PrimaryKeyRelatedField(required=False, queryset=ReferenceitemModel.objects.all()) + rate_goal = serializers.PrimaryKeyRelatedField(required=False, queryset=ReferenceitemModel.objects.all()) + property_rights = serializers.PrimaryKeyRelatedField(required=False, queryset=ReferenceitemModel.objects.all()) + form_ownership = serializers.PrimaryKeyRelatedField(required=False, queryset=ReferenceitemModel.objects.all()) class Meta: model = EvaluationrequestModel @@ -161,30 +161,6 @@ class CreateEvaluationrequestSerializer(serializers.ModelSerializer): {"chassi": "Yuk avtomobil uchun shassi raqami majburiy."} ) - if attrs.get("value_determined"): - if attrs.get("value_determined") not in ReferenceitemModel.objects.values_list("id", flat=True): - raise serializers.ValidationError( - {"value_determined": "Noto'g'ri qiymat aniqlandi."} - ) - - if attrs.get("rate_goal"): - if attrs.get("rate_goal") not in ReferenceitemModel.objects.values_list("id", flat=True): - raise serializers.ValidationError( - {"rate_goal": "Noto'g'ri qiymat aniqlandi."} - ) - - if attrs.get("property_rights"): - if attrs.get("property_rights") not in ReferenceitemModel.objects.values_list("id", flat=True): - raise serializers.ValidationError( - {"property_rights": "Noto'g'ri qiymat aniqlandi."} - ) - - if attrs.get("form_ownership"): - if attrs.get("form_ownership") not in ReferenceitemModel.objects.values_list("id", flat=True): - raise serializers.ValidationError( - {"form_ownership": "Noto'g'ri qiymat aniqlandi."} - ) - return attrs def create(self, validated_data):