🔄 Update image to 147 [CI SKIP]

Reviewed-on: #128

.env.example

@@ -73,6 +73,5 @@ STORAGE_BUCKET_STATIC=name
 STORAGE_PATH=127.0.0.1:8081/bucket/
 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"
-
             export PORT=8085
             docker stack deploy -c stack.yaml ${{ env.PROJECT_NAME }} --with-registry-auth

config/conf/apps.py

@@ -1,11 +1,11 @@
 from config.env import env
 
 APPS = [
-    
+
     "cacheops",
     "rosetta",
     "django_ckeditor_5",
-    
+
     "drf_spectacular",
     "rest_framework",
     "corsheaders",
@@ -14,9 +14,10 @@ APPS = [
     "rest_framework_simplejwt",
     "django_core",
     "core.apps.accounts.apps.AccountsConfig",
+    'core.apps.tasks.apps.TasksConfig',
 ]
 
 if env.bool("SILK_ENABLED", False):
     APPS += [
-        
+
     ]

config/conf/navigation.py

@@ -165,5 +165,78 @@ PAGES = [
                 "link": reverse_lazy("admin:evaluation_documentcategorymodel_changelist"),
             }
         ]
+    },
+    {
+        "title": _("Joylashuvlar"),
+        "separator": True,
+        "items": [
+            {
+                "title": _("Shaharlar"),
+                "icon": "attach_file",
+                "link": reverse_lazy("admin:shared_regionmodel_changelist"),
+            },
+            {
+                "title": _("Tumanlar"),
+                "icon": "attach_file",
+                "link": reverse_lazy("admin:shared_districtmodel_changelist"),
+            },
+            {
+                "title": _("Mahallalar"),
+                "icon": "attach_file",
+                "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"),
+            },
+        ]
+    },
+    {
+        "title": _("Task Management"),
+        "separator": True,
+        "items": [
+            {
+                "title": _("Task"),
+                "icon": "task",
+                "link": reverse_lazy("admin:tasks_task_changelist"),
+            },
+            {
+                "title": _("Column"),
+                "icon": "tag",
+                "link": reverse_lazy("admin:tasks_column_changelist"),
+            },
+            {
+                "title": _("Comment"),
+                "icon": "message",
+                "link": reverse_lazy("admin:tasks_comment_changelist"),
+            },
+            {
+                "title": _("Label"),
+                "icon": "tag",
+                "link": reverse_lazy("admin:tasks_label_changelist"),
+            },
+        ]
     }
 ]

config/env.py

@@ -9,7 +9,7 @@ import environ
 environ.Env.read_env(os.path.join(".env"))
 
 env = environ.Env(
-    DEBUG=(bool, False),
+    DEBUG=(bool, True),
     CACHE_TIME=(int, 180),
     OTP_EXPIRE_TIME=(int, 2),
     VITE_LIVE=(bool, False),
@@ -26,4 +26,5 @@ env = environ.Env(
     OTP_SERVICE="EskizService",
     PROJECT_ENV=(str, "prod"),
     SILK_ENABLED=(bool, False),
+    DIDOX_PARTNER_TOKEN=(str),
 )

config/settings/common.py

@@ -49,6 +49,7 @@ INSTALLED_APPS = [
     "django.contrib.sessions",
     "django.contrib.messages",
     "django.contrib.staticfiles",
+    "django.contrib.postgres",
 ] + APPS
 
 MODULES = [app for app in MODULES if isinstance(app, str)]
@@ -165,6 +166,8 @@ SITE_URL = env.str("SITE_URL", default="http://localhost:8055")
 MODELTRANSLATION_LANGUAGES = ("uz", "ru", "en")
 MODELTRANSLATION_DEFAULT_LANGUAGE = "uz"
 
+DIDOX_PARTNER_TOKEN = env.str("DIDOX_PARTNER_TOKEN")
+
 
 
 JST_LANGUAGES = [

config/urls.py

@@ -13,7 +13,7 @@ from config.env import env
 
 
 def home(request):
-    return HttpResponse("OK: #264548c3b1036f4b57edd4143dcb417e459a4e71")
+    return HttpResponse("OK: #65ab51e65224a92a4b6d488d3e8f9b21d3256876")
 
 
 urlpatterns = [
@@ -23,6 +23,7 @@ urlpatterns = [
     path("api/v1/", include("core.apps.evaluation.urls")),
     path("api/v1/", include("core.apps.payment.urls")),
     path("api/v1/", include("core.apps.chat.urls")),
+    path("api/v1/tasks/", include("core.apps.tasks.urls")),
 ]
 urlpatterns += [
     path("admin/", admin.site.urls),

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/permissions.py

@@ -0,0 +1,15 @@
+from rest_framework.exceptions import PermissionDenied
+from rest_framework.permissions import BasePermission
+
+from core.apps.accounts.choices import RoleChoice
+
+
+class IsAdminRole(BasePermission):
+    def has_permission(self, request, view):
+        if not request.user.is_authenticated:
+            return False
+
+        if request.user.role != RoleChoice.ADMIN:
+            raise PermissionDenied("Only admin can access this")
+
+        return True

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, read_only=True)
+
+    class Meta:
+        model = PermissionToTab
+        fields = ['id', 'name', 'permission_to_actions']
+
+
+class PermissionSerializer(serializers.ModelSerializer):
+    permission_tabs = PermissionToTabSerializer(many=True, read_only=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

@@ -3,6 +3,8 @@ from rest_framework import serializers
 
 
 class UserSerializer(serializers.ModelSerializer):
+    avatar = serializers.SerializerMethodField(method_name='get_avatar')
+
     class Meta:
         exclude = [
             "created_at",
@@ -10,10 +12,15 @@ class UserSerializer(serializers.ModelSerializer):
             "password",
             "groups",
             "user_permissions",
-            "role"
         ]
         model = get_user_model()
 
+    def get_avatar(self, obj):
+        request = self.context.get('request')
+        if obj.avatar:
+            return request.build_absolute_uri(obj.avatar.url)
+        return None
+
 
 class UserUpdateSerializer(serializers.ModelSerializer):
     class Meta:
@@ -23,3 +30,46 @@ 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"
+        ]
+
+
+class ShortUserSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = get_user_model()
+        fields = [
+            'id',
+            'first_name',
+            'last_name',
+            'avatar',
+        ]
+    
+    def get_avatar(self, obj):
+        request = self.context.get('request')
+        if obj.avatar:
+            return request.build_absolute_uri(obj.avatar.url)
+        return None

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/auth.py

@@ -177,11 +177,11 @@ class MeView(BaseViewSetMixin, GenericViewSet, UserService):
 
     @action(methods=["GET", "OPTIONS"], detail=False, url_path="me")
     def me(self, request):
-        return Response(self.get_serializer(request.user).data)
+        return Response(UserSerializer(request.user, context={"request": request}).data)
 
     @action(methods=["PATCH", "PUT"], detail=False, url_path="user-update")
     def user_update(self, request):
-        ser = self.get_serializer(instance=request.user, data=request.data, partial=True)
+        ser = self.get_serializer(instance=request.user, data=request.data, partial=True, context={"request": request})
         ser.is_valid(raise_exception=True)
         data = ser.save()
         return Response(UserSerializer(data).data)

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,21 @@
 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.models import Role
+from core.apps.accounts.serializers.permission import RoleListSerializer
+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)
@@ -18,6 +24,9 @@ class UserListApiView(generics.ListAPIView):
     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'])
 class AdminUserListApiView(generics.ListAPIView):
@@ -26,3 +35,84 @@ 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'
+
+
+class AdminPermissionsAPIView(generics.GenericAPIView):
+    permission_classes = [IsAuthenticated]
+    queryset = User.objects.all()
+
+    def get(self, request):
+        if request.user.role.name != RoleChoice.ADMIN:
+            return Response({'detail': 'Forbidden'}, status=403)
+
+        admin_role = Role.objects.get(name=RoleChoice.ADMIN)
+
+        serializer = RoleListSerializer(admin_role)
+        return Response(serializer.data)

core/apps/chat/consumers/chat.py

@@ -4,6 +4,11 @@ from channels.db import database_sync_to_async
 from channels.generic.websocket import AsyncWebsocketConsumer
 from django.contrib.auth.models import AnonymousUser
 
+def get_base_url(scope):
+    headers = dict(scope["headers"])
+    host = headers.get(b"host", b"").decode()
+    scheme = "https" if scope.get("scheme") == "https" else "http"
+    return f"{scheme}://{host}"
 
 class ChatConsumer(AsyncWebsocketConsumer):
     """
@@ -36,7 +41,7 @@ class ChatConsumer(AsyncWebsocketConsumer):
     async def receive(self, text_data):
         user = self.scope.get("user")
         if not user or isinstance(user, AnonymousUser):
-            await self.close(code=4001)
+            await self.close(code=401)
             return
 
         try:
@@ -48,13 +53,10 @@ class ChatConsumer(AsyncWebsocketConsumer):
         message_type = data.get("message_type", "text")
         text = (data.get("text") or "").strip()
 
-        # Matn xabari uchun text majburiy
         if message_type == "text" and not text:
             await self.send(text_data=json.dumps({"error": "Matn bo'sh bo'lishi mumkin emas."}))
             return
 
-        # WS orqali faqat matn + caption saqlanadi.
-        # Fayl yuklash uchun REST /chat/messages/ POST ishlatiladi.
         if message_type != "text":
             await self.send(
                 text_data=json.dumps(
@@ -63,9 +65,9 @@ class ChatConsumer(AsyncWebsocketConsumer):
             )
             return
 
-        # DB ga saqlash — post_save signal WS ga broadcast qiladi
         await self._save_message(user, text)
 
+   
     async def chat_message(self, event):
         await self.send(
             text_data=json.dumps(
@@ -91,6 +93,12 @@ class ChatConsumer(AsyncWebsocketConsumer):
             text=text,
         )
         full_name = user.get_full_name().strip() or str(user.phone)
+        base_url = get_base_url(self.scope)
+
+        avatar_url = (
+            base_url + user.avatar.url
+            if user.avatar else None
+        )
         return {
             "id": msg.id,
             "message_type": msg.message_type,
@@ -100,6 +108,8 @@ class ChatConsumer(AsyncWebsocketConsumer):
                 "id": user.id,
                 "full_name": full_name,
                 "role": user.role,
+                "phone": user.phone,
+                "avatar": avatar_url,
             },
             "created_at": msg.created_at.isoformat(),
         }

core/apps/chat/serializers/chat/ChatMessage.py

@@ -1,7 +1,7 @@
 from rest_framework import serializers
 
 from core.apps.chat.models import ChatmessageModel
-
+from core.apps.chat.tasks.message import send_message_to_chat
 
 class BaseChatmessageSerializer(serializers.ModelSerializer):
     sender = serializers.SerializerMethodField()
@@ -13,10 +13,13 @@ class BaseChatmessageSerializer(serializers.ModelSerializer):
         full_name = obj.sender.get_full_name().strip()
         if not full_name:
             full_name = str(obj.sender.phone)
+        request = self.context.get("request")
         return {
             "id": obj.sender.id,
             "full_name": full_name,
             "role": obj.sender.role,
+            "phone": obj.sender.phone,
+            "avatar": request.build_absolute_uri(obj.sender.avatar.url) if obj.sender.avatar else None,
         }
 
     def get_file_url(self, obj):
@@ -72,4 +75,9 @@ class CreateChatmessageSerializer(serializers.ModelSerializer):
 
     def create(self, validated_data):
         validated_data["sender"] = self.context["request"].user
-        return super().create(validated_data)
+        request = self.context["request"]
+        message = super().create(validated_data)
+        file_url = request.build_absolute_uri(message.file.url) if message.file else None
+        avatar_url = request.build_absolute_uri(self.context['request'].user.avatar.url) if self.context['request'].user.avatar else None
+        send_message_to_chat.delay(message.id, file_url, avatar_url)
+        return message

core/apps/chat/signals/chat.py

@@ -7,42 +7,42 @@ from django.dispatch import receiver
 from core.apps.chat.models import ChatmessageModel, ChatroomModel
 
 
-@receiver(post_save, sender=ChatmessageModel)
+# @receiver(post_save, sender=ChatmessageModel)
-def broadcast_new_message(sender, instance, created, **kwargs):
+# def broadcast_new_message(sender, instance, created, **kwargs):
-    """Yangi xabar saqlanganda xonadagi barcha WS ulanishlariga yuboradi."""
+#     """Yangi xabar saqlanganda xonadagi barcha WS ulanishlariga yuboradi."""
-    if not created:
+#     if not created:
-        return
+#         return
 
-    channel_layer = get_channel_layer()
+#     channel_layer = get_channel_layer()
-    if channel_layer is None:
+#     if channel_layer is None:
-        return
+#         return
 
-    sender_obj = instance.sender
+#     sender_obj = instance.sender
-    if sender_obj:
+#     if sender_obj:
-        full_name = sender_obj.get_full_name().strip() or str(sender_obj.phone)
+#         full_name = sender_obj.get_full_name().strip() or str(sender_obj.phone)
-        sender_data = {
+#         sender_data = {
-            "id": sender_obj.id,
+#             "id": sender_obj.id,
-            "full_name": full_name,
+#             "full_name": full_name,
-            "role": sender_obj.role,
+#             "role": sender_obj.role,
-        }
+#         }
-    else:
+#     else:
-        sender_data = None
+#         sender_data = None
 
-    site_url = getattr(settings, "SITE_URL", "").rstrip("/")
+#     site_url = getattr(settings, "SITE_URL", "").rstrip("/")
-    file_url = (site_url + instance.file.url) if instance.file else None
+#     file_url = (site_url + instance.file.url) if instance.file else None
 
-    async_to_sync(channel_layer.group_send)(
+#     async_to_sync(channel_layer.group_send)(
-        f"chat_room_{instance.room_id}",
+#         f"chat_room_{instance.room_id}",
-        {
+#         {
-            "type": "chat_message",
+#             "type": "chat_message",
-            "id": instance.id,
+#             "id": instance.id,
-            "message_type": instance.message_type,
+#             "message_type": instance.message_type,
-            "text": instance.text,
+#             "text": instance.text,
-            "file_url": file_url,
+#             "file_url": file_url,
-            "sender": sender_data,
+#             "sender": sender_data,
-            "created_at": instance.created_at.isoformat(),
+#             "created_at": instance.created_at.isoformat(),
-        },
+#         },
-    )
+#     )
 
 
 @receiver(post_save, sender="evaluation.AutoEvaluationModel")

core/apps/chat/tasks/__init__.py

@@ -0,0 +1 @@
+from .message import send_message_to_chat

core/apps/chat/tasks/message.py

@@ -0,0 +1,44 @@
+from asgiref.sync import async_to_sync
+from channels.layers import get_channel_layer
+
+from celery import shared_task
+
+from core.apps.chat.models import ChatmessageModel
+
+
+@shared_task
+def send_message_to_chat(message_id, file_url, avatar_url):
+    try:
+        message = ChatmessageModel.objects.get(id=message_id)
+    except ChatmessageModel.DoesNotExist:
+        return "Not found"
+
+    channel_layer = get_channel_layer()
+    if channel_layer is None:
+        return
+
+    sender_obj = message.sender
+    if sender_obj:
+        full_name = sender_obj.get_full_name().strip() or str(sender_obj.phone)
+        sender_data = {
+            "id": sender_obj.id,
+            "full_name": full_name,
+            "role": sender_obj.role,
+            "phone": sender_obj.phone,
+            "avatar": avatar_url,
+        }
+    else:
+        sender_data = None
+
+    async_to_sync(channel_layer.group_send)(
+        f"chat_room_{message.room_id}",
+        {
+            "type": "chat_message",
+            "id": message.id,
+            "message_type": message.message_type,
+            "text": message.text,
+            "file_url": file_url,
+            "sender": sender_data,
+            "created_at": message.created_at.isoformat(),
+        },
+    )

core/apps/evaluation/admin/auto.py

@@ -50,15 +50,8 @@ class AutoEvaluationAdmin(ModelAdmin):
                 ("value_determined", "rate_type"),
             ),
         }),
-        ("Step 3 — Manzil ma'lumotlari", {
+
-            "fields": (
+        ("Step 3 — Avtomobil ma'lumotlari", {
-                ("object_location_province", "object_location_district"),
-                ("object_location_city", "object_location_neighborhood"),
-                ("object_location_street", "object_location_home"),
-                ("object_location_highways", "object_location_covenience"),
-            ),
-        }),
-        ("Step 4 — Avtomobil ma'lumotlari", {
             "fields": (
                 "tex_passport_serie_num",
                 ("tex_passport_gived_date", "tex_passport_gived_location"),

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/0029_autoevaluationmodel_user.py

@@ -0,0 +1,21 @@
+# Generated by Django 5.2.7 on 2026-04-18 11:28
+
+import django.db.models.deletion
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('evaluation', '0028_autoevaluationmodel_appraisers'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.AddField(
+            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, verbose_name='user'),
+        ),
+    ]

core/apps/evaluation/migrations/0030_autoevaluationmodel_evaluation_request.py

@@ -0,0 +1,19 @@
+# Generated by Django 5.2.7 on 2026-04-20 13:08
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('evaluation', '0029_autoevaluationmodel_user'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='autoevaluationmodel',
+            name='evaluation_request',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='auto_evaluations_request', to='evaluation.evaluationrequestmodel', verbose_name='evaluation request'),
+        ),
+    ]

core/apps/evaluation/migrations/0031_remove_autoevaluationmodel_object_location_city_and_more.py

@@ -0,0 +1,54 @@
+# Generated by Django 5.2.7 on 2026-04-21 10:22
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('evaluation', '0030_autoevaluationmodel_evaluation_request'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='autoevaluationmodel',
+            name='object_location_city',
+        ),
+        migrations.RemoveField(
+            model_name='autoevaluationmodel',
+            name='object_location_covenience',
+        ),
+        migrations.RemoveField(
+            model_name='autoevaluationmodel',
+            name='object_location_district',
+        ),
+        migrations.RemoveField(
+            model_name='autoevaluationmodel',
+            name='object_location_highways',
+        ),
+        migrations.RemoveField(
+            model_name='autoevaluationmodel',
+            name='object_location_home',
+        ),
+        migrations.RemoveField(
+            model_name='autoevaluationmodel',
+            name='object_location_neighborhood',
+        ),
+        migrations.RemoveField(
+            model_name='autoevaluationmodel',
+            name='object_location_province',
+        ),
+        migrations.RemoveField(
+            model_name='autoevaluationmodel',
+            name='object_location_street',
+        ),
+        migrations.RemoveField(
+            model_name='quickevaluationmodel',
+            name='tex_passport_file',
+        ),
+        migrations.AddField(
+            model_name='autoevaluationmodel',
+            name='tex_passport_file',
+            field=models.FileField(blank=True, null=True, upload_to='quick_evaluation/tech_passports/%Y/%m/', verbose_name='tech passport file'),
+        ),
+    ]

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_evaluationrequestmodel_is_archive.py

@@ -0,0 +1,18 @@
+# Generated by Django 6.0.4 on 2026-04-23 07:22
+
+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='evaluationrequestmodel',
+            name='is_archive',
+            field=models.BooleanField(default=False, verbose_name='is archive'),
+        ),
+    ]

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

@@ -22,11 +22,24 @@ from .vehicle import VehicleModel
 
 
 class AutoEvaluationModel(AbstractBaseModel):
+    user = models.ForeignKey(
+        "accounts.User",
+        on_delete=models.SET_NULL,
+        related_name="auto_evaluations_user",
+        null=True,
+        blank=True,
+    )
+    evaluation_request = models.ForeignKey(
+        "evaluation.EvaluationRequestModel",
+        on_delete=models.SET_NULL,
+        related_name="auto_evaluations_request",
+        null=True,
+        blank=True,
+    )
     valuation = models.OneToOneField(
         ValuationModel,
         on_delete=models.CASCADE,
         related_name="auto_detail",
-        verbose_name=_("valuation"),
         null=True,
         blank=True,
     )
@@ -34,14 +47,19 @@ 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,
+    )
+
+    tex_passport_file = models.FileField(
+        verbose_name=_("tech passport file"),
+        upload_to="quick_evaluation/tech_passports/%Y/%m/",
         blank=True,
         null=True,
     )
@@ -73,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,
@@ -130,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"),
@@ -164,56 +159,6 @@ class AutoEvaluationModel(AbstractBaseModel):
         related_name='evaluation_auto_rate_type'
     )
 
-    # ── Step 3 — Manzil ma'lumotlari ────────────────────────────────
-    object_location_province = models.CharField(
-        verbose_name=_("object location province"),
-        max_length=100,
-        blank=True,
-        null=True,
-    )
-    object_location_district = models.CharField(
-        verbose_name=_("object location district"),
-        max_length=100,
-        blank=True,
-        null=True,
-    )
-    object_location_city = models.CharField(
-        verbose_name=_("object location city"),
-        max_length=100,
-        blank=True,
-        null=True,
-    )
-    object_location_neighborhood = models.CharField(
-        verbose_name=_("object location neighborhood"),
-        max_length=100,
-        blank=True,
-        null=True,
-    )
-    object_location_street = models.CharField(
-        verbose_name=_("object location street"),
-        max_length=100,
-        blank=True,
-        null=True,
-    )
-    object_location_home = models.CharField(
-        verbose_name=_("object location home"),
-        max_length=50,
-        blank=True,
-        null=True,
-    )
-    object_location_highways = models.IntegerField(
-        verbose_name=_("location highways"),
-        choices=LocationHighways.choices,
-        blank=True,
-        null=True,
-    )
-    object_location_covenience = models.IntegerField(
-        verbose_name=_("location convenience"),
-        choices=LocationConvenience.choices,
-        blank=True,
-        null=True,
-    )
-
     # ── Step 4 — Avtomobil ma'lumotlari ─────────────────────────────
     tex_passport_serie_num = models.CharField(
         verbose_name=_("tech passport series and number"),
@@ -294,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

@@ -34,12 +34,6 @@ class QuickEvaluationModel(AbstractBaseModel):
         blank=True,
         null=True,
     )
-    tex_passport_file = models.FileField(
-        verbose_name=_("tech passport file"),
-        upload_to="quick_evaluation/tech_passports/%Y/%m/",
-        blank=True,
-        null=True,
-    )
 
     # Car info
     car_type = models.CharField(
@@ -138,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,50 +75,10 @@ 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,
-    )
 
     def __str__(self):
-        return f"Request #{self.pk} — {self.get_rate_type_display()}"
+        return f"Requests #{self.pk} — {self.get_rate_type_display()}"
 
     @classmethod
     def _baker(cls):
@@ -144,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

@@ -11,3 +11,5 @@ from .report import *  # noqa
 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,26 +1,39 @@
 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
+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)
+    user = serializers.SerializerMethodField(method_name="get_user", read_only=True)
-    form_ownership = ListReferenceitemSerializer(read_only=True)
 
     class Meta:
         model = AutoEvaluationModel
         fields = [
             "id",
+            "contract_date",
+            "object_inspection_date",
+            "object_owner_individual_person_passport_num",
+            "object_owner_type",
+            "object_owner_individual_person_f_name",
+            "object_owner_individual_person_l_name",
+            "object_owner_individual_person_p_name",
+            "object_owner_legal_entity",
+            "object_owner_legal_inn",
+            "tex_passport_serie_num",
+            "rating_goal",
             "registration_number",
             "object_type",
             "object_type_display",
@@ -34,10 +47,20 @@ class BaseAutoevaluationSerializer(serializers.ModelSerializer):
             "created_at",
             "value_determined",
             "rate_type",
-            "property_rights",
+            "user",
-            "form_ownership",
+            "evaluation_request",
         ]
 
+    def get_user(self, obj):
+        request = self.context.get('request')
+        return {
+            "id": obj.user.id,
+            "phone": obj.user.phone,
+            "first_name": obj.user.first_name,
+            "last_name": obj.user.last_name,
+            "avatar": request.build_absolute_uri(obj.user.avatar.url) if obj.user.avatar else None
+        } if obj.user else None
+
 
 class ListAutoevaluationSerializer(BaseAutoevaluationSerializer):
     class Meta(BaseAutoevaluationSerializer.Meta):
@@ -47,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 + [
@@ -61,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",
@@ -71,19 +87,9 @@ class RetrieveAutoevaluationSerializer(BaseAutoevaluationSerializer):
             "object_owner_individual_person_passport_num",
             "object_owner_legal_entity",
             "object_owner_legal_inn",
-            # Step 3
-            "object_location_province",
-            "object_location_district",
-            "object_location_city",
-            "object_location_neighborhood",
-            "object_location_street",
-            "object_location_home",
-            "object_location_highways",
-            "object_location_highways_display",
-            "object_location_covenience",
-            "object_location_covenience_display",
             # Step 4
             "tex_passport_serie_num",
+            "tex_passport_file",
             "tex_passport_gived_date",
             "tex_passport_gived_location",
             "car_type",
@@ -99,22 +105,12 @@ class RetrieveAutoevaluationSerializer(BaseAutoevaluationSerializer):
         ]
 
 
-class CreateAutoevaluationSerializer(serializers.ModelSerializer):
+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,
@@ -126,7 +122,6 @@ class CreateAutoevaluationSerializer(serializers.ModelSerializer):
         allow_null=True,
     )
 
-
     class Meta:
         model = AutoEvaluationModel
         fields = [
@@ -136,7 +131,6 @@ class CreateAutoevaluationSerializer(serializers.ModelSerializer):
             "object_inspection_date",
             "rate_date",
             "rate_report_date",
-            "rate_object_name",
             "object_type",
             # Step 2
             "object_owner_type",
@@ -146,20 +140,10 @@ 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 3
-            "object_location_province",
-            "object_location_district",
-            "object_location_city",
-            "object_location_neighborhood",
-            "object_location_street",
-            "object_location_home",
-            "object_location_highways",
-            "object_location_covenience",
             # Step 4
+            "tex_passport_file",
             "tex_passport_serie_num",
             "tex_passport_gived_date",
             "tex_passport_gived_location",
@@ -216,9 +200,118 @@ class CreateAutoevaluationSerializer(serializers.ModelSerializer):
         return attrs
 
 
+class CreateAutoevaluationSerializer(serializers.ModelSerializer):
+    value_determined = serializers.PrimaryKeyRelatedField(
+        queryset=ReferenceitemModel.objects.all(),
+        required=False,
+        allow_null=True,
+    )
+    value_determined = serializers.PrimaryKeyRelatedField(
+        queryset=ReferenceitemModel.objects.all(),
+        required=False,
+        allow_null=True,
+    )
+    rate_type = serializers.PrimaryKeyRelatedField(
+        queryset=ReferenceitemModel.objects.all(),
+        required=False,
+        allow_null=True,
+    )
+    evaluation_request = serializers.PrimaryKeyRelatedField(
+        queryset=EvaluationrequestModel.objects.all(),
+        required=False,
+        allow_null=True,
+    )
+
+    class Meta:
+        model = AutoEvaluationModel
+        fields = [
+            # Step 1
+            "registration_number",
+            "evaluation_request",
+            "contract_date",
+            "object_inspection_date",
+            "rate_date",
+            "rate_report_date",
+            "object_type",
+            # Step 2
+            "object_owner_type",
+            "object_owner_individual_person_f_name",
+            "object_owner_individual_person_l_name",
+            "object_owner_individual_person_p_name",
+            "object_owner_individual_person_passport_num",
+            "object_owner_legal_entity",
+            "object_owner_legal_inn",
+            "value_determined",
+            "rate_type",
+            # Step 4
+            "tex_passport_serie_num",
+            "tex_passport_file",
+            "tex_passport_gived_date",
+            "tex_passport_gived_location",
+            "car_type",
+            "car_wheel",
+            "car_brand",
+            "car_model",
+            "car_number",
+            "manufacture_year",
+            "car_dvigatel_number",
+            "car_color",
+        ]
+
+    def validate_tex_passport_serie_num(self, value):
+        if value and not re.match(r"^[A-Z]{3}\s?\d{7}$", value):
+            raise serializers.ValidationError(
+                "Format: AAA 1234567 (3 harf + 7 raqam)"
+            )
+        return value
+
+    def validate_object_owner_individual_person_passport_num(self, value):
+        if value and not re.match(r"^[A-Z]{2}\s?\d{7}$", value):
+            raise serializers.ValidationError(
+                "Format: AA 1234567 (2 harf + 7 raqam)"
+            )
+        return value
+
+    def validate(self, attrs):
+        owner_type = attrs.get("object_owner_type")
+        if owner_type == 1:
+            required_fields = {
+                "object_owner_individual_person_f_name": "Ismi",
+                "object_owner_individual_person_l_name": "Familiyasi",
+                "object_owner_individual_person_p_name": "Sharifi",
+                "object_owner_individual_person_passport_num": "Passport raqami",
+            }
+            for field, label in required_fields.items():
+                if not attrs.get(field):
+                    raise serializers.ValidationError(
+                        {field: f"Jismoniy shaxs uchun {label} majburiy."}
+                    )
+
+        elif owner_type == 2:
+            if not attrs.get("object_owner_legal_entity"):
+                raise serializers.ValidationError(
+                    {"object_owner_legal_entity": "Yuridik shaxs nomi majburiy."}
+                )
+            if not attrs.get("object_owner_legal_inn"):
+                raise serializers.ValidationError(
+                    {"object_owner_legal_inn": "INN raqami majburiy."}
+                )
+
+        return attrs
+
+    def create(self, validated_data):
+        user = self.context.get('request').user
+        validated_data['user'] = user
+        evaluation_req = validated_data.get("evaluation_request")
+        if evaluation_req:
+            evaluation_req.status = RequestStatus.IN_PROGRESS
+            evaluation_req.save()
+        return super().create(validated_data)
+
+
 class AutoEvaluationAppraisersSerializer(serializers.Serializer):
     ids = serializers.ListField(child=serializers.IntegerField())
-    
+
     def validate(self, data):
         if not data.get("ids"):
             raise serializers.ValidationError("Appraisers IDs are required.")
@@ -227,3 +320,70 @@ 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()
+
+
+class AutoEvaluationModelSerializer(serializers.ModelSerializer):
+    user = serializers.StringRelatedField(read_only=True)
+    appraisers = serializers.PrimaryKeyRelatedField(
+        many=True,
+        queryset=User.objects.all(),
+        required=False
+    )
+
+    class Meta:
+        model = AutoEvaluationModel
+        fields = ("tex_passport_file",
+
+            "registration_number",
+            "contract_date",
+            "object_inspection_date",
+            "rate_date",
+            "rate_report_date",
+            "object_type",
+
+            "object_owner_type",
+            "object_owner_individual_person_f_name",
+            "object_owner_individual_person_l_name",
+            "object_owner_individual_person_p_name",
+            "object_owner_individual_person_passport_num",
+            "object_owner_legal_entity",
+            "object_owner_legal_inn",
+            "value_determined",
+            "rate_type",
+
+            "tex_passport_serie_num",
+            "tex_passport_gived_date",
+            "tex_passport_gived_location",
+            "car_type",
+            "car_wheel",
+            "car_brand",
+            "car_model",
+            "car_number",
+            "manufacture_year",
+            "car_dvigatel_number",
+            "car_color",
+
+            "rating_goal",
+            "status",
+            "is_archived",
+
+            "created_at",
+            "updated_at",
+        )
+
+        read_only_fields = (
+            "id",
+            "created_at",
+            "updated_at",
+        )

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

@@ -37,6 +37,9 @@ class BaseQuickevaluationSerializer(serializers.ModelSerializer):
             "state_car",
             "state_car_name",
             "created_at",
+            "distance_covered",
+            "tex_passport_serie_num",
+            "is_archive"
         ]
 
 
@@ -51,7 +54,6 @@ class RetrieveQuickevaluationSerializer(BaseQuickevaluationSerializer):
             "tex_passport_serie_num",
             "tech_passport_issued_date",
             "tech_passport_issued_place",
-            "tex_passport_file",
             "car_position",
             "car_position_name",
             "distance_covered",
@@ -74,7 +76,6 @@ class CreateQuickevaluationSerializer(serializers.ModelSerializer):
             "tex_passport_serie_num",
             "tech_passport_issued_date",
             "tech_passport_issued_place",
-            "tex_passport_file",
             "car_type",
             "brand",
             "marka",
@@ -125,3 +126,44 @@ 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)
+
+
+class QuickEvaluationModelSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = QuickEvaluationModel
+        fields = (
+            "id",
+
+            "created_by",
+            "brand",
+            "marka",
+            "car_position",
+            "body_type",
+            "color",
+            "fuel_type",
+            "state_car",
+
+            "tex_passport_serie_num",
+            "tech_passport_issued_date",
+            "tech_passport_issued_place",
+
+            "car_type",
+            "distance_covered",
+            "vin_number",
+            "car_number",
+            "car_manufactured_date",
+            "engine_number",
+
+            "estimated_price",
+            "status",
+            "is_archive",
+
+            "created_at",
+            "updated_at",
+        )
+
+        read_only_fields = (
+            "id",
+            "created_at",
+            "updated_at",
+        )

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

@@ -1,9 +1,17 @@
 import re
 
+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()
 
 
 class BaseEvaluationrequestSerializer(serializers.ModelSerializer):
@@ -24,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
@@ -50,6 +60,9 @@ class BaseEvaluationrequestSerializer(serializers.ModelSerializer):
             "user",
             "created_at",
             "updated_at",
+            "is_archive",
+            "customer",
+            "owner",
         ]
 
     def get_location(self, obj):
@@ -62,13 +75,14 @@ class BaseEvaluationrequestSerializer(serializers.ModelSerializer):
         return None
 
     def get_user(self, obj):
+        request = self.context.get('request')
         return {
             "id": obj.user.id,
             "phone": obj.user.phone,
             "first_name": obj.user.first_name,
             "last_name": obj.user.last_name,
             "role": obj.user.role,
-            "avatar": obj.user.avatar.url if obj.user.avatar else None
+            "avatar": request.build_absolute_uri(obj.user.avatar.url) if obj.user.avatar else None
         }
 
 
@@ -85,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,
@@ -93,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,
@@ -109,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
@@ -127,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):
@@ -150,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(
@@ -175,6 +192,33 @@ 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)

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

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

core/apps/evaluation/serializers/tech_passport/tech_passport.py

@@ -0,0 +1,6 @@
+from rest_framework import serializers
+
+class TechPassportSerializer(serializers.Serializer):
+    autonumber = serializers.CharField(required=True, max_length=20)
+    tech_pass_number = serializers.CharField(required=True, max_length=20)
+    tech_pass_series = serializers.CharField(required=True, max_length=20)

core/apps/evaluation/urls.py

@@ -1,63 +1,88 @@
 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,
 
-)
 
 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("admin/", views.AdminQuickEvalAPIView.as_view(), name="quick-evaluation"),
-            path("<int:id>/set/", AutoEvaluationSetAppraisersView.as_view(), name="auto-evaluation-set-appraisers"),
+            path(
-            path("<int:id>/remove/", AutoEvaluationRemoveAppraisersView.as_view(), name="auto-evaluation-remove-appraisers"),
+                'archive/', include(
+                    [
+                        path("list/", views.QuickEvaluationArchivedListAPIView.as_view()),
+                        path("<int:pk>/", views.QuickEvaluationArchiveAPIView.as_view()),
+                    ]
+                )
+            ),
         ]
     )),
+
+    # Auto Evaluation
+    path("auto-evaluation/", include(
+        [
+            path("admin/", views.AdminEvaluationsAPIView.as_view(), name="admin-evaluations"),
+            path('archive/', include(
+                [
+                    path('<int:pk>/', views.AutoEvaluationArchiveAPIView.as_view()),
+                    path('list/', views.AutoEvaluationArchivedListAPIView.as_view())
+                ]
+            )),
+            path('appraisers/', include(
+                [
+                    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

@@ -11,3 +11,7 @@ from .report import *  # noqa
 from .request import *  # noqa
 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,23 +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 import generics
 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.permissions import IsAdminRole
 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, AutoEvaluationModelSerializer
-    CreateAutoevaluationSerializer,
-    ListAutoevaluationSerializer,
-    RetrieveAutoevaluationSerializer,
-    AutoEvaluationAppraisersSerializer
-)
 
 
 @extend_schema(tags=["AutoEvaluation"])
@@ -26,8 +24,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]
@@ -39,47 +37,53 @@ class AutoEvaluationView(BaseViewSetMixin, ModelViewSet):
         "car_number",
     ]
     ordering_fields = [
-        "registration_number",
+        "id",
         "contract_date",
         "object_inspection_date",
-        "rate_date",
+        "object_owner_individual_person_passport_num",
-        "rate_report_date",
-        "rate_object_name",
-        "object_type",
         "object_owner_type",
-        "object_location_province",
+        "object_owner_individual_person_f_name",
-        "object_location_district",
+        "object_owner_individual_person_l_name",
-        "object_location_city",
+        "object_owner_individual_person_p_name",
+        "object_owner_legal_entity",
+        "object_owner_legal_inn",
         "tex_passport_serie_num",
-        "tex_passport_gived_date",
+        "rating_goal",
+        "object_location_province",
+        "registration_number",
+        "object_type",
+        "object_type_display",
         "car_brand",
         "car_model",
         "car_number",
         "manufacture_year",
         "car_color",
-        "property_rights",
+        "status",
-        "form_ownership",
+        "status_display",
+        "created_at",
         "value_determined",
         "rate_type",
-        "status",
-        "created_at",
-        "updated_at",
     ]
     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": serializers.UpdateAutoevaluationSerializer,
+        "partial_update": serializers.UpdateAutoevaluationSerializer,
     }
 
+    def serializer_context(self):
+        return self.serializer_class(context={'request': self.request})
+
 
 @extend_schema(tags=["AutoEvaluation"])
 class AutoEvaluationSetAppraisersView(GenericAPIView):
     permission_classes = [IsAuthenticated]
     queryset = AutoEvaluationModel.objects.all()
-    serializer_class = AutoEvaluationAppraisersSerializer
+    serializer_class = serializers.AutoEvaluationAppraisersSerializer
 
     def post(self, request, id):
         try:
@@ -98,7 +102,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:
@@ -136,8 +140,8 @@ class AutoEvaluationListAppraisersView(GenericAPIView):
             query = auto_evaluation.appraisers.all()
             if search_query:
                 query = query.filter(
-                    Q(phone__icontains=search_query) | 
+                    Q(phone__icontains=search_query) |
-                    Q(first_name__icontains=search_query) | 
+                    Q(first_name__icontains=search_query) |
                     Q(last_name__icontains=search_query)
                 )
             page = self.paginate_queryset(query)
@@ -145,3 +149,44 @@ 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
+        )
+
+
+@extend_schema(tags=["AutoEvaluation"])
+class AdminEvaluationsAPIView(generics.GenericAPIView):
+    permission_classes = [IsAuthenticated, IsAdminRole]
+    queryset = AutoEvaluationModel.objects.all()
+    serializer_class = AutoEvaluationModel
+
+    def get(self, request):
+        auto_eval = AutoEvaluationModel.objects.filter(
+            created_by=self.request.user
+        ).select_related('appraisers').distinct()
+        serializer = AutoEvaluationModelSerializer(auto_eval, many=True)
+        return Response(serializer.data)

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

@@ -0,0 +1,58 @@
+# rest framework
+from rest_framework.response import Response
+from rest_framework import status
+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 = [IsAuthenticated]
+
+    @extend_schema(
+        tags=["Didox"],
+        summary="Get company info by TIN",
+        description="TIN/JSHSHIR orqali Didoxdan ma'lumot olish",
+        parameters=[
+            OpenApiParameter(
+                name="tin",
+                type=int,
+                location=OpenApiParameter.PATH,
+                required=True,
+                description="TIN / STIR / INN / JSHSHIR"
+            )
+        ],
+        responses={200: dict},
+    )
+    def get(self, request, *args, **kwargs):
+        tin = kwargs.get("tin")
+
+        try:
+            tin = int(tin)
+        except (TypeError, ValueError):
+            return Response(
+                {"detail": "TIN must be a valid integer"},
+                status=status.HTTP_400_BAD_REQUEST
+            )
+        data = DidoxService.get_company_info(tin)
+
+        if not data:
+            return Response(
+                {"detail": "Didox service unavailable"},
+                status=status.HTTP_502_BAD_GATEWAY
+            )
+
+        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)

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,31 +32,36 @@ 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
 
     filter_backends = [DjangoFilterBackend, OrderingFilter]
     filterset_class = AutoevaluationhistoryFilter
-    ordering_fields = ["created_at"]
+    ordering_fields = [
+        "id",
+        "event_type",
+        "event_type_display",
+        "actor",
+        "meta",
+        "created_at",
+    ]
     ordering = ["created_at"]
 
     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({
@@ -81,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
 
@@ -92,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,26 @@
+# 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, generics
 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
 
+from core.apps.accounts.permissions import IsAdminRole
+# 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, QuickEvaluationModelSerializer
-    CreateQuickevaluationSerializer,
-    ListQuickevaluationSerializer,
-    RetrieveQuickevaluationSerializer,
-)
 
 
 @extend_schema(tags=["QuickEvaluation"])
@@ -20,8 +28,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 +54,48 @@ 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)
+
+
+@extend_schema(tags=["QuickEvaluation"])
+class AdminQuickEvalAPIView(generics.GenericAPIView):
+    permission_classes = [IsAuthenticated, IsAdminRole]
+    queryset = QuickEvaluationModel.objects.all()
+    serializer_class = QuickEvaluationModelSerializer
+
+    def get(self, request):
+        quick_eval = QuickEvaluationModel.objects.filter(
+            created_by=self.request.user
+        ).select_related('created_by').distinct()
+        serializer = QuickEvaluationModelSerializer(quick_eval, many=True)
+
+        return Response(serializer.data)

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,33 +1,33 @@
-from django_core.mixins import BaseViewSetMixin
+# django
-from django_filters.rest_framework import DjangoFilterBackend
+from django.db.models.base import transaction
-from drf_spectacular.utils import extend_schema
+from django.shortcuts import get_object_or_404
-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
 
+# 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, 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,
-)
-
-
-# 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",
@@ -35,35 +35,52 @@ class EvaluationrequestView(BaseViewSetMixin, ModelViewSet):
         "tex_passport",
     ]
     ordering_fields = [
+        "id",
+        "rate_type",
+        "rate_type_display",
+        "object_type",
+        "object_type_display",
+        "customer_inn_number",
+        "owner_inn_number",
+        "tex_passport",
+        "value_determined",
+        "rate_goal",
+        "property_rights",
+        "form_ownership",
+        "worked_hours",
+        "chassi",
+        "need_delivering",
+        "location",
+        "location_name",
+        "status",
+        "status_display",
+        "user",
         "created_at",
         "updated_at",
-        "rate_type",
-        "object_type",
-        "status",
     ]
     ordering = ["-created_at"]
 
     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):
+        return self.serializer_class(context={"request": self.request})
+
     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",
@@ -71,20 +88,106 @@ class AdminEvaluationrequestView(BaseViewSetMixin, ModelViewSet):
         "tex_passport",
     ]
     ordering_fields = [
+        "id",
+        "rate_type",
+        "rate_type_display",
+        "object_type",
+        "object_type_display",
+        "customer_inn_number",
+        "owner_inn_number",
+        "tex_passport",
+        "value_determined",
+        "rate_goal",
+        "property_rights",
+        "form_ownership",
+        "worked_hours",
+        "chassi",
+        "need_delivering",
+        "location",
+        "location_name",
+        "status",
+        "status_display",
+        "user",
         "created_at",
         "updated_at",
-        "rate_type",
-        "object_type",
-        "status",
     ]
     ordering = ["-created_at"]
 
     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(views.APIView):
+    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)
+
+        valid_statuses = [
+            RequestStatus.PENDING,
+            RequestStatus.IN_PROGRESS,
+            RequestStatus.COMPLETED,
+            RequestStatus.REJECTED
+        ]
+
+        if status_value not in valid_statuses:
+            return Response(
+                {'detail': f'Invalid status. Must be one of: {valid_statuses}'},
+                status=status.HTTP_400_BAD_REQUEST
+            )
+
+        evaluation.status = status_value
+        evaluation.save()
+
+        return Response({
+            'success': True,
+            'status': evaluation.status,
+            'id': evaluation.pk
+        })
+
+
+@extend_schema(tags=["EvaluationRequest"])
+class RequestEvaluationArchivedListAPIView(generics.ListAPIView):
+    permission_classes = [permissions.IsAuthenticated]
+    serializer_class = serializers.ListEvaluationrequestSerializer
+
+    def get_queryset(self):
+        return EvaluationrequestModel.objects.filter(is_archive=True)
+
+
+@extend_schema(tags=["EvaluationRequest"])
+class RequestEvaluationArchiveAPIView(views.APIView):
+    permission_classes = [permissions.IsAuthenticated]
+
+    @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,
+                "status": req_evaluation.status,
+                "id": req_evaluation.pk
+            },
+            status=status.HTTP_200_OK
+        )

core/apps/evaluation/views/tech_passport.py

@@ -0,0 +1,51 @@
+# rest framework
+from rest_framework.response import Response
+from rest_framework import status
+from rest_framework.permissions import IsAuthenticated
+from rest_framework.generics import GenericAPIView
+
+# swagger
+from drf_spectacular.utils import extend_schema
+
+# core apps
+from core.services.tech_passport import TechPassportService
+from core.apps.evaluation.serializers import TechPassportSerializer
+
+
+class TechPassportAPIView(GenericAPIView):
+    authentication_classes = []
+    permission_classes = [IsAuthenticated]
+
+    @extend_schema(
+        tags=["Tech Passport"],
+        request=TechPassportSerializer,
+        responses={
+            200: dict,
+            400: dict,
+        },
+        )
+    def post(self, request, *args, **kwargs):
+        serializer = TechPassportSerializer(data=request.data)
+        serializer.is_valid(raise_exception=True)
+
+        data = serializer.validated_data
+
+        result = TechPassportService.get_auto_info(
+            autonumber=data["autonumber"],
+            tech_pass_number=data["tech_pass_number"],
+            tech_pass_series=data["tech_pass_series"],
+        )
+
+        response_data = result["data"]
+        status_code = result["status_code"]
+
+        if status_code == 200:
+            return Response(
+                response_data.get("data", {}),
+                status=status.HTTP_200_OK
+            )
+
+        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/apps/shared/admin/__init__.py

@@ -1 +1,2 @@
-from .settings import * # noqa
+from .settings import * # noqa
+from .region import * # noqa

core/apps/shared/admin/region.py

@@ -0,0 +1,21 @@
+from django.contrib import admin
+
+from core.apps.shared.models import RegionModel, DistrictModel, VillageModel
+
+
+@admin.register(RegionModel)
+class RegionAdmin(admin.ModelAdmin):
+    list_display = ('id', 'name',)
+    search_fields = ('name',)
+
+
+@admin.register(DistrictModel)
+class DistrictAdmin(admin.ModelAdmin):
+    list_display = ('id', 'name', 'region')
+    search_fields = ('name', 'region')
+
+
+@admin.register(VillageModel)
+class VillageAdmin(admin.ModelAdmin):
+    list_display = ('id', 'name', 'district')
+    search_fields = ('name', 'district')

core/apps/shared/management/commands/save_regions.py

@@ -0,0 +1,140 @@
+import json
+import os
+
+from django.core.management.base import BaseCommand
+from django.db import transaction
+
+from core.apps.shared.models import RegionModel, DistrictModel, VillageModel
+
+
+class Command(BaseCommand):
+    help = "Import regions, districts, and neighborhoods from JSON files."
+
+    def add_arguments(self, parser):
+        parser.add_argument('--path', type=str, default='JSON/', help='Path to JSON files directory')
+
+    def transliterate_uz_to_en(self, text):
+        """Simple transliteration for English names"""
+        if not text:
+            return ""
+
+        mapping = {
+            "o'": "o", "O'": "O",
+            "g'": "g", "G'": "G",
+            "sh": "sh", "Sh": "Sh",
+            "ch": "ch", "Ch": "Ch",
+            "ng": "ng", "Ng": "Ng",
+            "q": "q", "Q": "Q",
+            "yo": "yo", "Yo": "Yo",
+            "yu": "yu", "Yu": "Yu",
+            "ya": "ya", "Ya": "Ya",
+            "ye": "ye", "Ye": "Ye",
+            "o‘": "o", "O‘": "O",
+            "g‘": "g", "G‘": "G",
+        }
+
+        res = text
+        for k, v in mapping.items():
+            res = res.replace(k, v)
+
+        replacements = {
+            "viloyati": "Region",
+            "viloyat": "Region",
+            "tumani": "District",
+            "tuman": "District",
+            "shahri": "City",
+            "shahar": "City",
+            "Respublikasi": "Republic",
+        }
+
+        for k, v in replacements.items():
+            res = res.replace(k, v)
+            res = res.replace(k.capitalize(), v)
+
+        return res.strip()
+
+    def handle(self, *args, **options):
+        path = options['path']
+
+        regions_file = os.path.join(path, 'region.json')
+        districts_file = os.path.join(path, 'district.json')
+        villages_file = os.path.join(path, 'village.json')
+
+        try:
+            with transaction.atomic():
+                # 1. Import Regions
+                self.stdout.write("Importing Regions...")
+                if os.path.exists(regions_file):
+                    with open(regions_file, 'r', encoding='utf-8-sig') as f:
+                        regions_data = json.load(f)
+                        for item in regions_data:
+                            name_uz = item.get('name_uz', '')
+                            # name_ru = item.get('name_ru', '') or name_uz
+                            # name_en = self.transliterate_uz_to_en(name_uz)
+
+                            # Use get_or_create to avoid duplicates if ID matches or name matches
+                            # Actually, it's better to use our own internal IDs if we want to link them
+                            # But since many JSON files use these IDs, we'll store them as a reference or use them directly if we reset the DB
+                            region, created = RegionModel.objects.update_or_create(
+                                id=item['id'],
+                                defaults={
+                                    'name': name_uz,
+                                    # 'name_ru': name_ru,
+                                    # 'name_en': name_en,
+                                }
+                            )
+
+                # 2. Import Districts
+                self.stdout.write("Importing Districts...")
+                if os.path.exists(districts_file):
+                    with open(districts_file, 'r', encoding='utf-8-sig') as f:
+                        districts_data = json.load(f)
+                        for item in districts_data:
+                            name = item.get('name_uz', '')
+
+                            region_id = item.get('region_id')
+                            if not RegionModel.objects.filter(id=region_id).exists():
+                                self.stdout.write(self.style.WARNING(f"Region {region_id} not found for district {name_uz}"))
+                                continue
+
+                            DistrictModel.objects.update_or_create(
+                                id=item['id'],
+                                defaults={
+                                    'region_id': region_id,
+                                    'name': name,
+                                    # 'name_ru': name_ru,
+                                    # 'name_en': name_en,
+                                }
+                            )
+
+                # 3. Import Neighborhoods (Villages)
+                self.stdout.write("Importing Neighborhoods (Villages)...")
+                if os.path.exists(villages_file):
+                    with open(villages_file, 'r', encoding='utf-8-sig') as f:
+                        villages_data = json.load(f)
+                        count = 0
+                        total = len(villages_data)
+                        for item in villages_data:
+                            name_uz = item.get('name_uz', '')
+                            name_ru = item.get('name_ru', '') or name_uz
+                            name_en = self.transliterate_uz_to_en(name_uz)
+
+                            district_id = item.get('district_id')
+                            if not DistrictModel.objects.filter(id=district_id).exists():
+                                continue
+
+                            VillageModel.objects.update_or_create(
+                                id=item['id'],
+                                defaults={
+                                    'district_id': district_id,
+                                    'name': name_uz,
+                                }
+                            )
+                            count += 1
+                            if count % 1000 == 0:
+                                self.stdout.write(f"Processed {count}/{total} neighborhoods...")
+
+            self.stdout.write(self.style.SUCCESS("Import completed successfully!"))
+
+        except Exception as e:
+            self.stdout.write(self.style.ERROR(f"Error: {str(e)}"))

core/apps/shared/migrations/0003_regionmodel_districtmodel_villagemodel.py

@@ -0,0 +1,55 @@
+# Generated by Django 5.2.7 on 2026-04-20 10:14
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('shared', '0002_settingsmodel_created_at_settingsmodel_description_and_more'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='RegionModel',
+            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=255, unique=True)),
+            ],
+            options={
+                'verbose_name': 'Region',
+                'verbose_name_plural': 'Regions',
+            },
+        ),
+        migrations.CreateModel(
+            name='DistrictModel',
+            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=255, unique=True)),
+                ('region', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='districts', to='shared.regionmodel')),
+            ],
+            options={
+                'verbose_name': 'District',
+                'verbose_name_plural': 'Districts',
+            },
+        ),
+        migrations.CreateModel(
+            name='VillageModel',
+            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=255, unique=True)),
+                ('district', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='villages', to='shared.districtmodel')),
+            ],
+            options={
+                'verbose_name': 'Village',
+                'verbose_name_plural': 'Villages',
+            },
+        ),
+    ]

core/apps/shared/migrations/0004_alter_districtmodel_name_alter_regionmodel_name_and_more.py

@@ -0,0 +1,28 @@
+# Generated by Django 5.2.7 on 2026-04-21 09:48
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('shared', '0003_regionmodel_districtmodel_villagemodel'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='districtmodel',
+            name='name',
+            field=models.CharField(max_length=255),
+        ),
+        migrations.AlterField(
+            model_name='regionmodel',
+            name='name',
+            field=models.CharField(max_length=255),
+        ),
+        migrations.AlterField(
+            model_name='villagemodel',
+            name='name',
+            field=models.CharField(max_length=255),
+        ),
+    ]

core/apps/shared/models/__init__.py

@@ -1 +1,2 @@
-from .settings import * # noqa
+from .settings import * # noqa
+from .region import * # noqa

core/apps/shared/models/region.py

@@ -0,0 +1,28 @@
+from django.db import models
+from django_core.models import AbstractBaseModel
+
+
+class RegionModel(AbstractBaseModel):
+    name = models.CharField(max_length=255)
+
+    class Meta:
+        verbose_name = "Region"
+        verbose_name_plural = "Regions"
+
+
+class DistrictModel(AbstractBaseModel):
+    name = models.CharField(max_length=255)
+    region = models.ForeignKey(RegionModel, on_delete=models.CASCADE, related_name='districts')
+
+    class Meta:
+        verbose_name = "District"
+        verbose_name_plural = "Districts"
+
+
+class VillageModel(AbstractBaseModel):
+    name = models.CharField(max_length=255)
+    district = models.ForeignKey(DistrictModel, on_delete=models.CASCADE, related_name='villages')
+
+    class Meta:
+        verbose_name = "Village"
+        verbose_name_plural = "Villages"

core/apps/shared/serializers/region/district.py

@@ -0,0 +1,21 @@
+from rest_framework import serializers
+
+from core.apps.shared.models import RegionModel, VillageModel, DistrictModel
+
+
+class DistrictSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = DistrictModel
+        fields = ('id', 'name')
+
+
+class VillageSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = VillageModel
+        fields = ('id', 'name')
+
+
+class RegionSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = RegionModel
+        fields = ('id', 'name')

core/apps/shared/urls.py

@@ -1,6 +1,7 @@
 from django.urls import path, include
 from rest_framework.routers import DefaultRouter
 from .views import SettingsView
+from .views.region.region import RegionListCreateView, DistrictListCreateView, VillageListCreateView
 
 router = DefaultRouter()
 router.register("settings", SettingsView, basename="settings")
@@ -8,4 +9,7 @@ router.register("settings", SettingsView, basename="settings")
 
 urlpatterns = [
     path("", include(router.urls)),
+    path("region/", RegionListCreateView.as_view(), name="region-list-create"),
+    path("district/", DistrictListCreateView.as_view(), name="district-list-create"),
+    path("village/", VillageListCreateView.as_view(), name="village-list-create"),
 ]

core/apps/shared/views/region/region.py

@@ -0,0 +1,74 @@
+from rest_framework import generics
+from rest_framework.permissions import IsAuthenticated
+
+from drf_spectacular.utils import extend_schema, OpenApiParameter
+from drf_spectacular.types import OpenApiTypes
+
+from core.apps.shared.serializers.region.district import DistrictSerializer, VillageSerializer, RegionSerializer
+from core.apps.shared.models import RegionModel, VillageModel, DistrictModel
+
+@extend_schema(
+    parameters=[
+        OpenApiParameter(
+            name="region",
+            type=OpenApiTypes.INT,
+            location=OpenApiParameter.QUERY,
+            description="Filter by region ID"
+        ),
+        OpenApiParameter(
+            name="name",
+            type=OpenApiTypes.STR,
+            location=OpenApiParameter.QUERY,
+            description="Filter by district name"
+        ),
+    ]
+)
+class DistrictListCreateView(generics.ListCreateAPIView):
+    permission_classes = [IsAuthenticated]
+    serializer_class = DistrictSerializer
+    queryset = DistrictModel.objects.all()
+
+    def get_queryset(self):
+        region = self.request.query_params.get('region')
+        name = self.request.query_params.get('name')
+        if name:
+            return self.queryset.filter(name__icontains=name)
+        if region:
+            return self.queryset.filter(region=region)
+        return super().get_queryset()
+
+@extend_schema(
+    parameters=[
+        OpenApiParameter(
+            name="district",
+            type=OpenApiTypes.INT,
+            location=OpenApiParameter.QUERY,
+            description="Filter by district ID"
+        ),
+        OpenApiParameter(
+            name="name",
+            type=OpenApiTypes.STR,
+            location=OpenApiParameter.QUERY,
+            description="Filter by village name"
+        ),
+    ]
+)
+class VillageListCreateView(generics.ListCreateAPIView):
+    permission_classes = [IsAuthenticated]
+    serializer_class = VillageSerializer
+    queryset = VillageModel.objects.all()
+
+    def get_queryset(self):
+        district = self.request.query_params.get('district')
+        name = self.request.query_params.get('name')
+        if district:
+            return self.queryset.filter(district=district)
+        if name:
+            return self.queryset.filter(name__icontains=name)
+        return super().get_queryset()
+
+
+class RegionListCreateView(generics.ListCreateAPIView):
+    permission_classes = [IsAuthenticated]
+    serializer_class = RegionSerializer
+    queryset = RegionModel.objects.all()

core/apps/tasks/admin/__init__.py

@@ -0,0 +1,4 @@
+from .column import *
+from .comment import *
+from .task import *
+from .label import *

core/apps/tasks/admin/column.py

@@ -0,0 +1,7 @@
+from django.contrib import admin
+
+from core.apps.tasks.models import Column
+
+@admin.register(Column)
+class ColumnAdmin(admin.ModelAdmin):
+    list_display = ('name',)

core/apps/tasks/admin/comment.py

@@ -0,0 +1,7 @@
+from django.contrib import admin
+
+from core.apps.tasks.models import Comment
+
+@admin.register(Comment)
+class CommentAdmin(admin.ModelAdmin):
+    list_display = ('created_by', 'type')

core/apps/tasks/admin/label.py

@@ -0,0 +1,7 @@
+from django.contrib import admin
+
+from core.apps.tasks.models import Label
+
+@admin.register(Label)
+class LabelAdmin(admin.ModelAdmin):
+    list_display = ('name',)

core/apps/tasks/admin/task.py

@@ -0,0 +1,7 @@
+from django.contrib import admin
+
+from core.apps.tasks.models import Task
+
+@admin.register(Task)
+class TaskAdmin(admin.ModelAdmin):
+    list_display = ('name', 'created_by', 'priority')

core/apps/tasks/apps.py

@@ -0,0 +1,8 @@
+from django.apps import AppConfig
+
+
+class TasksConfig(AppConfig):
+    name = "core.apps.tasks"
+
+    def ready(self):
+        from core.apps.tasks import admin

core/apps/tasks/choices/comment.py

@@ -0,0 +1,6 @@
+from django.db import models
+
+
+class MessageChoice(models.TextChoices):
+    FILE = "file", "File"
+    TEXT = "text", "Text"

core/apps/tasks/choices/task.py

@@ -0,0 +1,7 @@
+from django.db import models
+
+
+class PriorityChoice(models.TextChoices):
+    LOW = "low", "Low"
+    MEDIUM = "medium", "Medium"
+    HIGH = "high", "High"

core/apps/tasks/migrations/0001_initial.py

@@ -0,0 +1,77 @@
+# Generated by Django 5.2.7 on 2026-04-29 13:18
+
+import django.db.models.deletion
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Column',
+            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=255)),
+            ],
+            options={
+                'abstract': False,
+            },
+        ),
+        migrations.CreateModel(
+            name='Label',
+            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=255)),
+            ],
+            options={
+                'abstract': False,
+            },
+        ),
+        migrations.CreateModel(
+            name='Task',
+            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=255)),
+                ('description', models.TextField(blank=True)),
+                ('priority', models.CharField(choices=[('low', 'Low'), ('medium', 'Medium'), ('high', 'High')], max_length=255)),
+                ('from_date', models.DateField(blank=True, null=True)),
+                ('to_date', models.DateField(blank=True, null=True)),
+                ('assignees', models.ManyToManyField(related_name='assigned_tasks', to=settings.AUTH_USER_MODEL)),
+                ('column', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='tasks', to='tasks.column')),
+                ('created_by', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='created_tasks', to=settings.AUTH_USER_MODEL)),
+                ('labels', models.ManyToManyField(related_name='tasks', to='tasks.label')),
+            ],
+            options={
+                'abstract': False,
+            },
+        ),
+        migrations.CreateModel(
+            name='Comment',
+            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)),
+                ('message', models.TextField()),
+                ('file', models.FileField(blank=True, null=True, upload_to='comments/')),
+                ('type', models.CharField(choices=[('file', 'File'), ('text', 'Text')], max_length=255)),
+                ('created_by', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='created_comments', to=settings.AUTH_USER_MODEL)),
+                ('task', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='comments', to='tasks.task')),
+            ],
+            options={
+                'abstract': False,
+            },
+        ),
+    ]

core/apps/tasks/migrations/0002_alter_comment_created_by.py

@@ -0,0 +1,21 @@
+# Generated by Django 5.2.7 on 2026-04-29 13:20
+
+import django.db.models.deletion
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('tasks', '0001_initial'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='comment',
+            name='created_by',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='comments', to=settings.AUTH_USER_MODEL),
+        ),
+    ]

core/apps/tasks/models/__init__.py

@@ -0,0 +1,4 @@
+from .column import *
+from .comment import *
+from .task import *
+from .label import *

core/apps/tasks/models/column.py

@@ -0,0 +1,10 @@
+from django.db import models
+
+from django_core.models import AbstractBaseModel
+
+
+class Column(AbstractBaseModel):
+    name = models.CharField(max_length=255)
+
+    def __str__(self):
+        return self.name