🔄 Update image to 144 [CI SKIP]

Reviewed-on: #125

.env.example

@@ -75,7 +75,3 @@ STORAGE_PROTOCOL=http:
 
 # Didox configs
 DIDOX_PARTNER_TOKEN=...
-
-
-
-# Celery configs

.github/workflows/deploy.yaml

@@ -8,7 +8,6 @@ on:
 env:
   PROJECT_NAME: sifatbaho
 
-
 permissions:
   contents: write
 
@@ -48,6 +47,24 @@ jobs:
       - name: Copy env
         run: |
           cp .env.example .env
+          update_env() {
+            local env_file=".env"
+            for kv in "$@"; do
+              local key="${kv%%=*}"
+              local value="${kv#*=}"
+              if grep -q "^$key=" "$env_file"; then
+                sed -i "s|^$key=.*|$key=$value|" "$env_file"
+              else
+                echo "$key=$value" >> "$env_file"
+              fi
+            done
+          }
+
+          update_env \
+            "DB_HOST=postgres" \
+            "DB_NAME=sifatbahodb" \
+            "DB_PORT=5432" \
+            "DIDOX_PARTNER_TOKEN=${{ secrets.DIDOX_TOKEN }}"
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
@@ -95,7 +112,6 @@ jobs:
           sed -i "s|image: .*/${{ env.PROJECT_NAME }}:.*|image: ${{ secrets.DOCKER_USERNAME }}/${{ env.PROJECT_NAME }}:${{ github.run_number }}|g" stack.yaml
           sed -i 's/return HttpResponse("OK.*"/return HttpResponse("OK: #${{ github.sha }}"/' config/urls.py
 
-
       - name: Commit and push updated version
         run: |
           git config user.name "github-actions[bot]"
@@ -136,24 +152,5 @@ jobs:
             git reset --hard origin/main
 
             cp .env.example .env
-
-            update_env() {
-              local env_file=".env"
-              for kv in "$@"; do
-                local key="${kv%%=*}"
-                local value="${kv#*=}"
-                if grep -q "^$key=" "$env_file"; then
-                  sed -i "s|^$key=.*|$key=$value|" "$env_file"
-                else
-                  echo "$key=$value" >> "$env_file"
-                fi
-              done
-            }
-
-            update_env \
-              "DB_HOST=postgres" \
-              "DB_NAME=sifatbahodb" \
-              "DB_PORT=5432" \
-              "DIDOX_TOKEN=${{ secrets.DIDOX_TOKEN }}"
             export PORT=8085
             docker stack deploy -c stack.yaml ${{ env.PROJECT_NAME }} --with-registry-auth

config/conf/navigation.py

@@ -186,5 +186,31 @@ PAGES = [
                 "link": reverse_lazy("admin:shared_villagemodel_changelist"),
             },
         ]
+    },
+    {
+        "title": _("Ruxsatlar"),
+        "separator": True,
+        "items": [
+            {
+                "title": _("Ruxsatlar"),
+                "icon": "attach_file",
+                "link": reverse_lazy("admin:accounts_permission_changelist"),
+            },
+            {
+                "title": _("Sahifa uchun ruxsatlar"),
+                "icon": "attach_file",
+                "link": reverse_lazy("admin:accounts_permissiontotab_changelist"),
+            },
+            {
+                "title": _("Actionlar uchun ruxsatlar"),
+                "icon": "attach_file",
+                "link": reverse_lazy("admin:accounts_permissiontoaction_changelist"),
+            },
+            {
+                "title": _("Role"),
+                "icon": "attach_file",
+                "link": reverse_lazy("admin:accounts_role_changelist"),
+            },
+        ]
     }
 ]

config/urls.py

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

core/apps/accounts/admin/__init__.py

@@ -1,2 +1,3 @@
 from .core import *  # noqa
 from .user import *  # noqa
+from .permission import *

core/apps/accounts/admin/permission.py

@@ -0,0 +1,77 @@
+from django.contrib import admin
+from core.apps.accounts.models.permission import (
+    PermissionToAction,
+    PermissionToTab,
+    Permission,
+    Role,
+)
+
+@admin.register(PermissionToAction)
+class PermissionToActionAdmin(admin.ModelAdmin):
+    list_display = ("id", "name", "code", "created_at")
+    search_fields = ("name", "code")
+
+    fieldsets = (
+        ("Asosiy", {
+            "fields": ("name", "code"),
+        }),
+    )
+
+
+@admin.register(PermissionToTab)
+class PermissionToTabAdmin(admin.ModelAdmin):
+    list_display = ("id", "name", "code", "created_at")
+    search_fields = ("name", "code")
+    filter_horizontal = ("permission_to_actions",)
+
+    fieldsets = (
+        ("Asosiy", {
+            "fields": ("name", "code"),
+        }),
+        ("Harakatlar", {
+            "fields": ("permission_to_actions",),
+        }),
+    )
+
+
+@admin.register(Permission)
+class PermissionAdmin(admin.ModelAdmin):
+    list_display = ("id", "name", "code", "created_at")
+    search_fields = ("name", "code")
+    filter_horizontal = ("permission_tabs",)
+
+    fieldsets = (
+        ("Asosiy", {
+            "fields": ("name", "code"),
+        }),
+        ("Bog‘lanishlar", {
+            "fields": ("permission_tabs",),
+        }),
+    )
+
+
+@admin.register(Role)
+class RoleAdmin(admin.ModelAdmin):
+    list_display = ("id", "name")
+    search_fields = ("name",)
+
+    filter_horizontal = (
+        "permissions",
+        "permission_to_tabs",
+        "permission_to_actions",
+    )
+
+    fieldsets = (
+        ("Asosiy ma'lumotlar", {
+            "fields": ("name", "comment"),
+        }),
+        ("Sahifa ruxsatlari", {
+            "fields": ("permissions",),
+        }),
+        ("Bo‘lim ruxsatlari", {
+            "fields": ("permission_to_tabs",),
+        }),
+        ("Harakat ruxsatlari", {
+            "fields": ("permission_to_actions",),
+        }),
+    )

core/apps/accounts/admin/user.py

@@ -1,4 +1,5 @@
 from django.contrib.auth import admin
+from django.contrib.auth.admin import UserAdmin
 from django.utils.translation import gettext_lazy as _
 from django.utils.safestring import mark_safe
 from unfold.admin import ModelAdmin

core/apps/accounts/migrations/0004_permissiontoaction_permissiontotab_permission_role_and_more.py

@@ -0,0 +1,78 @@
+# Generated by Django 5.2.7 on 2026-04-27 09:33
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('accounts', '0003_user_avatar'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='PermissionToAction',
+            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)),
+                ('name', models.CharField(max_length=200)),
+                ('code', models.CharField(max_length=100, unique=True)),
+            ],
+            options={
+                'verbose_name': 'Harakatlar uchun ruxsatnoma',
+                'verbose_name_plural': 'Harakatlar uchun ruxsatnomalar',
+            },
+        ),
+        migrations.CreateModel(
+            name='PermissionToTab',
+            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)),
+                ('name', models.CharField(max_length=200)),
+                ('code', models.CharField(max_length=100, unique=True)),
+                ('permission_to_actions', models.ManyToManyField(related_name='permission_to_tabs', to='accounts.permissiontoaction')),
+            ],
+            options={
+                'verbose_name': "Bo'lim uchun ruxsatnoma",
+                'verbose_name_plural': "Bo'lim uchun ruxsatnomalar",
+            },
+        ),
+        migrations.CreateModel(
+            name='Permission',
+            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)),
+                ('name', models.CharField(max_length=200)),
+                ('code', models.CharField(max_length=100, unique=True)),
+                ('permission_tab', models.ManyToManyField(related_name='permissions', to='accounts.permissiontotab')),
+            ],
+            options={
+                'verbose_name': 'Sahifa uchun ruxsatnoma',
+                'verbose_name_plural': 'Sahifa uchun ruxsatnomalar',
+            },
+        ),
+        migrations.CreateModel(
+            name='Role',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=200, unique=True)),
+                ('comment', models.CharField(blank=True, max_length=200, null=True)),
+                ('permission_to_actions', models.ManyToManyField(blank=True, related_name='roles', to='accounts.permissiontoaction')),
+                ('permission_to_tabs', models.ManyToManyField(blank=True, related_name='roles', to='accounts.permissiontotab')),
+                ('permissions', models.ManyToManyField(blank=True, related_name='roles', to='accounts.permission')),
+            ],
+            options={
+                'verbose_name': 'Rol',
+                'verbose_name_plural': 'Rollar',
+            },
+        ),
+        migrations.AddField(
+            model_name='user',
+            name='permission',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='users', to='accounts.role'),
+        ),
+    ]

core/apps/accounts/migrations/0005_rename_permission_tab_permission_permission_tabs.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.2.7 on 2026-04-28 11:02
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('accounts', '0004_permissiontoaction_permissiontotab_permission_role_and_more'),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name='permission',
+            old_name='permission_tab',
+            new_name='permission_tabs',
+        ),
+    ]

core/apps/accounts/models/permission.py

@@ -0,0 +1,60 @@
+from django.db import models
+from django.utils.translation import gettext_lazy as _
+from django_core.models import AbstractBaseModel
+
+
+class PermissionToAction(AbstractBaseModel):
+    name = models.CharField(max_length=200)
+    code = models.CharField(max_length=100, unique=True)
+
+    def __str__(self):
+        return f"{self.name} - {self.code}"
+
+    class Meta:
+        verbose_name = _('Harakatlar uchun ruxsatnoma')
+        verbose_name_plural = _('Harakatlar uchun ruxsatnomalar')
+
+
+class PermissionToTab(AbstractBaseModel):
+    name = models.CharField(max_length=200)
+    code = models.CharField(max_length=100, unique=True)
+    permission_to_actions = models.ManyToManyField(
+        PermissionToAction, related_name='permission_to_tabs'
+    )
+
+    def __str__(self):
+        return f'{self.name} - {self.code}'
+
+    class Meta:
+        verbose_name = _("Bo'lim uchun ruxsatnoma")
+        verbose_name_plural = _("Bo'lim uchun ruxsatnomalar")
+
+
+class Permission(AbstractBaseModel):
+    name = models.CharField(max_length=200)
+    code = models.CharField(max_length=100, unique=True)
+    permission_tabs = models.ManyToManyField(PermissionToTab, related_name='permissions')
+
+    def __str__(self):
+        return f'{self.name} - {self.code}'
+
+    class Meta:
+        verbose_name = _('Sahifa uchun ruxsatnoma')
+        verbose_name_plural = _('Sahifa uchun ruxsatnomalar')
+
+class Role(models.Model):
+    name = models.CharField(max_length=200, unique=True)
+    permissions = models.ManyToManyField(Permission, related_name='roles', blank=True)
+    permission_to_tabs = models.ManyToManyField(PermissionToTab, related_name='roles', blank=True)
+    permission_to_actions = models.ManyToManyField(
+        PermissionToAction, related_name='roles', blank=True
+    )
+    comment = models.CharField(max_length=200, null=True, blank=True)
+
+    def __str__(self):
+        return self.name
+
+    class Meta:
+        verbose_name = _('Rol')
+        verbose_name_plural = _('Rollar')
+

core/apps/accounts/models/user.py

@@ -1,6 +1,7 @@
 from django.contrib.auth import models as auth_models
 from django.db import models
 
+from .permission import Role
 from ..choices import RoleChoice
 from ..managers import UserManager
 
@@ -17,6 +18,7 @@ class User(auth_models.AbstractUser):
         default=RoleChoice.USER,
     )
     avatar = models.ImageField(upload_to="avatars/", null=True, blank=True)
+    permission = models.ForeignKey(Role, on_delete=models.SET_NULL, null=True, blank=True, related_name='users')
 
     USERNAME_FIELD = "phone"
     objects = UserManager()

core/apps/accounts/serializers/permission.py

@@ -0,0 +1,55 @@
+from rest_framework import serializers
+
+from core.apps.accounts.models.permission import PermissionToAction, PermissionToTab, Permission, Role
+
+
+class PermissionToActionSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = PermissionToAction
+        fields = ['id', 'name']
+
+
+class PermissionToTabSerializer(serializers.ModelSerializer):
+    permission_to_actions = PermissionToActionSerializer(many=True)
+
+    class Meta:
+        model = PermissionToTab
+        fields = ['id', 'name', 'permission_to_actions']
+
+
+class PermissionSerializer(serializers.ModelSerializer):
+    permission_tabs = PermissionToTabSerializer(many=True)
+
+    class Meta:
+        model = Permission
+        fields = ['id', 'name', 'permission_tabs']
+
+
+class PermissionToActionListSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = PermissionToAction
+        fields = ['id', 'name']
+
+
+class PermissionToTabListSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = PermissionToTab
+        fields = ['id', 'name']
+
+
+class PermissionListSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = Permission
+        fields = ['id', 'name']
+
+
+class RoleListSerializer(serializers.ModelSerializer):
+    permissions = PermissionListSerializer(many=True)
+    permission_to_tabs = PermissionToTabListSerializer(many=True)
+    permission_to_actions = PermissionToActionListSerializer(many=True)
+
+    class Meta:
+        model = Role
+        fields = [
+            'id', 'name', 'comment', 'permissions', 'permission_to_tabs', 'permission_to_actions',
+        ]

core/apps/accounts/serializers/user.py

@@ -30,3 +30,28 @@ class UserUpdateSerializer(serializers.ModelSerializer):
             "last_name",
             "avatar"
         ]
+
+class AdminUserSerializer(serializers.ModelSerializer):
+    avatar = serializers.SerializerMethodField(method_name='get_avatar')
+
+    class Meta:
+        model = get_user_model()
+        fields = "__all__"
+
+    def get_avatar(self, obj):
+        request = self.context.get('request')
+        if obj.avatar:
+            return request.build_absolute_uri(obj.avatar.url)
+        return None
+
+
+
+class UserCreateSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = get_user_model()
+        fields = [
+            "phone",
+            "first_name",
+            "last_name",
+            "password",
+            "role"]

core/apps/accounts/urls.py

@@ -4,25 +4,34 @@ Accounts app urls
 
 from django.urls import path, include
 from rest_framework_simplejwt import views as jwt_views
-from .views import RegisterView, ResetPasswordView, MeView, ChangePasswordView, UserListApiView, AdminUserListApiView
+from .views import RegisterView, ResetPasswordView, MeView, ChangePasswordView, UserListApiView, AdminUserListApiView, \
+    AdminUserView, AdminCreateAPIView, AdminUpdateAPIView
 from rest_framework.routers import DefaultRouter
 
+from .views.permission import PermissionToActionViewSet, PermissionToTabViewSet, PermissionViewSet, RoleViewSet
+from core.apps.accounts.views.user import DeleteAdminUserApiView, UserDetailAPIView
+
 router = DefaultRouter()
 router.register("auth", RegisterView, basename="auth")
 router.register("auth", ResetPasswordView, basename="reset-password")
 router.register("auth", MeView, basename="me")
 router.register("auth", ChangePasswordView, basename="change-password")
+router.register("user", AdminUserView, basename="user-crud")
+router.register("action", PermissionToActionViewSet, basename="action")
+router.register("permission-to-tab", PermissionToTabViewSet, basename="permission-to-tab")
+router.register("permission", PermissionViewSet, basename="permission")
+router.register("permission-role", RoleViewSet, basename="permission-role")
 
 
 urlpatterns = [
     path("", include(router.urls)),
     path("auth/token/", jwt_views.TokenObtainPairView.as_view(), name="token_obtain_pair"),
     path("auth/token/verify/", jwt_views.TokenVerifyView.as_view(), name="token_verify"),
-    path(
+    path("auth/token/refresh/",jwt_views.TokenRefreshView.as_view()),
-        "auth/token/refresh/",
-        jwt_views.TokenRefreshView.as_view(),
-        name="token_refresh",
-    ),
     path("user/list/", UserListApiView.as_view(), name="user-list"),
     path("admin-user/list/", AdminUserListApiView.as_view(), name="admin-user-list"),
+    path("admin/create/", AdminCreateAPIView.as_view(), name="user-create"),
+    path("admin/update/<int:pk>/", AdminUpdateAPIView.as_view(), name="user-update"),
+    path('user/admin/<int:pk>/delete/', DeleteAdminUserApiView.as_view(), name='user-delete'),
+    path('user/<int:pk>/', UserDetailAPIView.as_view(), name='user-detail'),
 ]

core/apps/accounts/views/permission.py

@@ -0,0 +1,41 @@
+from django_core.mixins import BaseViewSetMixin
+from drf_spectacular.utils import extend_schema
+from rest_framework.permissions import AllowAny, IsAdminUser
+from rest_framework.viewsets import ModelViewSet
+
+from core.apps.accounts.models.permission import PermissionToAction, PermissionToTab, Permission, Role
+from core.apps.accounts.serializers.permission import PermissionToActionSerializer, PermissionToTabSerializer, \
+    PermissionSerializer, RoleListSerializer
+
+
+@extend_schema(tags=["permission"])
+class PermissionToActionViewSet(BaseViewSetMixin, ModelViewSet):
+    queryset = PermissionToAction.objects.all()
+    serializer_class = PermissionToActionSerializer
+
+    action_serializer_class = {
+        'create': PermissionToActionSerializer,
+        'update': PermissionToActionSerializer,
+    }
+
+    action_permission_classes = {
+        'create': [AllowAny],
+        'destroy': [IsAdminUser],
+    }
+
+
+@extend_schema(tags=["permission"])
+class PermissionToTabViewSet(BaseViewSetMixin, ModelViewSet):
+    queryset = PermissionToTab.objects.all()
+    serializer_class = PermissionToTabSerializer
+
+
+@extend_schema(tags=["permission"])
+class PermissionViewSet(BaseViewSetMixin, ModelViewSet):
+    queryset = Permission.objects.all()
+    serializer_class = PermissionSerializer
+
+
+class RoleViewSet(BaseViewSetMixin, ModelViewSet):
+    queryset = Role.objects.all()
+    serializer_class = RoleListSerializer

core/apps/accounts/views/user.py

@@ -1,15 +1,19 @@
 from django.contrib.auth import get_user_model
-
+from django.shortcuts import get_object_or_404
+from django_core.mixins import BaseViewSetMixin
+from drf_spectacular.utils import extend_schema
 from rest_framework import generics, filters
 from rest_framework.permissions import IsAuthenticated
+from rest_framework.response import Response
+from rest_framework.views import APIView
+from rest_framework.viewsets import ModelViewSet
 
-from drf_spectacular.utils import extend_schema
-
-from core.apps.accounts.serializers.user import UserSerializer
 from core.apps.accounts.choices.user import RoleChoice
+from core.apps.accounts.serializers.user import UserSerializer, AdminUserSerializer, UserCreateSerializer
 
 User = get_user_model()
 
+
 @extend_schema(tags=['User'])
 class UserListApiView(generics.ListAPIView):
     queryset = User.objects.filter(role=RoleChoice.USER)
@@ -29,3 +33,71 @@ class AdminUserListApiView(generics.ListAPIView):
     permission_classes = [IsAuthenticated]
     filter_backends = [filters.SearchFilter]
     search_fields = ['phone', 'first_name', 'last_name']
+
+
+@extend_schema(tags=["User"], request=AdminUserSerializer)
+class AdminUserView(BaseViewSetMixin, ModelViewSet):
+    queryset = User.objects.filter(role=RoleChoice.USER)
+    serializer_class = AdminUserSerializer
+    permission_classes = [IsAuthenticated]
+    filter_backends = [filters.SearchFilter]
+    search_fields = ['phone', 'first_name', 'last_name']
+
+    def serializer_context(self):
+        return self.serializer_class(context={"request": self.request})
+
+
+@extend_schema(tags=['User'],
+               responses={200: UserSerializer},
+               request=UserCreateSerializer)
+class AdminCreateAPIView(APIView):
+    permission_classes = [IsAuthenticated]
+
+    def post(self, request):
+        if request.user.role not in (RoleChoice.SUPERUSER, RoleChoice.ADMIN):
+            return Response({'detail': 'Forbidden'}, status=403)
+
+        serializer = UserCreateSerializer(data=request.data)
+        serializer.is_valid(raise_exception=True)
+        serializer.save()
+
+        return Response(serializer.data, status=201)
+
+
+@extend_schema(tags=['User'],)
+class AdminUpdateAPIView(generics.GenericAPIView):
+    permission_classes = [IsAuthenticated]
+    serializer_class = UserCreateSerializer
+
+    def put(self, request, pk):
+        if request.user.role not in (RoleChoice.SUPERUSER, RoleChoice.ADMIN):
+            return Response({'detail': 'Forbidden'}, status=403)
+
+        user = get_object_or_404(User, pk=pk)
+        serializer = UserCreateSerializer(user, data=request.data)
+        serializer.is_valid(raise_exception=True)
+        serializer.save()
+
+        return Response(serializer.data, status=200)
+
+
+class DeleteAdminUserApiView(APIView):
+    permission_classes = [IsAuthenticated]
+
+    def delete(self, request, pk):
+        if request.user.role != RoleChoice.SUPERUSER:
+            return Response({'detail': 'Forbidden'}, status=403)
+
+
+        user = get_object_or_404(User, pk=pk)
+        if user.role != RoleChoice.ADMIN:
+            return Response({'detail': 'This user is not an admin'}, status=400)
+        user.delete()
+
+        return Response(status=204)
+
+
+class UserDetailAPIView(generics.RetrieveAPIView):
+    permission_classes = [IsAuthenticated]
+    serializer_class = UserSerializer
+    lookup_field = 'id'

core/apps/evaluation/choices/request.py

@@ -19,3 +19,8 @@ class RequestStatus(models.TextChoices):
     IN_PROGRESS = "in_progress", _("Jarayonda")
     COMPLETED = "completed", _("Bajarildi")
     REJECTED = "rejected", _("Rad etildi")
+
+
+class RequestPersonType(models.TextChoices):
+    INDIVIDUAL_PERSON = "individual_person", "Jismoniy shaxs"
+    LEGAL_PERSON = "legal_person", 'Yuridik shaxs',

core/apps/evaluation/migrations/0032_certificatemodel.py

@@ -0,0 +1,28 @@
+# Generated by Django 6.0.4 on 2026-04-23 11:07
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('evaluation', '0031_remove_autoevaluationmodel_object_location_city_and_more'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='CertificateModel',
+            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)),
+                ('title', models.CharField(max_length=255, verbose_name='title')),
+                ('file_url', models.URLField(max_length=255, verbose_name='file url')),
+            ],
+            options={
+                'verbose_name': 'Certificate',
+                'verbose_name_plural': 'Certificates',
+                'db_table': 'certificate',
+            },
+        ),
+    ]

core/apps/evaluation/migrations/0032_quickevaluationmodel_is_archive.py

@@ -0,0 +1,18 @@
+# Generated by Django 6.0.4 on 2026-04-23 07:24
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('evaluation', '0031_remove_autoevaluationmodel_object_location_city_and_more'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='quickevaluationmodel',
+            name='is_archive',
+            field=models.BooleanField(default=False, verbose_name='is archive'),
+        ),
+    ]

core/apps/evaluation/migrations/0033_merge_20260423_1622.py

@@ -0,0 +1,15 @@
+# Generated by Django 6.0.4 on 2026-04-23 11:22
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('evaluation', '0032_certificatemodel'),
+        ('evaluation', '0032_evaluationrequestmodel_is_archive'),
+        ('evaluation', '0032_quickevaluationmodel_is_archive'),
+    ]
+
+    operations = [
+    ]

core/apps/evaluation/migrations/0034_remove_certificatemodel_file_url_and_more.py

@@ -0,0 +1,22 @@
+# Generated by Django 6.0.4 on 2026-04-23 13:42
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('evaluation', '0033_merge_20260423_1622'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='certificatemodel',
+            name='file_url',
+        ),
+        migrations.AddField(
+            model_name='certificatemodel',
+            name='file',
+            field=models.FileField(blank=True, null=True, upload_to='certificates/', verbose_name='file'),
+        ),
+    ]

core/apps/evaluation/migrations/0035_autoevaluationmodel_is_archived.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.2.7 on 2026-04-27 09:33
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('evaluation', '0034_remove_certificatemodel_file_url_and_more'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='autoevaluationmodel',
+            name='is_archived',
+            field=models.BooleanField(default=False, verbose_name='is archived'),
+        ),
+    ]

core/apps/evaluation/migrations/0036_remove_autoevaluationmodel_form_ownership_and_more.py

@@ -0,0 +1,53 @@
+# Generated by Django 5.2.7 on 2026-04-28 11:07
+
+import django.db.models.deletion
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('evaluation', '0035_autoevaluationmodel_is_archived'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='autoevaluationmodel',
+            name='form_ownership',
+        ),
+        migrations.RemoveField(
+            model_name='autoevaluationmodel',
+            name='property_rights',
+        ),
+        migrations.RemoveField(
+            model_name='autoevaluationmodel',
+            name='rate_object_name',
+        ),
+        migrations.AlterField(
+            model_name='autoevaluationmodel',
+            name='appraisers',
+            field=models.ManyToManyField(blank=True, null=True, to=settings.AUTH_USER_MODEL, verbose_name='appraisers'),
+        ),
+        migrations.AlterField(
+            model_name='autoevaluationmodel',
+            name='evaluation_request',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='auto_evaluations_request', to='evaluation.evaluationrequestmodel'),
+        ),
+        migrations.AlterField(
+            model_name='autoevaluationmodel',
+            name='user',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='auto_evaluations_user', to=settings.AUTH_USER_MODEL),
+        ),
+        migrations.AlterField(
+            model_name='autoevaluationmodel',
+            name='valuation',
+            field=models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='auto_detail', to='evaluation.valuationmodel'),
+        ),
+        migrations.AlterField(
+            model_name='autoevaluationmodel',
+            name='vehicle',
+            field=models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='evaluation', to='evaluation.vehiclemodel'),
+        ),
+    ]

core/apps/evaluation/migrations/0037_evaluationrequestmodel_customer_and_owner_same_and_more.py

@@ -0,0 +1,49 @@
+# Generated by Django 5.2.7 on 2026-04-28 11:41
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('evaluation', '0036_remove_autoevaluationmodel_form_ownership_and_more'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='evaluationrequestmodel',
+            name='customer_and_owner_same',
+            field=models.BooleanField(default=False),
+        ),
+        migrations.CreateModel(
+            name='EvaluationRequestCustomerModel',
+            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)),
+                ('type', models.CharField(choices=[('individual_person', 'Jismoniy shaxs'), ('legal_person', 'Yuridik shaxs')], max_length=100)),
+                ('jshshir', models.CharField(max_length=100)),
+                ('evaluation_request', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, related_name='customer', to='evaluation.evaluationrequestmodel')),
+            ],
+            options={
+                'verbose_name': 'Evaluation Request Customer',
+                'verbose_name_plural': 'Evaluation Request Customers',
+            },
+        ),
+        migrations.CreateModel(
+            name='EvaluationRequestOwnerModel',
+            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)),
+                ('type', models.CharField(choices=[('individual_person', 'Jismoniy shaxs'), ('legal_person', 'Yuridik shaxs')], max_length=100)),
+                ('jshshir', models.CharField(max_length=100)),
+                ('evaluation_request', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, related_name='owner', to='evaluation.evaluationrequestmodel')),
+            ],
+            options={
+                'verbose_name': 'Evaluation Request Owner',
+                'verbose_name_plural': 'Evaluation Request Owners',
+            },
+        ),
+    ]

core/apps/evaluation/migrations/0038_evaluationrequestmodel_distance_covered_and_more.py

@@ -0,0 +1,88 @@
+# Generated by Django 5.2.7 on 2026-04-28 11:47
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('evaluation', '0037_evaluationrequestmodel_customer_and_owner_same_and_more'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='evaluationrequestmodel',
+            name='distance_covered',
+            field=models.FloatField(blank=True, default=0.0, null=True),
+        ),
+        migrations.AddField(
+            model_name='evaluationrequestmodel',
+            name='gov_number',
+            field=models.CharField(blank=True, max_length=100, null=True),
+        ),
+        migrations.AlterField(
+            model_name='evaluationrequestmodel',
+            name='chassi',
+            field=models.CharField(blank=True, max_length=100, null=True),
+        ),
+        migrations.AlterField(
+            model_name='evaluationrequestmodel',
+            name='customer_inn_number',
+            field=models.CharField(max_length=20),
+        ),
+        migrations.AlterField(
+            model_name='evaluationrequestmodel',
+            name='is_archive',
+            field=models.BooleanField(default=False),
+        ),
+        migrations.AlterField(
+            model_name='evaluationrequestmodel',
+            name='location_lat',
+            field=models.DecimalField(blank=True, decimal_places=6, max_digits=9, null=True),
+        ),
+        migrations.AlterField(
+            model_name='evaluationrequestmodel',
+            name='location_lng',
+            field=models.DecimalField(blank=True, decimal_places=6, max_digits=9, null=True),
+        ),
+        migrations.AlterField(
+            model_name='evaluationrequestmodel',
+            name='location_name',
+            field=models.CharField(blank=True, max_length=255, null=True),
+        ),
+        migrations.AlterField(
+            model_name='evaluationrequestmodel',
+            name='need_delivering',
+            field=models.BooleanField(default=True),
+        ),
+        migrations.AlterField(
+            model_name='evaluationrequestmodel',
+            name='object_type',
+            field=models.CharField(blank=True, choices=[('lightweight_auto', 'Yengil automobil'), ('truck_car', 'Yuk automobil'), ('special_tech', 'Maxsus texnika')], max_length=50, null=True),
+        ),
+        migrations.AlterField(
+            model_name='evaluationrequestmodel',
+            name='owner_inn_number',
+            field=models.CharField(max_length=20),
+        ),
+        migrations.AlterField(
+            model_name='evaluationrequestmodel',
+            name='rate_type',
+            field=models.CharField(choices=[('auto', 'Automobil'), ('real_estate', "Ko'chmas mulk"), ('equipment', 'Uskuna')], max_length=50),
+        ),
+        migrations.AlterField(
+            model_name='evaluationrequestmodel',
+            name='status',
+            field=models.CharField(choices=[('pending', 'Kutilmoqda'), ('in_progress', 'Jarayonda'), ('completed', 'Bajarildi'), ('rejected', 'Rad etildi')], default='pending', max_length=50),
+        ),
+        migrations.AlterField(
+            model_name='evaluationrequestmodel',
+            name='tex_passport',
+            field=models.CharField(blank=True, max_length=20, null=True),
+        ),
+        migrations.AlterField(
+            model_name='evaluationrequestmodel',
+            name='worked_hours',
+            field=models.IntegerField(blank=True, null=True),
+        ),
+    ]

core/apps/evaluation/models/__init__.py

@@ -11,3 +11,4 @@ from .report import *  # noqa
 from .request import *  # noqa
 from .valuation import *  # noqa
 from .vehicle import *  # noqa
+from .certificate import *  # noqa

core/apps/evaluation/models/auto.py

@@ -26,7 +26,6 @@ class AutoEvaluationModel(AbstractBaseModel):
         "accounts.User",
         on_delete=models.SET_NULL,
         related_name="auto_evaluations_user",
-        verbose_name=_("user"),
         null=True,
         blank=True,
     )
@@ -34,7 +33,6 @@ class AutoEvaluationModel(AbstractBaseModel):
         "evaluation.EvaluationRequestModel",
         on_delete=models.SET_NULL,
         related_name="auto_evaluations_request",
-        verbose_name=_("evaluation request"),
         null=True,
         blank=True,
     )
@@ -42,7 +40,6 @@ class AutoEvaluationModel(AbstractBaseModel):
         ValuationModel,
         on_delete=models.CASCADE,
         related_name="auto_detail",
-        verbose_name=_("valuation"),
         null=True,
         blank=True,
     )
@@ -50,14 +47,12 @@ class AutoEvaluationModel(AbstractBaseModel):
         VehicleModel,
         on_delete=models.CASCADE,
         related_name="evaluation",
-        verbose_name=_("vehicle"),
         null=True,
         blank=True,
     )
     appraisers = models.ManyToManyField(
         "accounts.User",
         verbose_name=_("appraisers"),
-        related_name="auto_evaluations",
         blank=True,
         null=True,
     )
@@ -96,12 +91,6 @@ class AutoEvaluationModel(AbstractBaseModel):
         blank=True,
         null=True,
     )
-    rate_object_name = models.CharField(
-        verbose_name=_("rate object name"),
-        max_length=255,
-        blank=True,
-        null=True,
-    )
     object_type = models.CharField(
         verbose_name=_("object type"),
         max_length=50,
@@ -153,23 +142,6 @@ class AutoEvaluationModel(AbstractBaseModel):
         blank=True,
         null=True,
     )
-
-    property_rights = models.ForeignKey(
-        'evaluation.ReferenceitemModel',
-        verbose_name=_("property rights"),
-        blank=True,
-        null=True,
-        on_delete=models.SET_NULL,
-        related_name='evaluation_auto_property_rights'
-    )
-    form_ownership = models.ForeignKey(
-        'evaluation.ReferenceitemModel',
-        verbose_name=_("form of ownership"),
-        blank=True,
-        null=True,
-        on_delete=models.SET_NULL,
-        related_name='evaluation_auto_form_ownership'
-    )
     value_determined = models.ForeignKey(
         'evaluation.ReferenceitemModel',
         verbose_name=_("value determined"),
@@ -267,6 +239,12 @@ class AutoEvaluationModel(AbstractBaseModel):
         choices=AutoEvaluationStatus.choices,
         default=AutoEvaluationStatus.CREATED,
     )
+    is_archived = models.BooleanField(
+        verbose_name=_("is archived"),
+        default=False,
+    )
+
+
 
     def __str__(self):
         return f"Auto Evaluation {self.registration_number or self.pk}"

core/apps/evaluation/models/certificate.py

@@ -0,0 +1,30 @@
+from django.db import models
+from django_core.models import AbstractBaseModel
+from django.utils.translation import gettext_lazy as _
+from model_bakery import baker
+
+
+class CertificateModel(AbstractBaseModel):
+    title = models.CharField(
+        verbose_name=_("title"),
+        max_length=255
+    )
+
+    file = models.FileField(
+        verbose_name=_("file"),
+        upload_to="certificates/",
+        blank=True,
+        null=True
+    )
+
+    def __str__(self):
+        return self.title
+
+    @classmethod
+    def _baker(cls):
+        return baker.make(cls)
+
+    class Meta:
+        db_table = "certificate"
+        verbose_name = _("Certificate")
+        verbose_name_plural = _("Certificates")

core/apps/evaluation/models/quick.py

@@ -132,6 +132,11 @@ class QuickEvaluationModel(AbstractBaseModel):
         default=QuickEvaluationStatus.CREATED,
     )
 
+    is_archive = models.BooleanField(
+        verbose_name=_("is archive"),
+        default=False,
+    )
+
     def __str__(self):
         return f"Quick Evaluation {self.pk} by {self.created_by}"
 

core/apps/evaluation/models/request.py

@@ -8,43 +8,41 @@ from core.apps.evaluation.choices.request import (
     EvaluationRateType,
     RequestObjectType,
     RequestStatus,
+    RequestPersonType,
 )
 from core.apps.evaluation.models import ReferenceitemModel
 
 
 class EvaluationrequestModel(AbstractBaseModel):
+    rate_type = models.CharField(max_length=50,choices=EvaluationRateType.choices)
+    object_type = models.CharField(max_length=50,choices=RequestObjectType.choices,blank=True,null=True)
+    status = models.CharField(max_length=50, choices=RequestStatus.choices, default=RequestStatus.PENDING)
+
+    distance_covered = models.FloatField(default=0.0, null=True, blank=True)
+    worked_hours = models.IntegerField(blank=True,null=True)
+    customer_inn_number = models.CharField(max_length=20)
+    owner_inn_number = models.CharField(max_length=20)
+    tex_passport = models.CharField(max_length=20,blank=True,null=True)
+    chassi = models.CharField(max_length=100,blank=True,null=True)
+    gov_number = models.CharField(max_length=100, null=True, blank=True)
+
+    location_name = models.CharField(max_length=255,blank=True,null=True)
+    location_lat = models.DecimalField(max_digits=9,decimal_places=6,blank=True, null=True)
+    location_lng = models.DecimalField(max_digits=9,decimal_places=6,blank=True,null=True)
+
+    need_delivering = models.BooleanField(default=True)
+    is_archive = models.BooleanField(default=False)
+    customer_and_owner_same = models.BooleanField(default=False)
+
+    ###################
+    # Foreign Keys
+    ###################
     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.ForeignKey(
         "evaluation.ReferenceitemModel",
         verbose_name=_("value determined"),
@@ -77,51 +75,8 @@ class EvaluationrequestModel(AbstractBaseModel):
         blank=True,
         null=True,
     )
-    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,
-    )
-    is_archive = models.BooleanField(
-        verbose_name=_("is archive"),
-        default=False,
-    )
     def __str__(self):
         return f"Requests #{self.pk} — {self.get_rate_type_display()}"
 
@@ -147,3 +102,29 @@ class EvaluationrequestModel(AbstractBaseModel):
         db_table = "EvaluationRequest"
         verbose_name = _("Evaluation Request")
         verbose_name_plural = _("Evaluation Requests")
+
+
+class EvaluationRequestOwnerModel(AbstractBaseModel):
+    evaluation_request = models.OneToOneField(EvaluationrequestModel, on_delete=models.CASCADE, related_name='owner')
+    type = models.CharField(max_length=100, choices=RequestPersonType.choices)
+    jshshir = models.CharField(max_length=100)
+
+    def __str__(self):
+        return f"Owner #{self.pk} — {self.type}"
+
+    class Meta:
+        verbose_name = _("Evaluation Request Owner")
+        verbose_name_plural = _("Evaluation Request Owners")
+
+
+class EvaluationRequestCustomerModel(AbstractBaseModel):
+    evaluation_request = models.OneToOneField(EvaluationrequestModel, on_delete=models.CASCADE, related_name='customer')
+    type = models.CharField(max_length=100, choices=RequestPersonType.choices)
+    jshshir = models.CharField(max_length=100)
+
+    def __str__(self):
+        return f"Customer #{self.pk} — {self.type}"
+
+    class Meta:
+        verbose_name = _("Evaluation Request Customer")
+        verbose_name_plural = _("Evaluation Request Customers")

core/apps/evaluation/serializers/__init__.py

@@ -12,3 +12,4 @@ from .request import *  # noqa
 from .valuation import *  # noqa
 from .vehicle import *  # noqa
 from .tech_passport import *  # noqa
+from .certificate import *  # noqa

core/apps/evaluation/serializers/auto/AutoEvaluation.py

@@ -1,22 +1,22 @@
 import re
-from django.contrib.auth import get_user_model
 
+from django.contrib.auth import get_user_model
 from rest_framework import serializers
 
-from core.apps.evaluation.models import AutoEvaluationModel,ReferenceitemModel, EvaluationrequestModel
-from core.apps.evaluation.serializers.reference import ListReferenceitemSerializer
 from core.apps.evaluation.choices.request import RequestStatus
+from core.apps.evaluation.models import AutoEvaluationModel, ReferenceitemModel, EvaluationrequestModel
+from core.apps.evaluation.serializers.reference import ListReferenceitemSerializer
 
 User = get_user_model()
 
+
 class BaseAutoevaluationSerializer(serializers.ModelSerializer):
     status_display = serializers.CharField(source="get_status_display", read_only=True)
     object_type_display = serializers.CharField(source="get_object_type_display", read_only=True, default=None)
-    object_owner_type_display = serializers.CharField(source="get_object_owner_type_display", read_only=True, default=None)
+    object_owner_type_display = serializers.CharField(source="get_object_owner_type_display", read_only=True,
+                                                      default=None)
     rate_type = ListReferenceitemSerializer(read_only=True)
     value_determined = ListReferenceitemSerializer(read_only=True)
-    property_rights = ListReferenceitemSerializer(read_only=True)
-    form_ownership = ListReferenceitemSerializer(read_only=True)
     user = serializers.SerializerMethodField(method_name="get_user", read_only=True)
 
     class Meta:
@@ -47,8 +47,6 @@ class BaseAutoevaluationSerializer(serializers.ModelSerializer):
             "created_at",
             "value_determined",
             "rate_type",
-            "property_rights",
-            "form_ownership",
             "user",
             "evaluation_request",
         ]
@@ -72,12 +70,6 @@ class ListAutoevaluationSerializer(BaseAutoevaluationSerializer):
 class RetrieveAutoevaluationSerializer(BaseAutoevaluationSerializer):
     car_type_display = serializers.CharField(source="get_car_type_display", read_only=True, default=None)
     car_wheel_display = serializers.CharField(source="get_car_wheel_display", read_only=True, default=None)
-    # object_location_highways_display = serializers.CharField(
-    #     source="get_object_location_highways_display", read_only=True, default=None
-    # )
-    # object_location_covenience_display = serializers.CharField(
-    #     source="get_object_location_covenience_display", read_only=True, default=None
-    # )
 
     class Meta(BaseAutoevaluationSerializer.Meta):
         fields = BaseAutoevaluationSerializer.Meta.fields + [
@@ -86,7 +78,6 @@ class RetrieveAutoevaluationSerializer(BaseAutoevaluationSerializer):
             "object_inspection_date",
             "rate_date",
             "rate_report_date",
-            "rate_object_name",
             # Step 2
             "object_owner_type",
             "object_owner_type_display",
@@ -115,21 +106,11 @@ class RetrieveAutoevaluationSerializer(BaseAutoevaluationSerializer):
 
 
 class UpdateAutoevaluationSerializer(serializers.ModelSerializer):
-    property_rights = serializers.PrimaryKeyRelatedField(
-        queryset=ReferenceitemModel.objects.all(),
-        required=False,
-        allow_null=True,
-    )
     value_determined = serializers.PrimaryKeyRelatedField(
         queryset=ReferenceitemModel.objects.all(),
         required=False,
         allow_null=True,
     )
-    form_ownership = serializers.PrimaryKeyRelatedField(
-        queryset=ReferenceitemModel.objects.all(),
-        required=False,
-        allow_null=True,
-    )
     value_determined = serializers.PrimaryKeyRelatedField(
         queryset=ReferenceitemModel.objects.all(),
         required=False,
@@ -141,7 +122,6 @@ class UpdateAutoevaluationSerializer(serializers.ModelSerializer):
         allow_null=True,
     )
 
-
     class Meta:
         model = AutoEvaluationModel
         fields = [
@@ -151,7 +131,6 @@ class UpdateAutoevaluationSerializer(serializers.ModelSerializer):
             "object_inspection_date",
             "rate_date",
             "rate_report_date",
-            "rate_object_name",
             "object_type",
             # Step 2
             "object_owner_type",
@@ -161,8 +140,6 @@ class UpdateAutoevaluationSerializer(serializers.ModelSerializer):
             "object_owner_individual_person_passport_num",
             "object_owner_legal_entity",
             "object_owner_legal_inn",
-            "property_rights",
-            "form_ownership",
             "value_determined",
             "rate_type",
             # Step 4
@@ -222,22 +199,13 @@ class UpdateAutoevaluationSerializer(serializers.ModelSerializer):
 
         return attrs
 
+
 class CreateAutoevaluationSerializer(serializers.ModelSerializer):
-    property_rights = serializers.PrimaryKeyRelatedField(
-        queryset=ReferenceitemModel.objects.all(),
-        required=False,
-        allow_null=True,
-    )
     value_determined = serializers.PrimaryKeyRelatedField(
         queryset=ReferenceitemModel.objects.all(),
         required=False,
         allow_null=True,
     )
-    form_ownership = serializers.PrimaryKeyRelatedField(
-        queryset=ReferenceitemModel.objects.all(),
-        required=False,
-        allow_null=True,
-    )
     value_determined = serializers.PrimaryKeyRelatedField(
         queryset=ReferenceitemModel.objects.all(),
         required=False,
@@ -254,7 +222,6 @@ class CreateAutoevaluationSerializer(serializers.ModelSerializer):
         allow_null=True,
     )
 
-
     class Meta:
         model = AutoEvaluationModel
         fields = [
@@ -265,7 +232,6 @@ class CreateAutoevaluationSerializer(serializers.ModelSerializer):
             "object_inspection_date",
             "rate_date",
             "rate_report_date",
-            "rate_object_name",
             "object_type",
             # Step 2
             "object_owner_type",
@@ -275,8 +241,6 @@ class CreateAutoevaluationSerializer(serializers.ModelSerializer):
             "object_owner_individual_person_passport_num",
             "object_owner_legal_entity",
             "object_owner_legal_inn",
-            "property_rights",
-            "form_ownership",
             "value_determined",
             "rate_type",
             # Step 4
@@ -356,3 +320,13 @@ class AutoEvaluationAppraisersSerializer(serializers.Serializer):
             raise serializers.ValidationError("Invalid appraisers IDs.")
         data['users'] = users
         return data
+
+class AutoEvaluationSerializer(serializers.Serializer):
+    brand = serializers.CharField()
+    brand_model = serializers.CharField()
+    year = serializers.CharField()
+    color = serializers.CharField()
+    transmission = serializers.CharField()
+    condition = serializers.CharField()
+    fuel_type = serializers.CharField()
+    mileage = serializers.CharField()

core/apps/evaluation/serializers/auto/AvgCost.py

@@ -0,0 +1,11 @@
+from rest_framework import serializers
+
+
+class AvgCostSerializer(serializers.Serializer):
+    brand = serializers.CharField(max_length=100)
+    condition = serializers.CharField(max_length=100)
+    model = serializers.CharField(max_length=100)
+    complication = serializers.CharField(max_length=100)
+    manufacture_date = serializers.DateField()
+    distance_covered = serializers.IntegerField()
+    color = serializers.CharField(max_length=100)

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

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

core/apps/evaluation/serializers/certificate/certificate.py

@@ -0,0 +1,30 @@
+from rest_framework import serializers
+from core.apps.evaluation.models import CertificateModel
+
+
+class BaseCertificateSerializer(serializers.ModelSerializer):
+    file = serializers.SerializerMethodField(method_name='get_file', read_only=True)
+
+    class Meta:
+        model = CertificateModel
+        fields = [
+            "id",
+            "title",
+            "file",
+        ]
+
+    def get_file(self, obj):
+        if obj.file:
+            request = self.context.get('request')
+            return request.build_absolute_uri(obj.file.url)
+        return None
+
+
+class CreateCertificateSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = CertificateModel
+        fields = [
+            "id",
+            "title",
+            "file",
+        ]

core/apps/evaluation/serializers/quick/QuickEvaluation.py

@@ -38,7 +38,8 @@ class BaseQuickevaluationSerializer(serializers.ModelSerializer):
             "state_car_name",
             "created_at",
             "distance_covered",
-            "tex_passport_serie_num"
+            "tex_passport_serie_num",
+            "is_archive"
         ]
 
 
@@ -125,3 +126,5 @@ class CreateQuickevaluationSerializer(serializers.ModelSerializer):
         if request and request.user and request.user.is_authenticated:
             validated_data["created_by"] = request.user
         return super().create(validated_data)
+
+

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

@@ -4,8 +4,11 @@ from django.contrib.auth import get_user_model
 
 from rest_framework import serializers
 
-from core.apps.evaluation.models import EvaluationrequestModel, ReferenceitemModel
+from core.apps.evaluation.models import EvaluationrequestModel, ReferenceitemModel, EvaluationRequestOwnerModel, EvaluationRequestCustomerModel
 from core.apps.evaluation.serializers.reference import ListReferenceitemSerializer
+from core.apps.evaluation.serializers.request.owner import EvaluationRequestOwnerSerializer
+from core.apps.evaluation.serializers.request.req_customer import EvaluationRequestCustomerSerializer
+
 
 
 User = get_user_model()
@@ -29,6 +32,8 @@ class BaseEvaluationrequestSerializer(serializers.ModelSerializer):
     property_rights = ListReferenceitemSerializer(read_only=True)
     form_ownership = ListReferenceitemSerializer(read_only=True)
     user = serializers.SerializerMethodField(method_name="get_user")
+    customer = EvaluationRequestCustomerSerializer(read_only=True)
+    owner = EvaluationRequestOwnerSerializer(read_only=True)
 
     class Meta:
         model = EvaluationrequestModel
@@ -56,6 +61,8 @@ class BaseEvaluationrequestSerializer(serializers.ModelSerializer):
             "created_at",
             "updated_at",
             "is_archive",
+            "customer",
+            "owner",
         ]
 
     def get_location(self, obj):
@@ -92,7 +99,6 @@ 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,
@@ -100,8 +106,6 @@ class CreateEvaluationrequestSerializer(serializers.ModelSerializer):
         allow_blank=True,
     )
 
-    # 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,
@@ -116,6 +120,8 @@ class CreateEvaluationrequestSerializer(serializers.ModelSerializer):
     rate_goal = serializers.PrimaryKeyRelatedField(required=False, queryset=ReferenceitemModel.objects.all())
     property_rights = serializers.PrimaryKeyRelatedField(required=False, queryset=ReferenceitemModel.objects.all())
     form_ownership = serializers.PrimaryKeyRelatedField(required=False, queryset=ReferenceitemModel.objects.all())
+    customer = EvaluationRequestCustomerSerializer()
+    owner = EvaluationRequestOwnerSerializer()
 
     class Meta:
         model = EvaluationrequestModel
@@ -134,6 +140,11 @@ class CreateEvaluationrequestSerializer(serializers.ModelSerializer):
             "need_delivering",
             "location",
             "locationName",
+            "customer",
+            "owner",
+            "customer_and_owner_same",
+            "distance_covered",
+            "gov_number"
         ]
 
     def validate_tex_passport(self, value):
@@ -157,7 +168,6 @@ class CreateEvaluationrequestSerializer(serializers.ModelSerializer):
                 {"tex_passport": "rate_type 'auto' bo'lganda tex_passport majburiy."}
             )
 
-        # worked_hours va chassi FAQAT yuk avtomobil (truck_car) uchun majburiy
         if object_type == "truck_car":
             if attrs.get("worked_hours") is None:
                 raise serializers.ValidationError(
@@ -183,8 +193,32 @@ class CreateEvaluationrequestSerializer(serializers.ModelSerializer):
         if location_name:
             validated_data["location_name"] = str(location_name)
         validated_data["user"] = self.context["request"].user
-        return super().create(validated_data)
+
+        instance = super().create(validated_data)
+
+        customer = validated_data.pop("customer", None)
+        owner = validated_data.pop("owner", None)
+        EvaluationRequestCustomerModel.objects.create(
+            evaluation_request=instance,
+            type=customer.get("type"),
+            jshshir=customer.get("jshshir")
+        )
+        if not instance.customer_and_owner_same:
+            EvaluationRequestOwnerModel.objects.create(
+                evaluation_request=instance,
+                type=owner.get("type"),
+                jshshir=owner.get("jshshir")
+            )
+        else:
+            EvaluationRequestOwnerModel.objects.create(
+                evaluation_request=instance,
+                type=customer.get("type"),
+                jshshir=customer.get("jshshir")
+            )
+
+        return instance
+
 
 class ArchiveEvaluationrequestSerializer(serializers.Serializer):
     id = serializers.IntegerField(required=True)
-    is_archive = serializers.BooleanField(required=True)
+    is_archive = serializers.BooleanField(required=True)

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

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

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

@@ -0,0 +1,9 @@
+from rest_framework import serializers
+
+from core.apps.evaluation.models.request import EvaluationRequestOwnerModel
+
+
+class EvaluationRequestOwnerSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = EvaluationRequestOwnerModel
+        fields = ["id", "evaluation_request", "type", "jshshir"]

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

@@ -0,0 +1,9 @@
+from rest_framework import serializers
+
+from core.apps.evaluation.models.request import EvaluationRequestCustomerModel
+
+
+class EvaluationRequestCustomerSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = EvaluationRequestCustomerModel
+        fields = ["id", "evaluation_request", "type", "jshshir"]

core/apps/evaluation/urls.py

@@ -1,79 +1,86 @@
 from django.urls import include, path
 from rest_framework.routers import DefaultRouter
 
-from .views import (
+from core.apps.evaluation import views
-    AdminEvaluationrequestView,
+
-    AutoEvaluationHistoryView,
-    AutoEvaluationView,
-    CustomerView,
-    DeterminedValueView,
-    DocumentCategoryView,
-    DocumentView,
-    EvaluationPurposeView,
-    EvaluationReportView,
-    EvaluationrequestView,
-    MovablePropertyEvaluationView,
-    OwnershipFormView,
-    PropertyOwnerView,
-    PropertyRightsView,
-    QuickEvaluationHistoryView,
-    QuickEvaluationView,
-    RealEstateEvaluationView,
-    ReferenceitemView,
-    ValuationDocumentView,
-    ValuationView,
-    VehicleView,
-    AutoEvaluationListAppraisersView,
-    AutoEvaluationSetAppraisersView,
-    AutoEvaluationRemoveAppraisersView,
-    DidoxCompanyInfoAPIView,
-    TechPassportAPIView,
-    EvaluationStatusChange,
-    ArchiveEvaluationrequestView,
-)
 
 router = DefaultRouter()
-router.register("document-category", DocumentCategoryView, basename="DocumentCategory")
+router.register("document-category", views.DocumentCategoryView, basename="DocumentCategory")
-router.register("document", DocumentView, basename="Document")
+router.register("document", views.DocumentView, basename="Document")
-router.register("auto-evaluation-history", AutoEvaluationHistoryView, basename="auto-evaluation-history")
+router.register("auto-evaluation-history", views.AutoEvaluationHistoryView, basename="auto-evaluation-history")
-router.register("quick-evaluation-history", QuickEvaluationHistoryView, basename="quick-evaluation-history")
+router.register("quick-evaluation-history", views.QuickEvaluationHistoryView, basename="quick-evaluation-history")
-router.register("determined-value", DeterminedValueView, basename="determined-value")
+router.register("determined-value", views.DeterminedValueView, basename="determined-value")
-router.register("evaluation-purpose", EvaluationPurposeView, basename="evaluation-purpose")
+router.register("evaluation-purpose", views.EvaluationPurposeView, basename="evaluation-purpose")
-router.register("property-rights", PropertyRightsView, basename="property-rights")
+router.register("property-rights", views.PropertyRightsView, basename="property-rights")
-router.register("ownership-form", OwnershipFormView, basename="ownership-form")
+router.register("ownership-form", views.OwnershipFormView, basename="ownership-form")
-router.register("evaluation-request", EvaluationrequestView, basename="evaluation-request")
+router.register("evaluation-request", views.EvaluationrequestView, basename="evaluation-request")
-router.register("admin-evaluation-request", AdminEvaluationrequestView, basename="admin-evaluation-request")
+router.register("admin-evaluation-request", views.AdminEvaluationrequestView, basename="admin-evaluation-request")
-router.register("reference-item", ReferenceitemView, basename="reference-item")
+router.register("reference-item", views.ReferenceitemView, basename="reference-item")
-router.register("valuation-document", ValuationDocumentView, basename="valuation-document")
+router.register("valuation-document", views.ValuationDocumentView, basename="valuation-document")
-router.register("evaluation-report", EvaluationReportView, basename="evaluation-report")
+router.register("evaluation-report", views.EvaluationReportView, basename="evaluation-report")
-router.register("quick-evaluation", QuickEvaluationView, basename="quick-evaluation")
+router.register("quick-evaluation", views.QuickEvaluationView, basename="quick-evaluation")
-router.register("movable-property-evaluation", MovablePropertyEvaluationView, basename="movable-property-evaluation")
+router.register("movable-property-evaluation", views.MovablePropertyEvaluationView, basename="movable-property-evaluation")
-router.register("real-estate-evaluation", RealEstateEvaluationView, basename="real-estate-evaluation")
+router.register("real-estate-evaluation", views.RealEstateEvaluationView, basename="real-estate-evaluation")
-router.register("auto-evaluation", AutoEvaluationView, basename="auto-evaluation")
+router.register("auto-evaluation", views.AutoEvaluationView, basename="auto-evaluation")
-router.register("vehicle", VehicleView, basename="vehicle")
+router.register("vehicle", views.VehicleView, basename="vehicle")
-router.register("valuation", ValuationView, basename="valuation")
+router.register("valuation", views.ValuationView, basename="valuation")
-router.register("property-owner", PropertyOwnerView, basename="property-owner")
+router.register("property-owner", views.PropertyOwnerView, basename="property-owner")
-router.register("customer", CustomerView, basename="customer")
+router.register("customer", views.CustomerView, basename="customer")
+router.register("certificate", views.CertificateView, basename="certificate")
+
 urlpatterns = [
     path("", include(router.urls)),
-    path("auto-evaluation/appraisers/", include(
+
+    path("didox/info/<int:tin>/", views.DidoxCompanyInfoAPIView.as_view()),
+    path("tech-passport/", views.TechPassportAPIView.as_view()),
+
+    # Quick Evaluation
+    path('quick-evaluation/', include(
         [
-            path("<int:id>/list/", AutoEvaluationListAppraisersView.as_view(), name="auto-evaluation-list-appraisers"),
+            path(
-            path("<int:id>/set/", AutoEvaluationSetAppraisersView.as_view(), name="auto-evaluation-set-appraisers"),
+                'archive/', include(
-            path("<int:id>/remove/", AutoEvaluationRemoveAppraisersView.as_view(), name="auto-evaluation-remove-appraisers"),
+                    [
+                        path("list/", views.QuickEvaluationArchivedListAPIView.as_view()),
+                        path("<int:pk>/", views.QuickEvaluationArchiveAPIView.as_view()),
+                    ]
+                )
+            ),
         ]
     )),
-    path(
+
-        "didox/info/<int:tin>/",
+    # Auto Evaluation
-        DidoxCompanyInfoAPIView.as_view(),
+    path("auto-evaluation/", include(
-        name="didox-info"
+        [
-    ),
+            path('archive/', include(
-    path(
+                [
-        "tech-passport/",
+                    path('<int:pk>/', views.AutoEvaluationArchiveAPIView.as_view()),
-        TechPassportAPIView.as_view(),
+                    path('list/', views.AutoEvaluationArchivedListAPIView.as_view())
-        name="tech-passport"
+                ]
-    ),
+            )),
-    path("evaluation-request/<int:pk>/change-status/", EvaluationStatusChange.as_view(),
+            path('appraisers/', include(
-         name="evaluation-change-status"),
+                [
-    path("evaluation-request/archive/", ArchiveEvaluationrequestView.as_view(), name="evaluation-request-archive"),
+                    path("<int:id>/list/", views.AutoEvaluationListAppraisersView.as_view()),
+                    path("<int:id>/set/", views.AutoEvaluationSetAppraisersView.as_view()),
+                    path("<int:id>/remove/", views.AutoEvaluationRemoveAppraisersView.as_view()),
+                ]
+            ))
+        ]
+    )),
+
+    # Evaluation Request
+    path("evaluation-request/", include(
+        [
+            path("<int:pk>/change-status/", views.EvaluationStatusChange.as_view()),
+            path(
+                'archive/', include(
+                    [
+                        path('list/', views.RequestEvaluationArchivedListAPIView.as_view()),
+                        path('<int:pk>/', views.RequestEvaluationArchiveAPIView.as_view()),
+                    ]
+                )
+            )
+        ]
+    )),
+
+    path("calculate_avg_cost/", views.AvgCostAPIView.as_view()),
 ]

core/apps/evaluation/views/__init__.py

@@ -13,3 +13,5 @@ from .valuation import *  # noqa
 from .vehicle import *  # noqa
 from .didox import * # noqa
 from .tech_passport import *  # noqa
+from .certificate import *  # noqa
+from .avg_cost import *

core/apps/evaluation/views/auto.py

@@ -1,25 +1,21 @@
 from django.db.models import Q
-from django_core.mixins import BaseViewSetMixin
 from django.shortcuts import get_object_or_404
+from django_core.mixins import BaseViewSetMixin
+
 from django_filters.rest_framework import DjangoFilterBackend
 from drf_spectacular.utils import extend_schema, OpenApiParameter
+
 from rest_framework.filters import OrderingFilter, SearchFilter
+from rest_framework.generics import GenericAPIView, ListAPIView
 from rest_framework.permissions import AllowAny, IsAuthenticated
-from rest_framework.viewsets import ModelViewSet
-from rest_framework.generics import GenericAPIView
 from rest_framework.response import Response
+from rest_framework.views import APIView
+from rest_framework.viewsets import ModelViewSet
 
 from core.apps.accounts.serializers.user import UserSerializer
 from core.apps.evaluation.filters.auto import AutoevaluationFilter
 from core.apps.evaluation.models import AutoEvaluationModel
-from core.apps.evaluation.serializers.auto import (
+from core.apps.evaluation.serializers import auto as serializers
-    CreateAutoevaluationSerializer,
-    ListAutoevaluationSerializer,
-    RetrieveAutoevaluationSerializer,
-    AutoEvaluationAppraisersSerializer,
-    UpdateAutoevaluationSerializer
-)
-
 
 @extend_schema(tags=["AutoEvaluation"])
 class AutoEvaluationView(BaseViewSetMixin, ModelViewSet):
@@ -27,8 +23,8 @@ class AutoEvaluationView(BaseViewSetMixin, ModelViewSet):
         "valuation",
         "valuation__customer",
         "vehicle",
-    ).all()
+    ).filter(is_archived=False)
-    serializer_class = ListAutoevaluationSerializer
+    serializer_class = serializers.ListAutoevaluationSerializer
     permission_classes = [AllowAny]
 
     filter_backends = [DjangoFilterBackend, SearchFilter, OrderingFilter]
@@ -66,18 +62,16 @@ class AutoEvaluationView(BaseViewSetMixin, ModelViewSet):
         "created_at",
         "value_determined",
         "rate_type",
-        "property_rights",
-        "form_ownership",
     ]
     ordering = ["-created_at"]
 
     action_permission_classes = {}
     action_serializer_class = {
-        "list": ListAutoevaluationSerializer,
+        "list": serializers.ListAutoevaluationSerializer,
-        "retrieve": RetrieveAutoevaluationSerializer,
+        "retrieve": serializers.RetrieveAutoevaluationSerializer,
-        "create": CreateAutoevaluationSerializer,
+        "create": serializers.CreateAutoevaluationSerializer,
-        "update": UpdateAutoevaluationSerializer,
+        "update": serializers.UpdateAutoevaluationSerializer,
-        "partial_update": UpdateAutoevaluationSerializer,
+        "partial_update": serializers.UpdateAutoevaluationSerializer,
     }
 
     def serializer_context(self):
@@ -88,7 +82,7 @@ class AutoEvaluationView(BaseViewSetMixin, ModelViewSet):
 class AutoEvaluationSetAppraisersView(GenericAPIView):
     permission_classes = [IsAuthenticated]
     queryset = AutoEvaluationModel.objects.all()
-    serializer_class = AutoEvaluationAppraisersSerializer
+    serializer_class = serializers.AutoEvaluationAppraisersSerializer
 
     def post(self, request, id):
         try:
@@ -107,7 +101,7 @@ class AutoEvaluationSetAppraisersView(GenericAPIView):
 class AutoEvaluationRemoveAppraisersView(GenericAPIView):
     permission_classes = [IsAuthenticated]
     queryset = AutoEvaluationModel.objects.all()
-    serializer_class = AutoEvaluationAppraisersSerializer
+    serializer_class = serializers.AutoEvaluationAppraisersSerializer
 
     def post(self, request, id):
         try:
@@ -154,3 +148,30 @@ class AutoEvaluationListAppraisersView(GenericAPIView):
             return self.get_paginated_response(serializer.data)
         except Exception as e:
             return Response({"error": str(e)}, status=500)
+
+
+@extend_schema(tags=["AutoEvaluation"])
+class AutoEvaluationArchivedListAPIView(ListAPIView):
+    permission_classes = [IsAuthenticated]
+    serializer_class = serializers.ListAutoevaluationSerializer
+
+    def get_queryset(self):
+        return AutoEvaluationModel.objects.filter(is_archived=True)
+
+
+@extend_schema(tags=["AutoEvaluation"])
+class AutoEvaluationArchiveAPIView(APIView):
+    permission_classes = [IsAuthenticated]
+
+    def post(self, request, pk):
+        auto_evaluation = get_object_or_404(AutoEvaluationModel, pk=pk)
+        auto_evaluation.is_archived = request.data["is_archived"]
+        auto_evaluation.save()
+        return Response(
+            {
+                "success": True,
+                "status": auto_evaluation.status,
+                "id": auto_evaluation.pk
+            },
+            status=200
+        )

core/apps/evaluation/views/avg_cost.py

@@ -0,0 +1,37 @@
+# rest framework
+from rest_framework import generics
+from rest_framework.response import Response
+from rest_framework import permissions
+
+# core apps
+from core.apps.evaluation.serializers.auto.AvgCost import AvgCostSerializer
+from core.services.grpc.auto import get_auto_avg_cost
+
+
+class AvgCostAPIView(generics.GenericAPIView):
+    serializer_class = AvgCostSerializer
+    permission_classes = [permissions.IsAuthenticated]
+
+    def post(self, request):
+        serializer = self.get_serializer(data=request.data)
+        if serializer.is_valid():
+            print(serializer.validated_data)
+            brand = serializer.validated_data['brand']
+            condition = serializer.validated_data['condition']
+            model = serializer.validated_data['model']
+            complication = serializer.validated_data['complication']
+            manufacture_date = serializer.validated_data['manufacture_date']
+            distance_covered = serializer.validated_data['distance_covered']
+            color = serializer.validated_data['color']
+
+            avg_cost = get_auto_avg_cost(
+                brand=brand,
+                condition=condition,
+                model=model,
+                complication=complication,
+                manufacture_date=manufacture_date,
+                distance_covered=str(distance_covered),
+                color=color
+            )
+            return Response(avg_cost, status=200)
+        return Response(serializer.errors, status=400)

core/apps/evaluation/views/certificate.py

@@ -0,0 +1,30 @@
+# django core
+from django_core.mixins import BaseViewSetMixin
+
+# swagger
+from drf_spectacular.utils import extend_schema
+
+# rest framework
+from rest_framework.viewsets import ModelViewSet
+from rest_framework.permissions import IsAuthenticated
+from rest_framework.filters import SearchFilter
+from rest_framework.parsers import MultiPartParser, FormParser
+
+# local apps
+from core.apps.evaluation.models import CertificateModel
+from core.apps.evaluation.serializers.certificate import BaseCertificateSerializer, CreateCertificateSerializer
+
+
+@extend_schema(tags=["Certificate"],request=BaseCertificateSerializer)
+class CertificateView(BaseViewSetMixin, ModelViewSet):
+    queryset = CertificateModel.objects.all()
+    serializer_class = BaseCertificateSerializer
+    permission_classes = [IsAuthenticated]
+    parser_classes = [MultiPartParser, FormParser]
+    filter_backends = [SearchFilter]
+    search_fields = ["title"]
+    pagination_class = None
+    action_permission_classes = {}
+    action_serializer_class = {
+        "create": CreateCertificateSerializer
+    }

core/apps/evaluation/views/customer.py

@@ -3,44 +3,33 @@ from drf_spectacular.utils import extend_schema
 from rest_framework.permissions import AllowAny
 from rest_framework.viewsets import ReadOnlyModelViewSet
 
+# local apps
 from core.apps.evaluation.models import CustomerModel, PropertyOwnerModel
-from core.apps.evaluation.serializers.customer import (
+from core.apps.evaluation.serializers import customer as serializers
-    CreateCustomerSerializer,
-    CreatePropertyOwnerSerializer,
-    ListCustomerSerializer,
-    ListPropertyOwnerSerializer,
-    RetrieveCustomerSerializer,
-    RetrievePropertyOwnerSerializer,
-)
 
 
 @extend_schema(tags=["Customer"])
 class CustomerView(BaseViewSetMixin, ReadOnlyModelViewSet):
     queryset = CustomerModel.objects.all()
-    serializer_class = ListCustomerSerializer
+    serializer_class = serializers.ListCustomerSerializer
     permission_classes = [AllowAny]
 
     action_permission_classes = {}
     action_serializer_class = {
-        "list": ListCustomerSerializer,
+        "list": serializers.ListCustomerSerializer,
-        "retrieve": RetrieveCustomerSerializer,
+        "retrieve": serializers.RetrieveCustomerSerializer,
-        "create": CreateCustomerSerializer,
+        "create": serializers.CreateCustomerSerializer,
     }
 
 
-
-
 @extend_schema(tags=["PropertyOwner"])
 class PropertyOwnerView(BaseViewSetMixin, ReadOnlyModelViewSet):
     queryset = PropertyOwnerModel.objects.all()
-    serializer_class = ListPropertyOwnerSerializer
+    serializer_class = serializers.ListPropertyOwnerSerializer
     permission_classes = [AllowAny]
-
     action_permission_classes = {}
     action_serializer_class = {
-        "list": ListPropertyOwnerSerializer,
+        "list": serializers.ListPropertyOwnerSerializer,
-        "retrieve": RetrievePropertyOwnerSerializer,
+        "retrieve": serializers.RetrievePropertyOwnerSerializer,
-        "create": CreatePropertyOwnerSerializer,
+        "create": serializers.CreatePropertyOwnerSerializer,
-    }
+    }
-
-    #test commit

core/apps/evaluation/views/didox.py

@@ -1,17 +1,19 @@
+# rest framework
 from rest_framework.response import Response
 from rest_framework import status
-from rest_framework.permissions import AllowAny
+from rest_framework.permissions import IsAuthenticated
 from rest_framework.generics import GenericAPIView
 
-
+# swagger
 from drf_spectacular.utils import extend_schema, OpenApiParameter
 
+# local apps
 from core.services.didox import DidoxService
 
 
 class DidoxCompanyInfoAPIView(GenericAPIView):
     authentication_classes = []
-    permission_classes = [AllowAny]
+    permission_classes = [IsAuthenticated]
 
     @extend_schema(
         tags=["Didox"],
@@ -38,7 +40,6 @@ class DidoxCompanyInfoAPIView(GenericAPIView):
                 {"detail": "TIN must be a valid integer"},
                 status=status.HTTP_400_BAD_REQUEST
             )
-
         data = DidoxService.get_company_info(tin)
 
         if not data:
@@ -47,14 +48,11 @@ class DidoxCompanyInfoAPIView(GenericAPIView):
                 status=status.HTTP_502_BAD_GATEWAY
             )
 
-        # if both name and personalNum are null/empty -> 404
         name = data.get("name")
         personal_num = data.get("personalNum")
-
         if not name and not personal_num:
             return Response(
                 {"detail": "Company or person not found"},
                 status=status.HTTP_404_NOT_FOUND
             )
-
+        return Response(data, status=status.HTTP_200_OK)
-        return Response(data, status=status.HTTP_200_OK)

core/apps/evaluation/views/document.py

@@ -1,51 +1,51 @@
+# django
 from django.shortcuts import get_object_or_404
 from django_core.mixins import BaseViewSetMixin
+
+# swagger
 from drf_spectacular.utils import extend_schema, OpenApiParameter
+
+# rest framework
 from rest_framework.exceptions import NotFound, PermissionDenied
 from rest_framework.permissions import AllowAny
 from rest_framework.viewsets import ReadOnlyModelViewSet, ModelViewSet
 from rest_framework.parsers import FormParser, MultiPartParser
 from rest_framework.decorators import action
 from rest_framework.response import Response
+
+# filters
 from django_filters.rest_framework import DjangoFilterBackend
 
 from core.apps.evaluation.models import DocumentModel, ValuationDocumentModel, AutoEvaluationModel
-from core.apps.evaluation.serializers.document import (
+from core.apps.evaluation.serializers import document as serializers
-    CreateDocumentSerializer,
-    CreateValuationdocumentSerializer,
-    ListDocumentSerializer,
-    ListValuationdocumentSerializer,
-    RetrieveDocumentSerializer,
-    RetrieveValuationdocumentSerializer,
-)
 
 
 @extend_schema(tags=["ValuationDocument"])
 class ValuationDocumentView(BaseViewSetMixin, ReadOnlyModelViewSet):
     queryset = ValuationDocumentModel.objects.all()
-    serializer_class = ListValuationdocumentSerializer
+    serializer_class = serializers.ListValuationdocumentSerializer
     permission_classes = [AllowAny]
 
     action_permission_classes = {}
     action_serializer_class = {
-        "list": ListValuationdocumentSerializer,
+        "list": serializers.ListValuationdocumentSerializer,
-        "retrieve": RetrieveValuationdocumentSerializer,
+        "retrieve": serializers.RetrieveValuationdocumentSerializer,
-        "create": CreateValuationdocumentSerializer,
+        "create": serializers.CreateValuationdocumentSerializer,
     }
 
 
 @extend_schema(tags=["Document"])
 class DocumentView(BaseViewSetMixin, ModelViewSet):
     queryset = DocumentModel.objects.all()
-    serializer_class = ListDocumentSerializer
+    serializer_class = serializers.ListDocumentSerializer
     permission_classes = [AllowAny]
     parser_classes = [FormParser, MultiPartParser]
     filter_backends = [DjangoFilterBackend]
     action_permission_classes = {}
     action_serializer_class = {
-        "list": ListDocumentSerializer,
+        "list": serializers.ListDocumentSerializer,
-        "retrieve": RetrieveDocumentSerializer,
+        "retrieve": serializers.RetrieveDocumentSerializer,
-        "create": CreateDocumentSerializer,
+        "create": serializers.CreateDocumentSerializer,
     }
 
     @extend_schema(
@@ -83,9 +83,9 @@ class DocumentView(BaseViewSetMixin, ModelViewSet):
                 documents = documents.filter(category_id=category_id)
             page = self.paginate_queryset(documents)
             if page is not None:
-                serializer = ListDocumentSerializer(page, many=True, context={"request": request})
+                serializer = serializers.ListDocumentSerializer(page, many=True, context={"request": request})
                 return self.get_paginated_response(serializer.data)
-            serializer = ListDocumentSerializer(documents, many=True, context={"request": request})
+            serializer = serializers.ListDocumentSerializer(documents, many=True, context={"request": request})
             return Response(serializer.data)
         except AutoEvaluationModel.DoesNotExist:
             raise NotFound("Auto evaluation not found")

core/apps/evaluation/views/documentcategory.py

@@ -1,8 +1,14 @@
+# django core
 from django_core.mixins import BaseViewSetMixin
+
+# swagger
 from drf_spectacular.utils import extend_schema
+
+# rest framework
 from rest_framework.permissions import AllowAny
 from rest_framework.viewsets import ReadOnlyModelViewSet
 
+# core apps
 from core.apps.evaluation.models import DocumentcategoryModel
 from core.apps.evaluation.serializers.documentcategory import (
     ListDocumentcategorySerializer,

core/apps/evaluation/views/history.py

@@ -1,24 +1,25 @@
+# django
 from django_core.mixins import BaseViewSetMixin
+
+# django filters
 from django_filters.rest_framework import DjangoFilterBackend
+
+# swagger
 from drf_spectacular.utils import OpenApiParameter, extend_schema
+
+# rest framework
 from rest_framework.filters import OrderingFilter
 from rest_framework.permissions import AllowAny
 from rest_framework.response import Response
 from rest_framework.viewsets import ReadOnlyModelViewSet
 
+# core apps
 from core.apps.evaluation.filters.history import (
     AutoevaluationhistoryFilter,
     QuickevaluationhistoryFilter,
 )
 from core.apps.evaluation.models import AutoevaluationhistoryModel, QuickevaluationhistoryModel
-from core.apps.evaluation.serializers.history import (
+from core.apps.evaluation.serializers import history as serializers
-    CreateAutoevaluationhistorySerializer,
-    CreateQuickevaluationhistorySerializer,
-    ListAutoevaluationhistorySerializer,
-    ListQuickevaluationhistorySerializer,
-    RetrieveAutoevaluationhistorySerializer,
-    RetrieveQuickevaluationhistorySerializer,
-)
 
 
 @extend_schema(
@@ -31,13 +32,12 @@ from core.apps.evaluation.serializers.history import (
     ],
 )
 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
+    serializer_class = serializers.ListAutoevaluationhistorySerializer
     permission_classes = [AllowAny]
     pagination_class = None
 
@@ -55,14 +55,13 @@ class AutoEvaluationHistoryView(BaseViewSetMixin, ReadOnlyModelViewSet):
 
     action_permission_classes = {}
     action_serializer_class = {
-        "list": ListAutoevaluationhistorySerializer,
+        "list": serializers.ListAutoevaluationhistorySerializer,
-        "retrieve": RetrieveAutoevaluationhistorySerializer,
+        "retrieve": serializers.RetrieveAutoevaluationhistorySerializer,
-        "create": CreateAutoevaluationhistorySerializer,
+        "create": serializers.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({
@@ -88,7 +87,7 @@ class QuickEvaluationHistoryView(BaseViewSetMixin, ReadOnlyModelViewSet):
         "actor_id", "actor_full_name", "actor_role",
         "meta", "created_at",
     )
-    serializer_class = ListQuickevaluationhistorySerializer
+    serializer_class = serializers.ListQuickevaluationhistorySerializer
     permission_classes = [AllowAny]
     pagination_class = None
 
@@ -99,9 +98,9 @@ class QuickEvaluationHistoryView(BaseViewSetMixin, ReadOnlyModelViewSet):
 
     action_permission_classes = {}
     action_serializer_class = {
-        "list": ListQuickevaluationhistorySerializer,
+        "list": serializers.ListQuickevaluationhistorySerializer,
-        "retrieve": RetrieveQuickevaluationhistorySerializer,
+        "retrieve": serializers.RetrieveQuickevaluationhistorySerializer,
-        "create": CreateQuickevaluationhistorySerializer,
+        "create": serializers.CreateQuickevaluationhistorySerializer,
     }
 
     def list(self, request, *args, **kwargs):

core/apps/evaluation/views/movable.py

@@ -1,25 +1,27 @@
+# django core
 from django_core.mixins import BaseViewSetMixin
+
+# swagger
 from drf_spectacular.utils import extend_schema
+
+# rest framework
 from rest_framework.permissions import AllowAny
 from rest_framework.viewsets import ReadOnlyModelViewSet
 
+# core apps
 from core.apps.evaluation.models import MovablePropertyEvaluationModel
-from core.apps.evaluation.serializers.movable import (
+from core.apps.evaluation.serializers import movable as serializers
-    CreateMovablepropertyevaluationSerializer,
-    ListMovablepropertyevaluationSerializer,
-    RetrieveMovablepropertyevaluationSerializer,
-)
 
 
 @extend_schema(tags=["MovablePropertyEvaluation"])
 class MovablePropertyEvaluationView(BaseViewSetMixin, ReadOnlyModelViewSet):
     queryset = MovablePropertyEvaluationModel.objects.all()
-    serializer_class = ListMovablepropertyevaluationSerializer
+    serializer_class = serializers.ListMovablepropertyevaluationSerializer
     permission_classes = [AllowAny]
 
     action_permission_classes = {}
     action_serializer_class = {
-        "list": ListMovablepropertyevaluationSerializer,
+        "list": serializers.ListMovablepropertyevaluationSerializer,
-        "retrieve": RetrieveMovablepropertyevaluationSerializer,
+        "retrieve": serializers.RetrieveMovablepropertyevaluationSerializer,
-        "create": CreateMovablepropertyevaluationSerializer,
+        "create": serializers.CreateMovablepropertyevaluationSerializer,
     }

core/apps/evaluation/views/quick.py

@@ -1,18 +1,29 @@
+# django
+from django.shortcuts import get_object_or_404
+
+# django core
 from django_core.mixins import BaseViewSetMixin
+
+# django filters
 from django_filters.rest_framework import DjangoFilterBackend
+
+# swagger
 from drf_spectacular.utils import extend_schema
+
+# rest framework
+from rest_framework import status
 from rest_framework.filters import OrderingFilter, SearchFilter
+from rest_framework.generics import ListAPIView
 from rest_framework.parsers import FormParser, MultiPartParser
-from rest_framework.permissions import AllowAny
+from rest_framework.permissions import AllowAny, IsAuthenticated
+from rest_framework.response import Response
+from rest_framework.views import APIView
 from rest_framework.viewsets import ModelViewSet
 
+# core apps
 from core.apps.evaluation.filters.quick import QuickevaluationFilter
 from core.apps.evaluation.models import QuickEvaluationModel
-from core.apps.evaluation.serializers.quick import (
+from core.apps.evaluation.serializers import quick as serializers
-    CreateQuickevaluationSerializer,
-    ListQuickevaluationSerializer,
-    RetrieveQuickevaluationSerializer,
-)
 
 
 @extend_schema(tags=["QuickEvaluation"])
@@ -20,8 +31,8 @@ class QuickEvaluationView(BaseViewSetMixin, ModelViewSet):
     queryset = QuickEvaluationModel.objects.select_related(
         "created_by", "brand", "marka", "color", "fuel_type",
         "body_type", "state_car", "car_position",
-    ).all()
+    ).filter(is_archive=False)
-    serializer_class = ListQuickevaluationSerializer
+    serializer_class = serializers.ListQuickevaluationSerializer
     permission_classes = [AllowAny]
     parser_classes = [MultiPartParser, FormParser]
 
@@ -46,7 +57,33 @@ class QuickEvaluationView(BaseViewSetMixin, ModelViewSet):
 
     action_permission_classes = {}
     action_serializer_class = {
-        "list": ListQuickevaluationSerializer,
+        "list": serializers.ListQuickevaluationSerializer,
-        "retrieve": RetrieveQuickevaluationSerializer,
+        "retrieve": serializers.RetrieveQuickevaluationSerializer,
-        "create": CreateQuickevaluationSerializer,
+        "create": serializers.CreateQuickevaluationSerializer,
     }
+
+
+@extend_schema(tags=["QuickEvaluation"])
+class QuickEvaluationArchiveAPIView(APIView):
+
+    def post(self, request, pk):
+        instance = get_object_or_404(QuickEvaluationModel, pk=pk)
+
+        is_archived = request.data.get("is_archived")
+        if is_archived is None:
+            return Response(
+                {"error": "Поле 'is_archived' обязательно"},
+                status=status.HTTP_400_BAD_REQUEST
+            )
+        instance.is_archive = is_archived
+        instance.save()
+        return Response({"success": True}, status=200)
+
+
+@extend_schema(tags=["QuickEvaluation"])
+class QuickEvaluationArchivedListAPIView(ListAPIView):
+    permission_classes = [IsAuthenticated]
+    serializer_class = serializers.ListQuickevaluationSerializer
+
+    def get_queryset(self):
+        return QuickEvaluationModel.objects.filter(is_archive=True)

core/apps/evaluation/views/real_estate.py

@@ -1,25 +1,27 @@
+# django core
 from django_core.mixins import BaseViewSetMixin
+
+# swagger
 from drf_spectacular.utils import extend_schema
+
+# rest framework
 from rest_framework.permissions import AllowAny
 from rest_framework.viewsets import ReadOnlyModelViewSet
 
+# core
 from core.apps.evaluation.models import RealEstateEvaluationModel
-from core.apps.evaluation.serializers.real_estate import (
+from core.apps.evaluation.serializers import real_estate as serializers
-    CreateRealestateevaluationSerializer,
-    ListRealestateevaluationSerializer,
-    RetrieveRealestateevaluationSerializer,
-)
 
 
 @extend_schema(tags=["RealEstateEvaluation"])
 class RealEstateEvaluationView(BaseViewSetMixin, ReadOnlyModelViewSet):
     queryset = RealEstateEvaluationModel.objects.all()
-    serializer_class = ListRealestateevaluationSerializer
+    serializer_class = serializers.ListRealestateevaluationSerializer
     permission_classes = [AllowAny]
 
     action_permission_classes = {}
     action_serializer_class = {
-        "list": ListRealestateevaluationSerializer,
+        "list": serializers.ListRealestateevaluationSerializer,
-        "retrieve": RetrieveRealestateevaluationSerializer,
+        "retrieve": serializers.RetrieveRealestateevaluationSerializer,
-        "create": CreateRealestateevaluationSerializer,
+        "create": serializers.CreateRealestateevaluationSerializer,
     }

core/apps/evaluation/views/reference.py

@@ -1,20 +1,21 @@
+# django core
 from django_core.mixins import BaseViewSetMixin
+
+# django filters
 from django_filters.rest_framework import DjangoFilterBackend
+
+# swagger
 from drf_spectacular.utils import extend_schema
+
+# rest framework
 from rest_framework.filters import OrderingFilter, SearchFilter
 from rest_framework.permissions import AllowAny
 from rest_framework.viewsets import ReadOnlyModelViewSet
 
+# core apps
 from core.apps.evaluation.filters.reference import ReferenceitemFilter
 from core.apps.evaluation.models import ReferenceitemModel
-from core.apps.evaluation.serializers.reference import (
+from core.apps.evaluation.serializers import reference as serializers
-    CreateReferenceitemSerializer,
-    ListReferenceitemSerializer,
-    RetrieveReferenceitemSerializer,
-    EvaluationPurposeSerializer,
-    DeterminedValueSerializer,
-    LabelValueSerializer,
-)
 
 
 @extend_schema(tags=["EvaluationPurpose"])
@@ -22,10 +23,9 @@ class EvaluationPurposeView(BaseViewSetMixin, ReadOnlyModelViewSet):
     queryset = ReferenceitemModel.objects.filter(
         type="evaluation_purpose", is_active=True
     ).order_by("order", "name")
-    serializer_class = EvaluationPurposeSerializer
+    serializer_class = serializers.EvaluationPurposeSerializer
     permission_classes = [AllowAny]
     pagination_class = None
-
     filter_backends = [DjangoFilterBackend, SearchFilter, OrderingFilter]
     search_fields = ["name"]
     ordering_fields = ["name", "order"]
@@ -37,10 +37,9 @@ class DeterminedValueView(BaseViewSetMixin, ReadOnlyModelViewSet):
     queryset = ReferenceitemModel.objects.filter(
         type="determined_value", is_active=True
     ).order_by("order", "name")
-    serializer_class = DeterminedValueSerializer
+    serializer_class = serializers.DeterminedValueSerializer
     permission_classes = [AllowAny]
     pagination_class = None
-
     filter_backends = [DjangoFilterBackend, SearchFilter, OrderingFilter]
     search_fields = ["name"]
     ordering_fields = ["name", "order"]
@@ -52,10 +51,9 @@ class PropertyRightsView(BaseViewSetMixin, ReadOnlyModelViewSet):
     queryset = ReferenceitemModel.objects.filter(
         type="property_rights", is_active=True
     ).order_by("order", "name")
-    serializer_class = LabelValueSerializer
+    serializer_class = serializers.LabelValueSerializer
     permission_classes = [AllowAny]
     pagination_class = None
-
     filter_backends = [DjangoFilterBackend, SearchFilter, OrderingFilter]
     search_fields = ["name"]
     ordering_fields = ["name", "order"]
@@ -67,10 +65,9 @@ class OwnershipFormView(BaseViewSetMixin, ReadOnlyModelViewSet):
     queryset = ReferenceitemModel.objects.filter(
         type="ownership_form", is_active=True
     ).order_by("order", "name")
-    serializer_class = LabelValueSerializer
+    serializer_class = serializers.LabelValueSerializer
     permission_classes = [AllowAny]
     pagination_class = None
-
     filter_backends = [DjangoFilterBackend, SearchFilter, OrderingFilter]
     search_fields = ["name"]
     ordering_fields = ["name", "order"]
@@ -80,18 +77,16 @@ class OwnershipFormView(BaseViewSetMixin, ReadOnlyModelViewSet):
 @extend_schema(tags=["ReferenceItem"])
 class ReferenceitemView(BaseViewSetMixin, ReadOnlyModelViewSet):
     queryset = ReferenceitemModel.objects.select_related("parent").filter(is_active=True)
-    serializer_class = ListReferenceitemSerializer
+    serializer_class = serializers.ListReferenceitemSerializer
     permission_classes = [AllowAny]
-
     filter_backends = [DjangoFilterBackend, SearchFilter, OrderingFilter]
     filterset_class = ReferenceitemFilter
     search_fields = ["name"]
     ordering_fields = ["name", "order", "type"]
     ordering = ["order", "name"]
-
     action_permission_classes = {}
     action_serializer_class = {
-        "list": ListReferenceitemSerializer,
+        "list": serializers.ListReferenceitemSerializer,
-        "retrieve": RetrieveReferenceitemSerializer,
+        "retrieve": serializers.RetrieveReferenceitemSerializer,
-        "create": CreateReferenceitemSerializer,
+        "create": serializers.CreateReferenceitemSerializer,
     }

core/apps/evaluation/views/report.py

@@ -1,25 +1,26 @@
+# django core
 from django_core.mixins import BaseViewSetMixin
+
+# swagger
 from drf_spectacular.utils import extend_schema
+
+# rest framework
 from rest_framework.permissions import AllowAny
 from rest_framework.viewsets import ReadOnlyModelViewSet
 
+# core apps
 from core.apps.evaluation.models import EvaluationReportModel
-from core.apps.evaluation.serializers.report import (
+from core.apps.evaluation.serializers import report as serializers
-    CreateEvaluationreportSerializer,
-    ListEvaluationreportSerializer,
-    RetrieveEvaluationreportSerializer,
-)
 
 
 @extend_schema(tags=["EvaluationReport"])
 class EvaluationReportView(BaseViewSetMixin, ReadOnlyModelViewSet):
     queryset = EvaluationReportModel.objects.all()
-    serializer_class = ListEvaluationreportSerializer
+    serializer_class = serializers.ListEvaluationreportSerializer
     permission_classes = [AllowAny]
-
     action_permission_classes = {}
     action_serializer_class = {
-        "list": ListEvaluationreportSerializer,
+        "list": serializers.ListEvaluationreportSerializer,
-        "retrieve": RetrieveEvaluationreportSerializer,
+        "retrieve": serializers.RetrieveEvaluationreportSerializer,
-        "create": CreateEvaluationreportSerializer,
+        "create": serializers.CreateEvaluationreportSerializer,
     }

core/apps/evaluation/views/request.py

@@ -1,42 +1,33 @@
+# django
+from django.db.models.base import transaction
 from django.shortcuts import get_object_or_404
 
+# django core
 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 rest_framework.response import Response
-from rest_framework.views import APIView
-from rest_framework import status
 
+# django filters
+from django_filters.rest_framework import DjangoFilterBackend
+
+# swagger
+from drf_spectacular.utils import extend_schema
+
+# rest framework
+from rest_framework import status, filters, generics, permissions, views, viewsets
+from rest_framework.response import Response
+
+# core apps
+from core.apps.accounts.choices import RoleChoice
+from core.apps.evaluation.choices.request import RequestStatus
 from core.apps.evaluation.filters.request import EvaluationrequestFilter
 from core.apps.evaluation.models import EvaluationrequestModel
-from core.apps.evaluation.serializers.request import (
+from core.apps.evaluation.serializers import request as serializers
-    CreateEvaluationrequestSerializer,
-    ListEvaluationrequestSerializer,
-    RetrieveEvaluationrequestSerializer,
-    ArchiveEvaluationrequestSerializer,
-)
-from core.apps.evaluation.choices.request import RequestStatus
-from rest_framework.generics import GenericAPIView
-from drf_spectacular.utils import OpenApiResponse
-
-
-# class RequestPagination(PageNumberPagination):
-#     page_size = 20
-#     page_size_query_param = "limit"
-#     max_page_size = 100
 
 
 @extend_schema(tags=["EvaluationRequest"])
-class EvaluationrequestView(BaseViewSetMixin, ModelViewSet):
+class EvaluationrequestView(BaseViewSetMixin, viewsets.ModelViewSet):
-    serializer_class = ListEvaluationrequestSerializer
+    serializer_class = serializers.ListEvaluationrequestSerializer
-    permission_classes = [IsAuthenticated]
+    permission_classes = [permissions.IsAuthenticated]
-    # pagination_class = RequestPagination
+    filter_backends = [DjangoFilterBackend, filters.SearchFilter, filters.OrderingFilter]
-
-    filter_backends = [DjangoFilterBackend, SearchFilter, OrderingFilter]
     filterset_class = EvaluationrequestFilter
     search_fields = [
         "customer_inn_number",
@@ -71,9 +62,9 @@ class EvaluationrequestView(BaseViewSetMixin, ModelViewSet):
 
     action_permission_classes = {}
     action_serializer_class = {
-        "list": ListEvaluationrequestSerializer,
+        "list": serializers.ListEvaluationrequestSerializer,
-        "retrieve": RetrieveEvaluationrequestSerializer,
+        "retrieve": serializers.RetrieveEvaluationrequestSerializer,
-        "create": CreateEvaluationrequestSerializer,
+        "create": serializers.CreateEvaluationrequestSerializer,
     }
 
     def serializer_context(self):
@@ -81,18 +72,15 @@ class EvaluationrequestView(BaseViewSetMixin, ModelViewSet):
 
     def get_queryset(self):
         return EvaluationrequestModel.objects.filter(
-            user=self.request.user
+            user=self.request.user, is_archive=False 
         ).order_by("-created_at")
 
 
-
 @extend_schema(tags=["EvaluationRequest"])
-class AdminEvaluationrequestView(BaseViewSetMixin, ModelViewSet):
+class AdminEvaluationrequestView(BaseViewSetMixin, viewsets.ModelViewSet):
-    serializer_class = ListEvaluationrequestSerializer
+    serializer_class = serializers.ListEvaluationrequestSerializer
-    permission_classes = [IsAuthenticated]
+    permission_classes = [permissions.IsAuthenticated]
-    # pagination_class = RequestPagination
+    filter_backends = [DjangoFilterBackend, filters.SearchFilter, filters.OrderingFilter]
-
-    filter_backends = [DjangoFilterBackend, SearchFilter, OrderingFilter]
     filterset_class = EvaluationrequestFilter
     search_fields = [
         "customer_inn_number",
@@ -127,29 +115,29 @@ class AdminEvaluationrequestView(BaseViewSetMixin, ModelViewSet):
 
     action_permission_classes = {}
     action_serializer_class = {
-        "list": ListEvaluationrequestSerializer,
+        "list": serializers.ListEvaluationrequestSerializer,
-        "retrieve": RetrieveEvaluationrequestSerializer,
+        "retrieve": serializers.RetrieveEvaluationrequestSerializer,
-        "create": CreateEvaluationrequestSerializer,
+        "create": serializers.CreateEvaluationrequestSerializer,
     }
 
     def get_queryset(self):
-        return EvaluationrequestModel.objects.select_related("value_determined", "rate_goal", "property_rights", "form_ownership", "user").order_by("-created_at")
+        return EvaluationrequestModel.objects.\
+        select_related("value_determined","rate_goal","property_rights","form_ownership","user")\
+        .order_by("-created_at")
 
     def serializer_context(self):
         return self.serializer_class(context={"request": self.request})
 
 
 @extend_schema(tags=["EvaluationRequest"])
-class EvaluationStatusChange(APIView):
+class EvaluationStatusChange(views.APIView):
-    permission_classes = [IsAuthenticated]
+    permission_classes = [permissions.IsAuthenticated]
 
     def post(self, request, pk):
         if request.user.role not in [RoleChoice.ADMIN, RoleChoice.SUPERUSER]:
             return Response({'detail': 'Forbidden'}, status=status.HTTP_403_FORBIDDEN)
 
         evaluation = get_object_or_404(EvaluationrequestModel, pk=pk)
-
-
         status_value = request.data.get('status')
         if not status_value:
             return Response({'detail': 'Status is required'}, status=status.HTTP_400_BAD_REQUEST)
@@ -176,75 +164,30 @@ class EvaluationStatusChange(APIView):
             'id': evaluation.pk
         })
 
+
 @extend_schema(tags=["EvaluationRequest"])
-class ArchiveEvaluationrequestView(GenericAPIView):
+class RequestEvaluationArchivedListAPIView(generics.ListAPIView):
-    permission_classes = [IsAuthenticated]
+    permission_classes = [permissions.IsAuthenticated]
+    serializer_class = serializers.ListEvaluationrequestSerializer
 
-    def get_serializer_class(self):
+    def get_queryset(self):
-        if self.request.method == "GET":
+        return EvaluationrequestModel.objects.filter(is_archive=True)
-            return ListEvaluationrequestSerializer
-        return ArchiveEvaluationrequestSerializer
 
-    @extend_schema(
-        tags=["EvaluationRequest"],
-        summary="Get archived evaluation requests list",
-        description="""
-        Returns only archived evaluation requests.
 
-        This endpoint works like evaluation-request/,
+@extend_schema(tags=["EvaluationRequest"])
-        but only records with is_archive=True are returned.
+class RequestEvaluationArchiveAPIView(views.APIView):
-        """,
+    permission_classes = [permissions.IsAuthenticated]
-        responses={200: ListEvaluationrequestSerializer(many=True)},
-    )
-    def get(self, request, *args, **kwargs):
-        queryset = EvaluationrequestModel.objects.filter(
-            is_archive=True
-        ).order_by("-created_at")
-
-        serializer = self.get_serializer(queryset, many=True)
-
-        return Response(serializer.data, status=status.HTTP_200_OK)
-
-    @extend_schema(
-        tags=["EvaluationRequest"],
-        summary="Archive or unarchive evaluation request",
-        description="""
-        Update archive status for evaluation request.
-
-        - is_archive=true → archive
-        - is_archive=false → remove from archive
-        """,
-        request=ArchiveEvaluationrequestSerializer,
-        responses={
-            200: OpenApiResponse(
-                description="Archive status updated successfully"
-            ),
-            400: OpenApiResponse(
-                description="Validation error"
-            ),
-            404: OpenApiResponse(
-                description="Evaluation request not found"
-            ),
-        },
-    )
-    def post(self, request, *args, **kwargs):
-        serializer = self.get_serializer(data=request.data)
-        serializer.is_valid(raise_exception=True)
-
-        validated_data = serializer.validated_data
-
-        obj = get_object_or_404(
-            EvaluationrequestModel,
-            id=validated_data["id"]
-        )
-
-        obj.is_archive = validated_data["is_archive"]
-        obj.save(update_fields=["is_archive"])
 
+    @transaction.atomic
+    def post(self, request, pk):
+        req_evaluation = get_object_or_404(EvaluationrequestModel, pk=pk)
+        req_evaluation.is_archive = request.data["is_archived"]
+        req_evaluation.save()
         return Response(
             {
                 "success": True,
-                "message": "Archive status updated successfully"
+                "status": req_evaluation.status,
+                "id": req_evaluation.pk
             },
             status=status.HTTP_200_OK
-        )
+        )

core/apps/evaluation/views/tech_passport.py

@@ -1,29 +1,23 @@
+# rest framework
 from rest_framework.response import Response
 from rest_framework import status
-from rest_framework.permissions import AllowAny
+from rest_framework.permissions import IsAuthenticated
 from rest_framework.generics import GenericAPIView
 
-from drf_spectacular.utils import (
+# swagger
-    extend_schema,
+from drf_spectacular.utils import extend_schema
-    OpenApiExample,
-)
 
+# core apps
 from core.services.tech_passport import TechPassportService
-from ..serializers import TechPassportSerializer
+from core.apps.evaluation.serializers import TechPassportSerializer
 
 
 class TechPassportAPIView(GenericAPIView):
     authentication_classes = []
-    permission_classes = [AllowAny]
+    permission_classes = [IsAuthenticated]
 
     @extend_schema(
         tags=["Tech Passport"],
-        summary="Get vehicle information by technical passport",
-        description=(
-            "This endpoint retrieves vehicle information using "
-            "autonumber, technical passport number, and technical passport series "
-            "via Gross Insurance API integration."
-        ),
         request=TechPassportSerializer,
         responses={
             200: dict,
@@ -45,15 +39,13 @@ class TechPassportAPIView(GenericAPIView):
         response_data = result["data"]
         status_code = result["status_code"]
 
-        # success bo‘lsa faqat data ichidagi data qaytariladi
         if status_code == 200:
             return Response(
                 response_data.get("data", {}),
                 status=status.HTTP_200_OK
             )
 
-        # error bo‘lsa original response qaytariladi
         return Response(
             response_data,
             status=status_code
-        )
+        )

core/apps/evaluation/views/valuation.py

@@ -1,25 +1,27 @@
+# django core
 from django_core.mixins import BaseViewSetMixin
+
+# swagger
 from drf_spectacular.utils import extend_schema
+
+# rest framework
 from rest_framework.permissions import AllowAny
 from rest_framework.viewsets import ReadOnlyModelViewSet
 
+# core apps
 from core.apps.evaluation.models import ValuationModel
-from core.apps.evaluation.serializers.valuation import (
+from core.apps.evaluation.serializers import valuation as serializers
-    CreateValuationSerializer,
-    ListValuationSerializer,
-    RetrieveValuationSerializer,
-)
 
 
 @extend_schema(tags=["Valuation"])
 class ValuationView(BaseViewSetMixin, ReadOnlyModelViewSet):
     queryset = ValuationModel.objects.all()
-    serializer_class = ListValuationSerializer
+    serializer_class = serializers.ListValuationSerializer
     permission_classes = [AllowAny]
 
     action_permission_classes = {}
     action_serializer_class = {
-        "list": ListValuationSerializer,
+        "list": serializers.ListValuationSerializer,
-        "retrieve": RetrieveValuationSerializer,
+        "retrieve": serializers.RetrieveValuationSerializer,
-        "create": CreateValuationSerializer,
+        "create": serializers.CreateValuationSerializer,
     }

core/apps/evaluation/views/vehicle.py

@@ -1,14 +1,16 @@
+# django core
 from django_core.mixins import BaseViewSetMixin
+
+# swagger
 from drf_spectacular.utils import extend_schema
+
+# rest framework
 from rest_framework.permissions import AllowAny
 from rest_framework.viewsets import ReadOnlyModelViewSet
 
+# core apps
 from core.apps.evaluation.models import VehicleModel
-from core.apps.evaluation.serializers.vehicle import (
+from core.apps.evaluation.serializers import vehicle as serialziers
-    CreateVehicleSerializer,
-    ListVehicleSerializer,
-    RetrieveVehicleSerializer,
-)
 
 
 @extend_schema(tags=["Vehicle"])
@@ -16,12 +18,12 @@ class VehicleView(BaseViewSetMixin, ReadOnlyModelViewSet):
     queryset = VehicleModel.objects.select_related(
         "brand", "model", "color", "fuel_type", "body_type", "position",
     ).all()
-    serializer_class = ListVehicleSerializer
+    serializer_class = serialziers.ListVehicleSerializer
     permission_classes = [AllowAny]
 
     action_permission_classes = {}
     action_serializer_class = {
-        "list": ListVehicleSerializer,
+        "list": serialziers.ListVehicleSerializer,
-        "retrieve": RetrieveVehicleSerializer,
+        "retrieve": serialziers.RetrieveVehicleSerializer,
-        "create": CreateVehicleSerializer,
+        "create": serialziers.CreateVehicleSerializer,
     }

core/generated/auto_pb2.py

@@ -0,0 +1,45 @@
+# -*- coding: utf-8 -*-
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# NO CHECKED-IN PROTOBUF GENCODE
+# source: auto.proto
+# Protobuf Python Version: 6.31.1
+"""Generated protocol buffer code."""
+from google.protobuf import descriptor as _descriptor
+from google.protobuf import descriptor_pool as _descriptor_pool
+from google.protobuf import runtime_version as _runtime_version
+from google.protobuf import symbol_database as _symbol_database
+from google.protobuf.internal import builder as _builder
+_runtime_version.ValidateProtobufRuntimeVersion(
+    _runtime_version.Domain.PUBLIC,
+    6,
+    31,
+    1,
+    '',
+    'auto.proto'
+)
+# @@protoc_insertion_point(imports)
+
+_sym_db = _symbol_database.Default()
+
+
+from google.protobuf import timestamp_pb2 as google_dot_protobuf_dot_timestamp__pb2
+
+
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\nauto.proto\x12\x04\x61uto\x1a\x1fgoogle/protobuf/timestamp.proto\"\xba\x01\n\x12\x41utoAvgCostRequest\x12\r\n\x05\x62rand\x18\x01 \x01(\t\x12\x11\n\tcondition\x18\x02 \x01(\t\x12\r\n\x05model\x18\x03 \x01(\t\x12\x14\n\x0c\x63omplication\x18\x04 \x01(\t\x12\x34\n\x10manufacture_date\x18\x05 \x01(\x0b\x32\x1a.google.protobuf.Timestamp\x12\x18\n\x10\x64istance_covered\x18\x06 \x01(\t\x12\r\n\x05\x63olor\x18\x07 \x01(\t\"$\n\x13\x41\x64ImageListResponse\x12\r\n\x05image\x18\x01 \x01(\t\"t\n\x0e\x41\x64ListResponse\x12\n\n\x02id\x18\x01 \x01(\t\x12)\n\x06images\x18\x02 \x03(\x0b\x32\x19.auto.AdImageListResponse\x12\r\n\x05title\x18\x03 \x01(\t\x12\r\n\x05price\x18\x04 \x01(\t\x12\r\n\x05model\x18\x05 \x01(\t\"J\n\x13\x41utoAvgCostResponse\x12\x10\n\x08\x61vg_cost\x18\x01 \x01(\x01\x12!\n\x03\x61\x64s\x18\x02 \x03(\x0b\x32\x14.auto.AdListResponse2X\n\x12\x41utoAvgCostService\x12\x42\n\x0b\x41utoAvgCost\x12\x18.auto.AutoAvgCostRequest\x1a\x19.auto.AutoAvgCostResponseb\x06proto3')
+
+_globals = globals()
+_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
+_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'auto_pb2', _globals)
+if not _descriptor._USE_C_DESCRIPTORS:
+  DESCRIPTOR._loaded_options = None
+  _globals['_AUTOAVGCOSTREQUEST']._serialized_start=54
+  _globals['_AUTOAVGCOSTREQUEST']._serialized_end=240
+  _globals['_ADIMAGELISTRESPONSE']._serialized_start=242
+  _globals['_ADIMAGELISTRESPONSE']._serialized_end=278
+  _globals['_ADLISTRESPONSE']._serialized_start=280
+  _globals['_ADLISTRESPONSE']._serialized_end=396
+  _globals['_AUTOAVGCOSTRESPONSE']._serialized_start=398
+  _globals['_AUTOAVGCOSTRESPONSE']._serialized_end=472
+  _globals['_AUTOAVGCOSTSERVICE']._serialized_start=474
+  _globals['_AUTOAVGCOSTSERVICE']._serialized_end=562
+# @@protoc_insertion_point(module_scope)

core/generated/auto_pb2_grpc.py

@@ -0,0 +1,97 @@
+# Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT!
+"""Client and server classes corresponding to protobuf-defined services."""
+import grpc
+import warnings
+
+from core.generated import auto_pb2 as auto__pb2
+
+GRPC_GENERATED_VERSION = '1.80.0'
+GRPC_VERSION = grpc.__version__
+_version_not_supported = False
+
+try:
+    from grpc._utilities import first_version_is_lower
+    _version_not_supported = first_version_is_lower(GRPC_VERSION, GRPC_GENERATED_VERSION)
+except ImportError:
+    _version_not_supported = True
+
+if _version_not_supported:
+    raise RuntimeError(
+        f'The grpc package installed is at version {GRPC_VERSION},'
+        + ' but the generated code in auto_pb2_grpc.py depends on'
+        + f' grpcio>={GRPC_GENERATED_VERSION}.'
+        + f' Please upgrade your grpc module to grpcio>={GRPC_GENERATED_VERSION}'
+        + f' or downgrade your generated code using grpcio-tools<={GRPC_VERSION}.'
+    )
+
+
+class AutoAvgCostServiceStub(object):
+    """Missing associated documentation comment in .proto file."""
+
+    def __init__(self, channel):
+        """Constructor.
+
+        Args:
+            channel: A grpc.Channel.
+        """
+        self.AutoAvgCost = channel.unary_unary(
+                '/auto.AutoAvgCostService/AutoAvgCost',
+                request_serializer=auto__pb2.AutoAvgCostRequest.SerializeToString,
+                response_deserializer=auto__pb2.AutoAvgCostResponse.FromString,
+                _registered_method=True)
+
+
+class AutoAvgCostServiceServicer(object):
+    """Missing associated documentation comment in .proto file."""
+
+    def AutoAvgCost(self, request, context):
+        """Missing associated documentation comment in .proto file."""
+        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+        context.set_details('Method not implemented!')
+        raise NotImplementedError('Method not implemented!')
+
+
+def add_AutoAvgCostServiceServicer_to_server(servicer, server):
+    rpc_method_handlers = {
+            'AutoAvgCost': grpc.unary_unary_rpc_method_handler(
+                    servicer.AutoAvgCost,
+                    request_deserializer=auto__pb2.AutoAvgCostRequest.FromString,
+                    response_serializer=auto__pb2.AutoAvgCostResponse.SerializeToString,
+            ),
+    }
+    generic_handler = grpc.method_handlers_generic_handler(
+            'auto.AutoAvgCostService', rpc_method_handlers)
+    server.add_generic_rpc_handlers((generic_handler,))
+    server.add_registered_method_handlers('auto.AutoAvgCostService', rpc_method_handlers)
+
+
+ # This class is part of an EXPERIMENTAL API.
+class AutoAvgCostService(object):
+    """Missing associated documentation comment in .proto file."""
+
+    @staticmethod
+    def AutoAvgCost(request,
+            target,
+            options=(),
+            channel_credentials=None,
+            call_credentials=None,
+            insecure=False,
+            compression=None,
+            wait_for_ready=None,
+            timeout=None,
+            metadata=None):
+        return grpc.experimental.unary_unary(
+            request,
+            target,
+            '/auto.AutoAvgCostService/AutoAvgCost',
+            auto__pb2.AutoAvgCostRequest.SerializeToString,
+            auto__pb2.AutoAvgCostResponse.FromString,
+            options,
+            channel_credentials,
+            insecure,
+            call_credentials,
+            compression,
+            wait_for_ready,
+            timeout,
+            metadata,
+            _registered_method=True)

core/services/grpc/auto.py

@@ -0,0 +1,54 @@
+from datetime import datetime
+import grpc
+from google.protobuf.timestamp_pb2 import Timestamp
+from datetime import datetime
+
+from config.env import env
+from core.generated import auto_pb2, auto_pb2_grpc
+
+
+def get_auto_avg_cost(
+    brand,
+    condition,
+    model,
+    complication,
+    manufacture_date: datetime,
+    distance_covered,
+    color
+):
+    channel = grpc.insecure_channel("94.230.232.47:50051")
+    stub = auto_pb2_grpc.AutoAvgCostServiceStub(channel)
+
+
+    ts = Timestamp()
+    if isinstance(manufacture_date, datetime):
+        dt = manufacture_date
+    else:
+        dt = datetime.combine(manufacture_date, datetime.min.time())
+
+    ts.FromDatetime(dt)
+
+    response = stub.AutoAvgCost(auto_pb2.AutoAvgCostRequest(
+        brand=brand,
+        condition=condition,
+        model=model,
+        complication=complication,
+        manufacture_date=ts,
+        distance_covered=distance_covered,
+        color=color,
+    ))
+    print("manufacture_date:", manufacture_date, type(manufacture_date))
+
+    return {
+        "avg_cost": response.avg_cost,
+        "ads": [
+            {
+                "id": ad.id,
+                "title": ad.title,
+                "price": ad.price,
+                "model": ad.model,
+                "images": [img.image for img in ad.images],
+            }
+            for ad in response.ads
+        ]
+    }

requirements.txt

@@ -46,3 +46,7 @@ boto3
 # !NOTE: on-websocket
 # websockets
 # channels-redis
+
+grpcio>=1.62.0
+grpcio-tools>=1.62.0
+protobuf>=4.25.0

stack.yaml

@@ -84,7 +84,7 @@ services:
         max-file: "5"
 
   web:
-    image: husanjon/sifatbaho:107
+    image: husanjon/sifatbaho:144
     env_file:
       - .env
     environment:
@@ -129,7 +129,7 @@ services:
         max-file: "5"
 
   celery:
-    image: husanjon/sifatbaho:107
+    image: husanjon/sifatbaho:144
     env_file:
       - .env
     environment: