From 4a958f064bd9aff134fab8ad710a90c9b130db8e Mon Sep 17 00:00:00 2001 From: xoliqberdiyev Date: Tue, 28 Apr 2026 16:09:25 +0500 Subject: [PATCH] remove unused fields from auto-evalution model --- ...evaluationmodel_form_ownership_and_more.py | 53 +++++++++++++++++++ core/apps/evaluation/models/auto.py | 28 ---------- .../serializers/auto/AutoEvaluation.py | 38 ------------- core/apps/evaluation/views/auto.py | 2 - 4 files changed, 53 insertions(+), 68 deletions(-) create mode 100644 core/apps/evaluation/migrations/0036_remove_autoevaluationmodel_form_ownership_and_more.py diff --git a/core/apps/evaluation/migrations/0036_remove_autoevaluationmodel_form_ownership_and_more.py b/core/apps/evaluation/migrations/0036_remove_autoevaluationmodel_form_ownership_and_more.py new file mode 100644 index 0000000..a6fe4bb --- /dev/null +++ b/core/apps/evaluation/migrations/0036_remove_autoevaluationmodel_form_ownership_and_more.py @@ -0,0 +1,53 @@ +# Generated by Django 5.2.7 on 2026-04-28 11:07 + +import django.db.models.deletion +from django.conf import settings +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('evaluation', '0035_autoevaluationmodel_is_archived'), + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ] + + operations = [ + migrations.RemoveField( + model_name='autoevaluationmodel', + name='form_ownership', + ), + migrations.RemoveField( + model_name='autoevaluationmodel', + name='property_rights', + ), + migrations.RemoveField( + model_name='autoevaluationmodel', + name='rate_object_name', + ), + migrations.AlterField( + model_name='autoevaluationmodel', + name='appraisers', + field=models.ManyToManyField(blank=True, null=True, to=settings.AUTH_USER_MODEL, verbose_name='appraisers'), + ), + migrations.AlterField( + 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'), + ), + migrations.AlterField( + model_name='autoevaluationmodel', + name='user', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='auto_evaluations_user', to=settings.AUTH_USER_MODEL), + ), + migrations.AlterField( + model_name='autoevaluationmodel', + name='valuation', + field=models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='auto_detail', to='evaluation.valuationmodel'), + ), + migrations.AlterField( + model_name='autoevaluationmodel', + name='vehicle', + field=models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='evaluation', to='evaluation.vehiclemodel'), + ), + ] diff --git a/core/apps/evaluation/models/auto.py b/core/apps/evaluation/models/auto.py index 5a77af3..799fe53 100644 --- a/core/apps/evaluation/models/auto.py +++ b/core/apps/evaluation/models/auto.py @@ -26,7 +26,6 @@ class AutoEvaluationModel(AbstractBaseModel): "accounts.User", on_delete=models.SET_NULL, related_name="auto_evaluations_user", - verbose_name=_("user"), null=True, blank=True, ) @@ -34,7 +33,6 @@ class AutoEvaluationModel(AbstractBaseModel): "evaluation.EvaluationRequestModel", on_delete=models.SET_NULL, related_name="auto_evaluations_request", - verbose_name=_("evaluation request"), null=True, blank=True, ) @@ -42,7 +40,6 @@ class AutoEvaluationModel(AbstractBaseModel): ValuationModel, on_delete=models.CASCADE, related_name="auto_detail", - verbose_name=_("valuation"), null=True, blank=True, ) @@ -50,14 +47,12 @@ class AutoEvaluationModel(AbstractBaseModel): VehicleModel, on_delete=models.CASCADE, related_name="evaluation", - verbose_name=_("vehicle"), null=True, blank=True, ) appraisers = models.ManyToManyField( "accounts.User", verbose_name=_("appraisers"), - related_name="auto_evaluations", blank=True, null=True, ) @@ -96,12 +91,6 @@ class AutoEvaluationModel(AbstractBaseModel): blank=True, null=True, ) - rate_object_name = models.CharField( - verbose_name=_("rate object name"), - max_length=255, - blank=True, - null=True, - ) object_type = models.CharField( verbose_name=_("object type"), max_length=50, @@ -153,23 +142,6 @@ class AutoEvaluationModel(AbstractBaseModel): blank=True, null=True, ) - - property_rights = models.ForeignKey( - 'evaluation.ReferenceitemModel', - verbose_name=_("property rights"), - blank=True, - null=True, - on_delete=models.SET_NULL, - related_name='evaluation_auto_property_rights' - ) - form_ownership = models.ForeignKey( - 'evaluation.ReferenceitemModel', - verbose_name=_("form of ownership"), - blank=True, - null=True, - on_delete=models.SET_NULL, - related_name='evaluation_auto_form_ownership' - ) value_determined = models.ForeignKey( 'evaluation.ReferenceitemModel', verbose_name=_("value determined"), diff --git a/core/apps/evaluation/serializers/auto/AutoEvaluation.py b/core/apps/evaluation/serializers/auto/AutoEvaluation.py index 137278f..9b2391c 100644 --- a/core/apps/evaluation/serializers/auto/AutoEvaluation.py +++ b/core/apps/evaluation/serializers/auto/AutoEvaluation.py @@ -17,8 +17,6 @@ class BaseAutoevaluationSerializer(serializers.ModelSerializer): default=None) rate_type = ListReferenceitemSerializer(read_only=True) 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: @@ -49,8 +47,6 @@ class BaseAutoevaluationSerializer(serializers.ModelSerializer): "created_at", "value_determined", "rate_type", - "property_rights", - "form_ownership", "user", "evaluation_request", ] @@ -75,13 +71,6 @@ class RetrieveAutoevaluationSerializer(BaseAutoevaluationSerializer): car_type_display = serializers.CharField(source="get_car_type_display", read_only=True, default=None) car_wheel_display = serializers.CharField(source="get_car_wheel_display", read_only=True, default=None) - # object_location_highways_display = serializers.CharField( - # source="get_object_location_highways_display", read_only=True, default=None - # ) - # object_location_covenience_display = serializers.CharField( - # source="get_object_location_covenience_display", read_only=True, default=None - # ) - class Meta(BaseAutoevaluationSerializer.Meta): fields = BaseAutoevaluationSerializer.Meta.fields + [ # Step 1 @@ -89,7 +78,6 @@ class RetrieveAutoevaluationSerializer(BaseAutoevaluationSerializer): "object_inspection_date", "rate_date", "rate_report_date", - "rate_object_name", # Step 2 "object_owner_type", "object_owner_type_display", @@ -118,21 +106,11 @@ class RetrieveAutoevaluationSerializer(BaseAutoevaluationSerializer): class UpdateAutoevaluationSerializer(serializers.ModelSerializer): - property_rights = serializers.PrimaryKeyRelatedField( - queryset=ReferenceitemModel.objects.all(), - required=False, - allow_null=True, - ) value_determined = serializers.PrimaryKeyRelatedField( queryset=ReferenceitemModel.objects.all(), required=False, allow_null=True, ) - form_ownership = serializers.PrimaryKeyRelatedField( - queryset=ReferenceitemModel.objects.all(), - required=False, - allow_null=True, - ) value_determined = serializers.PrimaryKeyRelatedField( queryset=ReferenceitemModel.objects.all(), required=False, @@ -153,7 +131,6 @@ class UpdateAutoevaluationSerializer(serializers.ModelSerializer): "object_inspection_date", "rate_date", "rate_report_date", - "rate_object_name", "object_type", # Step 2 "object_owner_type", @@ -163,8 +140,6 @@ class UpdateAutoevaluationSerializer(serializers.ModelSerializer): "object_owner_individual_person_passport_num", "object_owner_legal_entity", "object_owner_legal_inn", - "property_rights", - "form_ownership", "value_determined", "rate_type", # Step 4 @@ -226,21 +201,11 @@ class UpdateAutoevaluationSerializer(serializers.ModelSerializer): class CreateAutoevaluationSerializer(serializers.ModelSerializer): - property_rights = serializers.PrimaryKeyRelatedField( - queryset=ReferenceitemModel.objects.all(), - required=False, - allow_null=True, - ) value_determined = serializers.PrimaryKeyRelatedField( queryset=ReferenceitemModel.objects.all(), required=False, allow_null=True, ) - form_ownership = serializers.PrimaryKeyRelatedField( - queryset=ReferenceitemModel.objects.all(), - required=False, - allow_null=True, - ) value_determined = serializers.PrimaryKeyRelatedField( queryset=ReferenceitemModel.objects.all(), required=False, @@ -267,7 +232,6 @@ class CreateAutoevaluationSerializer(serializers.ModelSerializer): "object_inspection_date", "rate_date", "rate_report_date", - "rate_object_name", "object_type", # Step 2 "object_owner_type", @@ -277,8 +241,6 @@ class CreateAutoevaluationSerializer(serializers.ModelSerializer): "object_owner_individual_person_passport_num", "object_owner_legal_entity", "object_owner_legal_inn", - "property_rights", - "form_ownership", "value_determined", "rate_type", # Step 4 diff --git a/core/apps/evaluation/views/auto.py b/core/apps/evaluation/views/auto.py index 30de8b2..ca8445a 100644 --- a/core/apps/evaluation/views/auto.py +++ b/core/apps/evaluation/views/auto.py @@ -62,8 +62,6 @@ class AutoEvaluationView(BaseViewSetMixin, ModelViewSet): "created_at", "value_determined", "rate_type", - "property_rights", - "form_ownership", ] ordering = ["-created_at"]