test migrate

config/conf/navigation.py

@@ -48,11 +48,6 @@ PAGES = [
         "title": _("Arizalar"),
         "separator": True,
         "items": [
-            {
-                "title": _("Baholash so'rovlari"),
-                "icon": "rate_review",
-                "link": reverse_lazy("admin:evaluation_evaluationrequestmodel_changelist"),
-            },
             {
                 "title": _("Barcha arizalar"),
                 "icon": "description",

config/urls.py

@@ -13,7 +13,7 @@ from config.env import env
 
 
 def home(request):
-    return HttpResponse("OK: #a06cf173b69ce36a54b5e1cacd87c2f1b8edf6e9")
+    return HttpResponse("OK: #5bb3dcd432ba0c045e6f2ef91c23bd4a16a1d256")
 
 
 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",
+            "last_name"
-            "avatar"
         ]

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:

core/apps/evaluation/admin/__init__.py

@@ -6,6 +6,5 @@ from .quick import *  # noqa
 from .real_estate import *  # noqa
 from .reference import *  # noqa
 from .report import *  # noqa
-from .request import *  # noqa
 from .valuation import *  # noqa
 from .vehicle import *  # noqa

core/apps/evaluation/admin/request.py

@@ -1,63 +0,0 @@
-from django.contrib import admin
-from unfold.admin import ModelAdmin
-
-from core.apps.evaluation.models import EvaluationrequestModel
-
-
-@admin.register(EvaluationrequestModel)
-class EvaluationrequestAdmin(ModelAdmin):
-    list_display = (
-        "id",
-        "user",
-        "rate_type",
-        "object_type",
-        "customer_inn_number",
-        "owner_inn_number",
-        "status",
-        "need_delivering",
-        "created_at",
-    )
-    list_filter = ("status", "rate_type", "object_type", "need_delivering")
-    search_fields = (
-        "customer_inn_number",
-        "owner_inn_number",
-        "tex_passport",
-        "user__phone",
-    )
-    readonly_fields = ("user", "created_at", "updated_at")
-    fieldsets = (
-        ("Asosiy", {
-            "fields": (
-                "user",
-                "rate_type",
-                "object_type",
-                "status",
-            ),
-        }),
-        ("Buyurtmachi", {
-            "fields": (
-                ("customer_inn_number", "owner_inn_number"),
-                "tex_passport",
-            ),
-        }),
-        ("Baholash parametrlari", {
-            "fields": (
-                ("value_determined", "rate_goal"),
-                ("property_rights", "form_ownership"),
-            ),
-        }),
-        ("Qo'shimcha (truck_car)", {
-            "classes": ("collapse",),
-            "fields": ("worked_hours", "chassi"),
-        }),
-        ("Yetkazish", {
-            "fields": (
-                "need_delivering",
-                ("location_lat", "location_lng"),
-            ),
-        }),
-        ("Tizim", {
-            "classes": ("collapse",),
-            "fields": ("created_at", "updated_at"),
-        }),
-    )

core/apps/evaluation/choices/reference.py

@@ -10,4 +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")

core/apps/evaluation/choices/request.py

@@ -1,21 +0,0 @@
-from django.db import models
-from django.utils.translation import gettext_lazy as _
-
-
-class EvaluationRateType(models.TextChoices):
-    AUTO = "auto", _("Automobil")
-    REAL_ESTATE = "real_estate", _("Ko'chmas mulk")
-    EQUIPMENT = "equipment", _("Uskuna")
-
-
-class RequestObjectType(models.TextChoices):
-    LIGHTWEIGHT_AUTO = "lightweight_auto", _("Yengil automobil")
-    TRUCK_CAR = "truck_car", _("Yuk automobil")
-    SPECIAL_TECH = "special_tech", _("Maxsus texnika")
-
-
-class RequestStatus(models.TextChoices):
-    PENDING = "pending", _("Kutilmoqda")
-    IN_PROGRESS = "in_progress", _("Jarayonda")
-    COMPLETED = "completed", _("Bajarildi")
-    REJECTED = "rejected", _("Rad etildi")

core/apps/evaluation/filters/__init__.py

@@ -6,6 +6,5 @@ from .quick import *  # noqa
 from .real_estate import *  # noqa
 from .reference import *  # noqa
 from .report import *  # noqa
-from .request import *  # noqa
 from .valuation import *  # noqa
 from .vehicle import *  # noqa

core/apps/evaluation/filters/request.py

@@ -1,35 +0,0 @@
-from django_filters import rest_framework as filters
-
-from core.apps.evaluation.models import EvaluationrequestModel
-
-
-class EvaluationrequestFilter(filters.FilterSet):
-    rate_type = filters.CharFilter(field_name="rate_type", lookup_expr="exact")
-    object_type = filters.CharFilter(field_name="object_type", lookup_expr="exact")
-    status = filters.CharFilter(field_name="status", lookup_expr="exact")
-    need_delivering = filters.BooleanFilter(field_name="need_delivering")
-    customer_inn_number = filters.CharFilter(
-        field_name="customer_inn_number", lookup_expr="icontains"
-    )
-    owner_inn_number = filters.CharFilter(
-        field_name="owner_inn_number", lookup_expr="icontains"
-    )
-    tex_passport = filters.CharFilter(
-        field_name="tex_passport", lookup_expr="icontains"
-    )
-    date_from = filters.DateFilter(field_name="created_at", lookup_expr="gte")
-    date_to = filters.DateFilter(field_name="created_at", lookup_expr="lte")
-
-    class Meta:
-        model = EvaluationrequestModel
-        fields = [
-            "rate_type",
-            "object_type",
-            "status",
-            "need_delivering",
-            "customer_inn_number",
-            "owner_inn_number",
-            "tex_passport",
-            "date_from",
-            "date_to",
-        ]

core/apps/evaluation/forms/__init__.py

@@ -6,6 +6,5 @@ from .quick import *  # noqa
 from .real_estate import *  # noqa
 from .reference import *  # noqa
 from .report import *  # noqa
-from .request import *  # noqa
 from .valuation import *  # noqa
 from .vehicle import *  # noqa

core/apps/evaluation/forms/request.py

@@ -1,10 +0,0 @@
-from django import forms
-
-from core.apps.evaluation.models import EvaluationrequestModel
-
-
-class EvaluationrequestForm(forms.ModelForm):
-
-    class Meta:
-        model = EvaluationrequestModel
-        fields = "__all__"

core/apps/evaluation/migrations/0018_autoevaluationmodel_chassi_and_more.py

@@ -0,0 +1,58 @@
+# Generated by Django 5.2.7 on 2026-03-10 07:47
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('evaluation', '0017_autoevaluationmodel_car_brand_and_more'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='autoevaluationmodel',
+            name='chassi',
+            field=models.IntegerField(blank=True, null=True, verbose_name='chassi'),
+        ),
+        migrations.AddField(
+            model_name='autoevaluationmodel',
+            name='customer_inn_number',
+            field=models.CharField(blank=True, max_length=20, null=True, verbose_name='customer INN number'),
+        ),
+        migrations.AddField(
+            model_name='autoevaluationmodel',
+            name='location_lat',
+            field=models.DecimalField(blank=True, decimal_places=6, max_digits=9, null=True, verbose_name='location latitude'),
+        ),
+        migrations.AddField(
+            model_name='autoevaluationmodel',
+            name='location_lng',
+            field=models.DecimalField(blank=True, decimal_places=6, max_digits=9, null=True, verbose_name='location longitude'),
+        ),
+        migrations.AddField(
+            model_name='autoevaluationmodel',
+            name='need_delivering',
+            field=models.BooleanField(default=True, verbose_name='need delivering'),
+        ),
+        migrations.AddField(
+            model_name='autoevaluationmodel',
+            name='owner_inn_number',
+            field=models.CharField(blank=True, max_length=20, null=True, verbose_name='owner INN number'),
+        ),
+        migrations.AddField(
+            model_name='autoevaluationmodel',
+            name='worked_hours',
+            field=models.IntegerField(blank=True, null=True, verbose_name='worked hours'),
+        ),
+        migrations.AlterField(
+            model_name='autoevaluationmodel',
+            name='rate_type',
+            field=models.CharField(blank=True, choices=[('auto', 'Automobil'), ('real_estate', "Ko'chmas mulk"), ('equipment', 'Uskuna')], max_length=50, null=True, verbose_name='rate type'),
+        ),
+        migrations.AlterField(
+            model_name='autoevaluationmodel',
+            name='status',
+            field=models.CharField(choices=[('pending', 'Kutilmoqda'), ('in_progress', 'Jarayonda'), ('completed', 'Bajarildi'), ('rejected', 'Rad etildi')], default='pending', max_length=50, verbose_name='status'),
+        ),
+    ]

core/apps/evaluation/migrations/0018_evaluationrequestmodel.py

@@ -1,45 +0,0 @@
-# Generated by Django 5.2.7 on 2026-03-10 08:34
-
-import django.db.models.deletion
-from django.conf import settings
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('evaluation', '0017_autoevaluationmodel_car_brand_and_more'),
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='EvaluationrequestModel',
-            fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('created_at', models.DateTimeField(auto_now_add=True)),
-                ('updated_at', models.DateTimeField(auto_now=True)),
-                ('rate_type', models.CharField(choices=[('auto', 'Automobil'), ('real_estate', "Ko'chmas mulk"), ('equipment', 'Uskuna')], max_length=50, verbose_name='rate type')),
-                ('object_type', models.CharField(blank=True, choices=[('lightweight_auto', 'Yengil automobil'), ('truck_car', 'Yuk automobil'), ('special_tech', 'Maxsus texnika')], max_length=50, null=True, verbose_name='object type')),
-                ('customer_inn_number', models.CharField(max_length=20, verbose_name='customer INN number')),
-                ('owner_inn_number', models.CharField(max_length=20, verbose_name='owner INN number')),
-                ('tex_passport', models.CharField(blank=True, max_length=20, null=True, verbose_name='tex passport')),
-                ('value_determined', models.CharField(max_length=100, verbose_name='value determined')),
-                ('rate_goal', models.CharField(max_length=100, verbose_name='rate goal')),
-                ('property_rights', models.CharField(max_length=100, verbose_name='property rights')),
-                ('form_ownership', models.CharField(max_length=100, verbose_name='form ownership')),
-                ('worked_hours', models.IntegerField(blank=True, null=True, verbose_name='worked hours')),
-                ('chassi', models.IntegerField(blank=True, null=True, verbose_name='chassi')),
-                ('need_delivering', models.BooleanField(default=True, verbose_name='need delivering')),
-                ('location_lat', models.DecimalField(blank=True, decimal_places=6, max_digits=9, null=True, verbose_name='location latitude')),
-                ('location_lng', models.DecimalField(blank=True, decimal_places=6, max_digits=9, null=True, verbose_name='location longitude')),
-                ('status', models.CharField(choices=[('pending', 'Kutilmoqda'), ('in_progress', 'Jarayonda'), ('completed', 'Bajarildi'), ('rejected', 'Rad etildi')], default='pending', max_length=50, verbose_name='status')),
-                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='evaluation_requests', to=settings.AUTH_USER_MODEL, verbose_name='user')),
-            ],
-            options={
-                'verbose_name': 'Evaluation Request',
-                'verbose_name_plural': 'Evaluation Requests',
-                'db_table': 'EvaluationRequest',
-            },
-        ),
-    ]

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/0019_remove_autoevaluationmodel_chassi_and_more.py

@@ -0,0 +1,51 @@
+# Generated by Django 5.2.7 on 2026-03-10 08:00
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('evaluation', '0018_autoevaluationmodel_chassi_and_more'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='autoevaluationmodel',
+            name='chassi',
+        ),
+        migrations.RemoveField(
+            model_name='autoevaluationmodel',
+            name='customer_inn_number',
+        ),
+        migrations.RemoveField(
+            model_name='autoevaluationmodel',
+            name='location_lat',
+        ),
+        migrations.RemoveField(
+            model_name='autoevaluationmodel',
+            name='location_lng',
+        ),
+        migrations.RemoveField(
+            model_name='autoevaluationmodel',
+            name='need_delivering',
+        ),
+        migrations.RemoveField(
+            model_name='autoevaluationmodel',
+            name='owner_inn_number',
+        ),
+        migrations.RemoveField(
+            model_name='autoevaluationmodel',
+            name='worked_hours',
+        ),
+        migrations.AlterField(
+            model_name='autoevaluationmodel',
+            name='rate_type',
+            field=models.IntegerField(blank=True, choices=[(1, "Kredit ta'minoti sifatida garovga qo'yish"), (2, 'Sotish maqsadida bozor qiymatini aniqlash'), (3, 'Soliqqa tortish maqsadida'), (4, 'Boshqa')], null=True, verbose_name='rate type'),
+        ),
+        migrations.AlterField(
+            model_name='autoevaluationmodel',
+            name='status',
+            field=models.CharField(choices=[('yaratildi', 'Yaratildi'), ('baxolovchi_biriktirildi', 'Baholovchi biriktirildi'), ('baxolandi', 'Baholandi'), ('rad_etildi', 'Rad etildi'), ('tasdiqlandi', 'Tasdiqlandi')], default='yaratildi', max_length=50, verbose_name='status'),
+        ),
+    ]

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/models/__init__.py

@@ -6,6 +6,5 @@ from .quick import *  # noqa
 from .real_estate import *  # noqa
 from .reference import *  # noqa
 from .report import *  # noqa
-from .request import *  # noqa
 from .valuation import *  # noqa
 from .vehicle import *  # noqa

core/apps/evaluation/models/request.py

@@ -1,126 +0,0 @@
-from django.conf import settings
-from django.db import models
-from django.utils.translation import gettext_lazy as _
-from django_core.models import AbstractBaseModel
-from model_bakery import baker
-
-from core.apps.evaluation.choices.request import (
-    EvaluationRateType,
-    RequestObjectType,
-    RequestStatus,
-)
-
-
-class EvaluationrequestModel(AbstractBaseModel):
-    user = models.ForeignKey(
-        "accounts.User",
-        on_delete=models.CASCADE,
-        related_name="evaluation_requests",
-        verbose_name=_("user"),
-    )
-    rate_type = models.CharField(
-        verbose_name=_("rate type"),
-        max_length=50,
-        choices=EvaluationRateType.choices,
-    )
-    object_type = models.CharField(
-        verbose_name=_("object type"),
-        max_length=50,
-        choices=RequestObjectType.choices,
-        blank=True,
-        null=True,
-    )
-    customer_inn_number = models.CharField(
-        verbose_name=_("customer INN number"),
-        max_length=20,
-    )
-    owner_inn_number = models.CharField(
-        verbose_name=_("owner INN number"),
-        max_length=20,
-    )
-    tex_passport = models.CharField(
-        verbose_name=_("tex passport"),
-        max_length=20,
-        blank=True,
-        null=True,
-    )
-    value_determined = models.CharField(
-        verbose_name=_("value determined"),
-        max_length=100,
-    )
-    rate_goal = models.CharField(
-        verbose_name=_("rate goal"),
-        max_length=100,
-    )
-    property_rights = models.CharField(
-        verbose_name=_("property rights"),
-        max_length=100,
-    )
-    form_ownership = models.CharField(
-        verbose_name=_("form ownership"),
-        max_length=100,
-    )
-    worked_hours = models.IntegerField(
-        verbose_name=_("worked hours"),
-        blank=True,
-        null=True,
-    )
-    chassi = models.CharField(
-        verbose_name=_("chassi"),
-        max_length=100,
-        blank=True,
-        null=True,
-    )
-    need_delivering = models.BooleanField(
-        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,
-        decimal_places=6,
-        blank=True,
-        null=True,
-    )
-    location_lng = models.DecimalField(
-        verbose_name=_("location longitude"),
-        max_digits=9,
-        decimal_places=6,
-        blank=True,
-        null=True,
-    )
-    status = models.CharField(
-        verbose_name=_("status"),
-        max_length=50,
-        choices=RequestStatus.choices,
-        default=RequestStatus.PENDING,
-    )
-
-    def __str__(self):
-        return f"Request #{self.pk} — {self.get_rate_type_display()}"
-
-    @classmethod
-    def _baker(cls):
-        user = baker.make(settings.AUTH_USER_MODEL)
-        return baker.make(
-            cls,
-            user=user,
-            rate_type=EvaluationRateType.AUTO,
-            customer_inn_number="123456789",
-            owner_inn_number="987654321",
-            value_determined="Bozor qiymati",
-            rate_goal="Kredit uchun",
-            property_rights="Xususiy",
-            form_ownership="Xususiy",
-        )
-
-    class Meta:
-        db_table = "EvaluationRequest"
-        verbose_name = _("Evaluation Request")
-        verbose_name_plural = _("Evaluation Requests")

core/apps/evaluation/permissions/__init__.py

@@ -6,6 +6,5 @@ from .quick import *  # noqa
 from .real_estate import *  # noqa
 from .reference import *  # noqa
 from .report import *  # noqa
-from .request import *  # noqa
 from .valuation import *  # noqa
 from .vehicle import *  # noqa

core/apps/evaluation/permissions/request.py

@@ -1,12 +0,0 @@
-from rest_framework import permissions
-
-
-class EvaluationrequestPermission(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

@@ -6,6 +6,5 @@ from .quick import *  # noqa
 from .real_estate import *  # noqa
 from .reference import *  # noqa
 from .report import *  # noqa
-from .request import *  # noqa
 from .valuation import *  # noqa
 from .vehicle import *  # noqa

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

@@ -46,12 +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"]

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

@@ -1,142 +0,0 @@
-import re
-
-from rest_framework import serializers
-
-from core.apps.evaluation.models import EvaluationrequestModel
-
-
-class BaseEvaluationrequestSerializer(serializers.ModelSerializer):
-    rate_type_display = serializers.CharField(
-        source="get_rate_type_display", read_only=True
-    )
-    object_type_display = serializers.CharField(
-        source="get_object_type_display", read_only=True, default=None
-    )
-    status_display = serializers.CharField(
-        source="get_status_display", read_only=True
-    )
-    location = serializers.SerializerMethodField()
-
-    location_name = serializers.CharField(required=False)
-
-    class Meta:
-        model = EvaluationrequestModel
-        fields = [
-            "id",
-            "rate_type",
-            "rate_type_display",
-            "object_type",
-            "object_type_display",
-            "customer_inn_number",
-            "owner_inn_number",
-            "tex_passport",
-            "value_determined",
-            "rate_goal",
-            "property_rights",
-            "form_ownership",
-            "worked_hours",
-            "chassi",
-            "need_delivering",
-            "location",
-            "location_name",
-            "status",
-            "status_display",
-            "created_at",
-            "updated_at",
-        ]
-
-    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 None
-
-
-class ListEvaluationrequestSerializer(BaseEvaluationrequestSerializer):
-    class Meta(BaseEvaluationrequestSerializer.Meta):
-        pass
-
-
-class RetrieveEvaluationrequestSerializer(BaseEvaluationrequestSerializer):
-    class Meta(BaseEvaluationrequestSerializer.Meta):
-        pass
-
-
-class CreateEvaluationrequestSerializer(serializers.ModelSerializer):
-    location = serializers.DictField(required=False)
-    # Frontend may send locationName
-    locationName = serializers.CharField(write_only=True, required=False)
-
-    class Meta:
-        model = EvaluationrequestModel
-        fields = [
-            "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):
-        if value and not re.match(r"^[A-Z]{2}\s?\d{7}$", value):
-            raise serializers.ValidationError(
-                "Format: AA 1234567 (2 harf + 7 raqam)"
-            )
-        return value
-
-    def validate(self, attrs):
-        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 automobil uchun majburiy (truck_car)
-        if object_type == "truck_car":
-            if attrs.get("worked_hours") is None:
-                raise serializers.ValidationError(
-                    {"worked_hours": "Yuk automobil uchun ishlagan soati majburiy."}
-                )
-            if attrs.get("chassi") is None:
-                raise serializers.ValidationError(
-                    {"chassi": "Yuk automobil uchun shassi 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"] = location_name
-
-        validated_data["user"] = self.context["request"].user
-        return super().create(validated_data)

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

@@ -1 +0,0 @@
-from .EvaluationRequest import *  # noqa

core/apps/evaluation/signals/__init__.py

@@ -6,6 +6,5 @@ from .quick import *  # noqa
 from .real_estate import *  # noqa
 from .reference import *  # noqa
 from .report import *  # noqa
-from .request import *  # noqa
 from .valuation import *  # noqa
 from .vehicle import *  # noqa

core/apps/evaluation/signals/request.py

@@ -1,27 +0,0 @@
-from django.db.models.signals import pre_save
-from django.dispatch import receiver
-
-from core.apps.evaluation.choices.request import RequestStatus
-from core.apps.evaluation.models import EvaluationrequestModel
-
-
-@receiver(pre_save, sender=EvaluationrequestModel)
-def create_evaluation_on_approve(sender, instance, **kwargs):
-    if not instance.pk:
-        return
-
-    try:
-        old = EvaluationrequestModel.objects.get(pk=instance.pk)
-    except EvaluationrequestModel.DoesNotExist:
-        return
-
-    if old.status != RequestStatus.COMPLETED and instance.status == RequestStatus.COMPLETED:
-        from core.apps.evaluation.models import AutoEvaluationModel
-
-        if instance.rate_type == "auto" and not hasattr(instance, "_evaluation_created"):
-            AutoEvaluationModel.objects.create(
-                object_type=instance.object_type or "",
-                tex_passport_serie_num=instance.tex_passport or "",
-                rating_goal=instance.rate_goal or "",
-            )
-            instance._evaluation_created = True

core/apps/evaluation/tests/__init__.py

@@ -6,6 +6,5 @@ from .quick import *  # noqa
 from .real_estate import *  # noqa
 from .reference import *  # noqa
 from .report import *  # noqa
-from .request import *  # noqa
 from .valuation import *  # noqa
 from .vehicle import *  # noqa

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

@@ -1 +0,0 @@
-from .test_EvaluationRequest import *  # noqa

core/apps/evaluation/tests/request/test_EvaluationRequest.py

@@ -1,101 +0,0 @@
-import pytest
-from django.urls import reverse
-from rest_framework.test import APIClient
-
-from core.apps.evaluation.models import EvaluationrequestModel
-
-
-@pytest.fixture
-def instance(db):
-    return EvaluationrequestModel._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("evaluation-request-list"),
-            "retrieve": reverse("evaluation-request-detail", kwargs={"pk": instance.pk}),
-            "retrieve-not-found": reverse("evaluation-request-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

@@ -6,6 +6,5 @@ from .quick import *  # noqa
 from .real_estate import *  # noqa
 from .reference import *  # noqa
 from .report import *  # noqa
-from .request import *  # noqa
 from .valuation import *  # noqa
 from .vehicle import *  # noqa

core/apps/evaluation/translation/request.py

@@ -1,8 +0,0 @@
-from modeltranslation.translator import TranslationOptions, register
-
-from core.apps.evaluation.models import EvaluationrequestModel
-
-
-@register(EvaluationrequestModel)
-class EvaluationrequestTranslation(TranslationOptions):
-    fields = []

core/apps/evaluation/urls.py

@@ -5,7 +5,6 @@ from .views import (
     AutoEvaluationView,
     CustomerView,
     EvaluationReportView,
-    EvaluationrequestView,
     MovablePropertyEvaluationView,
     PropertyOwnerView,
     QuickEvaluationView,
@@ -14,12 +13,9 @@ from .views import (
     ValuationDocumentView,
     ValuationView,
     VehicleView,
-    EvaluationPurposeView,
 )
 
 router = DefaultRouter()
-router.register("evaluation-purpose", EvaluationPurposeView, basename="evaluation-purpose")
-router.register("evaluation-request", EvaluationrequestView, basename="evaluation-request")
 router.register("reference-item", ReferenceitemView, basename="reference-item")
 router.register("valuation-document", ValuationDocumentView, basename="valuation-document")
 router.register("evaluation-report", EvaluationReportView, basename="evaluation-report")

core/apps/evaluation/validators/__init__.py

@@ -6,6 +6,5 @@ from .quick import *  # noqa
 from .real_estate import *  # noqa
 from .reference import *  # noqa
 from .report import *  # noqa
-from .request import *  # noqa
 from .valuation import *  # noqa
 from .vehicle import *  # noqa

core/apps/evaluation/validators/request.py

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

core/apps/evaluation/views/__init__.py

@@ -6,6 +6,5 @@ from .quick import *  # noqa
 from .real_estate import *  # noqa
 from .reference import *  # noqa
 from .report import *  # noqa
-from .request import *  # noqa
 from .valuation import *  # noqa
 from .vehicle import *  # noqa

core/apps/evaluation/views/reference.py

@@ -11,25 +11,9 @@ from core.apps.evaluation.serializers.reference import (
     CreateReferenceitemSerializer,
     ListReferenceitemSerializer,
     RetrieveReferenceitemSerializer,
-    EvaluationPurposeSerializer,
 )
 
 
-@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=["ReferenceItem"])
 class ReferenceitemView(BaseViewSetMixin, ReadOnlyModelViewSet):
     queryset = ReferenceitemModel.objects.select_related("parent").filter(is_active=True)

core/apps/evaluation/views/request.py

@@ -1,56 +0,0 @@
-from django_core.mixins import BaseViewSetMixin
-from django_filters.rest_framework import DjangoFilterBackend
-from drf_spectacular.utils import extend_schema
-from rest_framework.filters import OrderingFilter, SearchFilter
-from rest_framework.pagination import PageNumberPagination
-from rest_framework.permissions import AllowAny, IsAuthenticated
-from rest_framework.viewsets import ModelViewSet
-
-from core.apps.evaluation.filters.request import EvaluationrequestFilter
-from core.apps.evaluation.models import EvaluationrequestModel
-from core.apps.evaluation.serializers.request import (
-    CreateEvaluationrequestSerializer,
-    ListEvaluationrequestSerializer,
-    RetrieveEvaluationrequestSerializer,
-)
-
-
-# class RequestPagination(PageNumberPagination):
-#     page_size = 20
-#     page_size_query_param = "limit"
-#     max_page_size = 100
-
-
-@extend_schema(tags=["EvaluationRequest"])
-class EvaluationrequestView(BaseViewSetMixin, ModelViewSet):
-    serializer_class = ListEvaluationrequestSerializer
-    permission_classes = [IsAuthenticated]
-    # pagination_class = RequestPagination
-
-    filter_backends = [DjangoFilterBackend, SearchFilter, OrderingFilter]
-    filterset_class = EvaluationrequestFilter
-    search_fields = [
-        "customer_inn_number",
-        "owner_inn_number",
-        "tex_passport",
-    ]
-    ordering_fields = [
-        "created_at",
-        "updated_at",
-        "rate_type",
-        "object_type",
-        "status",
-    ]
-    ordering = ["-created_at"]
-
-    action_permission_classes = {}
-    action_serializer_class = {
-        "list": ListEvaluationrequestSerializer,
-        "retrieve": RetrieveEvaluationrequestSerializer,
-        "create": CreateEvaluationrequestSerializer,
-    }
-
-    def get_queryset(self):
-        return EvaluationrequestModel.objects.filter(
-            user=self.request.user
-        ).order_by("-created_at")

stack.yaml

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