sort yangilandi

config/conf/navigation.py

@@ -112,22 +112,6 @@ PAGES = [
             },
         ],
     },
-    {
-        "title": _("Tarix"),
-        "separator": True,
-        "items": [
-            {
-                "title": _("Avto baholash tarixi"),
-                "icon": "history",
-                "link": reverse_lazy("admin:evaluation_autoevaluationhistorymodel_changelist"),
-            },
-            {
-                "title": _("Tezkor baholash tarixi"),
-                "icon": "manage_history",
-                "link": reverse_lazy("admin:evaluation_quickevaluationhistorymodel_changelist"),
-            },
-        ],
-    },
     {
         "title": _("Ma'lumotnomalari"),
         "separator": True,

config/conf/rest_framework.py

@@ -1,11 +1,7 @@
 from typing import Any, Union
 
 REST_FRAMEWORK: Union[Any] = {
-    "DEFAULT_AUTHENTICATION_CLASSES": (
-        "rest_framework.authentication.SessionAuthentication",
-        "rest_framework.authentication.BaseAuthentication",
-        "rest_framework_simplejwt.authentication.JWTAuthentication",
-    ),
+    "DEFAULT_AUTHENTICATION_CLASSES": ("rest_framework_simplejwt.authentication.JWTAuthentication",),
     "DEFAULT_SCHEMA_CLASS": "drf_spectacular.openapi.AutoSchema",
     "DEFAULT_PERMISSION_CLASSES": ["rest_framework.permissions.IsAuthenticated"],
     "DEFAULT_PAGINATION_CLASS": "django_core.paginations.CustomPagination",

config/urls.py

@@ -13,7 +13,7 @@ from config.env import env
 
 
 def home(request):
-    return HttpResponse("OK: #41b63b164568ae8a39bf2da91742e783736bf9cb")
+    return HttpResponse("OK: #7bcf7bdc7f8b10357921efee0415dc6211137338")
 
 
 urlpatterns = [

core/apps/accounts/admin/user.py

@@ -1,6 +1,5 @@
 from django.contrib.auth import admin
 from django.utils.translation import gettext_lazy as _
-from django.utils.safestring import mark_safe
 from unfold.admin import ModelAdmin
 from unfold.forms import AdminPasswordChangeForm  # UserCreationForm,
 from unfold.forms import UserChangeForm
@@ -11,7 +10,6 @@ class CustomUserAdmin(admin.UserAdmin, ModelAdmin):
     # add_form = UserCreationForm
     form = UserChangeForm
     list_display = (
-        "display_avatar",
         "first_name",
         "last_name",
         "phone",
@@ -19,7 +17,7 @@ class CustomUserAdmin(admin.UserAdmin, ModelAdmin):
     )
     search_fields = ("phone", "first_name", "last_name", "username")
     autocomplete_fields = ["groups", "user_permissions"]
-    fieldsets = ((None, {"fields": ("phone", "avatar",)}),) + (
+    fieldsets = ((None, {"fields": ("phone",)}),) + (
         (None, {"fields": ("username", "password")}),
         (_("Personal info"), {"fields": ("first_name", "last_name", "email")}),
         (
@@ -38,15 +36,6 @@ class CustomUserAdmin(admin.UserAdmin, ModelAdmin):
         (_("Important dates"), {"fields": ("last_login", "date_joined")}),
     )
 
-    def display_avatar(self, obj):
-        if obj.avatar:
-            return mark_safe(
-                f'<img src="{obj.avatar.url}" width="35" height="35" style="border-radius: 50%; object-fit: cover;" />'
-            )
-        return _("No Image")
-
-    display_avatar.short_description = _("Avatar")
-
 
 class PermissionAdmin(ModelAdmin):
     list_display = ("name",)    

core/apps/accounts/migrations/0003_user_avatar.py

@@ -1,18 +0,0 @@
-# Generated by Django 5.2.7 on 2026-03-17 12:32
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('accounts', '0002_alter_user_role'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='user',
-            name='avatar',
-            field=models.ImageField(blank=True, null=True, upload_to='avatars/'),
-        ),
-    ]

core/apps/accounts/models/user.py

@@ -16,7 +16,6 @@ class User(auth_models.AbstractUser):
         choices=RoleChoice,
         default=RoleChoice.USER,
     )
-    avatar = models.ImageField(upload_to="avatars/", null=True, blank=True)
 
     USERNAME_FIELD = "phone"
     objects = UserManager()

core/apps/accounts/serializers/user.py

@@ -19,6 +19,5 @@ class UserUpdateSerializer(serializers.ModelSerializer):
         model = get_user_model()
         fields = [
             "first_name",
-            "last_name",
-            "avatar"
+            "last_name"
         ]

core/apps/accounts/views/auth.py

@@ -6,7 +6,7 @@ from django.contrib.auth import get_user_model
 from django.utils.translation import gettext_lazy as _
 from django_core import exceptions
 from drf_spectacular.utils import extend_schema
-from rest_framework import status, throttling, request, parsers
+from rest_framework import status, throttling, request
 from rest_framework.response import Response
 from rest_framework.exceptions import PermissionDenied
 from rest_framework.viewsets import GenericViewSet
@@ -160,11 +160,6 @@ class ResetPasswordView(BaseViewSetMixin, GenericViewSet, UserService):
 @extend_schema(tags=["me"])
 class MeView(BaseViewSetMixin, GenericViewSet, UserService):
     permission_classes = [IsAuthenticated]
-    parser_classes = (
-        parsers.MultiPartParser,
-        parsers.FormParser,
-        parsers.JSONParser,
-    )
 
     def get_serializer_class(self):
         match self.action:
@@ -183,8 +178,8 @@ class MeView(BaseViewSetMixin, GenericViewSet, UserService):
     def user_update(self, request):
         ser = self.get_serializer(instance=request.user, data=request.data, partial=True)
         ser.is_valid(raise_exception=True)
-        data = ser.save()
-        return Response(UserSerializer(data).data)
+        ser.save()
+        return Response({"detail": _("Malumotlar yangilandi")})
 
 
 @extend_schema(tags=["change-password"], description="Parolni o'zgartirish uchun")

core/apps/evaluation/admin/__init__.py

@@ -1,7 +1,6 @@
 from .auto import *  # noqa
 from .customer import *  # noqa
 from .document import *  # noqa
-from .history import *  # noqa
 from .movable import *  # noqa
 from .quick import *  # noqa
 from .real_estate import *  # noqa

core/apps/evaluation/admin/history.py

@@ -1,157 +0,0 @@
-from django.contrib import admin
-from django.utils.translation import gettext_lazy as _
-from unfold.admin import ModelAdmin
-
-from core.apps.evaluation.choices.history import EvaluationEventType
-from core.apps.evaluation.models import AutoevaluationhistoryModel, QuickevaluationhistoryModel
-
-
-class BaseHistoryAdmin(ModelAdmin):
-    """
-    History yozuvlari o'zgartirib bo'lmaydi — faqat o'qiladi.
-    Signallar tomonidan avtomatik yoziladi.
-    """
-
-    list_filter = (
-        "event_type",
-        "actor_role",
-        "created_at",
-    )
-    search_fields = (
-        "actor_full_name",
-        "meta",
-    )
-    ordering = ("created_at",)
-
-    def has_add_permission(self, request):
-        return False
-
-    def has_change_permission(self, request, obj=None):
-        return False
-
-    def has_delete_permission(self, request, obj=None):
-        return False
-
-
-@admin.register(AutoevaluationhistoryModel)
-class AutoevaluationhistoryAdmin(BaseHistoryAdmin):
-    list_display = (
-        "id",
-        "auto_evaluation",
-        "event_type_colored",
-        "actor_full_name",
-        "actor_role",
-        "created_at",
-    )
-    autocomplete_fields = ("auto_evaluation",)
-    readonly_fields = (
-        "auto_evaluation",
-        "event_type",
-        "actor_id",
-        "actor_full_name",
-        "actor_role",
-        "meta",
-        "created_at",
-    )
-    fieldsets = (
-        (_("Baholash"), {
-            "fields": ("auto_evaluation",),
-        }),
-        (_("Hodisa"), {
-            "fields": (
-                "event_type",
-                "meta",
-            ),
-        }),
-        (_("Kim bajargan"), {
-            "fields": (
-                "actor_id",
-                "actor_full_name",
-                "actor_role",
-            ),
-        }),
-        (_("Tizim"), {
-            "classes": ("collapse",),
-            "fields": ("created_at",),
-        }),
-    )
-
-    @admin.display(description=_("Hodisa turi"))
-    def event_type_colored(self, obj):
-        colors = {
-            EvaluationEventType.ORDER_CREATED: "#16a34a",
-            EvaluationEventType.STATUS_CHANGED: "#2563eb",
-            EvaluationEventType.EVALUATOR_ASSIGNED: "#7c3aed",
-            EvaluationEventType.DOCUMENT_UPLOADED: "#d97706",
-            EvaluationEventType.PAYMENT_MADE: "#dc2626",
-        }
-        color = colors.get(obj.event_type, "#6b7280")
-        label = obj.get_event_type_display()
-        from django.utils.html import format_html
-        return format_html(
-            '<span style="color:{}; font-weight:600;">{}</span>',
-            color,
-            label,
-        )
-
-
-@admin.register(QuickevaluationhistoryModel)
-class QuickevaluationhistoryAdmin(BaseHistoryAdmin):
-    list_display = (
-        "id",
-        "quick_evaluation",
-        "event_type_colored",
-        "actor_full_name",
-        "actor_role",
-        "created_at",
-    )
-    autocomplete_fields = ("quick_evaluation",)
-    readonly_fields = (
-        "quick_evaluation",
-        "event_type",
-        "actor_id",
-        "actor_full_name",
-        "actor_role",
-        "meta",
-        "created_at",
-    )
-    fieldsets = (
-        (_("Tezkor baholash"), {
-            "fields": ("quick_evaluation",),
-        }),
-        (_("Hodisa"), {
-            "fields": (
-                "event_type",
-                "meta",
-            ),
-        }),
-        (_("Kim bajargan"), {
-            "fields": (
-                "actor_id",
-                "actor_full_name",
-                "actor_role",
-            ),
-        }),
-        (_("Tizim"), {
-            "classes": ("collapse",),
-            "fields": ("created_at",),
-        }),
-    )
-
-    @admin.display(description=_("Hodisa turi"))
-    def event_type_colored(self, obj):
-        colors = {
-            EvaluationEventType.ORDER_CREATED: "#16a34a",
-            EvaluationEventType.STATUS_CHANGED: "#2563eb",
-            EvaluationEventType.EVALUATOR_ASSIGNED: "#7c3aed",
-            EvaluationEventType.DOCUMENT_UPLOADED: "#d97706",
-            EvaluationEventType.PAYMENT_MADE: "#dc2626",
-        }
-        color = colors.get(obj.event_type, "#6b7280")
-        label = obj.get_event_type_display()
-        from django.utils.html import format_html
-        return format_html(
-            '<span style="color:{}; font-weight:600;">{}</span>',
-            color,
-            label,
-        )

core/apps/evaluation/admin/request.py

@@ -24,7 +24,7 @@ class EvaluationrequestAdmin(ModelAdmin):
         "tex_passport",
         "user__phone",
     )
-    readonly_fields = ("created_at", "updated_at")
+    readonly_fields = ("user", "created_at", "updated_at")
     fieldsets = (
         ("Asosiy", {
             "fields": (

core/apps/evaluation/apps.py

@@ -4,6 +4,3 @@ from django.apps import AppConfig
 class ModuleConfig(AppConfig):
     default_auto_field = "django.db.models.BigAutoField"
     name = "core.apps.evaluation"
-
-    def ready(self):
-        import core.apps.evaluation.signals  # noqa

core/apps/evaluation/choices/history.py

@@ -1,10 +0,0 @@
-from django.db import models
-from django.utils.translation import gettext_lazy as _
-
-
-class EvaluationEventType(models.TextChoices):
-    ORDER_CREATED = "order_created", _("Buyurtma yaratildi")
-    STATUS_CHANGED = "status_changed", _("Status o'zgartirildi")
-    EVALUATOR_ASSIGNED = "evaluator_assigned", _("Baholovchi biriktirildi")
-    DOCUMENT_UPLOADED = "document_uploaded", _("Hujjat yuklandi")
-    PAYMENT_MADE = "payment_made", _("To'lov qilindi")

core/apps/evaluation/choices/reference.py

@@ -10,7 +10,3 @@ class ReferenceType(models.TextChoices):
     BODY_TYPE = "body_type", _("Body type")
     CAR_POSITION = "car_position", _("Car position")
     STATE_CAR = "state_car", _("Car state")
-    EVALUATION_PURPOSE = "evaluation_purpose", _("Evaluation purpose")
-    DETERMINED_VALUE = "determined_value", _("Determined value type")
-    PROPERTY_RIGHTS = "property_rights", _("Property rights")
-    OWNERSHIP_FORM = "ownership_form", _("Ownership form")

core/apps/evaluation/filters/__init__.py

@@ -1,7 +1,6 @@
 from .auto import *  # noqa
 from .customer import *  # noqa
 from .document import *  # noqa
-from .history import *  # noqa
 from .movable import *  # noqa
 from .quick import *  # noqa
 from .real_estate import *  # noqa

core/apps/evaluation/filters/history.py

@@ -1,54 +0,0 @@
-from django_filters import rest_framework as filters
-
-from core.apps.evaluation.choices.history import EvaluationEventType
-from core.apps.evaluation.models import AutoevaluationhistoryModel, QuickevaluationhistoryModel
-
-
-class AutoevaluationhistoryFilter(filters.FilterSet):
-    auto_evaluation = filters.NumberFilter(
-        field_name="auto_evaluation", lookup_expr="exact"
-    )
-    event_type = filters.ChoiceFilter(
-        field_name="event_type",
-        choices=EvaluationEventType.choices,
-    )
-    created_from = filters.DateTimeFilter(
-        field_name="created_at", lookup_expr="gte"
-    )
-    created_to = filters.DateTimeFilter(
-        field_name="created_at", lookup_expr="lte"
-    )
-
-    class Meta:
-        model = AutoevaluationhistoryModel
-        fields = [
-            "auto_evaluation",
-            "event_type",
-            "created_from",
-            "created_to",
-        ]
-
-
-class QuickevaluationhistoryFilter(filters.FilterSet):
-    quick_evaluation = filters.NumberFilter(
-        field_name="quick_evaluation", lookup_expr="exact"
-    )
-    event_type = filters.ChoiceFilter(
-        field_name="event_type",
-        choices=EvaluationEventType.choices,
-    )
-    created_from = filters.DateTimeFilter(
-        field_name="created_at", lookup_expr="gte"
-    )
-    created_to = filters.DateTimeFilter(
-        field_name="created_at", lookup_expr="lte"
-    )
-
-    class Meta:
-        model = QuickevaluationhistoryModel
-        fields = [
-            "quick_evaluation",
-            "event_type",
-            "created_from",
-            "created_to",
-        ]

core/apps/evaluation/forms/__init__.py

@@ -1,7 +1,6 @@
 from .auto import *  # noqa
 from .customer import *  # noqa
 from .document import *  # noqa
-from .history import *  # noqa
 from .movable import *  # noqa
 from .quick import *  # noqa
 from .real_estate import *  # noqa

core/apps/evaluation/forms/history.py

@@ -1,17 +0,0 @@
-from django import forms
-
-from core.apps.evaluation.models import AutoevaluationhistoryModel, QuickevaluationhistoryModel
-
-
-class AutoevaluationhistoryForm(forms.ModelForm):
-
-    class Meta:
-        model = AutoevaluationhistoryModel
-        fields = "__all__"
-
-
-class QuickevaluationhistoryForm(forms.ModelForm):
-
-    class Meta:
-        model = QuickevaluationhistoryModel
-        fields = "__all__"

core/apps/evaluation/migrations/0019_evaluationrequestmodel_location_name_and_more.py

@@ -1,23 +0,0 @@
-# Generated by Django 5.2.7 on 2026-03-17 13:34
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('evaluation', '0018_evaluationrequestmodel'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='evaluationrequestmodel',
-            name='location_name',
-            field=models.CharField(blank=True, max_length=255, null=True, verbose_name='location name'),
-        ),
-        migrations.AlterField(
-            model_name='evaluationrequestmodel',
-            name='chassi',
-            field=models.CharField(blank=True, max_length=100, null=True, verbose_name='chassi'),
-        ),
-    ]

core/apps/evaluation/migrations/0020_alter_referenceitemmodel_type.py

@@ -1,18 +0,0 @@
-# Generated by Django 5.2.7 on 2026-03-17 14:22
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('evaluation', '0019_evaluationrequestmodel_location_name_and_more'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='referenceitemmodel',
-            name='type',
-            field=models.CharField(choices=[('brand', 'Brand'), ('marka', 'Marka'), ('color', 'Color'), ('fuel_type', 'Fuel type'), ('body_type', 'Body type'), ('car_position', 'Car position'), ('state_car', 'Car state'), ('evaluation_purpose', 'Evaluation purpose')], max_length=50, verbose_name='type'),
-        ),
-    ]

core/apps/evaluation/migrations/0021_alter_referenceitemmodel_type.py

@@ -1,18 +0,0 @@
-# Generated by Django 5.2.7 on 2026-03-17 15:14
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('evaluation', '0020_alter_referenceitemmodel_type'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='referenceitemmodel',
-            name='type',
-            field=models.CharField(choices=[('brand', 'Brand'), ('marka', 'Marka'), ('color', 'Color'), ('fuel_type', 'Fuel type'), ('body_type', 'Body type'), ('car_position', 'Car position'), ('state_car', 'Car state'), ('evaluation_purpose', 'Evaluation purpose'), ('determined_value', 'Determined value type')], max_length=50, verbose_name='type'),
-        ),
-    ]

core/apps/evaluation/migrations/0022_alter_referenceitemmodel_type.py

@@ -1,18 +0,0 @@
-# Generated by Django 5.2.7 on 2026-03-18 08:20
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('evaluation', '0021_alter_referenceitemmodel_type'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='referenceitemmodel',
-            name='type',
-            field=models.CharField(choices=[('brand', 'Brand'), ('marka', 'Marka'), ('color', 'Color'), ('fuel_type', 'Fuel type'), ('body_type', 'Body type'), ('car_position', 'Car position'), ('state_car', 'Car state'), ('evaluation_purpose', 'Evaluation purpose'), ('determined_value', 'Determined value type'), ('property_rights', 'Property rights'), ('ownership_form', 'Ownership form')], max_length=50, verbose_name='type'),
-        ),
-    ]

core/apps/evaluation/migrations/0023_autoevaluationhistorymodel_and_more.py

@@ -1,52 +0,0 @@
-# Generated by Django 5.2.7 on 2026-04-02 10:03
-
-import django.db.models.deletion
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('evaluation', '0022_alter_referenceitemmodel_type'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='AutoevaluationhistoryModel',
-            fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('event_type', models.CharField(choices=[('order_created', 'Buyurtma yaratildi'), ('status_changed', "Status o'zgartirildi"), ('evaluator_assigned', 'Baholovchi biriktirildi'), ('document_uploaded', 'Hujjat yuklandi'), ('payment_made', "To'lov qilindi")], max_length=50, verbose_name='event type')),
-                ('actor_id', models.BigIntegerField(blank=True, null=True, verbose_name='actor id')),
-                ('actor_full_name', models.CharField(default='Tizim', max_length=255, verbose_name='actor full name')),
-                ('actor_role', models.CharField(default='system', max_length=50, verbose_name='actor role')),
-                ('meta', models.JSONField(blank=True, default=dict, verbose_name='meta')),
-                ('created_at', models.DateTimeField(auto_now_add=True, verbose_name='created at')),
-                ('auto_evaluation', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='history', to='evaluation.autoevaluationmodel', verbose_name='auto evaluation')),
-            ],
-            options={
-                'verbose_name': 'Auto Evaluation History',
-                'verbose_name_plural': 'Auto Evaluation Histories',
-                'db_table': 'AutoEvaluationHistory',
-                'ordering': ['created_at'],
-            },
-        ),
-        migrations.CreateModel(
-            name='QuickevaluationhistoryModel',
-            fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('event_type', models.CharField(choices=[('order_created', 'Buyurtma yaratildi'), ('status_changed', "Status o'zgartirildi"), ('evaluator_assigned', 'Baholovchi biriktirildi'), ('document_uploaded', 'Hujjat yuklandi'), ('payment_made', "To'lov qilindi")], max_length=50, verbose_name='event type')),
-                ('actor_id', models.BigIntegerField(blank=True, null=True, verbose_name='actor id')),
-                ('actor_full_name', models.CharField(default='Tizim', max_length=255, verbose_name='actor full name')),
-                ('actor_role', models.CharField(default='system', max_length=50, verbose_name='actor role')),
-                ('meta', models.JSONField(blank=True, default=dict, verbose_name='meta')),
-                ('created_at', models.DateTimeField(auto_now_add=True, verbose_name='created at')),
-                ('quick_evaluation', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='history', to='evaluation.quickevaluationmodel', verbose_name='quick evaluation')),
-            ],
-            options={
-                'verbose_name': 'Quick Evaluation History',
-                'verbose_name_plural': 'Quick Evaluation Histories',
-                'db_table': 'QuickEvaluationHistory',
-                'ordering': ['created_at'],
-            },
-        ),
-    ]

core/apps/evaluation/migrations/0024_add_history_indexes.py

@@ -1,29 +0,0 @@
-# Generated by Django 5.2.7 on 2026-04-02 11:08
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('evaluation', '0023_autoevaluationhistorymodel_and_more'),
-    ]
-
-    operations = [
-        migrations.AddIndex(
-            model_name='autoevaluationhistorymodel',
-            index=models.Index(fields=['auto_evaluation_id', 'created_at'], name='auto_hist_eval_date_idx'),
-        ),
-        migrations.AddIndex(
-            model_name='autoevaluationhistorymodel',
-            index=models.Index(fields=['event_type'], name='auto_hist_event_type_idx'),
-        ),
-        migrations.AddIndex(
-            model_name='quickevaluationhistorymodel',
-            index=models.Index(fields=['quick_evaluation_id', 'created_at'], name='quick_hist_eval_date_idx'),
-        ),
-        migrations.AddIndex(
-            model_name='quickevaluationhistorymodel',
-            index=models.Index(fields=['event_type'], name='quick_hist_event_type_idx'),
-        ),
-    ]

core/apps/evaluation/migrations/0025_alter_evaluationrequestmodel_form_ownership_and_more.py

@@ -1,34 +0,0 @@
-# Generated by Django 5.2.7 on 2026-04-02 12:34
-
-import django.db.models.deletion
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('evaluation', '0024_add_history_indexes'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='evaluationrequestmodel',
-            name='form_ownership',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='evaluation_form_ownership_requests', to='evaluation.referenceitemmodel', verbose_name='form ownership'),
-        ),
-        migrations.AlterField(
-            model_name='evaluationrequestmodel',
-            name='property_rights',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='evaluation_property_rights_requests', to='evaluation.referenceitemmodel', verbose_name='property rights'),
-        ),
-        migrations.AlterField(
-            model_name='evaluationrequestmodel',
-            name='rate_goal',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='evaluation_rate_goal_requests', to='evaluation.referenceitemmodel', verbose_name='rate goal'),
-        ),
-        migrations.AlterField(
-            model_name='evaluationrequestmodel',
-            name='value_determined',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='evaluation_value_determined_requests', to='evaluation.referenceitemmodel', verbose_name='value determined'),
-        ),
-    ]

core/apps/evaluation/models/__init__.py

@@ -1,7 +1,6 @@
 from .auto import *  # noqa
 from .customer import *  # noqa
 from .document import *  # noqa
-from .history import *  # noqa
 from .movable import *  # noqa
 from .quick import *  # noqa
 from .real_estate import *  # noqa

core/apps/evaluation/models/history.py

@@ -1,133 +0,0 @@
-from django.db import models
-from django.utils.translation import gettext_lazy as _
-from model_bakery import baker
-
-from core.apps.evaluation.choices.history import EvaluationEventType
-
-
-class AutoevaluationhistoryModel(models.Model):
-    """AutoEvaluation bo'yicha barcha harakatlar logi — faqat o'qiladi, signallar tomonidan yoziladi."""
-
-    auto_evaluation = models.ForeignKey(
-        "evaluation.AutoEvaluationModel",
-        on_delete=models.CASCADE,
-        related_name="history",
-        verbose_name=_("auto evaluation"),
-    )
-    event_type = models.CharField(
-        verbose_name=_("event type"),
-        max_length=50,
-        choices=EvaluationEventType.choices,
-    )
-
-    # Actor — kim bajargan (system bo'lsa actor_id=None)
-    actor_id = models.BigIntegerField(
-        verbose_name=_("actor id"),
-        null=True,
-        blank=True,
-    )
-    actor_full_name = models.CharField(
-        verbose_name=_("actor full name"),
-        max_length=255,
-        default="Tizim",
-    )
-    actor_role = models.CharField(
-        verbose_name=_("actor role"),
-        max_length=50,
-        default="system",
-    )
-
-    # Har bir event_type uchun turli struktura
-    meta = models.JSONField(
-        verbose_name=_("meta"),
-        default=dict,
-        blank=True,
-    )
-
-    created_at = models.DateTimeField(
-        verbose_name=_("created at"),
-        auto_now_add=True,
-    )
-
-    def __str__(self):
-        return f"{self.get_event_type_display()} — AutoEval #{self.auto_evaluation_id}"
-
-    @classmethod
-    def _baker(cls):
-        return baker.make(cls)
-
-    class Meta:
-        db_table = "AutoEvaluationHistory"
-        verbose_name = _("Auto Evaluation History")
-        verbose_name_plural = _("Auto Evaluation Histories")
-        ordering = ["created_at"]
-        indexes = [
-            # Asosiy query: bir baholash tarixi + sana bo'yicha tartib
-            models.Index(fields=["auto_evaluation_id", "created_at"], name="auto_hist_eval_date_idx"),
-            # event_type bo'yicha filter
-            models.Index(fields=["event_type"], name="auto_hist_event_type_idx"),
-        ]
-
-
-class QuickevaluationhistoryModel(models.Model):
-    """QuickEvaluation bo'yicha barcha harakatlar logi — faqat o'qiladi, signallar tomonidan yoziladi."""
-
-    quick_evaluation = models.ForeignKey(
-        "evaluation.QuickEvaluationModel",
-        on_delete=models.CASCADE,
-        related_name="history",
-        verbose_name=_("quick evaluation"),
-    )
-    event_type = models.CharField(
-        verbose_name=_("event type"),
-        max_length=50,
-        choices=EvaluationEventType.choices,
-    )
-
-    # Actor — kim bajargan (system bo'lsa actor_id=None)
-    actor_id = models.BigIntegerField(
-        verbose_name=_("actor id"),
-        null=True,
-        blank=True,
-    )
-    actor_full_name = models.CharField(
-        verbose_name=_("actor full name"),
-        max_length=255,
-        default="Tizim",
-    )
-    actor_role = models.CharField(
-        verbose_name=_("actor role"),
-        max_length=50,
-        default="system",
-    )
-
-    # Har bir event_type uchun turli struktura
-    meta = models.JSONField(
-        verbose_name=_("meta"),
-        default=dict,
-        blank=True,
-    )
-
-    created_at = models.DateTimeField(
-        verbose_name=_("created at"),
-        auto_now_add=True,
-    )
-
-    def __str__(self):
-        return f"{self.get_event_type_display()} — QuickEval #{self.quick_evaluation_id}"
-
-    @classmethod
-    def _baker(cls):
-        return baker.make(cls)
-
-    class Meta:
-        db_table = "QuickEvaluationHistory"
-        verbose_name = _("Quick Evaluation History")
-        verbose_name_plural = _("Quick Evaluation Histories")
-        ordering = ["created_at"]
-        indexes = [
-            # Asosiy query: bir baholash tarixi + sana bo'yicha tartib
-            models.Index(fields=["quick_evaluation_id", "created_at"], name="quick_hist_eval_date_idx"),
-            # event_type bo'yicha filter
-            models.Index(fields=["event_type"], name="quick_hist_event_type_idx"),
-        ]

core/apps/evaluation/models/request.py

@@ -44,46 +44,29 @@ class EvaluationrequestModel(AbstractBaseModel):
         blank=True,
         null=True,
     )
-    value_determined = models.ForeignKey(
-        "evaluation.ReferenceitemModel",
+    value_determined = models.CharField(
         verbose_name=_("value determined"),
-        related_name="evaluation_value_determined_requests",
-        on_delete=models.SET_NULL,
-        blank=True,
-        null=True,
+        max_length=100,
     )
-    rate_goal = models.ForeignKey(
-        "evaluation.ReferenceitemModel",
+    rate_goal = models.CharField(
         verbose_name=_("rate goal"),
-        related_name="evaluation_rate_goal_requests",
-        on_delete=models.SET_NULL,
-        blank=True,
-        null=True,
+        max_length=100,
     )
-    property_rights = models.ForeignKey(
-        "evaluation.ReferenceitemModel",
+    property_rights = models.CharField(
         verbose_name=_("property rights"),
-        related_name="evaluation_property_rights_requests",
-        on_delete=models.SET_NULL,
-        blank=True,
-        null=True,
+        max_length=100,
     )
-    form_ownership = models.ForeignKey(
-        "evaluation.ReferenceitemModel",
+    form_ownership = models.CharField(
         verbose_name=_("form ownership"),
-        related_name="evaluation_form_ownership_requests",
-        on_delete=models.SET_NULL,
-        blank=True,
-        null=True,
+        max_length=100,
     )
     worked_hours = models.IntegerField(
         verbose_name=_("worked hours"),
         blank=True,
         null=True,
     )
-    chassi = models.CharField(
+    chassi = models.IntegerField(
         verbose_name=_("chassi"),
-        max_length=100,
         blank=True,
         null=True,
     )
@@ -91,12 +74,6 @@ class EvaluationrequestModel(AbstractBaseModel):
         verbose_name=_("need delivering"),
         default=True,
     )
-    location_name = models.CharField(
-        verbose_name=_("location name"),
-        max_length=255,
-        blank=True,
-        null=True,
-    )
     location_lat = models.DecimalField(
         verbose_name=_("location latitude"),
         max_digits=9,
@@ -117,9 +94,8 @@ class EvaluationrequestModel(AbstractBaseModel):
         choices=RequestStatus.choices,
         default=RequestStatus.PENDING,
     )
-
     def __str__(self):
-        return f"Request #{self.pk} — {self.get_rate_type_display()}"
+        return f"Requests #{self.pk} — {self.get_rate_type_display()}"
 
     @classmethod
     def _baker(cls):

core/apps/evaluation/permissions/__init__.py

@@ -1,7 +1,6 @@
 from .auto import *  # noqa
 from .customer import *  # noqa
 from .document import *  # noqa
-from .history import *  # noqa
 from .movable import *  # noqa
 from .quick import *  # noqa
 from .real_estate import *  # noqa

core/apps/evaluation/permissions/history.py

@@ -1,23 +0,0 @@
-from rest_framework import permissions
-
-
-class AutoevaluationhistoryPermission(permissions.BasePermission):
-
-    def __init__(self) -> None: ...
-
-    def __call__(self, *args, **kwargs):
-        return self
-
-    def has_permission(self, request, view):
-        return True
-
-
-class QuickevaluationhistoryPermission(permissions.BasePermission):
-
-    def __init__(self) -> None: ...
-
-    def __call__(self, *args, **kwargs):
-        return self
-
-    def has_permission(self, request, view):
-        return True

core/apps/evaluation/serializers/__init__.py

@@ -1,7 +1,6 @@
 from .auto import *  # noqa
 from .customer import *  # noqa
 from .document import *  # noqa
-from .history import *  # noqa
 from .movable import *  # noqa
 from .quick import *  # noqa
 from .real_estate import *  # noqa

core/apps/evaluation/serializers/history/AutoEvaluationHistory.py

@@ -1,39 +0,0 @@
-from rest_framework import serializers
-
-from core.apps.evaluation.models import AutoevaluationhistoryModel
-
-
-class BaseAutoevaluationhistorySerializer(serializers.ModelSerializer):
-    event_type_display = serializers.CharField(source="get_event_type_display", read_only=True)
-    actor = serializers.SerializerMethodField()
-
-    def get_actor(self, obj):
-        return {
-            "id": obj.actor_id,
-            "full_name": obj.actor_full_name,
-            "role": obj.actor_role,
-        }
-
-    class Meta:
-        model = AutoevaluationhistoryModel
-        fields = [
-            "id",
-            "event_type",
-            "event_type_display",
-            "actor",
-            "meta",
-            "created_at",
-        ]
-
-
-class ListAutoevaluationhistorySerializer(BaseAutoevaluationhistorySerializer):
-    class Meta(BaseAutoevaluationhistorySerializer.Meta): ...
-
-
-class RetrieveAutoevaluationhistorySerializer(BaseAutoevaluationhistorySerializer):
-    class Meta(BaseAutoevaluationhistorySerializer.Meta):
-        fields = BaseAutoevaluationhistorySerializer.Meta.fields + ["auto_evaluation"]
-
-
-class CreateAutoevaluationhistorySerializer(BaseAutoevaluationhistorySerializer):
-    class Meta(BaseAutoevaluationhistorySerializer.Meta): ...

core/apps/evaluation/serializers/history/QuickEvaluationHistory.py

@@ -1,39 +0,0 @@
-from rest_framework import serializers
-
-from core.apps.evaluation.models import QuickevaluationhistoryModel
-
-
-class BaseQuickevaluationhistorySerializer(serializers.ModelSerializer):
-    event_type_display = serializers.CharField(source="get_event_type_display", read_only=True)
-    actor = serializers.SerializerMethodField()
-
-    def get_actor(self, obj):
-        return {
-            "id": obj.actor_id,
-            "full_name": obj.actor_full_name,
-            "role": obj.actor_role,
-        }
-
-    class Meta:
-        model = QuickevaluationhistoryModel
-        fields = [
-            "id",
-            "event_type",
-            "event_type_display",
-            "actor",
-            "meta",
-            "created_at",
-        ]
-
-
-class ListQuickevaluationhistorySerializer(BaseQuickevaluationhistorySerializer):
-    class Meta(BaseQuickevaluationhistorySerializer.Meta): ...
-
-
-class RetrieveQuickevaluationhistorySerializer(BaseQuickevaluationhistorySerializer):
-    class Meta(BaseQuickevaluationhistorySerializer.Meta):
-        fields = BaseQuickevaluationhistorySerializer.Meta.fields + ["quick_evaluation"]
-
-
-class CreateQuickevaluationhistorySerializer(BaseQuickevaluationhistorySerializer):
-    class Meta(BaseQuickevaluationhistorySerializer.Meta): ...

core/apps/evaluation/serializers/history/__init__.py

@@ -1,2 +0,0 @@
-from .AutoEvaluationHistory import *  # noqa
-from .QuickEvaluationHistory import *  # noqa

core/apps/evaluation/serializers/reference/ReferenceItem.py

@@ -46,30 +46,3 @@ class CreateReferenceitemSerializer(BaseReferenceitemSerializer):
             "order",
             "is_active",
         ]
-
-
-class EvaluationPurposeSerializer(serializers.ModelSerializer):
-    label = serializers.CharField(source="name")
-    value = serializers.IntegerField(source="id")
-
-    class Meta:
-        model = ReferenceitemModel
-        fields = ["label", "value"]
-
-
-class DeterminedValueSerializer(serializers.ModelSerializer):
-    label = serializers.CharField(source="name")
-    value = serializers.IntegerField(source="id")
-
-    class Meta:
-        model = ReferenceitemModel
-        fields = ["label", "value"]
-
-
-class LabelValueSerializer(serializers.ModelSerializer):
-    label = serializers.CharField(source="name")
-    value = serializers.IntegerField(source="id")
-
-    class Meta:
-        model = ReferenceitemModel
-        fields = ["label", "value"]

core/apps/evaluation/serializers/request/EvaluationRequest.py

@@ -2,8 +2,7 @@ import re
 
 from rest_framework import serializers
 
-from core.apps.evaluation.models import EvaluationrequestModel, ReferenceitemModel
-from core.apps.evaluation.serializers.reference import ListReferenceitemSerializer
+from core.apps.evaluation.models import EvaluationrequestModel
 
 
 class BaseEvaluationrequestSerializer(serializers.ModelSerializer):
@@ -18,12 +17,6 @@ class BaseEvaluationrequestSerializer(serializers.ModelSerializer):
     )
     location = serializers.SerializerMethodField()
 
-    location_name = serializers.CharField(required=False)
-    value_determined = ListReferenceitemSerializer(read_only=True)
-    rate_goal = ListReferenceitemSerializer(read_only=True)
-    property_rights = ListReferenceitemSerializer(read_only=True)
-    form_ownership = ListReferenceitemSerializer(read_only=True)
-
     class Meta:
         model = EvaluationrequestModel
         fields = [
@@ -43,7 +36,6 @@ class BaseEvaluationrequestSerializer(serializers.ModelSerializer):
             "chassi",
             "need_delivering",
             "location",
-            "location_name",
             "status",
             "status_display",
             "created_at",
@@ -52,11 +44,7 @@ class BaseEvaluationrequestSerializer(serializers.ModelSerializer):
 
     def get_location(self, obj):
         if obj.location_lat is not None and obj.location_lng is not None:
-            return {
-                "lat": float(obj.location_lat),
-                "lng": float(obj.location_lng),
-                "name": obj.location_name
-            }
+            return {"lat": float(obj.location_lat), "lng": float(obj.location_lng)}
         return None
 
 
@@ -71,50 +59,26 @@ class RetrieveEvaluationrequestSerializer(BaseEvaluationrequestSerializer):
 
 
 class CreateEvaluationrequestSerializer(serializers.ModelSerializer):
-    location = serializers.DictField(required=False, allow_empty=True)
-
-    # locationName — string qabul qiladi, location ichida yoki tashqarida yuborsa bo'ladi
-    locationName = serializers.CharField(
-        write_only=True,
-        required=False,
-        allow_null=True,
-        allow_blank=True,
+    location = serializers.DictField(
+        child=serializers.FloatField(), required=False
     )
 
-    # Faqat truck_car uchun majburiy — field darajasida optional qilib belgilaymiz,
-    # validate() da object_type ga qarab tekshiramiz
-    worked_hours = serializers.IntegerField(
-        required=False,
-        allow_null=True,
-    )
-    chassi = serializers.CharField(
-        required=False,
-        allow_null=True,
-        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)
-
     class Meta:
         model = EvaluationrequestModel
         fields = [
-            "value_determined",
-            "rate_goal",
-            "property_rights",
-            "form_ownership",
             "rate_type",
             "object_type",
             "customer_inn_number",
             "owner_inn_number",
             "tex_passport",
+            "value_determined",
+            "rate_goal",
+            "property_rights",
+            "form_ownership",
             "worked_hours",
             "chassi",
             "need_delivering",
             "location",
-            "locationName",
         ]
 
     def validate_tex_passport(self, value):
@@ -128,65 +92,41 @@ class CreateEvaluationrequestSerializer(serializers.ModelSerializer):
         rate_type = attrs.get("rate_type")
         object_type = attrs.get("object_type")
 
+        # object_type majburiy agar rate_type=auto
         if rate_type == "auto" and not object_type:
             raise serializers.ValidationError(
                 {"object_type": "rate_type 'auto' bo'lganda object_type majburiy."}
             )
 
+        # tex_passport majburiy agar rate_type=auto
         if rate_type == "auto" and not attrs.get("tex_passport"):
             raise serializers.ValidationError(
                 {"tex_passport": "rate_type 'auto' bo'lganda tex_passport majburiy."}
             )
 
-        # worked_hours va chassi FAQAT yuk avtomobil (truck_car) uchun majburiy
+        # worked_hours va chassi majburiy agar object_type=truck_car
         if object_type == "truck_car":
             if attrs.get("worked_hours") is None:
                 raise serializers.ValidationError(
-                    {"worked_hours": "Yuk avtomobil uchun ishlagan soati majburiy."}
+                    {"worked_hours": "Yuk automobil uchun ishlagan soati majburiy."}
                 )
-            if not attrs.get("chassi"):
+            if attrs.get("chassi") is None:
                 raise serializers.ValidationError(
-                    {"chassi": "Yuk avtomobil uchun shassi raqami majburiy."}
+                    {"chassi": "Yuk automobil uchun shassi 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."}
-                )
+        # location majburiy agar need_delivering=true
+        if attrs.get("need_delivering", True) and not attrs.get("location"):
+            raise serializers.ValidationError(
+                {"location": "Yetkazish kerak bo'lganda manzil majburiy."}
+            )
 
         return attrs
 
     def create(self, validated_data):
         location = validated_data.pop("location", None)
-        location_name = validated_data.pop("locationName", None)
-
         if location:
             validated_data["location_lat"] = location.get("lat")
             validated_data["location_lng"] = location.get("lng")
-            if not location_name:
-                location_name = location.get("name") or location.get("locationName")
-
-        if location_name:
-            validated_data["location_name"] = str(location_name)
-
         validated_data["user"] = self.context["request"].user
         return super().create(validated_data)

core/apps/evaluation/services/__init__.py

@@ -1 +0,0 @@
-from .history import EvaluationHistoryService  # noqa

core/apps/evaluation/services/history.py

@@ -1,51 +0,0 @@
-from core.apps.evaluation.choices.history import EvaluationEventType
-
-
-class EvaluationHistoryService:
-    """
-    AutoEvaluation va QuickEvaluation uchun history yozuvlarini yaratuvchi servis.
-    Faqat shu servis orqali yoziladi — frontend va boshqa kodlar bu sinfdan foydalanadi.
-    """
-
-    @staticmethod
-    def _build_actor(user) -> dict:
-        if user is None:
-            return {"id": None, "full_name": "Tizim", "role": "system"}
-        full_name = ""
-        if hasattr(user, "get_full_name"):
-            full_name = user.get_full_name().strip()
-        if not full_name and hasattr(user, "phone"):
-            full_name = str(user.phone)
-        return {
-            "id": user.id,
-            "full_name": full_name or str(user),
-            "role": getattr(user, "role", "user"),
-        }
-
-    @classmethod
-    def log_auto(cls, auto_evaluation, event_type: EvaluationEventType, actor=None, meta: dict = None):
-        from core.apps.evaluation.models import AutoevaluationhistoryModel
-
-        actor_data = cls._build_actor(actor)
-        AutoevaluationhistoryModel.objects.create(
-            auto_evaluation=auto_evaluation,
-            event_type=event_type,
-            actor_id=actor_data["id"],
-            actor_full_name=actor_data["full_name"],
-            actor_role=actor_data["role"],
-            meta=meta or {},
-        )
-
-    @classmethod
-    def log_quick(cls, quick_evaluation, event_type: EvaluationEventType, actor=None, meta: dict = None):
-        from core.apps.evaluation.models import QuickevaluationhistoryModel
-
-        actor_data = cls._build_actor(actor)
-        QuickevaluationhistoryModel.objects.create(
-            quick_evaluation=quick_evaluation,
-            event_type=event_type,
-            actor_id=actor_data["id"],
-            actor_full_name=actor_data["full_name"],
-            actor_role=actor_data["role"],
-            meta=meta or {},
-        )

core/apps/evaluation/signals/__init__.py

@@ -1,7 +1,6 @@
 from .auto import *  # noqa
 from .customer import *  # noqa
 from .document import *  # noqa
-from .history import *  # noqa
 from .movable import *  # noqa
 from .quick import *  # noqa
 from .real_estate import *  # noqa

core/apps/evaluation/signals/history.py

@@ -1,210 +0,0 @@
-from django.db.models.signals import post_save, pre_save
-from django.dispatch import receiver
-
-from core.apps.evaluation.choices.auto import AutoEvaluationStatus
-from core.apps.evaluation.choices.history import EvaluationEventType
-from core.apps.evaluation.choices.quick import QuickEvaluationStatus
-from core.apps.evaluation.models import (
-    AutoEvaluationModel,
-    QuickEvaluationModel,
-    ValuationDocumentModel,
-    ValuationModel,
-)
-from core.apps.evaluation.services.history import EvaluationHistoryService
-
-
-# ─────────────────────────────────────────────────────────────────────────────
-# AutoEvaluation — order_created va status_changed
-# ─────────────────────────────────────────────────────────────────────────────
-
-@receiver(pre_save, sender=AutoEvaluationModel)
-def auto_eval_pre_save(sender, instance, **kwargs):
-    """Status o'zgarishini kuzatish uchun eski qiymatni saqlaydi."""
-    if instance.pk:
-        try:
-            old = AutoEvaluationModel.objects.get(pk=instance.pk)
-            instance._old_status = old.status
-        except AutoEvaluationModel.DoesNotExist:
-            instance._old_status = None
-    else:
-        instance._old_status = None
-
-
-@receiver(post_save, sender=AutoEvaluationModel)
-def auto_eval_post_save(sender, instance, created, **kwargs):
-    if created:
-        actor = None
-        if instance.valuation_id:
-            try:
-                actor = instance.valuation.created_by
-            except Exception:
-                pass
-        EvaluationHistoryService.log_auto(
-            auto_evaluation=instance,
-            event_type=EvaluationEventType.ORDER_CREATED,
-            actor=actor,
-        )
-    else:
-        old_status = getattr(instance, "_old_status", None)
-        if old_status is not None and old_status != instance.status:
-            status_labels = dict(AutoEvaluationStatus.choices)
-            EvaluationHistoryService.log_auto(
-                auto_evaluation=instance,
-                event_type=EvaluationEventType.STATUS_CHANGED,
-                meta={
-                    "from_status": old_status,
-                    "from_status_display": status_labels.get(old_status, old_status),
-                    "to_status": instance.status,
-                    "to_status_display": status_labels.get(instance.status, instance.status),
-                },
-            )
-
-
-# ─────────────────────────────────────────────────────────────────────────────
-# Valuation — evaluator_assigned (assigned_to o'zgarganda)
-# ─────────────────────────────────────────────────────────────────────────────
-
-@receiver(pre_save, sender=ValuationModel)
-def valuation_pre_save(sender, instance, **kwargs):
-    """assigned_to o'zgarishini kuzatish uchun eski qiymatni saqlaydi."""
-    if instance.pk:
-        try:
-            old = ValuationModel.objects.get(pk=instance.pk)
-            instance._old_assigned_to_id = old.assigned_to_id
-        except ValuationModel.DoesNotExist:
-            instance._old_assigned_to_id = None
-    else:
-        instance._old_assigned_to_id = None
-
-
-@receiver(post_save, sender=ValuationModel)
-def valuation_post_save(sender, instance, created, **kwargs):
-    if created:
-        return
-    old_assigned_id = getattr(instance, "_old_assigned_to_id", None)
-    if instance.assigned_to_id and old_assigned_id != instance.assigned_to_id:
-        try:
-            auto_eval = instance.auto_detail
-        except AutoEvaluationModel.DoesNotExist:
-            return
-        evaluator = instance.assigned_to
-        evaluator_name = ""
-        if evaluator:
-            evaluator_name = evaluator.get_full_name().strip() or str(evaluator.phone)
-        EvaluationHistoryService.log_auto(
-            auto_evaluation=auto_eval,
-            event_type=EvaluationEventType.EVALUATOR_ASSIGNED,
-            meta={
-                "evaluator_id": instance.assigned_to_id,
-                "evaluator_name": evaluator_name,
-            },
-        )
-
-
-# ─────────────────────────────────────────────────────────────────────────────
-# ValuationDocument — document_uploaded
-# ─────────────────────────────────────────────────────────────────────────────
-
-@receiver(post_save, sender=ValuationDocumentModel)
-def document_post_save(sender, instance, created, **kwargs):
-    if not created:
-        return
-    try:
-        auto_eval = instance.valuation.auto_detail
-    except (AttributeError, AutoEvaluationModel.DoesNotExist):
-        return
-    file_name = ""
-    if instance.file:
-        file_name = instance.file.name.split("/")[-1]
-    EvaluationHistoryService.log_auto(
-        auto_evaluation=auto_eval,
-        event_type=EvaluationEventType.DOCUMENT_UPLOADED,
-        actor=instance.uploaded_by,
-        meta={
-            "document_type": instance.document_type,
-            "document_type_display": instance.get_document_type_display(),
-            "file_name": file_name,
-            "title": instance.title or "",
-        },
-    )
-
-
-# ─────────────────────────────────────────────────────────────────────────────
-# Payment — payment_made (status COMPLETED bo'lganda)
-# ─────────────────────────────────────────────────────────────────────────────
-
-@receiver(pre_save, sender="payment.PaymentModel")
-def payment_pre_save(sender, instance, **kwargs):
-    if instance.pk:
-        try:
-            old = sender.objects.get(pk=instance.pk)
-            instance._old_payment_status = old.status
-        except sender.DoesNotExist:
-            instance._old_payment_status = None
-    else:
-        instance._old_payment_status = None
-
-
-@receiver(post_save, sender="payment.PaymentModel")
-def payment_post_save(sender, instance, created, **kwargs):
-    old_status = getattr(instance, "_old_payment_status", None)
-    is_newly_completed = (
-        instance.status == "completed"
-        and (created or old_status != "completed")
-    )
-    if not is_newly_completed:
-        return
-    try:
-        auto_eval = instance.valuation.auto_detail
-    except (AttributeError, AutoEvaluationModel.DoesNotExist):
-        return
-    EvaluationHistoryService.log_auto(
-        auto_evaluation=auto_eval,
-        event_type=EvaluationEventType.PAYMENT_MADE,
-        actor=instance.payer,
-        meta={
-            "amount": str(instance.amount),
-            "payment_method": instance.payment_method,
-            "transaction_id": instance.transaction_id or "",
-        },
-    )
-
-
-# ─────────────────────────────────────────────────────────────────────────────
-# QuickEvaluation — order_created va status_changed
-# ─────────────────────────────────────────────────────────────────────────────
-
-@receiver(pre_save, sender=QuickEvaluationModel)
-def quick_eval_pre_save(sender, instance, **kwargs):
-    if instance.pk:
-        try:
-            old = QuickEvaluationModel.objects.get(pk=instance.pk)
-            instance._old_status = old.status
-        except QuickEvaluationModel.DoesNotExist:
-            instance._old_status = None
-    else:
-        instance._old_status = None
-
-
-@receiver(post_save, sender=QuickEvaluationModel)
-def quick_eval_post_save(sender, instance, created, **kwargs):
-    if created:
-        EvaluationHistoryService.log_quick(
-            quick_evaluation=instance,
-            event_type=EvaluationEventType.ORDER_CREATED,
-            actor=instance.created_by,
-        )
-    else:
-        old_status = getattr(instance, "_old_status", None)
-        if old_status is not None and old_status != instance.status:
-            status_labels = dict(QuickEvaluationStatus.choices)
-            EvaluationHistoryService.log_quick(
-                quick_evaluation=instance,
-                event_type=EvaluationEventType.STATUS_CHANGED,
-                meta={
-                    "from_status": old_status,
-                    "from_status_display": status_labels.get(old_status, old_status),
-                    "to_status": instance.status,
-                    "to_status_display": status_labels.get(instance.status, instance.status),
-                },
-            )

core/apps/evaluation/tests/__init__.py

@@ -1,7 +1,6 @@
 from .auto import *  # noqa
 from .customer import *  # noqa
 from .document import *  # noqa
-from .history import *  # noqa
 from .movable import *  # noqa
 from .quick import *  # noqa
 from .real_estate import *  # noqa

core/apps/evaluation/tests/history/__init__.py

@@ -1,2 +0,0 @@
-from .test_AutoEvaluationHistory import *  # noqa
-from .test_QuickEvaluationHistory import *  # noqa

core/apps/evaluation/tests/history/test_AutoEvaluationHistory.py

@@ -1,101 +0,0 @@
-import pytest
-from django.urls import reverse
-from rest_framework.test import APIClient
-
-from core.apps.evaluation.models import AutoevaluationhistoryModel
-
-
-@pytest.fixture
-def instance(db):
-    return AutoevaluationhistoryModel._baker()
-
-
-@pytest.fixture
-def api_client(instance):
-    client = APIClient()
-    ##client.force_authenticate(user=instance.user)
-    return client, instance
-
-
-@pytest.fixture
-def data(api_client):
-    client, instance = api_client
-    return (
-        {
-            "list": reverse("auto-evaluation-history-list"),
-            "retrieve": reverse("auto-evaluation-history-detail", kwargs={"pk": instance.pk}),
-            "retrieve-not-found": reverse("auto-evaluation-history-detail", kwargs={"pk": 1000}),
-        },
-        client,
-        instance,
-    )
-
-
-@pytest.mark.django_db
-def test_list(data):
-    urls, client, _ = data
-    response = client.get(urls["list"])
-    data_resp = response.json()
-    assert response.status_code == 200
-    assert data_resp["status"] is True
-
-
-@pytest.mark.django_db
-def test_retrieve(data):
-    urls, client, _ = data
-    response = client.get(urls["retrieve"])
-    data_resp = response.json()
-    assert response.status_code == 200
-    assert data_resp["status"] is True
-
-
-@pytest.mark.django_db
-def test_retrieve_not_found(data):
-    urls, client, _ = data
-    response = client.get(urls["retrieve-not-found"])
-    data_resp = response.json()
-    assert response.status_code == 404
-    assert data_resp["status"] is False
-
-
-# @pytest.mark.django_db
-# def test_create(data):
-#    urls, client, _ = data
-#    response = client.post(urls["list"], data={"name": "test"})
-#    assert response.json()["status"] is True
-#    assert response.status_code == 201
-
-
-# @pytest.mark.django_db
-# def test_update(data):
-#    urls, client, _ = data
-#    response = client.patch(urls["retrieve"], data={"name": "updated"})
-#    assert response.json()["status"] is True
-#    assert response.status_code == 200
-#
-#    # verify updated value
-#    response = client.get(urls["retrieve"])
-#    assert response.json()["status"] is True
-#    assert response.status_code == 200
-#    assert response.json()["data"]["name"] == "updated"
-
-
-# @pytest.mark.django_db
-# def test_partial_update():
-#    urls, client, _ = data
-#    response = client.patch(urls["retrieve"], data={"name": "updated"})
-#    assert response.json()["status"] is True
-#    assert response.status_code == 200
-#
-#    # verify updated value
-#    response = client.get(urls["retrieve"])
-#    assert response.json()["status"] is True
-#    assert response.status_code == 200
-#    assert response.json()["data"]["name"] == "updated"
-
-
-# @pytest.mark.django_db
-# def test_destroy(data):
-#    urls, client, _ = data
-#    response = client.delete(urls["retrieve"])
-#    assert response.status_code == 204

core/apps/evaluation/tests/history/test_QuickEvaluationHistory.py

@@ -1,101 +0,0 @@
-import pytest
-from django.urls import reverse
-from rest_framework.test import APIClient
-
-from core.apps.evaluation.models import QuickevaluationhistoryModel
-
-
-@pytest.fixture
-def instance(db):
-    return QuickevaluationhistoryModel._baker()
-
-
-@pytest.fixture
-def api_client(instance):
-    client = APIClient()
-    ##client.force_authenticate(user=instance.user)
-    return client, instance
-
-
-@pytest.fixture
-def data(api_client):
-    client, instance = api_client
-    return (
-        {
-            "list": reverse("quick-evaluation-history-list"),
-            "retrieve": reverse("quick-evaluation-history-detail", kwargs={"pk": instance.pk}),
-            "retrieve-not-found": reverse("quick-evaluation-history-detail", kwargs={"pk": 1000}),
-        },
-        client,
-        instance,
-    )
-
-
-@pytest.mark.django_db
-def test_list(data):
-    urls, client, _ = data
-    response = client.get(urls["list"])
-    data_resp = response.json()
-    assert response.status_code == 200
-    assert data_resp["status"] is True
-
-
-@pytest.mark.django_db
-def test_retrieve(data):
-    urls, client, _ = data
-    response = client.get(urls["retrieve"])
-    data_resp = response.json()
-    assert response.status_code == 200
-    assert data_resp["status"] is True
-
-
-@pytest.mark.django_db
-def test_retrieve_not_found(data):
-    urls, client, _ = data
-    response = client.get(urls["retrieve-not-found"])
-    data_resp = response.json()
-    assert response.status_code == 404
-    assert data_resp["status"] is False
-
-
-# @pytest.mark.django_db
-# def test_create(data):
-#    urls, client, _ = data
-#    response = client.post(urls["list"], data={"name": "test"})
-#    assert response.json()["status"] is True
-#    assert response.status_code == 201
-
-
-# @pytest.mark.django_db
-# def test_update(data):
-#    urls, client, _ = data
-#    response = client.patch(urls["retrieve"], data={"name": "updated"})
-#    assert response.json()["status"] is True
-#    assert response.status_code == 200
-#
-#    # verify updated value
-#    response = client.get(urls["retrieve"])
-#    assert response.json()["status"] is True
-#    assert response.status_code == 200
-#    assert response.json()["data"]["name"] == "updated"
-
-
-# @pytest.mark.django_db
-# def test_partial_update():
-#    urls, client, _ = data
-#    response = client.patch(urls["retrieve"], data={"name": "updated"})
-#    assert response.json()["status"] is True
-#    assert response.status_code == 200
-#
-#    # verify updated value
-#    response = client.get(urls["retrieve"])
-#    assert response.json()["status"] is True
-#    assert response.status_code == 200
-#    assert response.json()["data"]["name"] == "updated"
-
-
-# @pytest.mark.django_db
-# def test_destroy(data):
-#    urls, client, _ = data
-#    response = client.delete(urls["retrieve"])
-#    assert response.status_code == 204

core/apps/evaluation/translation/__init__.py

@@ -1,7 +1,6 @@
 from .auto import *  # noqa
 from .customer import *  # noqa
 from .document import *  # noqa
-from .history import *  # noqa
 from .movable import *  # noqa
 from .quick import *  # noqa
 from .real_estate import *  # noqa

core/apps/evaluation/translation/history.py

@@ -1,13 +0,0 @@
-from modeltranslation.translator import TranslationOptions, register
-
-from core.apps.evaluation.models import AutoevaluationhistoryModel, QuickevaluationhistoryModel
-
-
-@register(AutoevaluationhistoryModel)
-class AutoevaluationhistoryTranslation(TranslationOptions):
-    fields = []
-
-
-@register(QuickevaluationhistoryModel)
-class QuickevaluationhistoryTranslation(TranslationOptions):
-    fields = []

core/apps/evaluation/urls.py

@@ -2,18 +2,12 @@ from django.urls import include, path
 from rest_framework.routers import DefaultRouter
 
 from .views import (
-    AutoEvaluationHistoryView,
     AutoEvaluationView,
     CustomerView,
-    DeterminedValueView,
-    EvaluationPurposeView,
     EvaluationReportView,
     EvaluationrequestView,
     MovablePropertyEvaluationView,
-    OwnershipFormView,
     PropertyOwnerView,
-    PropertyRightsView,
-    QuickEvaluationHistoryView,
     QuickEvaluationView,
     RealEstateEvaluationView,
     ReferenceitemView,
@@ -23,12 +17,6 @@ from .views import (
 )
 
 router = DefaultRouter()
-router.register("auto-evaluation-history", AutoEvaluationHistoryView, basename="auto-evaluation-history")
-router.register("quick-evaluation-history", QuickEvaluationHistoryView, basename="quick-evaluation-history")
-router.register("determined-value", DeterminedValueView, basename="determined-value")
-router.register("evaluation-purpose", EvaluationPurposeView, basename="evaluation-purpose")
-router.register("property-rights", PropertyRightsView, basename="property-rights")
-router.register("ownership-form", OwnershipFormView, basename="ownership-form")
 router.register("evaluation-request", EvaluationrequestView, basename="evaluation-request")
 router.register("reference-item", ReferenceitemView, basename="reference-item")
 router.register("valuation-document", ValuationDocumentView, basename="valuation-document")

core/apps/evaluation/validators/__init__.py

@@ -1,7 +1,6 @@
 from .auto import *  # noqa
 from .customer import *  # noqa
 from .document import *  # noqa
-from .history import *  # noqa
 from .movable import *  # noqa
 from .quick import *  # noqa
 from .real_estate import *  # noqa

core/apps/evaluation/validators/history.py

@@ -1,15 +0,0 @@
-# from django.core.exceptions import ValidationError
-
-
-class AutoevaluationhistoryValidator:
-    def __init__(self): ...
-
-    def __call__(self):
-        return True
-
-
-class QuickevaluationhistoryValidator:
-    def __init__(self): ...
-
-    def __call__(self):
-        return True

core/apps/evaluation/views/__init__.py

@@ -1,7 +1,6 @@
 from .auto import *  # noqa
 from .customer import *  # noqa
 from .document import *  # noqa
-from .history import *  # noqa
 from .movable import *  # noqa
 from .quick import *  # noqa
 from .real_estate import *  # noqa

core/apps/evaluation/views/history.py

@@ -1,109 +0,0 @@
-from django_core.mixins import BaseViewSetMixin
-from django_filters.rest_framework import DjangoFilterBackend
-from drf_spectacular.utils import OpenApiParameter, extend_schema
-from rest_framework.filters import OrderingFilter
-from rest_framework.permissions import AllowAny
-from rest_framework.response import Response
-from rest_framework.viewsets import ReadOnlyModelViewSet
-
-from core.apps.evaluation.filters.history import (
-    AutoevaluationhistoryFilter,
-    QuickevaluationhistoryFilter,
-)
-from core.apps.evaluation.models import AutoevaluationhistoryModel, QuickevaluationhistoryModel
-from core.apps.evaluation.serializers.history import (
-    CreateAutoevaluationhistorySerializer,
-    CreateQuickevaluationhistorySerializer,
-    ListAutoevaluationhistorySerializer,
-    ListQuickevaluationhistorySerializer,
-    RetrieveAutoevaluationhistorySerializer,
-    RetrieveQuickevaluationhistorySerializer,
-)
-
-
-@extend_schema(
-    tags=["AutoEvaluationHistory"],
-    parameters=[
-        OpenApiParameter("auto_evaluation", int, description="AutoEvaluation ID bo'yicha filter"),
-        OpenApiParameter("event_type", str, description="Event turi bo'yicha filter"),
-        OpenApiParameter("created_from", str, description="Boshlanish sanasi (ISO 8601)"),
-        OpenApiParameter("created_to", str, description="Tugash sanasi (ISO 8601)"),
-    ],
-)
-class AutoEvaluationHistoryView(BaseViewSetMixin, ReadOnlyModelViewSet):
-    # select_related("auto_evaluation") faqat retrieve uchun — list uchun kerak emas
-    queryset = AutoevaluationhistoryModel.objects.only(
-        "id", "auto_evaluation_id", "event_type",
-        "actor_id", "actor_full_name", "actor_role",
-        "meta", "created_at",
-    )
-    serializer_class = ListAutoevaluationhistorySerializer
-    permission_classes = [AllowAny]
-    pagination_class = None
-
-    filter_backends = [DjangoFilterBackend, OrderingFilter]
-    filterset_class = AutoevaluationhistoryFilter
-    ordering_fields = ["created_at"]
-    ordering = ["created_at"]
-
-    action_permission_classes = {}
-    action_serializer_class = {
-        "list": ListAutoevaluationhistorySerializer,
-        "retrieve": RetrieveAutoevaluationhistorySerializer,
-        "create": CreateAutoevaluationhistorySerializer,
-    }
-
-    def list(self, request, *args, **kwargs):
-        queryset = self.filter_queryset(self.get_queryset())
-        # Queryset bir marta evaluate qilinadi — COUNT uchun alohida query yo'q
-        results = list(queryset)
-        serializer = self.get_serializer(results, many=True)
-        return Response({
-            "count": len(results),
-            "next": None,
-            "previous": None,
-            "results": serializer.data,
-        })
-
-
-@extend_schema(
-    tags=["QuickEvaluationHistory"],
-    parameters=[
-        OpenApiParameter("quick_evaluation", int, description="QuickEvaluation ID bo'yicha filter"),
-        OpenApiParameter("event_type", str, description="Event turi bo'yicha filter"),
-        OpenApiParameter("created_from", str, description="Boshlanish sanasi (ISO 8601)"),
-        OpenApiParameter("created_to", str, description="Tugash sanasi (ISO 8601)"),
-    ],
-)
-class QuickEvaluationHistoryView(BaseViewSetMixin, ReadOnlyModelViewSet):
-    queryset = QuickevaluationhistoryModel.objects.only(
-        "id", "quick_evaluation_id", "event_type",
-        "actor_id", "actor_full_name", "actor_role",
-        "meta", "created_at",
-    )
-    serializer_class = ListQuickevaluationhistorySerializer
-    permission_classes = [AllowAny]
-    pagination_class = None
-
-    filter_backends = [DjangoFilterBackend, OrderingFilter]
-    filterset_class = QuickevaluationhistoryFilter
-    ordering_fields = ["created_at"]
-    ordering = ["created_at"]
-
-    action_permission_classes = {}
-    action_serializer_class = {
-        "list": ListQuickevaluationhistorySerializer,
-        "retrieve": RetrieveQuickevaluationhistorySerializer,
-        "create": CreateQuickevaluationhistorySerializer,
-    }
-
-    def list(self, request, *args, **kwargs):
-        queryset = self.filter_queryset(self.get_queryset())
-        results = list(queryset)
-        serializer = self.get_serializer(results, many=True)
-        return Response({
-            "count": len(results),
-            "next": None,
-            "previous": None,
-            "results": serializer.data,
-        })

core/apps/evaluation/views/reference.py

@@ -11,72 +11,9 @@ from core.apps.evaluation.serializers.reference import (
     CreateReferenceitemSerializer,
     ListReferenceitemSerializer,
     RetrieveReferenceitemSerializer,
-    EvaluationPurposeSerializer,
-    DeterminedValueSerializer,
-    LabelValueSerializer,
 )
 
 
-@extend_schema(tags=["EvaluationPurpose"])
-class EvaluationPurposeView(BaseViewSetMixin, ReadOnlyModelViewSet):
-    queryset = ReferenceitemModel.objects.filter(
-        type="evaluation_purpose", is_active=True
-    ).order_by("order", "name")
-    serializer_class = EvaluationPurposeSerializer
-    permission_classes = [AllowAny]
-    pagination_class = None
-
-    filter_backends = [DjangoFilterBackend, SearchFilter, OrderingFilter]
-    search_fields = ["name"]
-    ordering_fields = ["name", "order"]
-    ordering = ["order", "name"]
-
-
-@extend_schema(tags=["DeterminedValue"])
-class DeterminedValueView(BaseViewSetMixin, ReadOnlyModelViewSet):
-    queryset = ReferenceitemModel.objects.filter(
-        type="determined_value", is_active=True
-    ).order_by("order", "name")
-    serializer_class = DeterminedValueSerializer
-    permission_classes = [AllowAny]
-    pagination_class = None
-
-    filter_backends = [DjangoFilterBackend, SearchFilter, OrderingFilter]
-    search_fields = ["name"]
-    ordering_fields = ["name", "order"]
-    ordering = ["order", "name"]
-
-
-@extend_schema(tags=["PropertyRights"])
-class PropertyRightsView(BaseViewSetMixin, ReadOnlyModelViewSet):
-    queryset = ReferenceitemModel.objects.filter(
-        type="property_rights", is_active=True
-    ).order_by("order", "name")
-    serializer_class = LabelValueSerializer
-    permission_classes = [AllowAny]
-    pagination_class = None
-
-    filter_backends = [DjangoFilterBackend, SearchFilter, OrderingFilter]
-    search_fields = ["name"]
-    ordering_fields = ["name", "order"]
-    ordering = ["order", "name"]
-
-
-@extend_schema(tags=["OwnershipForm"])
-class OwnershipFormView(BaseViewSetMixin, ReadOnlyModelViewSet):
-    queryset = ReferenceitemModel.objects.filter(
-        type="ownership_form", is_active=True
-    ).order_by("order", "name")
-    serializer_class = LabelValueSerializer
-    permission_classes = [AllowAny]
-    pagination_class = None
-
-    filter_backends = [DjangoFilterBackend, SearchFilter, OrderingFilter]
-    search_fields = ["name"]
-    ordering_fields = ["name", "order"]
-    ordering = ["order", "name"]
-
-
 @extend_schema(tags=["ReferenceItem"])
 class ReferenceitemView(BaseViewSetMixin, ReadOnlyModelViewSet):
     queryset = ReferenceitemModel.objects.select_related("parent").filter(is_active=True)

stack.yaml

@@ -84,7 +84,7 @@ services:
         max-file: "5"
 
   web:
-    image: husanjon/sifatbaho:54
+    image: husanjon/sifatbaho:46
     env_file:
       - .env
     environment: