101 Commits

Author SHA1 Message Date
503c16bdb8 Merge pull request 'swagger to'g'irlandi' (#63) from fix/swagger into main
All checks were successful
Deploy to Production / build-and-deploy (push) Successful in 1m57s
Reviewed-on: #63
2026-04-20 05:44:45 +00:00
701a375e3c swagger to'g'irlandi 2026-04-20 10:44:23 +05:00
github-actions[bot]
e64d7d037f 🔄 Update image to 81 [CI SKIP] 2026-04-18 11:56:52 +00:00
b7ecf0e47c Merge pull request 'fix' (#62) from behruz into main
All checks were successful
Deploy to Production / build-and-deploy (push) Successful in 1m54s
Reviewed-on: #62
2026-04-18 11:55:21 +00:00
xoliqberdiyev
c7c76e9c79 fix 2026-04-18 16:55:02 +05:00
github-actions[bot]
afdc6aa0ac 🔄 Update image to 80 [CI SKIP] 2026-04-18 11:52:43 +00:00
f991e3e4ec Merge pull request 'behruz' (#61) from behruz into main
All checks were successful
Deploy to Production / build-and-deploy (push) Successful in 1m57s
Reviewed-on: #61
2026-04-18 11:51:08 +00:00
xoliqberdiyev
0f142be77b fix 2026-04-18 16:50:48 +05:00
xoliqberdiyev
182b2483bf fix 2026-04-18 16:48:32 +05:00
469659baa8 Merge pull request 'fix' (#60) from behruz into main
Some checks failed
Deploy to Production / build-and-deploy (push) Failing after 1m17s
Reviewed-on: #60
2026-04-18 11:32:05 +00:00
xoliqberdiyev
965328edd4 fix 2026-04-18 16:31:53 +05:00
github-actions[bot]
11aa88a2b0 🔄 Update image to 78 [CI SKIP] 2026-04-18 11:25:47 +00:00
225565bc41 Merge pull request 'add extra user fields for chat' (#59) from behruz into main
All checks were successful
Deploy to Production / build-and-deploy (push) Successful in 1m55s
Reviewed-on: #59
2026-04-18 11:24:13 +00:00
xoliqberdiyev
75365f8e7e add extra user fields for chat 2026-04-18 16:24:02 +05:00
github-actions[bot]
3e9675a4be 🔄 Update image to 77 [CI SKIP] 2026-04-18 11:22:09 +00:00
c3cf7ac9d5 Merge pull request 'add all fields to ordering_fields filter' (#58) from behruz into main
All checks were successful
Deploy to Production / build-and-deploy (push) Successful in 1m55s
Reviewed-on: #58
2026-04-18 11:20:36 +00:00
xoliqberdiyev
5dcafb9cc1 add all fields to ordering_fields filter 2026-04-18 16:20:19 +05:00
github-actions[bot]
62bc6c17b8 🔄 Update image to 76 [CI SKIP] 2026-04-17 13:46:12 +00:00
22284f228f Merge pull request 'fi' (#57) from behruz into main
All checks were successful
Deploy to Production / build-and-deploy (push) Successful in 1m56s
Reviewed-on: #57
2026-04-17 13:44:40 +00:00
xoliqberdiyev
aa487c1557 fi 2026-04-17 18:44:18 +05:00
github-actions[bot]
73d5222a5b 🔄 Update image to 75 [CI SKIP] 2026-04-17 13:35:44 +00:00
707ea1e1fd Merge pull request 'add celery to docker-compose file' (#56) from behruz into main
All checks were successful
Deploy to Production / build-and-deploy (push) Successful in 1m52s
Reviewed-on: #56
2026-04-17 13:34:12 +00:00
xoliqberdiyev
bfbc14db82 add celery to docker-compose file 2026-04-17 18:33:58 +05:00
github-actions[bot]
4c1f1d7104 🔄 Update image to 74 [CI SKIP] 2026-04-17 13:26:45 +00:00
38e7aac505 Merge pull request 'fix' (#55) from behruz into main
All checks were successful
Deploy to Production / build-and-deploy (push) Successful in 1m50s
Reviewed-on: #55
2026-04-17 13:25:14 +00:00
xoliqberdiyev
a973da91f5 fix 2026-04-17 18:24:59 +05:00
github-actions[bot]
ec94e4cdd0 🔄 Update image to 73 [CI SKIP] 2026-04-17 13:21:05 +00:00
87701c31f1 Merge pull request 'fix' (#54) from behruz into main
All checks were successful
Deploy to Production / build-and-deploy (push) Successful in 1m51s
Reviewed-on: #54
2026-04-17 13:19:34 +00:00
xoliqberdiyev
35739ddc27 fix 2026-04-17 18:19:12 +05:00
e8feafca0b Merge pull request 'add new task for sending new messages to the chat' (#53) from behruz into main
Some checks failed
Deploy to Production / build-and-deploy (push) Failing after 48s
Reviewed-on: #53
2026-04-17 13:15:06 +00:00
xoliqberdiyev
505c33a554 add new task for sending new messages to the chat 2026-04-17 18:14:24 +05:00
github-actions[bot]
f24afaf55c 🔄 Update image to 71 [CI SKIP] 2026-04-17 10:15:24 +00:00
665db58bbc Merge pull request 'fix' (#52) from behruz into main
All checks were successful
Deploy to Production / build-and-deploy (push) Successful in 1m50s
Reviewed-on: #52
2026-04-17 10:13:52 +00:00
xoliqberdiyev
57e22e04db fix 2026-04-17 15:13:36 +05:00
github-actions[bot]
528dc57ea2 🔄 Update image to 70 [CI SKIP] 2026-04-17 10:13:21 +00:00
774be87f45 Merge pull request 'feat: add new extra fields for auto-evalution list serializer' (#51) from behruz into main
All checks were successful
Deploy to Production / build-and-deploy (push) Successful in 1m50s
Reviewed-on: #51
2026-04-17 10:11:48 +00:00
xoliqberdiyev
3d0141197f feat: add new extra fields for auto-evalution list serializer 2026-04-17 15:11:26 +05:00
9dc093e244 Merge pull request 'feat: auto-evaluation update api serializer class changed' (#50) from behruz into main
Some checks failed
Deploy to Production / build-and-deploy (push) Failing after 1m19s
Reviewed-on: #50
2026-04-17 10:01:57 +00:00
xoliqberdiyev
aa1e4ca6fc feat: auto-evaluation update api serializer class changed 2026-04-17 15:01:25 +05:00
github-actions[bot]
04ef567d5c 🔄 Update image to 68 [CI SKIP] 2026-04-16 10:33:44 +00:00
b604fff1c2 Merge pull request 'fi' (#49) from behruz into main
All checks were successful
Deploy to Production / build-and-deploy (push) Successful in 1m51s
Reviewed-on: #49
2026-04-16 10:32:13 +00:00
xoliqberdiyev
277bc2874e fi 2026-04-16 15:31:49 +05:00
github-actions[bot]
37459e8485 🔄 Update image to 67 [CI SKIP] 2026-04-16 10:28:48 +00:00
f231d889a5 Merge pull request 'add base url' (#48) from behruz into main
All checks were successful
Deploy to Production / build-and-deploy (push) Successful in 1m49s
Reviewed-on: #48
2026-04-16 10:27:19 +00:00
xoliqberdiyev
3fa70d9436 add base url 2026-04-16 15:26:47 +05:00
github-actions[bot]
6b1a9439ce 🔄 Update image to 66 [CI SKIP] 2026-04-16 10:15:07 +00:00
d26e2b0147 Merge pull request 'fix' (#47) from behruz into main
All checks were successful
Deploy to Production / build-and-deploy (push) Successful in 1m49s
Reviewed-on: #47
2026-04-16 10:13:37 +00:00
xoliqberdiyev
da71ce6d28 fix 2026-04-16 15:13:19 +05:00
github-actions[bot]
bc157da00d 🔄 Update image to 65 [CI SKIP] 2026-04-16 10:09:53 +00:00
9c40908cc7 Merge pull request 'some changes' (#46) from behruz into main
All checks were successful
Deploy to Production / build-and-deploy (push) Successful in 1m54s
Reviewed-on: #46
2026-04-16 10:08:16 +00:00
xoliqberdiyev
7ee2eee437 some changes 2026-04-16 15:07:52 +05:00
github-actions[bot]
31a08c810d 🔄 Update image to 64 [CI SKIP] 2026-04-03 12:34:09 +00:00
264548c3b1 Merge pull request 'feat: add appraisers for auto-evaluation and add curd for this' (#45) from behruz into main
All checks were successful
Deploy to Production / build-and-deploy (push) Successful in 1m59s
Reviewed-on: #45
2026-04-03 12:32:29 +00:00
xoliqberdiyev
9a18dda657 feat: add appraisers for auto-evaluation and add curd for this 2026-04-03 17:32:05 +05:00
github-actions[bot]
c7612221b8 🔄 Update image to 63 [CI SKIP] 2026-04-03 11:45:10 +00:00
a89dbafb62 Merge pull request 'feat: add filter and pagination to document api' (#44) from behruz into main
All checks were successful
Deploy to Production / build-and-deploy (push) Successful in 1m55s
Reviewed-on: #44
2026-04-03 11:42:02 +00:00
xoliqberdiyev
be0c96b28a feat: add filter and pagination to document api 2026-04-03 16:41:39 +05:00
github-actions[bot]
9d39f0b339 🔄 Update image to 62 [CI SKIP] 2026-04-03 11:32:26 +00:00
797286bcdb Merge pull request 'behruz' (#43) from behruz into main
All checks were successful
Deploy to Production / build-and-deploy (push) Successful in 1m54s
Reviewed-on: #43
2026-04-03 11:30:50 +00:00
xoliqberdiyev
091ddb39ed feat: add new api 2026-04-03 16:28:29 +05:00
xoliqberdiyev
12b19290d6 feat: add new document and documentcategory model for auto evaluation detail 2026-04-03 16:19:53 +05:00
github-actions[bot]
36ac4af4cd 🔄 Update image to 61 [CI SKIP] 2026-04-03 10:30:10 +00:00
4784b58abc Merge pull request 'feat: add new evaluation-request crud apis for admin' (#42) from behruz into main
All checks were successful
Deploy to Production / build-and-deploy (push) Successful in 1m55s
Reviewed-on: #42
2026-04-03 10:28:32 +00:00
xoliqberdiyev
3664f8f66d feat: add new evaluation-request crud apis for admin 2026-04-03 15:27:43 +05:00
github-actions[bot]
17e63ee2e4 🔄 Update image to 60 [CI SKIP] 2026-04-02 16:16:23 +00:00
40a68ff47d Merge pull request 'feat/avto-chat' (#41) from feat/avto-chat into main
All checks were successful
Deploy to Production / build-and-deploy (push) Successful in 1m56s
Reviewed-on: #41
2026-04-02 16:14:46 +00:00
cc6ef4cd63 make test qilindi 2026-04-02 21:14:17 +05:00
8f54bdedc2 chat qo'shildi 2026-04-02 20:50:00 +05:00
github-actions[bot]
878301605c 🔄 Update image to 59 [CI SKIP] 2026-04-02 13:30:22 +00:00
ea3f14058e Merge pull request 'feat: change AutoEvaluation model field and serializer fields' (#40) from behruz into main
All checks were successful
Deploy to Production / build-and-deploy (push) Successful in 1m50s
Reviewed-on: #40
2026-04-02 13:28:51 +00:00
xoliqberdiyev
ee4754b23d feat: change AutoEvaluation model field and serializer fields 2026-04-02 18:28:21 +05:00
github-actions[bot]
5dea19c104 🔄 Update image to 58 [CI SKIP] 2026-04-02 13:05:23 +00:00
eb2156f076 Merge pull request 'fix: error fixed about .authenticate() method and Evaluationrequest tests updated' (#39) from behruz into main
All checks were successful
Deploy to Production / build-and-deploy (push) Successful in 1m51s
Reviewed-on: #39
2026-04-02 13:03:51 +00:00
xoliqberdiyev
de03c97dac fix: error fixed about .authenticate() method and Evaluationrequest tests updated 2026-04-02 18:03:20 +05:00
01617c7e14 Merge pull request 'feat: change EvaluationrequestModel fields from CharField to ForeignKey, such as value_determined, rate_goal, property_rights, form_ownership, and change the BaseEvaluationrequestSerializer fields' (#38) from behruz into main
Some checks failed
Deploy to Production / build-and-deploy (push) Failing after 1m25s
Reviewed-on: #38
2026-04-02 12:49:33 +00:00
xoliqberdiyev
d5a132c75b feat: change EvaluationrequestModel fields from CharField to ForeignKey, such as value_determined, rate_goal, property_rights, form_ownership, and change the BaseEvaluationrequestSerializer fields 2026-04-02 17:49:03 +05:00
09862985e1 Merge pull request 'worked_hours to'g'irlandi' (#37) from fix/evaluation-request into main
Some checks failed
Deploy to Production / build-and-deploy (push) Failing after 1m27s
Reviewed-on: #37
2026-04-02 12:18:24 +00:00
e9d779d489 worked_hours to'g'irlandi 2026-04-02 17:17:49 +05:00
b8dcbe811d Merge pull request 'feat: change user_update api response, and add the basic and session auth to rest framework config file' (#36) from behruz into main
Some checks failed
Deploy to Production / build-and-deploy (push) Failing after 1m26s
Reviewed-on: #36
2026-04-02 12:08:35 +00:00
xoliqberdiyev
0dbd246120 feat: change user_update api response, and add the basic and session auth to rest framework config file 2026-04-02 17:07:56 +05:00
github-actions[bot]
9d8fd8e6de 🔄 Update image to 54 [CI SKIP] 2026-04-02 11:20:16 +00:00
41b63b1645 Merge pull request 'fix test' (#35) from fix/make-test into main
All checks were successful
Deploy to Production / build-and-deploy (push) Successful in 1m50s
Reviewed-on: #35
2026-04-02 11:18:45 +00:00
22740e59a7 fix test 2026-04-02 16:17:36 +05:00
43e6d8190e Merge pull request 'api response struktra ozgardi qb query kamytraildi' (#34) from fix/evaluation-history into main
Some checks failed
Deploy to Production / build-and-deploy (push) Failing after 1m14s
Reviewed-on: #34
2026-04-02 11:13:00 +00:00
ea020ae500 api response struktra ozgardi qb query kamytraildi 2026-04-02 16:12:28 +05:00
ad1e61498c Merge pull request 'feat: avto va tezkor baholash uchun history bo'limi qo'shildi' (#33) from feat/evaluation-history into main
Some checks failed
Deploy to Production / build-and-deploy (push) Failing after 1m14s
Reviewed-on: #33
2026-04-02 10:59:01 +00:00
2492583f43 feat: avto va tezkor baholash uchun history bo'limi qo'shildi 2026-04-02 15:57:41 +05:00
github-actions[bot]
c4330fd6f7 🔄 Update image to 51 [CI SKIP] 2026-03-18 09:13:47 +00:00
11f967da42 Merge pull request 'Mulk shakli uchun api kerak va Mulk egalik huquqi uchun api kerak olish uchun api chiqarildi' (#32) from feat/property-references-api into main
All checks were successful
Deploy to Production / build-and-deploy (push) Successful in 1m55s
Reviewed-on: #32
2026-03-18 09:12:13 +00:00
Husanjonazamov
f13f1eb16f Mulk shakli uchun api kerak va Mulk egalik huquqi uchun api kerak olish uchun api chiqarildi 2026-03-18 14:10:49 +05:00
github-actions[bot]
2ed50e10d9 🔄 Update image to 50 [CI SKIP] 2026-03-18 08:00:35 +00:00
b3f60b257a Merge pull request 'Aniqlanayotgan qiymat turi uchun api kerak' (#31) from feat/determined-value-api into main
All checks were successful
Deploy to Production / build-and-deploy (push) Successful in 2m16s
Reviewed-on: #31
2026-03-18 07:58:50 +00:00
Husanjonazamov
7f8858ac7e Aniqlanayotgan qiymat turi uchun api kerak 2026-03-18 12:41:51 +05:00
github-actions[bot]
28fdf82c08 🔄 Update image to 49 [CI SKIP] 2026-03-17 14:38:21 +00:00
a06cf173b6 Merge pull request 'Baholash maqsadi uchun api chiqarildi' (#30) from feat/valuation-purpose-api into main
All checks were successful
Deploy to Production / build-and-deploy (push) Successful in 1m59s
Reviewed-on: #30
2026-03-17 14:36:47 +00:00
Husanjonazamov
9593b02c2d Baholash maqsadi uchun api chiqarildi 2026-03-17 19:36:21 +05:00
386e9ead89 Merge pull request 'user request yuborishda api fix qilindi' (#29) from fix/user-request into main
Some checks failed
Deploy to Production / build-and-deploy (push) Failing after 1m34s
Reviewed-on: #29
2026-03-17 14:07:08 +00:00
Husanjonazamov
9a13a2b4f0 user request yuborishda api fix qilindi 2026-03-17 19:06:38 +05:00
github-actions[bot]
9b57611b62 🔄 Update image to 47 [CI SKIP] 2026-03-17 13:27:52 +00:00
4479a0c1a5 Merge pull request 'use modeliga avatar fieldni qoshildi' (#28) from feat/user into main
All checks were successful
Deploy to Production / build-and-deploy (push) Successful in 2m34s
Reviewed-on: #28
2026-03-17 13:25:41 +00:00
Husanjonazamov
0d574a92a9 use modeliga avatar fieldni qoshildi 2026-03-17 18:25:20 +05:00
147 changed files with 27526 additions and 161 deletions

View File

@@ -1,12 +1,27 @@
import os
from django.core.asgi import get_asgi_application
asgi_application = get_asgi_application()
from config.env import env # noqa
os.environ.setdefault("DJANGO_SETTINGS_MODULE", env("DJANGO_SETTINGS_MODULE"))
application = asgi_application
import os
from django.core.asgi import get_asgi_application
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "config.settings.local")
asgi_application = get_asgi_application()
from channels.routing import ProtocolTypeRouter, URLRouter # noqa
from django.urls import re_path # noqa
from core.apps.chat.consumers import ChatConsumer # noqa
from core.apps.chat.middlewares.auth import JWTAuthMiddlewareStack # noqa
websocket_urlpatterns = [
re_path(
r"^ws/chat/room/(?P<room_id>\d+)/$",
ChatConsumer.as_asgi(),
),
]
application = ProtocolTypeRouter({
"http": asgi_application,
"websocket": JWTAuthMiddlewareStack(
URLRouter(websocket_urlpatterns)
),
})

View File

@@ -1 +1 @@
MODULES = ["core.apps.shared", "core.apps.evaluation", "core.apps.payment"]
MODULES = ["core.apps.shared", "core.apps.evaluation", "core.apps.payment", "core.apps.chat"]

View File

@@ -112,6 +112,33 @@ PAGES = [
},
],
},
{
"title": _("Tarix"),
"separator": True,
"items": [
{
"title": _("Avto baholash tarixi"),
"icon": "history",
"link": reverse_lazy("admin:evaluation_autoevaluationhistorymodel_changelist"),
},
{
"title": _("Tezkor baholash tarixi"),
"icon": "manage_history",
"link": reverse_lazy("admin:evaluation_quickevaluationhistorymodel_changelist"),
},
],
},
{
"title": _("Chat"),
"separator": True,
"items": [
{
"title": _("Chat xabarlari"),
"icon": "chat",
"link": reverse_lazy("admin:chat_chatmessagemodel_changelist"),
},
],
},
{
"title": _("Ma'lumotnomalari"),
"separator": True,
@@ -123,4 +150,20 @@ PAGES = [
},
],
},
{
"title": _("Auto baholash"),
"separator": True,
"items": [
{
"title": _("Hujjatlar"),
"icon": "attach_file",
"link": reverse_lazy("admin:evaluation_documentmodel_changelist"),
},
{
"title": _("Kategoriyalar"),
"icon": "category",
"link": reverse_lazy("admin:evaluation_documentcategorymodel_changelist"),
}
]
}
]

View File

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

View File

@@ -148,8 +148,18 @@ AUTH_USER_MODEL = "accounts.User"
CELERY_BROKER_URL = env("REDIS_URL")
CELERY_RESULT_BACKEND = env("REDIS_URL")
CHANNEL_LAYERS = {
"default": {
"BACKEND": "channels_redis.core.RedisChannelLayer",
"CONFIG": {
"hosts": [env("REDIS_URL")],
},
},
}
ALLOWED_HOSTS += env("ALLOWED_HOSTS").split(",")
CSRF_TRUSTED_ORIGINS = env("CSRF_TRUSTED_ORIGINS").split(",")
SITE_URL = env.str("SITE_URL", default="http://localhost:8055")
MODELTRANSLATION_LANGUAGES = ("uz", "ru", "en")

View File

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

View File

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

View File

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

View File

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

View File

@@ -3,21 +3,30 @@ from rest_framework import serializers
class UserSerializer(serializers.ModelSerializer):
avatar = serializers.SerializerMethodField(method_name='get_avatar')
class Meta:
exclude = [
"created_at",
"updated_at",
"password",
"groups",
"user_permissions"
"user_permissions",
]
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:
model = get_user_model()
fields = [
"first_name",
"last_name"
"last_name",
"avatar"
]

View File

@@ -4,7 +4,7 @@ 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
from .views import RegisterView, ResetPasswordView, MeView, ChangePasswordView, UserListApiView, AdminUserListApiView
from rest_framework.routers import DefaultRouter
router = DefaultRouter()
@@ -23,4 +23,6 @@ urlpatterns = [
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"),
]

View File

@@ -1 +1,2 @@
from .auth import * # noqa
from .user import * # noqa

View File

@@ -6,7 +6,7 @@ from django.contrib.auth import get_user_model
from django.utils.translation import gettext_lazy as _
from django_core import exceptions
from drf_spectacular.utils import extend_schema
from rest_framework import status, throttling, request
from rest_framework import status, throttling, request, parsers
from rest_framework.response import Response
from rest_framework.exceptions import PermissionDenied
from rest_framework.viewsets import GenericViewSet
@@ -160,6 +160,11 @@ class ResetPasswordView(BaseViewSetMixin, GenericViewSet, UserService):
@extend_schema(tags=["me"])
class MeView(BaseViewSetMixin, GenericViewSet, UserService):
permission_classes = [IsAuthenticated]
parser_classes = (
parsers.MultiPartParser,
parsers.FormParser,
parsers.JSONParser,
)
def get_serializer_class(self):
match self.action:
@@ -172,14 +177,14 @@ 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)
ser.save()
return Response({"detail": _("Malumotlar yangilandi")})
data = ser.save()
return Response(UserSerializer(data).data)
@extend_schema(tags=["change-password"], description="Parolni o'zgartirish uchun")

View File

@@ -0,0 +1,31 @@
from django.contrib.auth import get_user_model
from rest_framework import generics, filters
from rest_framework.permissions import IsAuthenticated
from drf_spectacular.utils import extend_schema
from core.apps.accounts.serializers.user import UserSerializer
from core.apps.accounts.choices.user import RoleChoice
User = get_user_model()
@extend_schema(tags=['User'])
class UserListApiView(generics.ListAPIView):
queryset = User.objects.filter(role=RoleChoice.USER)
serializer_class = UserSerializer
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'])
class AdminUserListApiView(generics.ListAPIView):
queryset = User.objects.exclude(role=RoleChoice.USER)
serializer_class = UserSerializer
permission_classes = [IsAuthenticated]
filter_backends = [filters.SearchFilter]
search_fields = ['phone', 'first_name', 'last_name']

View File

View File

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

View File

@@ -0,0 +1,86 @@
from django.contrib import admin
from django.utils.translation import gettext_lazy as _
from unfold.admin import ModelAdmin
from core.apps.chat.models import ChatmessageModel, ChatroomModel
@admin.register(ChatmessageModel)
class ChatmessageAdmin(ModelAdmin):
list_display = (
"id",
"room",
"message_type",
"sender",
"short_text",
"is_read",
"created_at",
)
list_filter = ("message_type", "is_read", "created_at")
search_fields = (
"text",
"sender__phone",
"sender__first_name",
"sender__last_name",
)
readonly_fields = ("created_at",)
autocomplete_fields = ("sender",)
ordering = ("-created_at",)
fieldsets = (
(
_("Xabar"),
{
"fields": ("room", "sender", "message_type", "text", "file", "is_read"),
},
),
(
_("Tizim"),
{
"classes": ("collapse",),
"fields": ("created_at",),
},
),
)
def has_add_permission(self, request):
return False
def has_change_permission(self, request, obj=None):
return False
@admin.display(description=_("Xabar"))
def short_text(self, obj):
if not obj.text:
return f"[{obj.message_type}]"
return obj.text[:60] + "..." if len(obj.text) > 60 else obj.text
@admin.register(ChatroomModel)
class ChatroomAdmin(ModelAdmin):
list_display = (
"id",
"__str__",
"type",
"auto_evaluation",
"created_at",
)
list_filter = ("type",)
search_fields = ("auto_evaluation__id",)
autocomplete_fields = ("auto_evaluation",)
filter_horizontal = ("members",)
readonly_fields = ("created_at", "updated_at")
fieldsets = (
(
_("Xona"),
{
"fields": ("type", "auto_evaluation", "members"),
},
),
(
_("Tizim"),
{
"classes": ("collapse",),
"fields": ("created_at", "updated_at"),
},
),
)

9
core/apps/chat/apps.py Normal file
View File

@@ -0,0 +1,9 @@
from django.apps import AppConfig
class ModuleConfig(AppConfig):
default_auto_field = "django.db.models.BigAutoField"
name = "core.apps.chat"
def ready(self):
import core.apps.chat.signals # noqa

View File

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

View File

@@ -0,0 +1,15 @@
from django.db import models
from django.utils.translation import gettext_lazy as _
class RoomType(models.TextChoices):
AUTO_EVALUATION = "auto_evaluation", _("AutoEvaluation xonasi")
DIRECT = "direct", _("To'g'ridan-to'g'ri")
class MessageType(models.TextChoices):
TEXT = "text", _("Matn")
IMAGE = "image", _("Rasm")
VIDEO = "video", _("Video")
VOICE = "voice", _("Ovoz")
FILE = "file", _("Fayl")

View File

@@ -0,0 +1 @@
from .chat import ChatConsumer # noqa

View File

@@ -0,0 +1,118 @@
import json
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):
"""
Xona asosidagi chat consumer.
Ulanish: ws://host/ws/chat/room/{room_id}/?token=<jwt>
Matn xabari yuborish:
{ "message_type": "text", "text": "Salom" }
Fayl xabari (oldin REST orqali yuklab, keyin URL yuborish):
{ "message_type": "image", "file_url": "https://...", "text": "caption (ixtiyoriy)" }
"""
async def connect(self):
user = self.scope.get("user")
if not user or isinstance(user, AnonymousUser):
await self.close(code=4001)
return
self.room_id = self.scope["url_route"]["kwargs"]["room_id"]
self.room_group = f"chat_room_{self.room_id}"
await self.channel_layer.group_add(self.room_group, self.channel_name)
await self.accept()
async def disconnect(self, close_code):
if hasattr(self, "room_group"):
await self.channel_layer.group_discard(self.room_group, self.channel_name)
async def receive(self, text_data):
user = self.scope.get("user")
if not user or isinstance(user, AnonymousUser):
await self.close(code=4001)
return
try:
data = json.loads(text_data)
except (json.JSONDecodeError, ValueError):
await self.send(text_data=json.dumps({"error": "Noto'g'ri format."}))
return
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(
{"error": "Fayl xabarlarni yuklash uchun REST API dan foydalaning."}
)
)
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(
{
"id": event["id"],
"message_type": event["message_type"],
"text": event["text"],
"file_url": event["file_url"],
"sender": event["sender"],
"created_at": event["created_at"],
}
)
)
@database_sync_to_async
def _save_message(self, user, text):
from core.apps.chat.models import ChatmessageModel
msg = ChatmessageModel.objects.create(
room_id=self.room_id,
sender=user,
message_type="text",
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,
"text": msg.text,
"file_url": None,
"sender": {
"id": user.id,
"full_name": full_name,
"role": user.role,
"phone": user.phone,
"avatar": avatar_url,
},
"created_at": msg.created_at.isoformat(),
}

View File

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

View File

@@ -0,0 +1,33 @@
from django_filters import rest_framework as filters
from core.apps.chat.models import ChatmessageModel, ChatroomModel
class ChatmessageFilter(filters.FilterSet):
room = filters.NumberFilter(field_name="room_id", lookup_expr="exact")
message_type = filters.CharFilter(field_name="message_type", lookup_expr="exact")
is_read = filters.BooleanFilter(field_name="is_read")
created_from = filters.DateTimeFilter(field_name="created_at", lookup_expr="gte")
created_to = filters.DateTimeFilter(field_name="created_at", lookup_expr="lte")
class Meta:
model = ChatmessageModel
fields = [
"room",
"message_type",
"is_read",
"created_from",
"created_to",
]
class ChatroomFilter(filters.FilterSet):
type = filters.CharFilter(field_name="type", lookup_expr="exact")
auto_evaluation = filters.NumberFilter(field_name="auto_evaluation_id", lookup_expr="exact")
class Meta:
model = ChatroomModel
fields = [
"type",
"auto_evaluation",
]

View File

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

View File

@@ -0,0 +1,17 @@
from django import forms
from core.apps.chat.models import ChatmessageModel, ChatroomModel
class ChatmessageForm(forms.ModelForm):
class Meta:
model = ChatmessageModel
fields = "__all__"
class ChatroomForm(forms.ModelForm):
class Meta:
model = ChatroomModel
fields = "__all__"

View File

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

View File

@@ -0,0 +1,70 @@
import traceback
from urllib.parse import parse_qs
from channels.auth import AuthMiddlewareStack
from channels.db import database_sync_to_async
from django.conf import settings
from django.contrib.auth import get_user_model
from django.contrib.auth.models import AnonymousUser
from django.db import close_old_connections
from jwt import DecodeError, ExpiredSignatureError, InvalidSignatureError
from jwt import decode as jwt_decode
User = get_user_model()
class JWTAuthMiddleware:
def __init__(self, app):
self.app = app
async def __call__(self, scope, receive, send):
close_old_connections()
try:
if jwt_token_list := parse_qs(scope["query_string"].decode("utf8")).get(
"token", None
):
jwt_token = jwt_token_list[0]
jwt_payload = self.get_payload(jwt_token)
user_credentials = self.get_user_credentials(jwt_payload)
user = await self.get_logged_in_user(user_credentials)
scope["user"] = user
else:
scope["user"] = AnonymousUser()
except (
InvalidSignatureError,
KeyError,
ExpiredSignatureError,
DecodeError,
):
traceback.print_exc()
except Exception as e:
print(e)
scope["user"] = AnonymousUser()
return await self.app(scope, receive, send)
def get_payload(self, jwt_token):
payload = jwt_decode(jwt_token, settings.SECRET_KEY, algorithms=["HS256"])
return payload
def get_user_credentials(self, payload):
"""
method to get user credentials from jwt token payload.
defaults to user id.
"""
user_id = payload["user_id"]
return user_id
async def get_logged_in_user(self, user_id):
user = await self.get_user(user_id)
return user
@database_sync_to_async
def get_user(self, user_id):
try:
return User.objects.get(id=user_id)
except User.DoesNotExist:
return AnonymousUser()
def JWTAuthMiddlewareStack(app):
return JWTAuthMiddleware(AuthMiddlewareStack(app))

View File

@@ -0,0 +1,36 @@
# Generated by Django 5.2.7 on 2026-04-02 14:22
import django.db.models.deletion
from django.conf import settings
from django.db import migrations, models
class Migration(migrations.Migration):
initial = True
dependencies = [
('evaluation', '0026_alter_autoevaluationmodel_form_ownership_and_more'),
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
]
operations = [
migrations.CreateModel(
name='ChatmessageModel',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('text', models.TextField(verbose_name='text')),
('is_read', models.BooleanField(db_index=True, default=False, verbose_name='is read')),
('created_at', models.DateTimeField(auto_now_add=True, verbose_name='created at')),
('auto_evaluation', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='chat_messages', to='evaluation.autoevaluationmodel', verbose_name='auto evaluation')),
('sender', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='chat_messages', to=settings.AUTH_USER_MODEL, verbose_name='sender')),
],
options={
'verbose_name': 'Chat Message',
'verbose_name_plural': 'Chat Messages',
'db_table': 'ChatMessage',
'ordering': ['created_at'],
'indexes': [models.Index(fields=['auto_evaluation_id', 'created_at'], name='chat_eval_date_idx'), models.Index(fields=['auto_evaluation_id', 'is_read'], name='chat_eval_read_idx')],
},
),
]

View File

@@ -0,0 +1,152 @@
from django.conf import settings
from django.db import migrations, models
import django.db.models.deletion
import core.apps.chat.models.chat
def delete_old_messages(apps, schema_editor):
"""Eski xabarlarni o'chirish — room FK bilan mos kelmaydi."""
ChatmessageModel = apps.get_model("chat", "ChatmessageModel")
ChatmessageModel.objects.all().delete()
class Migration(migrations.Migration):
dependencies = [
("chat", "0001_initial_chat_message"),
("evaluation", "0026_alter_autoevaluationmodel_form_ownership_and_more"),
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
]
operations = [
# 1. ChatroomModel yaratish
migrations.CreateModel(
name="ChatroomModel",
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=[
("auto_evaluation", "AutoEvaluation xonasi"),
("direct", "To\u2018g\u2018ridan-to\u2018g\u2018ri"),
],
db_index=True,
default="auto_evaluation",
max_length=20,
verbose_name="type",
),
),
(
"auto_evaluation",
models.OneToOneField(
blank=True,
null=True,
on_delete=django.db.models.deletion.CASCADE,
related_name="chat_room",
to="evaluation.autoevaluationmodel",
verbose_name="auto evaluation",
),
),
(
"members",
models.ManyToManyField(
blank=True,
related_name="chat_rooms",
to=settings.AUTH_USER_MODEL,
verbose_name="members",
),
),
],
options={
"verbose_name": "Chat Xona",
"verbose_name_plural": "Chat Xonalar",
"db_table": "ChatRoom",
},
),
# 2. Eski xabarlarni o'chirish (room FKsiz migratsiya mumkin emas)
migrations.RunPython(delete_old_messages, migrations.RunPython.noop),
# 3. Eski indexlarni o'chirish
migrations.RemoveIndex(
model_name="chatmessagemodel",
name="chat_eval_date_idx",
),
migrations.RemoveIndex(
model_name="chatmessagemodel",
name="chat_eval_read_idx",
),
# 4. auto_evaluation FK o'chirish
migrations.RemoveField(
model_name="chatmessagemodel",
name="auto_evaluation",
),
# 5. room FK qo'shish
migrations.AddField(
model_name="chatmessagemodel",
name="room",
field=models.ForeignKey(
on_delete=django.db.models.deletion.CASCADE,
related_name="messages",
to="chat.chatroommodel",
verbose_name="room",
null=True,
),
),
# 6. room ni non-null qilish
migrations.AlterField(
model_name="chatmessagemodel",
name="room",
field=models.ForeignKey(
on_delete=django.db.models.deletion.CASCADE,
related_name="messages",
to="chat.chatroommodel",
verbose_name="room",
),
),
# 7. message_type qo'shish
migrations.AddField(
model_name="chatmessagemodel",
name="message_type",
field=models.CharField(
choices=[
("text", "Matn"),
("image", "Rasm"),
("video", "Video"),
("voice", "Ovoz"),
("file", "Fayl"),
],
db_index=True,
default="text",
max_length=10,
verbose_name="message type",
),
),
# 8. text ni nullable qilish
migrations.AlterField(
model_name="chatmessagemodel",
name="text",
field=models.TextField(blank=True, null=True, verbose_name="text"),
),
# 9. file field qo'shish
migrations.AddField(
model_name="chatmessagemodel",
name="file",
field=models.FileField(
blank=True,
null=True,
upload_to=core.apps.chat.models.chat.chat_file_upload_path,
verbose_name="file",
),
),
# 10. Yangi indexlar
migrations.AddIndex(
model_name="chatmessagemodel",
index=models.Index(fields=["room_id", "created_at"], name="chat_room_date_idx"),
),
migrations.AddIndex(
model_name="chatmessagemodel",
index=models.Index(fields=["room_id", "is_read"], name="chat_room_read_idx"),
),
]

View File

@@ -0,0 +1,22 @@
# Generated by Django 5.2.7 on 2026-04-03 10:58
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('chat', '0002_chatroom_and_message_media'),
]
operations = [
migrations.AlterModelOptions(
name='chatmessagemodel',
options={'ordering': ['created_at'], 'verbose_name': 'Chat Xabar', 'verbose_name_plural': 'Chat Xabarlar'},
),
migrations.AlterField(
model_name='chatroommodel',
name='type',
field=models.CharField(choices=[('auto_evaluation', 'AutoEvaluation xonasi'), ('direct', "To'g'ridan-to'g'ri")], db_index=True, default='auto_evaluation', max_length=20, verbose_name='type'),
),
]

View File

View File

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

View File

@@ -0,0 +1,110 @@
from django.db import models
from django.utils.translation import gettext_lazy as _
from django_core.models import AbstractBaseModel
from model_bakery import baker
from core.apps.chat.choices.chat import MessageType, RoomType
def chat_file_upload_path(instance, filename):
return f"chat/{instance.message_type}/{filename}"
class ChatroomModel(AbstractBaseModel):
type = models.CharField(
verbose_name=_("type"),
max_length=20,
choices=RoomType.choices,
default=RoomType.AUTO_EVALUATION,
db_index=True,
)
auto_evaluation = models.OneToOneField(
"evaluation.AutoEvaluationModel",
on_delete=models.CASCADE,
null=True,
blank=True,
related_name="chat_room",
verbose_name=_("auto evaluation"),
)
members = models.ManyToManyField(
"accounts.User",
blank=True,
related_name="chat_rooms",
verbose_name=_("members"),
)
def __str__(self):
if self.type == RoomType.AUTO_EVALUATION and self.auto_evaluation_id:
return f"AutoEval #{self.auto_evaluation_id} xonasi"
return f"Direct xona #{self.pk}"
@classmethod
def _baker(cls):
return baker.make(cls)
class Meta:
db_table = "ChatRoom"
verbose_name = _("Chat Xona")
verbose_name_plural = _("Chat Xonalar")
class ChatmessageModel(models.Model):
room = models.ForeignKey(
ChatroomModel,
on_delete=models.CASCADE,
related_name="messages",
verbose_name=_("room"),
)
sender = models.ForeignKey(
"accounts.User",
on_delete=models.SET_NULL,
null=True,
related_name="chat_messages",
verbose_name=_("sender"),
)
message_type = models.CharField(
verbose_name=_("message type"),
max_length=10,
choices=MessageType.choices,
default=MessageType.TEXT,
db_index=True,
)
text = models.TextField(verbose_name=_("text"), null=True, blank=True)
file = models.FileField(
verbose_name=_("file"),
upload_to=chat_file_upload_path,
null=True,
blank=True,
)
is_read = models.BooleanField(
verbose_name=_("is read"),
default=False,
db_index=True,
)
created_at = models.DateTimeField(
verbose_name=_("created at"),
auto_now_add=True,
)
def __str__(self):
return f"#{self.pk}{self.sender}"
@classmethod
def _baker(cls):
return baker.make(cls)
class Meta:
db_table = "ChatMessage"
verbose_name = _("Chat Xabar")
verbose_name_plural = _("Chat Xabarlar")
ordering = ["created_at"]
indexes = [
models.Index(
fields=["room_id", "created_at"],
name="chat_room_date_idx",
),
models.Index(
fields=["room_id", "is_read"],
name="chat_room_read_idx",
),
]

View File

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

View File

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

View File

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

View File

@@ -0,0 +1,82 @@
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()
file_url = serializers.SerializerMethodField()
def get_sender(self, obj):
if obj.sender is None:
return None
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):
if not obj.file:
return None
request = self.context.get("request")
if request:
return request.build_absolute_uri(obj.file.url)
return obj.file.url
class Meta:
model = ChatmessageModel
fields = [
"id",
"room",
"sender",
"message_type",
"text",
"file_url",
"is_read",
"created_at",
]
class ListChatmessageSerializer(BaseChatmessageSerializer):
class Meta(BaseChatmessageSerializer.Meta): ...
class RetrieveChatmessageSerializer(BaseChatmessageSerializer):
class Meta(BaseChatmessageSerializer.Meta): ...
class CreateChatmessageSerializer(serializers.ModelSerializer):
class Meta:
model = ChatmessageModel
fields = [
"room",
"message_type",
"text",
"file",
]
def validate(self, attrs):
message_type = attrs.get("message_type", "text")
text = attrs.get("text", "").strip() if attrs.get("text") else ""
file = attrs.get("file")
if message_type == "text" and not text:
raise serializers.ValidationError({"text": "Matn xabari uchun text majburiy."})
if message_type != "text" and not file:
raise serializers.ValidationError({"file": f"{message_type} xabari uchun fayl majburiy."})
return attrs
def create(self, validated_data):
validated_data["sender"] = self.context["request"].user
request = self.context["request"]
message = super().create(validated_data)
file_url = request.build_absolute_uri(message.file.url) if message.file else None
send_message_to_chat.delay(message.id, file_url)
return message

View File

@@ -0,0 +1,68 @@
from rest_framework import serializers
from core.apps.chat.models import ChatroomModel
class MemberSerializer(serializers.Serializer):
id = serializers.IntegerField()
full_name = serializers.SerializerMethodField()
role = serializers.CharField()
def get_full_name(self, obj):
name = obj.get_full_name().strip()
return name if name else str(obj.phone)
class BaseChatroomSerializer(serializers.ModelSerializer):
members = serializers.SerializerMethodField()
def get_members(self, obj):
return [
{
"id": u.id,
"full_name": (u.get_full_name().strip() or str(u.phone)),
"role": u.role,
}
for u in obj.members.only("id", "first_name", "last_name", "phone", "role")
]
class Meta:
model = ChatroomModel
fields = [
"id",
"type",
"auto_evaluation",
"members",
"created_at",
]
class ListChatroomSerializer(BaseChatroomSerializer):
class Meta(BaseChatroomSerializer.Meta): ...
class RetrieveChatroomSerializer(BaseChatroomSerializer):
class Meta(BaseChatroomSerializer.Meta): ...
class CreateChatroomSerializer(serializers.ModelSerializer):
type = serializers.ChoiceField(
choices=["auto_evaluation", "direct"],
required=True,
)
class Meta:
model = ChatroomModel
fields = [
"type",
"auto_evaluation",
"members",
]
def validate(self, attrs):
room_type = attrs.get("type")
if room_type == "auto_evaluation" and not attrs.get("auto_evaluation"):
raise serializers.ValidationError(
{"auto_evaluation": "auto_evaluation turi uchun AutoEvaluation majburiy."}
)
return attrs

View File

@@ -0,0 +1,2 @@
from .ChatMessage import * # noqa
from .ChatRoom import * # noqa

View File

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

View File

@@ -0,0 +1,55 @@
from asgiref.sync import async_to_sync
from channels.layers import get_channel_layer
from django.conf import settings
from django.db.models.signals import post_save
from django.dispatch import receiver
from core.apps.chat.models import ChatmessageModel, ChatroomModel
# @receiver(post_save, sender=ChatmessageModel)
# def broadcast_new_message(sender, instance, created, **kwargs):
# """Yangi xabar saqlanganda xonadagi barcha WS ulanishlariga yuboradi."""
# if not created:
# return
# channel_layer = get_channel_layer()
# if channel_layer is None:
# return
# sender_obj = instance.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,
# }
# else:
# sender_data = None
# site_url = getattr(settings, "SITE_URL", "").rstrip("/")
# file_url = (site_url + instance.file.url) if instance.file else None
# async_to_sync(channel_layer.group_send)(
# f"chat_room_{instance.room_id}",
# {
# "type": "chat_message",
# "id": instance.id,
# "message_type": instance.message_type,
# "text": instance.text,
# "file_url": file_url,
# "sender": sender_data,
# "created_at": instance.created_at.isoformat(),
# },
# )
@receiver(post_save, sender="evaluation.AutoEvaluationModel")
def auto_create_chatroom(sender, instance, created, **kwargs):
"""AutoEvaluation yaratilganda avtomatik chat xonasi ochiladi."""
if created:
ChatroomModel.objects.get_or_create(
auto_evaluation=instance,
defaults={"type": "auto_evaluation"},
)

View File

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

View File

@@ -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):
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,
}
else:
sender_data = None
# file_url = request.build_absolute_uri(message.file.url) if message.file else 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(),
},
)

View File

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

View File

@@ -0,0 +1,2 @@
from .test_ChatMessage import * # noqa
from .test_ChatRoom import * # noqa

View File

@@ -0,0 +1,112 @@
import pytest
from django.urls import reverse
from rest_framework.test import APIClient
from core.apps.chat.models import ChatmessageModel
@pytest.fixture
def instance(db):
return ChatmessageModel._baker()
@pytest.fixture
def api_client(instance):
from model_bakery import baker
user = instance.sender or baker.make("accounts.User")
if not instance.sender:
instance.sender = user
instance.save()
# ensure the sender is a member of the room (just in case)
if instance.room:
instance.room.members.add(user)
client = APIClient()
client.force_authenticate(user=user)
return client, instance
@pytest.fixture
def data(api_client):
client, instance = api_client
return (
{
"list": reverse("chat-messages-list"),
"retrieve": reverse("chat-messages-detail", kwargs={"pk": instance.pk}),
"retrieve-not-found": reverse("chat-messages-detail", kwargs={"pk": 1000}),
},
client,
instance,
)
@pytest.mark.django_db
def test_list(data):
urls, client, _ = data
response = client.get(urls["list"])
data_resp = response.json()
assert response.status_code == 200
assert data_resp["status"] is True
@pytest.mark.django_db
def test_retrieve(data):
urls, client, _ = data
response = client.get(urls["retrieve"])
data_resp = response.json()
assert response.status_code == 200
assert data_resp["status"] is True
@pytest.mark.django_db
def test_retrieve_not_found(data):
urls, client, _ = data
response = client.get(urls["retrieve-not-found"])
data_resp = response.json()
assert response.status_code == 404
assert data_resp["status"] is False
# @pytest.mark.django_db
# def test_create(data):
# urls, client, _ = data
# response = client.post(urls["list"], data={"name": "test"})
# assert response.json()["status"] is True
# assert response.status_code == 201
# @pytest.mark.django_db
# def test_update(data):
# urls, client, _ = data
# response = client.patch(urls["retrieve"], data={"name": "updated"})
# assert response.json()["status"] is True
# assert response.status_code == 200
#
# # verify updated value
# response = client.get(urls["retrieve"])
# assert response.json()["status"] is True
# assert response.status_code == 200
# assert response.json()["data"]["name"] == "updated"
# @pytest.mark.django_db
# def test_partial_update():
# urls, client, _ = data
# response = client.patch(urls["retrieve"], data={"name": "updated"})
# assert response.json()["status"] is True
# assert response.status_code == 200
#
# # verify updated value
# response = client.get(urls["retrieve"])
# assert response.json()["status"] is True
# assert response.status_code == 200
# assert response.json()["data"]["name"] == "updated"
# @pytest.mark.django_db
# def test_destroy(data):
# urls, client, _ = data
# response = client.delete(urls["retrieve"])
# assert response.status_code == 204

View File

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

View File

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

View File

@@ -0,0 +1,13 @@
from modeltranslation.translator import TranslationOptions, register
from core.apps.chat.models import ChatmessageModel, ChatroomModel
@register(ChatmessageModel)
class ChatmessageTranslation(TranslationOptions):
fields = []
@register(ChatroomModel)
class ChatroomTranslation(TranslationOptions):
fields = []

9
core/apps/chat/urls.py Normal file
View File

@@ -0,0 +1,9 @@
from django.urls import include, path
from rest_framework.routers import DefaultRouter
from .views import ChatmessageView, ChatRoomView
router = DefaultRouter()
router.register("rooms", ChatRoomView, basename="chat-rooms")
router.register("messages", ChatmessageView, basename="chat-messages")
urlpatterns = [path("", include(router.urls))]

View File

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

View File

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

View File

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

View File

@@ -0,0 +1,172 @@
from django_core.mixins import BaseViewSetMixin
from django_filters.rest_framework import DjangoFilterBackend
from drf_spectacular.utils import OpenApiParameter, extend_schema
from rest_framework.decorators import action
from rest_framework.filters import OrderingFilter
from rest_framework.permissions import IsAuthenticated
from rest_framework.response import Response
from rest_framework.viewsets import ModelViewSet
from core.apps.chat.filters.chat import ChatmessageFilter, ChatroomFilter
from core.apps.chat.models import ChatmessageModel, ChatroomModel
from core.apps.chat.serializers.chat import (
CreateChatmessageSerializer,
CreateChatroomSerializer,
ListChatmessageSerializer,
ListChatroomSerializer,
RetrieveChatmessageSerializer,
RetrieveChatroomSerializer,
)
@extend_schema(
tags=["Chat"],
parameters=[
OpenApiParameter("room", int, description="Xona ID bo'yicha filter"),
OpenApiParameter("message_type", str, description="Xabar turi: text, image, video, voice, file"),
OpenApiParameter("is_read", bool, description="O'qilgan/o'qilmagan"),
OpenApiParameter("created_from", str, description="Boshlanish sanasi (ISO 8601)"),
OpenApiParameter("created_to", str, description="Tugash sanasi (ISO 8601)"),
],
)
class ChatmessageView(BaseViewSetMixin, ModelViewSet):
permission_classes = [IsAuthenticated]
parser_classes_for_create = None # multipart + json qo'llab-quvvatlanadi
filter_backends = [DjangoFilterBackend, OrderingFilter]
filterset_class = ChatmessageFilter
ordering_fields = ["created_at"]
ordering = ["created_at"]
pagination_class = None
action_permission_classes = {}
action_serializer_class = {
"list": ListChatmessageSerializer,
"retrieve": RetrieveChatmessageSerializer,
"create": CreateChatmessageSerializer,
}
def get_serializer_class(self):
return self.action_serializer_class.get(self.action, ListChatmessageSerializer)
def get_queryset(self):
return (
ChatmessageModel.objects.select_related("sender")
.only(
"id",
"room_id",
"message_type",
"text",
"file",
"is_read",
"created_at",
"sender__id",
"sender__first_name",
"sender__last_name",
"sender__phone",
"sender__role",
)
)
def list(self, request, *args, **kwargs):
queryset = self.filter_queryset(self.get_queryset())
results = list(queryset)
serializer = self.get_serializer(results, many=True)
return Response(
{
"count": len(results),
"next": None,
"previous": None,
"results": serializer.data,
}
)
@extend_schema(description="Xabarlarni o'qilgan deb belgilash")
@action(detail=False, methods=["post"], url_path="mark-read")
def mark_read(self, request):
"""
Berilgan xona uchun barcha o'qilmagan xabarlarni o'qilgan qiladi.
Body: { "room": <id> }
"""
room_id = request.data.get("room")
if not room_id:
return Response({"detail": "room majburiy."}, status=400)
updated = (
ChatmessageModel.objects.filter(room_id=room_id, is_read=False)
.exclude(sender=request.user)
.update(is_read=True)
)
return Response({"updated": updated})
@extend_schema(
tags=["ChatRoom"],
parameters=[
OpenApiParameter("type", str, description="Xona turi: auto_evaluation, direct"),
OpenApiParameter("auto_evaluation", int, description="AutoEvaluation ID"),
],
)
class ChatRoomView(BaseViewSetMixin, ModelViewSet):
permission_classes = [IsAuthenticated]
filter_backends = [DjangoFilterBackend]
filterset_class = ChatroomFilter
pagination_class = None
action_permission_classes = {}
action_serializer_class = {
"list": ListChatroomSerializer,
"retrieve": RetrieveChatroomSerializer,
"create": CreateChatroomSerializer,
}
def get_serializer_class(self):
return self.action_serializer_class.get(self.action, ListChatroomSerializer)
def get_queryset(self):
return ChatroomModel.objects.prefetch_related("members").only(
"id",
"type",
"auto_evaluation_id",
"created_at",
)
def list(self, request, *args, **kwargs):
queryset = self.filter_queryset(self.get_queryset())
results = list(queryset)
serializer = self.get_serializer(results, many=True)
return Response(
{
"count": len(results),
"next": None,
"previous": None,
"results": serializer.data,
}
)
@extend_schema(
description="Xonaga yangi a'zo qo'shish",
request={"application/json": {"type": "object", "properties": {"user_id": {"type": "integer"}}}},
)
@action(detail=True, methods=["post"], url_path="add-member")
def add_member(self, request, pk=None):
room = self.get_object()
user_id = request.data.get("user_id")
if not user_id:
return Response({"detail": "user_id majburiy."}, status=400)
room.members.add(user_id)
return Response({"detail": "A'zo qo'shildi."})
@extend_schema(
description="Xonadan a'zoni chiqarish",
request={"application/json": {"type": "object", "properties": {"user_id": {"type": "integer"}}}},
)
@action(detail=True, methods=["post"], url_path="remove-member")
def remove_member(self, request, pk=None):
room = self.get_object()
user_id = request.data.get("user_id")
if not user_id:
return Response({"detail": "user_id majburiy."}, status=400)
room.members.remove(user_id)
return Response({"detail": "A'zo chiqarildi."})

View File

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

View File

@@ -1,7 +1,7 @@
from django.contrib import admin
from unfold.admin import ModelAdmin
from core.apps.evaluation.models import ValuationDocumentModel
from core.apps.evaluation.models import DocumentModel, ValuationDocumentModel
@admin.register(ValuationDocumentModel)
@@ -23,20 +23,37 @@ class ValuationDocumentAdmin(ModelAdmin):
readonly_fields = ("created_at", "updated_at")
autocomplete_fields = ("valuation", "uploaded_by")
fieldsets = (
("Hujjat", {
"fields": (
"valuation",
"document_type",
"title",
"file",
"uploaded_by",
),
}),
("Qo'shimcha", {
"fields": ("description",),
}),
("Tizim", {
"classes": ("collapse",),
"fields": ("created_at", "updated_at"),
}),
(
"Hujjat",
{
"fields": (
"valuation",
"document_type",
"title",
"file",
"uploaded_by",
),
},
),
(
"Qo'shimcha",
{
"fields": ("description",),
},
),
(
"Tizim",
{
"classes": ("collapse",),
"fields": ("created_at", "updated_at"),
},
),
)
@admin.register(DocumentModel)
class DocumentAdmin(ModelAdmin):
list_display = (
"id",
"__str__",
)

View File

@@ -0,0 +1,57 @@
from django.contrib import admin
from unfold.admin import ModelAdmin
from core.apps.evaluation.models import DocumentcategoryModel
@admin.register(DocumentcategoryModel)
class DocumentcategoryAdmin(ModelAdmin):
list_display = (
"id",
"label",
"value",
"created_at",
"updated_at"
)
search_fields = (
"label",
"value",
)
list_filter = (
"created_at",
"updated_at",
)
readonly_fields = (
"created_at",
"updated_at",
)
fieldsets = (
(
("Uzbekcha"),
{
"fields": (
"label_uz",
"value_uz",
)
}
),
(
("Ruscha"),
{
"fields": (
"label_ru",
"value_ru",
)
}
),
(
("Inglizcha"),
{
"fields": (
"label_en",
"value_en",
)
}
),
)
list_display_links =list_display

View File

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

View File

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

View File

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

View File

@@ -21,28 +21,6 @@ class ObjectOwnerType(models.IntegerChoices):
LEGAL = 2, _("Yuridik shaxs")
class PropertyRights(models.IntegerChoices):
PERMANENT_OWNERSHIP = 1, _("Doimiy egalik")
PERMANENT_USE = 2, _("Doimiy foydalanish")
TEMPORARY_USE = 3, _("Vaqtinchalik foydalanish")
TERM_LEASE = 4, _("Muddatli ijara")
LIFETIME_INHERITANCE = 5, _("Umrbod meros qilib olish")
class FormOwnership(models.IntegerChoices):
PRIVATE = 1, _("Xususiy")
STATE = 2, _("Davlat")
JSC = 3, _("AJ")
LLC = 4, _("MCHJ")
OTHER = 5, _("Boshqa")
class ValueDetermined(models.IntegerChoices):
MARKET_VALUE = 1, _("Bozor qiymati")
TAX_PURPOSE = 2, _("Soliq maqsadlari uchun")
LIQUIDATION_VALUE = 3, _("Tugatish qiymati")
UTILIZATION_VALUE = 4, _("Utilizatsiya qiymati")
class RateType(models.IntegerChoices):
CREDIT_COLLATERAL = 1, _("Kredit ta'minoti sifatida garovga qo'yish")

View File

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

View File

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

View File

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

View File

@@ -1,11 +1,18 @@
from django_filters import rest_framework as filters
from core.apps.evaluation.models import ValuationDocumentModel
from core.apps.evaluation.models import DocumentModel, ValuationDocumentModel
class ValuationdocumentFilter(filters.FilterSet):
# name = filters.CharFilter(field_name="name", lookup_expr="icontains")
class Meta:
model = ValuationDocumentModel
fields = []
class DocumentFilter(filters.FilterSet):
class Meta:
model = DocumentModel
fields = [
]

View File

@@ -0,0 +1,10 @@
from django_filters import rest_framework as filters
from core.apps.evaluation.models import DocumentcategoryModel
class DocumentcategoryFilter(filters.FilterSet):
class Meta:
model = DocumentcategoryModel
fields = [
]

View File

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

View File

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

View File

@@ -1,6 +1,6 @@
from django import forms
from core.apps.evaluation.models import ValuationDocumentModel
from core.apps.evaluation.models import DocumentModel, ValuationDocumentModel
class ValuationdocumentForm(forms.ModelForm):
@@ -8,3 +8,10 @@ class ValuationdocumentForm(forms.ModelForm):
class Meta:
model = ValuationDocumentModel
fields = "__all__"
class DocumentForm(forms.ModelForm):
class Meta:
model = DocumentModel
fields = "__all__"

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -0,0 +1,45 @@
# Generated by Django 5.2.7 on 2026-04-02 13:24
import django.db.models.deletion
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('evaluation', '0025_alter_evaluationrequestmodel_form_ownership_and_more'),
]
operations = [
# Mavjud integer qiymatlar ReferenceItem'da yo'q — FK qo'yishdan oldin NULL qilamiz
migrations.RunSQL(
sql="""
UPDATE "AutoEvaluation"
SET form_ownership = NULL,
property_rights = NULL,
rate_type = NULL,
value_determined = NULL;
""",
reverse_sql=migrations.RunSQL.noop,
),
migrations.AlterField(
model_name='autoevaluationmodel',
name='form_ownership',
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='evaluation_auto_form_ownership', to='evaluation.referenceitemmodel', verbose_name='form of ownership'),
),
migrations.AlterField(
model_name='autoevaluationmodel',
name='property_rights',
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='evaluation_auto_property_rights', to='evaluation.referenceitemmodel', verbose_name='property rights'),
),
migrations.AlterField(
model_name='autoevaluationmodel',
name='rate_type',
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='evaluation_auto_rate_type', to='evaluation.referenceitemmodel', verbose_name='rate type'),
),
migrations.AlterField(
model_name='autoevaluationmodel',
name='value_determined',
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='evaluation_auto_value_determined', to='evaluation.referenceitemmodel', verbose_name='value determined'),
),
]

View File

@@ -0,0 +1,52 @@
# Generated by Django 5.2.7 on 2026-04-03 10:58
import django.db.models.deletion
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('evaluation', '0026_alter_autoevaluationmodel_form_ownership_and_more'),
]
operations = [
migrations.CreateModel(
name='DocumentcategoryModel',
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)),
('label', models.CharField(max_length=255, verbose_name='label')),
('label_uz', models.CharField(max_length=255, null=True, verbose_name='label')),
('label_ru', models.CharField(max_length=255, null=True, verbose_name='label')),
('label_en', models.CharField(max_length=255, null=True, verbose_name='label')),
('value', models.CharField(max_length=255, verbose_name='value')),
('value_uz', models.CharField(max_length=255, null=True, verbose_name='value')),
('value_ru', models.CharField(max_length=255, null=True, verbose_name='value')),
('value_en', models.CharField(max_length=255, null=True, verbose_name='value')),
],
options={
'verbose_name': 'DocumentcategoryModel',
'verbose_name_plural': 'DocumentcategoryModels',
'db_table': 'DocumentCategory',
},
),
migrations.CreateModel(
name='DocumentModel',
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')),
('document', models.FileField(upload_to='evaluation/documents/%Y/%m/', verbose_name='document')),
('auto_evaluation', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='documents', to='evaluation.autoevaluationmodel', verbose_name='auto evaluation')),
('category', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='documents', to='evaluation.documentcategorymodel', verbose_name='category')),
],
options={
'verbose_name': 'DocumentModel',
'verbose_name_plural': 'DocumentModels',
'db_table': 'Document',
},
),
]

View File

@@ -0,0 +1,20 @@
# Generated by Django 5.2.7 on 2026-04-03 11:51
from django.conf import settings
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('evaluation', '0027_documentcategorymodel_documentmodel'),
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
]
operations = [
migrations.AddField(
model_name='autoevaluationmodel',
name='appraisers',
field=models.ManyToManyField(blank=True, null=True, related_name='auto_evaluations', to=settings.AUTH_USER_MODEL, verbose_name='appraisers'),
),
]

View File

@@ -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'),
),
]

View File

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

View File

@@ -8,13 +8,13 @@ from core.apps.evaluation.choices.auto import (
AutoCarWheel,
AutoEvaluationStatus,
AutoObjectType,
FormOwnership,
# FormOwnership,
LocationConvenience,
LocationHighways,
ObjectOwnerType,
PropertyRights,
RateType,
ValueDetermined,
# PropertyRights,
# RateType,
# ValueDetermined,
)
from .valuation import ValuationModel
@@ -22,6 +22,14 @@ from .vehicle import VehicleModel
class AutoEvaluationModel(AbstractBaseModel):
user = models.ForeignKey(
"accounts.User",
on_delete=models.SET_NULL,
related_name="auto_evaluations_user",
verbose_name=_("user"),
null=True,
blank=True,
)
valuation = models.OneToOneField(
ValuationModel,
on_delete=models.CASCADE,
@@ -38,6 +46,13 @@ class AutoEvaluationModel(AbstractBaseModel):
null=True,
blank=True,
)
appraisers = models.ManyToManyField(
"accounts.User",
verbose_name=_("appraisers"),
related_name="auto_evaluations",
blank=True,
null=True,
)
# ── Step 1 — Umumiy ma'lumotlar ──────────────────────────────────
registration_number = models.CharField(
@@ -123,29 +138,38 @@ class AutoEvaluationModel(AbstractBaseModel):
blank=True,
null=True,
)
property_rights = models.IntegerField(
property_rights = models.ForeignKey(
'evaluation.ReferenceitemModel',
verbose_name=_("property rights"),
choices=PropertyRights.choices,
blank=True,
null=True,
on_delete=models.SET_NULL,
related_name='evaluation_auto_property_rights'
)
form_ownership = models.IntegerField(
form_ownership = models.ForeignKey(
'evaluation.ReferenceitemModel',
verbose_name=_("form of ownership"),
choices=FormOwnership.choices,
blank=True,
null=True,
on_delete=models.SET_NULL,
related_name='evaluation_auto_form_ownership'
)
value_determined = models.IntegerField(
value_determined = models.ForeignKey(
'evaluation.ReferenceitemModel',
verbose_name=_("value determined"),
choices=ValueDetermined.choices,
blank=True,
null=True,
on_delete=models.SET_NULL,
related_name='evaluation_auto_value_determined'
)
rate_type = models.IntegerField(
rate_type = models.ForeignKey(
'evaluation.ReferenceitemModel',
verbose_name=_("rate type"),
choices=RateType.choices,
blank=True,
null=True,
on_delete=models.SET_NULL,
related_name='evaluation_auto_rate_type'
)
# ── Step 3 — Manzil ma'lumotlari ────────────────────────────────
@@ -290,4 +314,3 @@ class AutoEvaluationModel(AbstractBaseModel):
db_table = "AutoEvaluation"
verbose_name = _("Auto Evaluation")
verbose_name_plural = _("Auto Evaluations")

View File

@@ -3,9 +3,10 @@ from django.utils.translation import gettext_lazy as _
from django_core.models import AbstractBaseModel
from model_bakery import baker
from .valuation import ValuationModel
from core.apps.evaluation.choices.document import DocumentType
from .valuation import ValuationModel
class ValuationDocumentModel(AbstractBaseModel):
valuation = models.ForeignKey(
@@ -54,3 +55,35 @@ class ValuationDocumentModel(AbstractBaseModel):
verbose_name = _("Valuation Document")
verbose_name_plural = _("Valuation Documents")
ordering = ["-created_at"]
class DocumentModel(AbstractBaseModel):
auto_evaluation = models.ForeignKey(
"evaluation.AutoEvaluationModel",
on_delete=models.CASCADE,
related_name="documents",
verbose_name=_("auto evaluation"),
)
title = models.CharField(verbose_name=_("title"), max_length=255)
document = models.FileField(
verbose_name=_("document"),
upload_to="evaluation/documents/%Y/%m/",
)
category = models.ForeignKey(
"evaluation.DocumentCategoryModel",
on_delete=models.CASCADE,
related_name="documents",
verbose_name=_("category"),
)
def __str__(self):
return str(self.pk)
@classmethod
def _baker(cls):
return baker.make(cls)
class Meta:
db_table = "Document"
verbose_name = _("DocumentModel")
verbose_name_plural = _("DocumentModels")

View File

@@ -0,0 +1,21 @@
from django.db import models
from django.utils.translation import gettext_lazy as _
from django_core.models import AbstractBaseModel
from model_bakery import baker
class DocumentcategoryModel(AbstractBaseModel):
label = models.CharField(verbose_name=_("label"), max_length=255)
value = models.CharField(verbose_name=_("value"), max_length=255)
def __str__(self):
return str(self.pk)
@classmethod
def _baker(cls):
return baker.make(cls)
class Meta:
db_table = "DocumentCategory"
verbose_name = _("DocumentcategoryModel")
verbose_name_plural = _("DocumentcategoryModels")

View File

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

View File

@@ -9,6 +9,7 @@ from core.apps.evaluation.choices.request import (
RequestObjectType,
RequestStatus,
)
from core.apps.evaluation.models import ReferenceitemModel
class EvaluationrequestModel(AbstractBaseModel):
@@ -44,29 +45,46 @@ class EvaluationrequestModel(AbstractBaseModel):
blank=True,
null=True,
)
value_determined = models.CharField(
value_determined = models.ForeignKey(
"evaluation.ReferenceitemModel",
verbose_name=_("value determined"),
max_length=100,
related_name="evaluation_value_determined_requests",
on_delete=models.SET_NULL,
blank=True,
null=True,
)
rate_goal = models.CharField(
rate_goal = models.ForeignKey(
"evaluation.ReferenceitemModel",
verbose_name=_("rate goal"),
max_length=100,
related_name="evaluation_rate_goal_requests",
on_delete=models.SET_NULL,
blank=True,
null=True,
)
property_rights = models.CharField(
property_rights = models.ForeignKey(
"evaluation.ReferenceitemModel",
verbose_name=_("property rights"),
max_length=100,
related_name="evaluation_property_rights_requests",
on_delete=models.SET_NULL,
blank=True,
null=True,
)
form_ownership = models.CharField(
form_ownership = models.ForeignKey(
"evaluation.ReferenceitemModel",
verbose_name=_("form ownership"),
max_length=100,
related_name="evaluation_form_ownership_requests",
on_delete=models.SET_NULL,
blank=True,
null=True,
)
worked_hours = models.IntegerField(
verbose_name=_("worked hours"),
blank=True,
null=True,
)
chassi = models.IntegerField(
chassi = models.CharField(
verbose_name=_("chassi"),
max_length=100,
blank=True,
null=True,
)
@@ -74,6 +92,12 @@ class EvaluationrequestModel(AbstractBaseModel):
verbose_name=_("need delivering"),
default=True,
)
location_name = models.CharField(
verbose_name=_("location name"),
max_length=255,
blank=True,
null=True,
)
location_lat = models.DecimalField(
verbose_name=_("location latitude"),
max_digits=9,
@@ -101,16 +125,19 @@ class EvaluationrequestModel(AbstractBaseModel):
@classmethod
def _baker(cls):
user = baker.make(settings.AUTH_USER_MODEL)
reference = ReferenceitemModel.objects.create(
name="test"
)
return baker.make(
cls,
user=user,
rate_type=EvaluationRateType.AUTO,
customer_inn_number="123456789",
owner_inn_number="987654321",
value_determined="Bozor qiymati",
rate_goal="Kredit uchun",
property_rights="Xususiy",
form_ownership="Xususiy",
value_determined=reference,
rate_goal=reference,
property_rights=reference,
form_ownership=reference,
)
class Meta:

View File

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

View File

@@ -10,3 +10,14 @@ class ValuationdocumentPermission(permissions.BasePermission):
def has_permission(self, request, view):
return True
class DocumentPermission(permissions.BasePermission):
def __init__(self) -> None: ...
def __call__(self, *args, **kwargs):
return self
def has_permission(self, request, view):
return True

View File

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

View File

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

View File

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

View File

@@ -1,23 +1,39 @@
import re
from django.contrib.auth import get_user_model
from rest_framework import serializers
from core.apps.evaluation.models import AutoEvaluationModel
from core.apps.evaluation.models import AutoEvaluationModel,ReferenceitemModel
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)
rate_type_display = serializers.CharField(source="get_rate_type_display", read_only=True, default=None)
value_determined_display = serializers.CharField(source="get_value_determined_display", read_only=True, default=None)
object_owner_type_display = serializers.CharField(source="get_object_owner_type_display", read_only=True, default=None)
property_rights_display = serializers.CharField(source="get_property_rights_display", read_only=True, default=None)
form_ownership_display = serializers.CharField(source="get_form_ownership_display", read_only=True, default=None)
rate_type = ListReferenceitemSerializer(read_only=True)
value_determined = ListReferenceitemSerializer(read_only=True)
property_rights = ListReferenceitemSerializer(read_only=True)
form_ownership = ListReferenceitemSerializer(read_only=True)
user = serializers.SerializerMethodField(method_name="get_user", read_only=True)
class Meta:
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",
"object_location_province",
"registration_number",
"object_type",
"object_type_display",
@@ -26,15 +42,26 @@ class BaseAutoevaluationSerializer(serializers.ModelSerializer):
"car_number",
"manufacture_year",
"car_color",
"rate_type",
"rate_type_display",
"value_determined",
"value_determined_display",
"status",
"status_display",
"created_at",
"value_determined",
"rate_type",
"property_rights",
"form_ownership",
"user",
]
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):
@@ -68,10 +95,6 @@ class RetrieveAutoevaluationSerializer(BaseAutoevaluationSerializer):
"object_owner_individual_person_passport_num",
"object_owner_legal_entity",
"object_owner_legal_inn",
"property_rights",
"property_rights_display",
"form_ownership",
"form_ownership_display",
# Step 3
"object_location_province",
"object_location_district",
@@ -100,7 +123,34 @@ 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,
allow_null=True,
)
rate_type = serializers.PrimaryKeyRelatedField(
queryset=ReferenceitemModel.objects.all(),
required=False,
allow_null=True,
)
class Meta:
model = AutoEvaluationModel
fields = [
@@ -188,3 +238,136 @@ class CreateAutoevaluationSerializer(serializers.ModelSerializer):
)
return attrs
class CreateAutoevaluationSerializer(serializers.ModelSerializer):
property_rights = serializers.PrimaryKeyRelatedField(
queryset=ReferenceitemModel.objects.all(),
required=False,
allow_null=True,
)
value_determined = serializers.PrimaryKeyRelatedField(
queryset=ReferenceitemModel.objects.all(),
required=False,
allow_null=True,
)
form_ownership = serializers.PrimaryKeyRelatedField(
queryset=ReferenceitemModel.objects.all(),
required=False,
allow_null=True,
)
value_determined = serializers.PrimaryKeyRelatedField(
queryset=ReferenceitemModel.objects.all(),
required=False,
allow_null=True,
)
rate_type = serializers.PrimaryKeyRelatedField(
queryset=ReferenceitemModel.objects.all(),
required=False,
allow_null=True,
)
class Meta:
model = AutoEvaluationModel
fields = [
# Step 1
"registration_number",
"contract_date",
"object_inspection_date",
"rate_date",
"rate_report_date",
"rate_object_name",
"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",
"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_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",
]
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
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.")
users = User.objects.filter(id__in=data["ids"])
if not users:
raise serializers.ValidationError("Invalid appraisers IDs.")
data['users'] = users
return data

View File

@@ -0,0 +1,57 @@
from rest_framework import serializers
from core.apps.evaluation.models import DocumentModel, AutoEvaluationModel, DocumentcategoryModel
from core.apps.evaluation.serializers.documentcategory import ListDocumentcategorySerializer
class BaseDocumentSerializer(serializers.ModelSerializer):
category = ListDocumentcategorySerializer(read_only=True)
class Meta:
model = DocumentModel
fields = [
"id",
"title",
"document",
"category",
"created_at",
"updated_at"
]
class ListDocumentSerializer(BaseDocumentSerializer):
class Meta(BaseDocumentSerializer.Meta): ...
def get_document(self, obj):
request = self.context.get("request")
if obj.document:
if request:
return request.build_absolute_uri(obj.document.url)
return obj.document.url
return None
class RetrieveDocumentSerializer(BaseDocumentSerializer):
class Meta(BaseDocumentSerializer.Meta): ...
def get_document(self, obj):
request = self.context.get("request")
if obj.document:
if request:
return request.build_absolute_uri(obj.document.url)
return obj.document.url
return None
class CreateDocumentSerializer(BaseDocumentSerializer):
auto_evaluation = serializers.PrimaryKeyRelatedField(queryset=AutoEvaluationModel.objects.all())
category = serializers.PrimaryKeyRelatedField(queryset=DocumentcategoryModel.objects.all())
class Meta(BaseDocumentSerializer.Meta):
fields = [
"id",
"title",
"auto_evaluation",
"document",
"category",
"created_at",
"updated_at"
]

View File

@@ -1 +1,2 @@
from .Document import * # noqa
from .ValuationDocument import * # noqa

View File

@@ -0,0 +1,34 @@
from rest_framework import serializers
from core.apps.evaluation.models import DocumentcategoryModel
class BaseDocumentcategorySerializer(serializers.ModelSerializer):
class Meta:
model = DocumentcategoryModel
fields = [
"id",
"label",
"value",
"created_at",
"updated_at"
]
class ListDocumentcategorySerializer(BaseDocumentcategorySerializer):
class Meta(BaseDocumentcategorySerializer.Meta): ...
class RetrieveDocumentcategorySerializer(BaseDocumentcategorySerializer):
class Meta(BaseDocumentcategorySerializer.Meta): ...
# class CreateDocumentcategorySerializer(BaseDocumentcategorySerializer):
# class Meta(BaseDocumentcategorySerializer.Meta):
# fields = [
# "id",
# "label",
# "value",
# "created_at",
# "updated_at"
# ]

View File

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

View File

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

Some files were not shown because too many files have changed in this diff Show More