Compare commits
291 Commits
fix/evalua
...
f7be3be5d2
| Author | SHA1 | Date | |
|---|---|---|---|
| f7be3be5d2 | |||
|
|
557f9f821d | ||
|
|
5f70d69896 | ||
|
|
4ea7070a8f | ||
| 8b02f3a3a3 | |||
|
|
f0d93b10ac | ||
|
|
172ddf4da4 | ||
| 435dd56334 | |||
|
|
779c9db924 | ||
| eaaba123b0 | |||
|
|
63c4ad81eb | ||
|
|
d065891ad5 | ||
| 94c4d03925 | |||
|
|
4a958f064b | ||
|
|
d1f0a5a9ae | ||
| 0084d11c62 | |||
|
|
d1340cdd52 | ||
|
|
d7ea1acba6 | ||
| 560cbe8000 | |||
|
|
37d6a93529 | ||
|
|
e1b445d515 | ||
| ef87112c79 | |||
|
|
8c01c1dc2d | ||
|
|
921b54ab7c | ||
|
|
a74c348187 | ||
| 52fab30588 | |||
|
|
0de50ec328 | ||
|
|
e346546d24 | ||
| e97c6c7ab2 | |||
|
|
f7706e77ee | ||
|
|
e351ed5303 | ||
| affd3e1221 | |||
|
|
59ed3d23ac | ||
|
|
3ac6263035 | ||
| 2c6d7dd2f7 | |||
|
|
a6e0fca165 | ||
|
|
b64073e1ad | ||
| e3ffdddc46 | |||
|
|
6f48632e2d | ||
| faea9bdb89 | |||
|
|
e3e7f18d7f | ||
|
|
1dd1a132e4 | ||
| 04e193bae6 | |||
|
|
7134b2c185 | ||
|
|
306aecc956 | ||
| 3ede209e52 | |||
|
|
05857a227a | ||
| 10b25b5228 | |||
|
|
fcbfa94dd4 | ||
| 7e778d3a3e | |||
|
|
81a4287db1 | ||
|
|
e560fdaf2d | ||
|
|
0d96167a7b | ||
|
|
ae65d9d793 | ||
|
|
5249f7e6f7 | ||
|
|
e1b771e166 | ||
|
|
eded642bd7 | ||
| f830235813 | |||
|
|
a62cf3a1ee | ||
|
|
2f471173c3 | ||
| 3838fbaa47 | |||
|
|
b02078e618 | ||
|
|
1f59347d87 | ||
|
|
fe40057d95 | ||
| 550da049b9 | |||
|
|
bdd5aa9ce2 | ||
|
|
bd27205252 | ||
| 34aba90ebd | |||
|
|
260bc9101e | ||
|
|
f46dac515a | ||
|
|
c6fc150162 | ||
| 7272ef3fce | |||
|
|
1db936126d | ||
| 5e1b02064e | |||
|
|
4e242a4358 | ||
| bcb453d52a | |||
| 039ca92031 | |||
|
|
21bb61e51c | ||
|
|
c9d60acfc9 | ||
|
|
127a2073f8 | ||
| 1ad2016790 | |||
|
|
3fd0f9959b | ||
|
|
84cc11fe2a | ||
|
|
deebae384c | ||
|
|
2b5238f3c8 | ||
|
|
988d07f4b6 | ||
|
|
e27a9b7f11 | ||
|
|
c89f2b32af | ||
|
|
82489cf64c | ||
| 88dedd85c7 | |||
|
|
fb275a091a | ||
|
|
af559dadda | ||
|
|
190480b6f7 | ||
| 1a985ffa4b | |||
|
|
3b62c5a7bf | ||
|
|
d2f8d73cdd | ||
|
|
c4b2a80b2e | ||
|
|
07f8d55966 | ||
| b0b4ccfeee | |||
|
|
ccefe9c119 | ||
|
|
6456283f72 | ||
|
|
6eed2d998e | ||
| 2c82691166 | |||
|
|
7a88e39b96 | ||
|
|
7961fd76de | ||
|
|
dc622ce305 | ||
|
|
6e0718c5db | ||
|
|
32d3bea234 | ||
|
|
129827b495 | ||
|
|
50cc555783 | ||
|
|
76563b3ef0 | ||
|
|
207363dc6a | ||
| 2a08ad9662 | |||
|
|
049cd6ff25 | ||
|
|
5cf4b950fb | ||
|
|
3a08c81ff3 | ||
|
|
4fee037467 | ||
|
|
320f490d23 | ||
| d4e6d80c86 | |||
| 1f0e942be8 | |||
|
|
b8021c7728 | ||
|
|
2af67333e2 | ||
| 81c689e7e9 | |||
|
|
09d2e0954c | ||
| 84a5afb2ee | |||
|
|
cc8fc345d9 | ||
| 03e4387e4d | |||
|
|
64993805af | ||
|
|
01711b5927 | ||
|
|
33aa06f80b | ||
|
|
cb2d83b00d | ||
| 46c9621457 | |||
|
|
8d73fa09a7 | ||
| 3367063707 | |||
|
|
ae926914a5 | ||
|
|
229676be5c | ||
| d2f517baf4 | |||
|
|
6df20f35c2 | ||
|
|
fa676bfa96 | ||
| ca9f12ae32 | |||
|
|
56f693abfd | ||
|
|
5049919865 | ||
| ca3c9bfe4a | |||
|
|
8d8744731a | ||
|
|
7ab1e0b1e0 | ||
| f66a35ec80 | |||
|
|
f71dfa50c1 | ||
|
|
f68f34178e | ||
| ab68a6a463 | |||
|
|
d246406384 | ||
| 0a74f71efa | |||
|
|
575364e0ef | ||
|
|
406477fc33 | ||
|
|
2aa73e15a0 | ||
| 372a289447 | |||
|
|
7343f6191d | ||
|
|
5c4d5fbb71 | ||
| 20043db5b3 | |||
|
|
7d6618155f | ||
|
|
11605e6e6c | ||
|
|
8a1a66a05d | ||
|
|
70555fa93a | ||
| 674eafe65b | |||
|
|
47833176e2 | ||
| b03d2e1c5e | |||
|
|
7be8999a39 | ||
|
|
c5624e361d | ||
| c44b08bb28 | |||
|
|
d448324f89 | ||
|
|
0508a49c1d | ||
| 8b97ca53bb | |||
|
|
2d64777041 | ||
|
|
9f7b29fa13 | ||
| b4a3243e9c | |||
|
|
63359e69f7 | ||
|
|
3c9438aff6 | ||
| a3c67c5bfb | |||
|
|
e768c73d54 | ||
|
|
a2684ff749 | ||
| 91bbb6b6e5 | |||
|
|
01a70debaf | ||
|
|
ae9f10aa4d | ||
| f2dc2e1d52 | |||
|
|
7081a03a98 | ||
|
|
10646e2ebf | ||
| 93f6e79f58 | |||
|
|
3b95734ea4 | ||
| d1aad04ab8 | |||
|
|
adf3c9fff9 | ||
|
|
7e4a90fe2a | ||
| 503c16bdb8 | |||
| 701a375e3c | |||
|
|
e64d7d037f | ||
| b7ecf0e47c | |||
|
|
c7c76e9c79 | ||
|
|
afdc6aa0ac | ||
| f991e3e4ec | |||
|
|
0f142be77b | ||
|
|
182b2483bf | ||
| 469659baa8 | |||
|
|
965328edd4 | ||
|
|
11aa88a2b0 | ||
| 225565bc41 | |||
|
|
75365f8e7e | ||
|
|
3e9675a4be | ||
| c3cf7ac9d5 | |||
|
|
5dcafb9cc1 | ||
|
|
62bc6c17b8 | ||
| 22284f228f | |||
|
|
aa487c1557 | ||
|
|
73d5222a5b | ||
| 707ea1e1fd | |||
|
|
bfbc14db82 | ||
|
|
4c1f1d7104 | ||
| 38e7aac505 | |||
|
|
a973da91f5 | ||
|
|
ec94e4cdd0 | ||
| 87701c31f1 | |||
|
|
35739ddc27 | ||
| e8feafca0b | |||
|
|
505c33a554 | ||
|
|
f24afaf55c | ||
| 665db58bbc | |||
|
|
57e22e04db | ||
|
|
528dc57ea2 | ||
| 774be87f45 | |||
|
|
3d0141197f | ||
| 9dc093e244 | |||
|
|
aa1e4ca6fc | ||
|
|
04ef567d5c | ||
| b604fff1c2 | |||
|
|
277bc2874e | ||
|
|
37459e8485 | ||
| f231d889a5 | |||
|
|
3fa70d9436 | ||
|
|
6b1a9439ce | ||
| d26e2b0147 | |||
|
|
da71ce6d28 | ||
|
|
bc157da00d | ||
| 9c40908cc7 | |||
|
|
7ee2eee437 | ||
|
|
31a08c810d | ||
| 264548c3b1 | |||
|
|
9a18dda657 | ||
|
|
c7612221b8 | ||
| a89dbafb62 | |||
|
|
be0c96b28a | ||
|
|
9d39f0b339 | ||
| 797286bcdb | |||
|
|
091ddb39ed | ||
|
|
12b19290d6 | ||
|
|
36ac4af4cd | ||
| 4784b58abc | |||
|
|
3664f8f66d | ||
|
|
17e63ee2e4 | ||
| 40a68ff47d | |||
| cc6ef4cd63 | |||
| 8f54bdedc2 | |||
|
|
878301605c | ||
| ea3f14058e | |||
|
|
ee4754b23d | ||
|
|
5dea19c104 | ||
| eb2156f076 | |||
|
|
de03c97dac | ||
| 01617c7e14 | |||
|
|
d5a132c75b | ||
| 09862985e1 | |||
| e9d779d489 | |||
| b8dcbe811d | |||
|
|
0dbd246120 | ||
|
|
9d8fd8e6de | ||
| 41b63b1645 | |||
| 22740e59a7 | |||
| 43e6d8190e | |||
| ea020ae500 | |||
| ad1e61498c | |||
| 2492583f43 | |||
|
|
c4330fd6f7 | ||
| 11f967da42 | |||
|
|
f13f1eb16f | ||
|
|
2ed50e10d9 | ||
| b3f60b257a | |||
|
|
7f8858ac7e | ||
|
|
28fdf82c08 | ||
| a06cf173b6 | |||
|
|
9593b02c2d | ||
| 386e9ead89 | |||
|
|
9a13a2b4f0 | ||
|
|
9b57611b62 | ||
| 4479a0c1a5 | |||
|
|
0d574a92a9 |
@@ -73,6 +73,5 @@ STORAGE_BUCKET_STATIC=name
|
||||
STORAGE_PATH=127.0.0.1:8081/bucket/
|
||||
STORAGE_PROTOCOL=http:
|
||||
|
||||
|
||||
|
||||
# Celery configs
|
||||
# Didox configs
|
||||
DIDOX_PARTNER_TOKEN=...
|
||||
|
||||
39
.github/workflows/deploy.yaml
vendored
39
.github/workflows/deploy.yaml
vendored
@@ -8,7 +8,6 @@ on:
|
||||
env:
|
||||
PROJECT_NAME: sifatbaho
|
||||
|
||||
|
||||
permissions:
|
||||
contents: write
|
||||
|
||||
@@ -48,6 +47,24 @@ jobs:
|
||||
- name: Copy env
|
||||
run: |
|
||||
cp .env.example .env
|
||||
update_env() {
|
||||
local env_file=".env"
|
||||
for kv in "$@"; do
|
||||
local key="${kv%%=*}"
|
||||
local value="${kv#*=}"
|
||||
if grep -q "^$key=" "$env_file"; then
|
||||
sed -i "s|^$key=.*|$key=$value|" "$env_file"
|
||||
else
|
||||
echo "$key=$value" >> "$env_file"
|
||||
fi
|
||||
done
|
||||
}
|
||||
|
||||
update_env \
|
||||
"DB_HOST=postgres" \
|
||||
"DB_NAME=sifatbahodb" \
|
||||
"DB_PORT=5432" \
|
||||
"DIDOX_PARTNER_TOKEN=${{ secrets.DIDOX_TOKEN }}"
|
||||
|
||||
- name: Set up Docker Buildx
|
||||
uses: docker/setup-buildx-action@v3
|
||||
@@ -95,7 +112,6 @@ jobs:
|
||||
sed -i "s|image: .*/${{ env.PROJECT_NAME }}:.*|image: ${{ secrets.DOCKER_USERNAME }}/${{ env.PROJECT_NAME }}:${{ github.run_number }}|g" stack.yaml
|
||||
sed -i 's/return HttpResponse("OK.*"/return HttpResponse("OK: #${{ github.sha }}"/' config/urls.py
|
||||
|
||||
|
||||
- name: Commit and push updated version
|
||||
run: |
|
||||
git config user.name "github-actions[bot]"
|
||||
@@ -136,24 +152,5 @@ jobs:
|
||||
git reset --hard origin/main
|
||||
|
||||
cp .env.example .env
|
||||
|
||||
update_env() {
|
||||
local env_file=".env"
|
||||
for kv in "$@"; do
|
||||
local key="${kv%%=*}"
|
||||
local value="${kv#*=}"
|
||||
if grep -q "^$key=" "$env_file"; then
|
||||
sed -i "s|^$key=.*|$key=$value|" "$env_file"
|
||||
else
|
||||
echo "$key=$value" >> "$env_file"
|
||||
fi
|
||||
done
|
||||
}
|
||||
|
||||
update_env \
|
||||
"DB_HOST=postgres" \
|
||||
"DB_NAME=sifatbahodb" \
|
||||
"DB_PORT=5432"
|
||||
|
||||
export PORT=8085
|
||||
docker stack deploy -c stack.yaml ${{ env.PROJECT_NAME }} --with-registry-auth
|
||||
|
||||
@@ -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)
|
||||
),
|
||||
})
|
||||
|
||||
@@ -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"]
|
||||
|
||||
@@ -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,41 @@ 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"),
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"title": _("Joylashuvlar"),
|
||||
"separator": True,
|
||||
"items": [
|
||||
{
|
||||
"title": _("Shaharlar"),
|
||||
"icon": "attach_file",
|
||||
"link": reverse_lazy("admin:shared_regionmodel_changelist"),
|
||||
},
|
||||
{
|
||||
"title": _("Tumanlar"),
|
||||
"icon": "attach_file",
|
||||
"link": reverse_lazy("admin:shared_districtmodel_changelist"),
|
||||
},
|
||||
{
|
||||
"title": _("Mahallalar"),
|
||||
"icon": "attach_file",
|
||||
"link": reverse_lazy("admin:shared_villagemodel_changelist"),
|
||||
},
|
||||
]
|
||||
}
|
||||
]
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -9,7 +9,7 @@ import environ
|
||||
environ.Env.read_env(os.path.join(".env"))
|
||||
|
||||
env = environ.Env(
|
||||
DEBUG=(bool, False),
|
||||
DEBUG=(bool, True),
|
||||
CACHE_TIME=(int, 180),
|
||||
OTP_EXPIRE_TIME=(int, 2),
|
||||
VITE_LIVE=(bool, False),
|
||||
@@ -26,4 +26,5 @@ env = environ.Env(
|
||||
OTP_SERVICE="EskizService",
|
||||
PROJECT_ENV=(str, "prod"),
|
||||
SILK_ENABLED=(bool, False),
|
||||
DIDOX_PARTNER_TOKEN=(str),
|
||||
)
|
||||
|
||||
@@ -49,6 +49,7 @@ INSTALLED_APPS = [
|
||||
"django.contrib.sessions",
|
||||
"django.contrib.messages",
|
||||
"django.contrib.staticfiles",
|
||||
"django.contrib.postgres",
|
||||
] + APPS
|
||||
|
||||
MODULES = [app for app in MODULES if isinstance(app, str)]
|
||||
@@ -148,13 +149,25 @@ 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")
|
||||
MODELTRANSLATION_DEFAULT_LANGUAGE = "uz"
|
||||
|
||||
DIDOX_PARTNER_TOKEN = env.str("DIDOX_PARTNER_TOKEN")
|
||||
|
||||
|
||||
|
||||
JST_LANGUAGES = [
|
||||
|
||||
@@ -13,7 +13,7 @@ from config.env import env
|
||||
|
||||
|
||||
def home(request):
|
||||
return HttpResponse("OK: #7bcf7bdc7f8b10357921efee0415dc6211137338")
|
||||
return HttpResponse("OK: #8b02f3a3a323de305d49ef7fd372b4495363e1c5")
|
||||
|
||||
|
||||
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),
|
||||
|
||||
@@ -1,2 +1,3 @@
|
||||
from .core import * # noqa
|
||||
from .user import * # noqa
|
||||
from .permission import *
|
||||
|
||||
44
core/apps/accounts/admin/permission.py
Normal file
44
core/apps/accounts/admin/permission.py
Normal file
@@ -0,0 +1,44 @@
|
||||
from django.contrib import admin
|
||||
from core.apps.accounts.models.permission import (
|
||||
PermissionToAction,
|
||||
PermissionToTab,
|
||||
Permission,
|
||||
Role,
|
||||
)
|
||||
|
||||
|
||||
@admin.register(PermissionToAction)
|
||||
class PermissionToActionAdmin(admin.ModelAdmin):
|
||||
list_display = ("id", "name", "code", "created_at")
|
||||
search_fields = ("name", "code")
|
||||
list_filter = ("created_at",)
|
||||
ordering = ("-id",)
|
||||
|
||||
|
||||
@admin.register(PermissionToTab)
|
||||
class PermissionToTabAdmin(admin.ModelAdmin):
|
||||
list_display = ("id", "name", "code", "created_at")
|
||||
search_fields = ("name", "code")
|
||||
filter_horizontal = ("permission_to_actions",)
|
||||
list_filter = ("created_at",)
|
||||
ordering = ("-id",)
|
||||
|
||||
|
||||
@admin.register(Permission)
|
||||
class PermissionAdmin(admin.ModelAdmin):
|
||||
list_display = ("id", "name", "code", "created_at")
|
||||
search_fields = ("name", "code")
|
||||
filter_horizontal = ("permission_tabs",)
|
||||
list_filter = ("created_at",)
|
||||
ordering = ("-id",)
|
||||
|
||||
|
||||
@admin.register(Role)
|
||||
class RoleAdmin(admin.ModelAdmin):
|
||||
list_display = ("id", "name")
|
||||
search_fields = ("name",)
|
||||
filter_horizontal = (
|
||||
"permissions",
|
||||
"permission_to_tabs",
|
||||
"permission_to_actions",
|
||||
)
|
||||
@@ -1,5 +1,7 @@
|
||||
from django.contrib.auth import admin
|
||||
from django.contrib.auth.admin import UserAdmin
|
||||
from django.utils.translation import gettext_lazy as _
|
||||
from django.utils.safestring import mark_safe
|
||||
from unfold.admin import ModelAdmin
|
||||
from unfold.forms import AdminPasswordChangeForm # UserCreationForm,
|
||||
from unfold.forms import UserChangeForm
|
||||
@@ -10,6 +12,7 @@ class CustomUserAdmin(admin.UserAdmin, ModelAdmin):
|
||||
# add_form = UserCreationForm
|
||||
form = UserChangeForm
|
||||
list_display = (
|
||||
"display_avatar",
|
||||
"first_name",
|
||||
"last_name",
|
||||
"phone",
|
||||
@@ -17,7 +20,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 +39,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",)
|
||||
|
||||
18
core/apps/accounts/migrations/0003_user_avatar.py
Normal file
18
core/apps/accounts/migrations/0003_user_avatar.py
Normal 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/'),
|
||||
),
|
||||
]
|
||||
@@ -0,0 +1,78 @@
|
||||
# Generated by Django 5.2.7 on 2026-04-27 09:33
|
||||
|
||||
import django.db.models.deletion
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('accounts', '0003_user_avatar'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.CreateModel(
|
||||
name='PermissionToAction',
|
||||
fields=[
|
||||
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
||||
('created_at', models.DateTimeField(auto_now_add=True)),
|
||||
('updated_at', models.DateTimeField(auto_now=True)),
|
||||
('name', models.CharField(max_length=200)),
|
||||
('code', models.CharField(max_length=100, unique=True)),
|
||||
],
|
||||
options={
|
||||
'verbose_name': 'Harakatlar uchun ruxsatnoma',
|
||||
'verbose_name_plural': 'Harakatlar uchun ruxsatnomalar',
|
||||
},
|
||||
),
|
||||
migrations.CreateModel(
|
||||
name='PermissionToTab',
|
||||
fields=[
|
||||
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
||||
('created_at', models.DateTimeField(auto_now_add=True)),
|
||||
('updated_at', models.DateTimeField(auto_now=True)),
|
||||
('name', models.CharField(max_length=200)),
|
||||
('code', models.CharField(max_length=100, unique=True)),
|
||||
('permission_to_actions', models.ManyToManyField(related_name='permission_to_tabs', to='accounts.permissiontoaction')),
|
||||
],
|
||||
options={
|
||||
'verbose_name': "Bo'lim uchun ruxsatnoma",
|
||||
'verbose_name_plural': "Bo'lim uchun ruxsatnomalar",
|
||||
},
|
||||
),
|
||||
migrations.CreateModel(
|
||||
name='Permission',
|
||||
fields=[
|
||||
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
||||
('created_at', models.DateTimeField(auto_now_add=True)),
|
||||
('updated_at', models.DateTimeField(auto_now=True)),
|
||||
('name', models.CharField(max_length=200)),
|
||||
('code', models.CharField(max_length=100, unique=True)),
|
||||
('permission_tab', models.ManyToManyField(related_name='permissions', to='accounts.permissiontotab')),
|
||||
],
|
||||
options={
|
||||
'verbose_name': 'Sahifa uchun ruxsatnoma',
|
||||
'verbose_name_plural': 'Sahifa uchun ruxsatnomalar',
|
||||
},
|
||||
),
|
||||
migrations.CreateModel(
|
||||
name='Role',
|
||||
fields=[
|
||||
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
||||
('name', models.CharField(max_length=200, unique=True)),
|
||||
('comment', models.CharField(blank=True, max_length=200, null=True)),
|
||||
('permission_to_actions', models.ManyToManyField(blank=True, related_name='roles', to='accounts.permissiontoaction')),
|
||||
('permission_to_tabs', models.ManyToManyField(blank=True, related_name='roles', to='accounts.permissiontotab')),
|
||||
('permissions', models.ManyToManyField(blank=True, related_name='roles', to='accounts.permission')),
|
||||
],
|
||||
options={
|
||||
'verbose_name': 'Rol',
|
||||
'verbose_name_plural': 'Rollar',
|
||||
},
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name='user',
|
||||
name='permission',
|
||||
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='users', to='accounts.role'),
|
||||
),
|
||||
]
|
||||
@@ -0,0 +1,18 @@
|
||||
# Generated by Django 5.2.7 on 2026-04-28 11:02
|
||||
|
||||
from django.db import migrations
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('accounts', '0004_permissiontoaction_permissiontotab_permission_role_and_more'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.RenameField(
|
||||
model_name='permission',
|
||||
old_name='permission_tab',
|
||||
new_name='permission_tabs',
|
||||
),
|
||||
]
|
||||
60
core/apps/accounts/models/permission.py
Normal file
60
core/apps/accounts/models/permission.py
Normal file
@@ -0,0 +1,60 @@
|
||||
from django.db import models
|
||||
from django.utils.translation import gettext_lazy as _
|
||||
from django_core.models import AbstractBaseModel
|
||||
|
||||
|
||||
class PermissionToAction(AbstractBaseModel):
|
||||
name = models.CharField(max_length=200)
|
||||
code = models.CharField(max_length=100, unique=True)
|
||||
|
||||
def __str__(self):
|
||||
return f"{self.name} - {self.code}"
|
||||
|
||||
class Meta:
|
||||
verbose_name = _('Harakatlar uchun ruxsatnoma')
|
||||
verbose_name_plural = _('Harakatlar uchun ruxsatnomalar')
|
||||
|
||||
|
||||
class PermissionToTab(AbstractBaseModel):
|
||||
name = models.CharField(max_length=200)
|
||||
code = models.CharField(max_length=100, unique=True)
|
||||
permission_to_actions = models.ManyToManyField(
|
||||
PermissionToAction, related_name='permission_to_tabs'
|
||||
)
|
||||
|
||||
def __str__(self):
|
||||
return f'{self.name} - {self.code}'
|
||||
|
||||
class Meta:
|
||||
verbose_name = _("Bo'lim uchun ruxsatnoma")
|
||||
verbose_name_plural = _("Bo'lim uchun ruxsatnomalar")
|
||||
|
||||
|
||||
class Permission(AbstractBaseModel):
|
||||
name = models.CharField(max_length=200)
|
||||
code = models.CharField(max_length=100, unique=True)
|
||||
permission_tabs = models.ManyToManyField(PermissionToTab, related_name='permissions')
|
||||
|
||||
def __str__(self):
|
||||
return f'{self.name} - {self.code}'
|
||||
|
||||
class Meta:
|
||||
verbose_name = _('Sahifa uchun ruxsatnoma')
|
||||
verbose_name_plural = _('Sahifa uchun ruxsatnomalar')
|
||||
|
||||
class Role(models.Model):
|
||||
name = models.CharField(max_length=200, unique=True)
|
||||
permissions = models.ManyToManyField(Permission, related_name='roles', blank=True)
|
||||
permission_to_tabs = models.ManyToManyField(PermissionToTab, related_name='roles', blank=True)
|
||||
permission_to_actions = models.ManyToManyField(
|
||||
PermissionToAction, related_name='roles', blank=True
|
||||
)
|
||||
comment = models.CharField(max_length=200, null=True, blank=True)
|
||||
|
||||
def __str__(self):
|
||||
return self.name
|
||||
|
||||
class Meta:
|
||||
verbose_name = _('Rol')
|
||||
verbose_name_plural = _('Rollar')
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
from django.contrib.auth import models as auth_models
|
||||
from django.db import models
|
||||
|
||||
from .permission import Role
|
||||
from ..choices import RoleChoice
|
||||
from ..managers import UserManager
|
||||
|
||||
@@ -16,6 +17,8 @@ class User(auth_models.AbstractUser):
|
||||
choices=RoleChoice,
|
||||
default=RoleChoice.USER,
|
||||
)
|
||||
avatar = models.ImageField(upload_to="avatars/", null=True, blank=True)
|
||||
permission = models.ForeignKey(Role, on_delete=models.SET_NULL, null=True, blank=True, related_name='users')
|
||||
|
||||
USERNAME_FIELD = "phone"
|
||||
objects = UserManager()
|
||||
|
||||
37
core/apps/accounts/serializers/permission.py
Normal file
37
core/apps/accounts/serializers/permission.py
Normal file
@@ -0,0 +1,37 @@
|
||||
from rest_framework import serializers
|
||||
|
||||
from core.apps.accounts.models.permission import PermissionToAction, PermissionToTab, Permission, Role
|
||||
|
||||
|
||||
class PermissionToActionSerializer(serializers.ModelSerializer):
|
||||
class Meta:
|
||||
model = PermissionToAction
|
||||
fields = ['id', 'name']
|
||||
|
||||
|
||||
class PermissionToTabSerializer(serializers.ModelSerializer):
|
||||
permission_to_actions = PermissionToActionSerializer(many=True)
|
||||
|
||||
class Meta:
|
||||
model = PermissionToTab
|
||||
fields = ['id', 'name', 'permission_to_actions']
|
||||
|
||||
|
||||
class PermissionSerializer(serializers.ModelSerializer):
|
||||
permission_tabs = PermissionToTabSerializer(many=True)
|
||||
|
||||
class Meta:
|
||||
model = Permission
|
||||
fields = ['id', 'name', 'permission_tabs']
|
||||
|
||||
|
||||
class RoleListSerializer(serializers.ModelSerializer):
|
||||
permissions = PermissionSerializer(many=True)
|
||||
permission_to_tabs = PermissionToTabSerializer(many=True)
|
||||
permission_to_actions = PermissionToActionSerializer(many=True)
|
||||
|
||||
class Meta:
|
||||
model = Role
|
||||
fields = [
|
||||
'id', 'name', 'comment', 'permissions', 'permission_to_tabs', 'permission_to_actions',
|
||||
]
|
||||
@@ -3,21 +3,55 @@ 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"
|
||||
]
|
||||
|
||||
class AdminUserSerializer(serializers.ModelSerializer):
|
||||
avatar = serializers.SerializerMethodField(method_name='get_avatar')
|
||||
|
||||
class Meta:
|
||||
model = get_user_model()
|
||||
fields = "__all__"
|
||||
|
||||
def get_avatar(self, obj):
|
||||
request = self.context.get('request')
|
||||
if obj.avatar:
|
||||
return request.build_absolute_uri(obj.avatar.url)
|
||||
return None
|
||||
|
||||
|
||||
|
||||
class UserCreateSerializer(serializers.ModelSerializer):
|
||||
class Meta:
|
||||
model = get_user_model()
|
||||
fields = [
|
||||
"phone",
|
||||
"first_name",
|
||||
"last_name",
|
||||
"password",
|
||||
"role"]
|
||||
@@ -4,23 +4,33 @@ 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, \
|
||||
AdminUserView, AdminCreateAPIView, AdminUpdateAPIView
|
||||
from rest_framework.routers import DefaultRouter
|
||||
|
||||
from .views.permission import PermissionToActionViewSet, PermissionToTabViewSet, PermissionViewSet, RoleViewSet
|
||||
from core.apps.accounts.views.user import DeleteAdminUserApiView
|
||||
|
||||
router = DefaultRouter()
|
||||
router.register("auth", RegisterView, basename="auth")
|
||||
router.register("auth", ResetPasswordView, basename="reset-password")
|
||||
router.register("auth", MeView, basename="me")
|
||||
router.register("auth", ChangePasswordView, basename="change-password")
|
||||
router.register("user", AdminUserView, basename="user-crud")
|
||||
router.register("action", PermissionToActionViewSet, basename="action")
|
||||
router.register("permission-to-tab", PermissionToTabViewSet, basename="permission-to-tab")
|
||||
router.register("permission", PermissionViewSet, basename="permission")
|
||||
router.register("permission-role", RoleViewSet, basename="permission-role")
|
||||
|
||||
|
||||
urlpatterns = [
|
||||
path("", include(router.urls)),
|
||||
path("auth/token/", jwt_views.TokenObtainPairView.as_view(), name="token_obtain_pair"),
|
||||
path("auth/token/verify/", jwt_views.TokenVerifyView.as_view(), name="token_verify"),
|
||||
path(
|
||||
"auth/token/refresh/",
|
||||
jwt_views.TokenRefreshView.as_view(),
|
||||
name="token_refresh",
|
||||
),
|
||||
path("auth/token/refresh/",jwt_views.TokenRefreshView.as_view()),
|
||||
path("user/list/", UserListApiView.as_view(), name="user-list"),
|
||||
path("admin-user/list/", AdminUserListApiView.as_view(), name="admin-user-list"),
|
||||
path("admin/create/", AdminCreateAPIView.as_view(), name="user-create"),
|
||||
path("admin/update/<int:pk>/", AdminUpdateAPIView.as_view(), name="user-update"),
|
||||
path('user/admin/<int:pk>/delete/', DeleteAdminUserApiView.as_view(), name='user-delete')
|
||||
]
|
||||
|
||||
@@ -1 +1,2 @@
|
||||
from .auth import * # noqa
|
||||
from .user import * # noqa
|
||||
@@ -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")
|
||||
|
||||
41
core/apps/accounts/views/permission.py
Normal file
41
core/apps/accounts/views/permission.py
Normal file
@@ -0,0 +1,41 @@
|
||||
from django_core.mixins import BaseViewSetMixin
|
||||
from drf_spectacular.utils import extend_schema
|
||||
from rest_framework.permissions import AllowAny, IsAdminUser
|
||||
from rest_framework.viewsets import ModelViewSet
|
||||
|
||||
from core.apps.accounts.models.permission import PermissionToAction, PermissionToTab, Permission, Role
|
||||
from core.apps.accounts.serializers.permission import PermissionToActionSerializer, PermissionToTabSerializer, \
|
||||
PermissionSerializer, RoleListSerializer
|
||||
|
||||
|
||||
@extend_schema(tags=["permission"])
|
||||
class PermissionToActionViewSet(BaseViewSetMixin, ModelViewSet):
|
||||
queryset = PermissionToAction.objects.all()
|
||||
serializer_class = PermissionToActionSerializer
|
||||
|
||||
action_serializer_class = {
|
||||
'create': PermissionToActionSerializer,
|
||||
'update': PermissionToActionSerializer,
|
||||
}
|
||||
|
||||
action_permission_classes = {
|
||||
'create': [AllowAny],
|
||||
'destroy': [IsAdminUser],
|
||||
}
|
||||
|
||||
|
||||
@extend_schema(tags=["permission"])
|
||||
class PermissionToTabViewSet(BaseViewSetMixin, ModelViewSet):
|
||||
queryset = PermissionToTab.objects.all()
|
||||
serializer_class = PermissionToTabSerializer
|
||||
|
||||
|
||||
@extend_schema(tags=["permission"])
|
||||
class PermissionViewSet(BaseViewSetMixin, ModelViewSet):
|
||||
queryset = Permission.objects.all()
|
||||
serializer_class = PermissionSerializer
|
||||
|
||||
|
||||
class RoleViewSet(BaseViewSetMixin, ModelViewSet):
|
||||
queryset = Role.objects.all()
|
||||
serializer_class = RoleListSerializer
|
||||
97
core/apps/accounts/views/user.py
Normal file
97
core/apps/accounts/views/user.py
Normal file
@@ -0,0 +1,97 @@
|
||||
from django.contrib.auth import get_user_model
|
||||
from django.shortcuts import get_object_or_404
|
||||
from django_core.mixins import BaseViewSetMixin
|
||||
from drf_spectacular.utils import extend_schema
|
||||
from rest_framework import generics, filters
|
||||
from rest_framework.permissions import IsAuthenticated
|
||||
from rest_framework.response import Response
|
||||
from rest_framework.views import APIView
|
||||
from rest_framework.viewsets import ModelViewSet
|
||||
|
||||
from core.apps.accounts.choices.user import RoleChoice
|
||||
from core.apps.accounts.serializers.user import UserSerializer, AdminUserSerializer, UserCreateSerializer
|
||||
|
||||
User = get_user_model()
|
||||
|
||||
|
||||
@extend_schema(tags=['User'])
|
||||
class UserListApiView(generics.ListAPIView):
|
||||
queryset = User.objects.filter(role=RoleChoice.USER)
|
||||
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']
|
||||
|
||||
|
||||
@extend_schema(tags=["User"], request=AdminUserSerializer)
|
||||
class AdminUserView(BaseViewSetMixin, ModelViewSet):
|
||||
queryset = User.objects.filter(role=RoleChoice.USER)
|
||||
serializer_class = AdminUserSerializer
|
||||
permission_classes = [IsAuthenticated]
|
||||
filter_backends = [filters.SearchFilter]
|
||||
search_fields = ['phone', 'first_name', 'last_name']
|
||||
|
||||
def serializer_context(self):
|
||||
return self.serializer_class(context={"request": self.request})
|
||||
|
||||
|
||||
@extend_schema(tags=['User'],
|
||||
responses={200: UserSerializer},
|
||||
request=UserCreateSerializer)
|
||||
class AdminCreateAPIView(APIView):
|
||||
permission_classes = [IsAuthenticated]
|
||||
|
||||
def post(self, request):
|
||||
if request.user.role not in (RoleChoice.SUPERUSER, RoleChoice.ADMIN):
|
||||
return Response({'detail': 'Forbidden'}, status=403)
|
||||
|
||||
serializer = UserCreateSerializer(data=request.data)
|
||||
serializer.is_valid(raise_exception=True)
|
||||
serializer.save()
|
||||
|
||||
return Response(serializer.data, status=201)
|
||||
|
||||
|
||||
@extend_schema(tags=['User'],)
|
||||
class AdminUpdateAPIView(generics.GenericAPIView):
|
||||
permission_classes = [IsAuthenticated]
|
||||
serializer_class = UserCreateSerializer
|
||||
|
||||
def put(self, request, pk):
|
||||
if request.user.role not in (RoleChoice.SUPERUSER, RoleChoice.ADMIN):
|
||||
return Response({'detail': 'Forbidden'}, status=403)
|
||||
|
||||
user = get_object_or_404(User, pk=pk)
|
||||
serializer = UserCreateSerializer(user, data=request.data)
|
||||
serializer.is_valid(raise_exception=True)
|
||||
serializer.save()
|
||||
|
||||
return Response(serializer.data, status=200)
|
||||
|
||||
|
||||
class DeleteAdminUserApiView(APIView):
|
||||
permission_classes = [IsAuthenticated]
|
||||
|
||||
def delete(self, request, pk):
|
||||
if request.user.role != RoleChoice.SUPERUSER:
|
||||
return Response({'detail': 'Forbidden'}, status=403)
|
||||
|
||||
|
||||
user = get_object_or_404(User, pk=pk)
|
||||
if user.role != RoleChoice.ADMIN:
|
||||
return Response({'detail': 'This user is not an admin'}, status=400)
|
||||
user.delete()
|
||||
|
||||
return Response(status=204)
|
||||
0
core/apps/chat/__init__.py
Normal file
0
core/apps/chat/__init__.py
Normal file
1
core/apps/chat/admin/__init__.py
Normal file
1
core/apps/chat/admin/__init__.py
Normal file
@@ -0,0 +1 @@
|
||||
from .chat import * # noqa
|
||||
86
core/apps/chat/admin/chat.py
Normal file
86
core/apps/chat/admin/chat.py
Normal 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
9
core/apps/chat/apps.py
Normal 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
|
||||
1
core/apps/chat/choices/__init__.py
Normal file
1
core/apps/chat/choices/__init__.py
Normal file
@@ -0,0 +1 @@
|
||||
from .chat import * # noqa
|
||||
15
core/apps/chat/choices/chat.py
Normal file
15
core/apps/chat/choices/chat.py
Normal 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")
|
||||
1
core/apps/chat/consumers/__init__.py
Normal file
1
core/apps/chat/consumers/__init__.py
Normal file
@@ -0,0 +1 @@
|
||||
from .chat import ChatConsumer # noqa
|
||||
115
core/apps/chat/consumers/chat.py
Normal file
115
core/apps/chat/consumers/chat.py
Normal file
@@ -0,0 +1,115 @@
|
||||
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=401)
|
||||
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()
|
||||
|
||||
if message_type == "text" and not text:
|
||||
await self.send(text_data=json.dumps({"error": "Matn bo'sh bo'lishi mumkin emas."}))
|
||||
return
|
||||
|
||||
if message_type != "text":
|
||||
await self.send(
|
||||
text_data=json.dumps(
|
||||
{"error": "Fayl xabarlarni yuklash uchun REST API dan foydalaning."}
|
||||
)
|
||||
)
|
||||
return
|
||||
|
||||
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(),
|
||||
}
|
||||
1
core/apps/chat/filters/__init__.py
Normal file
1
core/apps/chat/filters/__init__.py
Normal file
@@ -0,0 +1 @@
|
||||
from .chat import * # noqa
|
||||
33
core/apps/chat/filters/chat.py
Normal file
33
core/apps/chat/filters/chat.py
Normal 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",
|
||||
]
|
||||
1
core/apps/chat/forms/__init__.py
Normal file
1
core/apps/chat/forms/__init__.py
Normal file
@@ -0,0 +1 @@
|
||||
from .chat import * # noqa
|
||||
17
core/apps/chat/forms/chat.py
Normal file
17
core/apps/chat/forms/chat.py
Normal 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__"
|
||||
1
core/apps/chat/middlewares/__init__.py
Normal file
1
core/apps/chat/middlewares/__init__.py
Normal file
@@ -0,0 +1 @@
|
||||
from .auth import * # noqa
|
||||
70
core/apps/chat/middlewares/auth.py
Normal file
70
core/apps/chat/middlewares/auth.py
Normal 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))
|
||||
36
core/apps/chat/migrations/0001_initial_chat_message.py
Normal file
36
core/apps/chat/migrations/0001_initial_chat_message.py
Normal 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')],
|
||||
},
|
||||
),
|
||||
]
|
||||
152
core/apps/chat/migrations/0002_chatroom_and_message_media.py
Normal file
152
core/apps/chat/migrations/0002_chatroom_and_message_media.py
Normal 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"),
|
||||
),
|
||||
]
|
||||
@@ -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'),
|
||||
),
|
||||
]
|
||||
0
core/apps/chat/migrations/__init__.py
Normal file
0
core/apps/chat/migrations/__init__.py
Normal file
1
core/apps/chat/models/__init__.py
Normal file
1
core/apps/chat/models/__init__.py
Normal file
@@ -0,0 +1 @@
|
||||
from .chat import * # noqa
|
||||
110
core/apps/chat/models/chat.py
Normal file
110
core/apps/chat/models/chat.py
Normal 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",
|
||||
),
|
||||
]
|
||||
1
core/apps/chat/permissions/__init__.py
Normal file
1
core/apps/chat/permissions/__init__.py
Normal file
@@ -0,0 +1 @@
|
||||
from .chat import * # noqa
|
||||
23
core/apps/chat/permissions/chat.py
Normal file
23
core/apps/chat/permissions/chat.py
Normal 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
|
||||
1
core/apps/chat/serializers/__init__.py
Normal file
1
core/apps/chat/serializers/__init__.py
Normal file
@@ -0,0 +1 @@
|
||||
from .chat import * # noqa
|
||||
83
core/apps/chat/serializers/chat/ChatMessage.py
Normal file
83
core/apps/chat/serializers/chat/ChatMessage.py
Normal file
@@ -0,0 +1,83 @@
|
||||
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
|
||||
avatar_url = request.build_absolute_uri(self.context['request'].user.avatar.url) if self.context['request'].user.avatar else None
|
||||
send_message_to_chat.delay(message.id, file_url, avatar_url)
|
||||
return message
|
||||
68
core/apps/chat/serializers/chat/ChatRoom.py
Normal file
68
core/apps/chat/serializers/chat/ChatRoom.py
Normal 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
|
||||
2
core/apps/chat/serializers/chat/__init__.py
Normal file
2
core/apps/chat/serializers/chat/__init__.py
Normal file
@@ -0,0 +1,2 @@
|
||||
from .ChatMessage import * # noqa
|
||||
from .ChatRoom import * # noqa
|
||||
1
core/apps/chat/signals/__init__.py
Normal file
1
core/apps/chat/signals/__init__.py
Normal file
@@ -0,0 +1 @@
|
||||
from .chat import * # noqa
|
||||
55
core/apps/chat/signals/chat.py
Normal file
55
core/apps/chat/signals/chat.py
Normal 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"},
|
||||
)
|
||||
1
core/apps/chat/tasks/__init__.py
Normal file
1
core/apps/chat/tasks/__init__.py
Normal file
@@ -0,0 +1 @@
|
||||
from .message import send_message_to_chat
|
||||
44
core/apps/chat/tasks/message.py
Normal file
44
core/apps/chat/tasks/message.py
Normal 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, avatar_url):
|
||||
try:
|
||||
message = ChatmessageModel.objects.get(id=message_id)
|
||||
except ChatmessageModel.DoesNotExist:
|
||||
return "Not found"
|
||||
|
||||
channel_layer = get_channel_layer()
|
||||
if channel_layer is None:
|
||||
return
|
||||
|
||||
sender_obj = message.sender
|
||||
if sender_obj:
|
||||
full_name = sender_obj.get_full_name().strip() or str(sender_obj.phone)
|
||||
sender_data = {
|
||||
"id": sender_obj.id,
|
||||
"full_name": full_name,
|
||||
"role": sender_obj.role,
|
||||
"phone": sender_obj.phone,
|
||||
"avatar": avatar_url,
|
||||
}
|
||||
else:
|
||||
sender_data = None
|
||||
|
||||
async_to_sync(channel_layer.group_send)(
|
||||
f"chat_room_{message.room_id}",
|
||||
{
|
||||
"type": "chat_message",
|
||||
"id": message.id,
|
||||
"message_type": message.message_type,
|
||||
"text": message.text,
|
||||
"file_url": file_url,
|
||||
"sender": sender_data,
|
||||
"created_at": message.created_at.isoformat(),
|
||||
},
|
||||
)
|
||||
1
core/apps/chat/tests/__init__.py
Normal file
1
core/apps/chat/tests/__init__.py
Normal file
@@ -0,0 +1 @@
|
||||
from .chat import * # noqa
|
||||
2
core/apps/chat/tests/chat/__init__.py
Normal file
2
core/apps/chat/tests/chat/__init__.py
Normal file
@@ -0,0 +1,2 @@
|
||||
from .test_ChatMessage import * # noqa
|
||||
from .test_ChatRoom import * # noqa
|
||||
112
core/apps/chat/tests/chat/test_ChatMessage.py
Normal file
112
core/apps/chat/tests/chat/test_ChatMessage.py
Normal 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
|
||||
105
core/apps/chat/tests/chat/test_ChatRoom.py
Normal file
105
core/apps/chat/tests/chat/test_ChatRoom.py
Normal 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
|
||||
1
core/apps/chat/translation/__init__.py
Normal file
1
core/apps/chat/translation/__init__.py
Normal file
@@ -0,0 +1 @@
|
||||
from .chat import * # noqa
|
||||
13
core/apps/chat/translation/chat.py
Normal file
13
core/apps/chat/translation/chat.py
Normal 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
9
core/apps/chat/urls.py
Normal 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))]
|
||||
1
core/apps/chat/validators/__init__.py
Normal file
1
core/apps/chat/validators/__init__.py
Normal file
@@ -0,0 +1 @@
|
||||
from .chat import * # noqa
|
||||
15
core/apps/chat/validators/chat.py
Normal file
15
core/apps/chat/validators/chat.py
Normal 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
|
||||
1
core/apps/chat/views/__init__.py
Normal file
1
core/apps/chat/views/__init__.py
Normal file
@@ -0,0 +1 @@
|
||||
from .chat import * # noqa
|
||||
172
core/apps/chat/views/chat.py
Normal file
172
core/apps/chat/views/chat.py
Normal 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."})
|
||||
@@ -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
|
||||
|
||||
@@ -50,15 +50,8 @@ class AutoEvaluationAdmin(ModelAdmin):
|
||||
("value_determined", "rate_type"),
|
||||
),
|
||||
}),
|
||||
("Step 3 — Manzil ma'lumotlari", {
|
||||
"fields": (
|
||||
("object_location_province", "object_location_district"),
|
||||
("object_location_city", "object_location_neighborhood"),
|
||||
("object_location_street", "object_location_home"),
|
||||
("object_location_highways", "object_location_covenience"),
|
||||
),
|
||||
}),
|
||||
("Step 4 — Avtomobil ma'lumotlari", {
|
||||
|
||||
("Step 3 — Avtomobil ma'lumotlari", {
|
||||
"fields": (
|
||||
"tex_passport_serie_num",
|
||||
("tex_passport_gived_date", "tex_passport_gived_location"),
|
||||
|
||||
@@ -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__",
|
||||
)
|
||||
|
||||
57
core/apps/evaluation/admin/documentcategory.py
Normal file
57
core/apps/evaluation/admin/documentcategory.py
Normal 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
|
||||
157
core/apps/evaluation/admin/history.py
Normal file
157
core/apps/evaluation/admin/history.py
Normal 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,
|
||||
)
|
||||
@@ -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": (
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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")
|
||||
|
||||
10
core/apps/evaluation/choices/history.py
Normal file
10
core/apps/evaluation/choices/history.py
Normal 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")
|
||||
@@ -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")
|
||||
|
||||
@@ -19,3 +19,8 @@ class RequestStatus(models.TextChoices):
|
||||
IN_PROGRESS = "in_progress", _("Jarayonda")
|
||||
COMPLETED = "completed", _("Bajarildi")
|
||||
REJECTED = "rejected", _("Rad etildi")
|
||||
|
||||
|
||||
class RequestPersonType(models.TextChoices):
|
||||
INDIVIDUAL_PERSON = "individual_person", "Jismoniy shaxs"
|
||||
LEGAL_PERSON = "legal_person", 'Yuridik shaxs',
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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 = [
|
||||
]
|
||||
|
||||
10
core/apps/evaluation/filters/documentcategory.py
Normal file
10
core/apps/evaluation/filters/documentcategory.py
Normal 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 = [
|
||||
]
|
||||
54
core/apps/evaluation/filters/history.py
Normal file
54
core/apps/evaluation/filters/history.py
Normal 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",
|
||||
]
|
||||
@@ -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
|
||||
|
||||
@@ -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__"
|
||||
|
||||
10
core/apps/evaluation/forms/documentcategory.py
Normal file
10
core/apps/evaluation/forms/documentcategory.py
Normal 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__"
|
||||
17
core/apps/evaluation/forms/history.py
Normal file
17
core/apps/evaluation/forms/history.py
Normal 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__"
|
||||
@@ -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'),
|
||||
),
|
||||
]
|
||||
@@ -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'),
|
||||
),
|
||||
]
|
||||
@@ -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'),
|
||||
),
|
||||
]
|
||||
@@ -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'),
|
||||
),
|
||||
]
|
||||
@@ -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'],
|
||||
},
|
||||
),
|
||||
]
|
||||
29
core/apps/evaluation/migrations/0024_add_history_indexes.py
Normal file
29
core/apps/evaluation/migrations/0024_add_history_indexes.py
Normal 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'),
|
||||
),
|
||||
]
|
||||
@@ -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'),
|
||||
),
|
||||
]
|
||||
@@ -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'),
|
||||
),
|
||||
]
|
||||
@@ -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',
|
||||
},
|
||||
),
|
||||
]
|
||||
@@ -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'),
|
||||
),
|
||||
]
|
||||
@@ -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'),
|
||||
),
|
||||
]
|
||||
@@ -0,0 +1,19 @@
|
||||
# Generated by Django 5.2.7 on 2026-04-20 13:08
|
||||
|
||||
import django.db.models.deletion
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('evaluation', '0029_autoevaluationmodel_user'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AddField(
|
||||
model_name='autoevaluationmodel',
|
||||
name='evaluation_request',
|
||||
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='auto_evaluations_request', to='evaluation.evaluationrequestmodel', verbose_name='evaluation request'),
|
||||
),
|
||||
]
|
||||
@@ -0,0 +1,54 @@
|
||||
# Generated by Django 5.2.7 on 2026-04-21 10:22
|
||||
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('evaluation', '0030_autoevaluationmodel_evaluation_request'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.RemoveField(
|
||||
model_name='autoevaluationmodel',
|
||||
name='object_location_city',
|
||||
),
|
||||
migrations.RemoveField(
|
||||
model_name='autoevaluationmodel',
|
||||
name='object_location_covenience',
|
||||
),
|
||||
migrations.RemoveField(
|
||||
model_name='autoevaluationmodel',
|
||||
name='object_location_district',
|
||||
),
|
||||
migrations.RemoveField(
|
||||
model_name='autoevaluationmodel',
|
||||
name='object_location_highways',
|
||||
),
|
||||
migrations.RemoveField(
|
||||
model_name='autoevaluationmodel',
|
||||
name='object_location_home',
|
||||
),
|
||||
migrations.RemoveField(
|
||||
model_name='autoevaluationmodel',
|
||||
name='object_location_neighborhood',
|
||||
),
|
||||
migrations.RemoveField(
|
||||
model_name='autoevaluationmodel',
|
||||
name='object_location_province',
|
||||
),
|
||||
migrations.RemoveField(
|
||||
model_name='autoevaluationmodel',
|
||||
name='object_location_street',
|
||||
),
|
||||
migrations.RemoveField(
|
||||
model_name='quickevaluationmodel',
|
||||
name='tex_passport_file',
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name='autoevaluationmodel',
|
||||
name='tex_passport_file',
|
||||
field=models.FileField(blank=True, null=True, upload_to='quick_evaluation/tech_passports/%Y/%m/', verbose_name='tech passport file'),
|
||||
),
|
||||
]
|
||||
28
core/apps/evaluation/migrations/0032_certificatemodel.py
Normal file
28
core/apps/evaluation/migrations/0032_certificatemodel.py
Normal file
@@ -0,0 +1,28 @@
|
||||
# Generated by Django 6.0.4 on 2026-04-23 11:07
|
||||
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('evaluation', '0031_remove_autoevaluationmodel_object_location_city_and_more'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.CreateModel(
|
||||
name='CertificateModel',
|
||||
fields=[
|
||||
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
||||
('created_at', models.DateTimeField(auto_now_add=True)),
|
||||
('updated_at', models.DateTimeField(auto_now=True)),
|
||||
('title', models.CharField(max_length=255, verbose_name='title')),
|
||||
('file_url', models.URLField(max_length=255, verbose_name='file url')),
|
||||
],
|
||||
options={
|
||||
'verbose_name': 'Certificate',
|
||||
'verbose_name_plural': 'Certificates',
|
||||
'db_table': 'certificate',
|
||||
},
|
||||
),
|
||||
]
|
||||
@@ -0,0 +1,18 @@
|
||||
# Generated by Django 6.0.4 on 2026-04-23 07:22
|
||||
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('evaluation', '0031_remove_autoevaluationmodel_object_location_city_and_more'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AddField(
|
||||
model_name='evaluationrequestmodel',
|
||||
name='is_archive',
|
||||
field=models.BooleanField(default=False, verbose_name='is archive'),
|
||||
),
|
||||
]
|
||||
@@ -0,0 +1,18 @@
|
||||
# Generated by Django 6.0.4 on 2026-04-23 07:24
|
||||
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('evaluation', '0031_remove_autoevaluationmodel_object_location_city_and_more'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AddField(
|
||||
model_name='quickevaluationmodel',
|
||||
name='is_archive',
|
||||
field=models.BooleanField(default=False, verbose_name='is archive'),
|
||||
),
|
||||
]
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user