From 47833176e2cbe7126f6545c47b95785c43ee5263 Mon Sep 17 00:00:00 2001 From: xoliqberdiyev Date: Mon, 20 Apr 2026 18:10:51 +0500 Subject: [PATCH] fix --- ..._autoevaluationmodel_evaluation_request.py | 19 +++++++++++++++++++ core/apps/evaluation/models/auto.py | 8 ++++++++ .../serializers/auto/AutoEvaluation.py | 9 ++++++++- 3 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 core/apps/evaluation/migrations/0030_autoevaluationmodel_evaluation_request.py diff --git a/core/apps/evaluation/migrations/0030_autoevaluationmodel_evaluation_request.py b/core/apps/evaluation/migrations/0030_autoevaluationmodel_evaluation_request.py new file mode 100644 index 0000000..57d70ac --- /dev/null +++ b/core/apps/evaluation/migrations/0030_autoevaluationmodel_evaluation_request.py @@ -0,0 +1,19 @@ +# Generated by Django 5.2.7 on 2026-04-20 13:08 + +import django.db.models.deletion +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('evaluation', '0029_autoevaluationmodel_user'), + ] + + operations = [ + migrations.AddField( + model_name='autoevaluationmodel', + name='evaluation_request', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='auto_evaluations_request', to='evaluation.evaluationrequestmodel', verbose_name='evaluation request'), + ), + ] diff --git a/core/apps/evaluation/models/auto.py b/core/apps/evaluation/models/auto.py index dc94672..144fa8f 100644 --- a/core/apps/evaluation/models/auto.py +++ b/core/apps/evaluation/models/auto.py @@ -30,6 +30,14 @@ class AutoEvaluationModel(AbstractBaseModel): null=True, blank=True, ) + evaluation_request = models.ForeignKey( + "evaluation.EvaluationRequestModel", + on_delete=models.SET_NULL, + related_name="auto_evaluations_request", + verbose_name=_("evaluation request"), + null=True, + blank=True, + ) valuation = models.OneToOneField( ValuationModel, on_delete=models.CASCADE, diff --git a/core/apps/evaluation/serializers/auto/AutoEvaluation.py b/core/apps/evaluation/serializers/auto/AutoEvaluation.py index 40b5a77..e9dfe50 100644 --- a/core/apps/evaluation/serializers/auto/AutoEvaluation.py +++ b/core/apps/evaluation/serializers/auto/AutoEvaluation.py @@ -3,7 +3,7 @@ from django.contrib.auth import get_user_model from rest_framework import serializers -from core.apps.evaluation.models import AutoEvaluationModel,ReferenceitemModel +from core.apps.evaluation.models import AutoEvaluationModel,ReferenceitemModel, EvaluationrequestModel from core.apps.evaluation.serializers.reference import ListReferenceitemSerializer User = get_user_model() @@ -50,6 +50,7 @@ class BaseAutoevaluationSerializer(serializers.ModelSerializer): "property_rights", "form_ownership", "user", + "evaluation_request", ] def get_user(self, obj): @@ -265,6 +266,11 @@ class CreateAutoevaluationSerializer(serializers.ModelSerializer): required=False, allow_null=True, ) + evaluation_request = serializers.PrimaryKeyRelatedField( + queryset=EvaluationrequestModel.objects.all(), + required=False, + allow_null=True, + ) class Meta: @@ -272,6 +278,7 @@ class CreateAutoevaluationSerializer(serializers.ModelSerializer): fields = [ # Step 1 "registration_number", + "evaluation_request", "contract_date", "object_inspection_date", "rate_date",