Compare commits
48 Commits
b03d2e1c5e
...
request-ar
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
3a08c81ff3 | ||
|
|
320f490d23 | ||
| d4e6d80c86 | |||
| 1f0e942be8 | |||
|
|
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 | ||
|
|
8207b750b8 |
@@ -73,6 +73,9 @@ STORAGE_BUCKET_STATIC=name
|
|||||||
STORAGE_PATH=127.0.0.1:8081/bucket/
|
STORAGE_PATH=127.0.0.1:8081/bucket/
|
||||||
STORAGE_PROTOCOL=http:
|
STORAGE_PROTOCOL=http:
|
||||||
|
|
||||||
|
# Didox configs
|
||||||
|
DIDOX_PARTNER_TOKEN=...
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# Celery configs
|
# Celery configs
|
||||||
4
.github/workflows/deploy.yaml
vendored
4
.github/workflows/deploy.yaml
vendored
@@ -153,7 +153,7 @@ jobs:
|
|||||||
update_env \
|
update_env \
|
||||||
"DB_HOST=postgres" \
|
"DB_HOST=postgres" \
|
||||||
"DB_NAME=sifatbahodb" \
|
"DB_NAME=sifatbahodb" \
|
||||||
"DB_PORT=5432"
|
"DB_PORT=5432" \
|
||||||
|
"DIDOX_TOKEN=${{ secrets.DIDOX_TOKEN }}"
|
||||||
export PORT=8085
|
export PORT=8085
|
||||||
docker stack deploy -c stack.yaml ${{ env.PROJECT_NAME }} --with-registry-auth
|
docker stack deploy -c stack.yaml ${{ env.PROJECT_NAME }} --with-registry-auth
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ import environ
|
|||||||
environ.Env.read_env(os.path.join(".env"))
|
environ.Env.read_env(os.path.join(".env"))
|
||||||
|
|
||||||
env = environ.Env(
|
env = environ.Env(
|
||||||
DEBUG=(bool, False),
|
DEBUG=(bool, True),
|
||||||
CACHE_TIME=(int, 180),
|
CACHE_TIME=(int, 180),
|
||||||
OTP_EXPIRE_TIME=(int, 2),
|
OTP_EXPIRE_TIME=(int, 2),
|
||||||
VITE_LIVE=(bool, False),
|
VITE_LIVE=(bool, False),
|
||||||
@@ -26,4 +26,5 @@ env = environ.Env(
|
|||||||
OTP_SERVICE="EskizService",
|
OTP_SERVICE="EskizService",
|
||||||
PROJECT_ENV=(str, "prod"),
|
PROJECT_ENV=(str, "prod"),
|
||||||
SILK_ENABLED=(bool, False),
|
SILK_ENABLED=(bool, False),
|
||||||
|
DIDOX_PARTNER_TOKEN=(str),
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -49,6 +49,7 @@ INSTALLED_APPS = [
|
|||||||
"django.contrib.sessions",
|
"django.contrib.sessions",
|
||||||
"django.contrib.messages",
|
"django.contrib.messages",
|
||||||
"django.contrib.staticfiles",
|
"django.contrib.staticfiles",
|
||||||
|
"django.contrib.postgres",
|
||||||
] + APPS
|
] + APPS
|
||||||
|
|
||||||
MODULES = [app for app in MODULES if isinstance(app, str)]
|
MODULES = [app for app in MODULES if isinstance(app, str)]
|
||||||
@@ -165,6 +166,8 @@ SITE_URL = env.str("SITE_URL", default="http://localhost:8055")
|
|||||||
MODELTRANSLATION_LANGUAGES = ("uz", "ru", "en")
|
MODELTRANSLATION_LANGUAGES = ("uz", "ru", "en")
|
||||||
MODELTRANSLATION_DEFAULT_LANGUAGE = "uz"
|
MODELTRANSLATION_DEFAULT_LANGUAGE = "uz"
|
||||||
|
|
||||||
|
DIDOX_PARTNER_TOKEN = env.str("DIDOX_PARTNER_TOKEN")
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
JST_LANGUAGES = [
|
JST_LANGUAGES = [
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ from config.env import env
|
|||||||
|
|
||||||
|
|
||||||
def home(request):
|
def home(request):
|
||||||
return HttpResponse("OK: #c44b08bb2837664cad50974a17e79e7de6f6d963")
|
return HttpResponse("OK: #d4e6d80c86fcf4422f71238c6552dfa4b42f9737")
|
||||||
|
|
||||||
|
|
||||||
urlpatterns = [
|
urlpatterns = [
|
||||||
|
|||||||
@@ -41,7 +41,7 @@ class ChatConsumer(AsyncWebsocketConsumer):
|
|||||||
async def receive(self, text_data):
|
async def receive(self, text_data):
|
||||||
user = self.scope.get("user")
|
user = self.scope.get("user")
|
||||||
if not user or isinstance(user, AnonymousUser):
|
if not user or isinstance(user, AnonymousUser):
|
||||||
await self.close(code=4001)
|
await self.close(code=401)
|
||||||
return
|
return
|
||||||
|
|
||||||
try:
|
try:
|
||||||
@@ -53,13 +53,10 @@ class ChatConsumer(AsyncWebsocketConsumer):
|
|||||||
message_type = data.get("message_type", "text")
|
message_type = data.get("message_type", "text")
|
||||||
text = (data.get("text") or "").strip()
|
text = (data.get("text") or "").strip()
|
||||||
|
|
||||||
# Matn xabari uchun text majburiy
|
|
||||||
if message_type == "text" and not text:
|
if message_type == "text" and not text:
|
||||||
await self.send(text_data=json.dumps({"error": "Matn bo'sh bo'lishi mumkin emas."}))
|
await self.send(text_data=json.dumps({"error": "Matn bo'sh bo'lishi mumkin emas."}))
|
||||||
return
|
return
|
||||||
|
|
||||||
# WS orqali faqat matn + caption saqlanadi.
|
|
||||||
# Fayl yuklash uchun REST /chat/messages/ POST ishlatiladi.
|
|
||||||
if message_type != "text":
|
if message_type != "text":
|
||||||
await self.send(
|
await self.send(
|
||||||
text_data=json.dumps(
|
text_data=json.dumps(
|
||||||
@@ -68,9 +65,9 @@ class ChatConsumer(AsyncWebsocketConsumer):
|
|||||||
)
|
)
|
||||||
return
|
return
|
||||||
|
|
||||||
# DB ga saqlash — post_save signal WS ga broadcast qiladi
|
|
||||||
await self._save_message(user, text)
|
await self._save_message(user, text)
|
||||||
|
|
||||||
|
|
||||||
async def chat_message(self, event):
|
async def chat_message(self, event):
|
||||||
await self.send(
|
await self.send(
|
||||||
text_data=json.dumps(
|
text_data=json.dumps(
|
||||||
|
|||||||
@@ -78,5 +78,6 @@ class CreateChatmessageSerializer(serializers.ModelSerializer):
|
|||||||
request = self.context["request"]
|
request = self.context["request"]
|
||||||
message = super().create(validated_data)
|
message = super().create(validated_data)
|
||||||
file_url = request.build_absolute_uri(message.file.url) if message.file else None
|
file_url = request.build_absolute_uri(message.file.url) if message.file else None
|
||||||
send_message_to_chat.delay(message.id, file_url)
|
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
|
return message
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ from core.apps.chat.models import ChatmessageModel
|
|||||||
|
|
||||||
|
|
||||||
@shared_task
|
@shared_task
|
||||||
def send_message_to_chat(message_id, file_url):
|
def send_message_to_chat(message_id, file_url, avatar_url):
|
||||||
try:
|
try:
|
||||||
message = ChatmessageModel.objects.get(id=message_id)
|
message = ChatmessageModel.objects.get(id=message_id)
|
||||||
except ChatmessageModel.DoesNotExist:
|
except ChatmessageModel.DoesNotExist:
|
||||||
@@ -24,12 +24,12 @@ def send_message_to_chat(message_id, file_url):
|
|||||||
"id": sender_obj.id,
|
"id": sender_obj.id,
|
||||||
"full_name": full_name,
|
"full_name": full_name,
|
||||||
"role": sender_obj.role,
|
"role": sender_obj.role,
|
||||||
|
"phone": sender_obj.phone,
|
||||||
|
"avatar": avatar_url,
|
||||||
}
|
}
|
||||||
else:
|
else:
|
||||||
sender_data = None
|
sender_data = None
|
||||||
|
|
||||||
# file_url = request.build_absolute_uri(message.file.url) if message.file else None
|
|
||||||
|
|
||||||
async_to_sync(channel_layer.group_send)(
|
async_to_sync(channel_layer.group_send)(
|
||||||
f"chat_room_{message.room_id}",
|
f"chat_room_{message.room_id}",
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -50,15 +50,8 @@ class AutoEvaluationAdmin(ModelAdmin):
|
|||||||
("value_determined", "rate_type"),
|
("value_determined", "rate_type"),
|
||||||
),
|
),
|
||||||
}),
|
}),
|
||||||
("Step 3 — Manzil ma'lumotlari", {
|
|
||||||
"fields": (
|
("Step 3 — Avtomobil ma'lumotlari", {
|
||||||
("object_location_province", "object_location_district"),
|
|
||||||
("object_location_city", "object_location_neighborhood"),
|
|
||||||
("object_location_street", "object_location_home"),
|
|
||||||
("object_location_highways", "object_location_covenience"),
|
|
||||||
),
|
|
||||||
}),
|
|
||||||
("Step 4 — Avtomobil ma'lumotlari", {
|
|
||||||
"fields": (
|
"fields": (
|
||||||
"tex_passport_serie_num",
|
"tex_passport_serie_num",
|
||||||
("tex_passport_gived_date", "tex_passport_gived_location"),
|
("tex_passport_gived_date", "tex_passport_gived_location"),
|
||||||
|
|||||||
@@ -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'),
|
||||||
|
),
|
||||||
|
]
|
||||||
@@ -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'),
|
||||||
|
),
|
||||||
|
]
|
||||||
@@ -30,6 +30,14 @@ class AutoEvaluationModel(AbstractBaseModel):
|
|||||||
null=True,
|
null=True,
|
||||||
blank=True,
|
blank=True,
|
||||||
)
|
)
|
||||||
|
evaluation_request = models.ForeignKey(
|
||||||
|
"evaluation.EvaluationRequestModel",
|
||||||
|
on_delete=models.SET_NULL,
|
||||||
|
related_name="auto_evaluations_request",
|
||||||
|
verbose_name=_("evaluation request"),
|
||||||
|
null=True,
|
||||||
|
blank=True,
|
||||||
|
)
|
||||||
valuation = models.OneToOneField(
|
valuation = models.OneToOneField(
|
||||||
ValuationModel,
|
ValuationModel,
|
||||||
on_delete=models.CASCADE,
|
on_delete=models.CASCADE,
|
||||||
@@ -54,6 +62,13 @@ class AutoEvaluationModel(AbstractBaseModel):
|
|||||||
null=True,
|
null=True,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
tex_passport_file = models.FileField(
|
||||||
|
verbose_name=_("tech passport file"),
|
||||||
|
upload_to="quick_evaluation/tech_passports/%Y/%m/",
|
||||||
|
blank=True,
|
||||||
|
null=True,
|
||||||
|
)
|
||||||
|
|
||||||
# ── Step 1 — Umumiy ma'lumotlar ──────────────────────────────────
|
# ── Step 1 — Umumiy ma'lumotlar ──────────────────────────────────
|
||||||
registration_number = models.CharField(
|
registration_number = models.CharField(
|
||||||
verbose_name=_("registration number"),
|
verbose_name=_("registration number"),
|
||||||
@@ -172,56 +187,6 @@ class AutoEvaluationModel(AbstractBaseModel):
|
|||||||
related_name='evaluation_auto_rate_type'
|
related_name='evaluation_auto_rate_type'
|
||||||
)
|
)
|
||||||
|
|
||||||
# ── Step 3 — Manzil ma'lumotlari ────────────────────────────────
|
|
||||||
object_location_province = models.CharField(
|
|
||||||
verbose_name=_("object location province"),
|
|
||||||
max_length=100,
|
|
||||||
blank=True,
|
|
||||||
null=True,
|
|
||||||
)
|
|
||||||
object_location_district = models.CharField(
|
|
||||||
verbose_name=_("object location district"),
|
|
||||||
max_length=100,
|
|
||||||
blank=True,
|
|
||||||
null=True,
|
|
||||||
)
|
|
||||||
object_location_city = models.CharField(
|
|
||||||
verbose_name=_("object location city"),
|
|
||||||
max_length=100,
|
|
||||||
blank=True,
|
|
||||||
null=True,
|
|
||||||
)
|
|
||||||
object_location_neighborhood = models.CharField(
|
|
||||||
verbose_name=_("object location neighborhood"),
|
|
||||||
max_length=100,
|
|
||||||
blank=True,
|
|
||||||
null=True,
|
|
||||||
)
|
|
||||||
object_location_street = models.CharField(
|
|
||||||
verbose_name=_("object location street"),
|
|
||||||
max_length=100,
|
|
||||||
blank=True,
|
|
||||||
null=True,
|
|
||||||
)
|
|
||||||
object_location_home = models.CharField(
|
|
||||||
verbose_name=_("object location home"),
|
|
||||||
max_length=50,
|
|
||||||
blank=True,
|
|
||||||
null=True,
|
|
||||||
)
|
|
||||||
object_location_highways = models.IntegerField(
|
|
||||||
verbose_name=_("location highways"),
|
|
||||||
choices=LocationHighways.choices,
|
|
||||||
blank=True,
|
|
||||||
null=True,
|
|
||||||
)
|
|
||||||
object_location_covenience = models.IntegerField(
|
|
||||||
verbose_name=_("location convenience"),
|
|
||||||
choices=LocationConvenience.choices,
|
|
||||||
blank=True,
|
|
||||||
null=True,
|
|
||||||
)
|
|
||||||
|
|
||||||
# ── Step 4 — Avtomobil ma'lumotlari ─────────────────────────────
|
# ── Step 4 — Avtomobil ma'lumotlari ─────────────────────────────
|
||||||
tex_passport_serie_num = models.CharField(
|
tex_passport_serie_num = models.CharField(
|
||||||
verbose_name=_("tech passport series and number"),
|
verbose_name=_("tech passport series and number"),
|
||||||
|
|||||||
@@ -34,12 +34,6 @@ class QuickEvaluationModel(AbstractBaseModel):
|
|||||||
blank=True,
|
blank=True,
|
||||||
null=True,
|
null=True,
|
||||||
)
|
)
|
||||||
tex_passport_file = models.FileField(
|
|
||||||
verbose_name=_("tech passport file"),
|
|
||||||
upload_to="quick_evaluation/tech_passports/%Y/%m/",
|
|
||||||
blank=True,
|
|
||||||
null=True,
|
|
||||||
)
|
|
||||||
|
|
||||||
# Car info
|
# Car info
|
||||||
car_type = models.CharField(
|
car_type = models.CharField(
|
||||||
|
|||||||
@@ -118,9 +118,12 @@ class EvaluationrequestModel(AbstractBaseModel):
|
|||||||
choices=RequestStatus.choices,
|
choices=RequestStatus.choices,
|
||||||
default=RequestStatus.PENDING,
|
default=RequestStatus.PENDING,
|
||||||
)
|
)
|
||||||
|
is_archive = models.BooleanField(
|
||||||
|
verbose_name=_("is archive"),
|
||||||
|
default=False,
|
||||||
|
)
|
||||||
def __str__(self):
|
def __str__(self):
|
||||||
return f"Request #{self.pk} — {self.get_rate_type_display()}"
|
return f"Requests #{self.pk} — {self.get_rate_type_display()}"
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
def _baker(cls):
|
def _baker(cls):
|
||||||
|
|||||||
@@ -11,3 +11,4 @@ from .report import * # noqa
|
|||||||
from .request import * # noqa
|
from .request import * # noqa
|
||||||
from .valuation import * # noqa
|
from .valuation import * # noqa
|
||||||
from .vehicle import * # noqa
|
from .vehicle import * # noqa
|
||||||
|
from .tech_passport import * # noqa
|
||||||
|
|||||||
@@ -3,8 +3,9 @@ from django.contrib.auth import get_user_model
|
|||||||
|
|
||||||
from rest_framework import serializers
|
from rest_framework import serializers
|
||||||
|
|
||||||
from core.apps.evaluation.models import AutoEvaluationModel,ReferenceitemModel
|
from core.apps.evaluation.models import AutoEvaluationModel,ReferenceitemModel, EvaluationrequestModel
|
||||||
from core.apps.evaluation.serializers.reference import ListReferenceitemSerializer
|
from core.apps.evaluation.serializers.reference import ListReferenceitemSerializer
|
||||||
|
from core.apps.evaluation.choices.request import RequestStatus
|
||||||
|
|
||||||
User = get_user_model()
|
User = get_user_model()
|
||||||
|
|
||||||
@@ -33,7 +34,6 @@ class BaseAutoevaluationSerializer(serializers.ModelSerializer):
|
|||||||
"object_owner_legal_inn",
|
"object_owner_legal_inn",
|
||||||
"tex_passport_serie_num",
|
"tex_passport_serie_num",
|
||||||
"rating_goal",
|
"rating_goal",
|
||||||
"object_location_province",
|
|
||||||
"registration_number",
|
"registration_number",
|
||||||
"object_type",
|
"object_type",
|
||||||
"object_type_display",
|
"object_type_display",
|
||||||
@@ -50,6 +50,7 @@ class BaseAutoevaluationSerializer(serializers.ModelSerializer):
|
|||||||
"property_rights",
|
"property_rights",
|
||||||
"form_ownership",
|
"form_ownership",
|
||||||
"user",
|
"user",
|
||||||
|
"evaluation_request",
|
||||||
]
|
]
|
||||||
|
|
||||||
def get_user(self, obj):
|
def get_user(self, obj):
|
||||||
@@ -71,12 +72,12 @@ class ListAutoevaluationSerializer(BaseAutoevaluationSerializer):
|
|||||||
class RetrieveAutoevaluationSerializer(BaseAutoevaluationSerializer):
|
class RetrieveAutoevaluationSerializer(BaseAutoevaluationSerializer):
|
||||||
car_type_display = serializers.CharField(source="get_car_type_display", read_only=True, default=None)
|
car_type_display = serializers.CharField(source="get_car_type_display", read_only=True, default=None)
|
||||||
car_wheel_display = serializers.CharField(source="get_car_wheel_display", read_only=True, default=None)
|
car_wheel_display = serializers.CharField(source="get_car_wheel_display", read_only=True, default=None)
|
||||||
object_location_highways_display = serializers.CharField(
|
# object_location_highways_display = serializers.CharField(
|
||||||
source="get_object_location_highways_display", read_only=True, default=None
|
# source="get_object_location_highways_display", read_only=True, default=None
|
||||||
)
|
# )
|
||||||
object_location_covenience_display = serializers.CharField(
|
# object_location_covenience_display = serializers.CharField(
|
||||||
source="get_object_location_covenience_display", read_only=True, default=None
|
# source="get_object_location_covenience_display", read_only=True, default=None
|
||||||
)
|
# )
|
||||||
|
|
||||||
class Meta(BaseAutoevaluationSerializer.Meta):
|
class Meta(BaseAutoevaluationSerializer.Meta):
|
||||||
fields = BaseAutoevaluationSerializer.Meta.fields + [
|
fields = BaseAutoevaluationSerializer.Meta.fields + [
|
||||||
@@ -95,19 +96,9 @@ class RetrieveAutoevaluationSerializer(BaseAutoevaluationSerializer):
|
|||||||
"object_owner_individual_person_passport_num",
|
"object_owner_individual_person_passport_num",
|
||||||
"object_owner_legal_entity",
|
"object_owner_legal_entity",
|
||||||
"object_owner_legal_inn",
|
"object_owner_legal_inn",
|
||||||
# Step 3
|
|
||||||
"object_location_province",
|
|
||||||
"object_location_district",
|
|
||||||
"object_location_city",
|
|
||||||
"object_location_neighborhood",
|
|
||||||
"object_location_street",
|
|
||||||
"object_location_home",
|
|
||||||
"object_location_highways",
|
|
||||||
"object_location_highways_display",
|
|
||||||
"object_location_covenience",
|
|
||||||
"object_location_covenience_display",
|
|
||||||
# Step 4
|
# Step 4
|
||||||
"tex_passport_serie_num",
|
"tex_passport_serie_num",
|
||||||
|
"tex_passport_file",
|
||||||
"tex_passport_gived_date",
|
"tex_passport_gived_date",
|
||||||
"tex_passport_gived_location",
|
"tex_passport_gived_location",
|
||||||
"car_type",
|
"car_type",
|
||||||
@@ -174,16 +165,8 @@ class UpdateAutoevaluationSerializer(serializers.ModelSerializer):
|
|||||||
"form_ownership",
|
"form_ownership",
|
||||||
"value_determined",
|
"value_determined",
|
||||||
"rate_type",
|
"rate_type",
|
||||||
# Step 3
|
|
||||||
"object_location_province",
|
|
||||||
"object_location_district",
|
|
||||||
"object_location_city",
|
|
||||||
"object_location_neighborhood",
|
|
||||||
"object_location_street",
|
|
||||||
"object_location_home",
|
|
||||||
"object_location_highways",
|
|
||||||
"object_location_covenience",
|
|
||||||
# Step 4
|
# Step 4
|
||||||
|
"tex_passport_file",
|
||||||
"tex_passport_serie_num",
|
"tex_passport_serie_num",
|
||||||
"tex_passport_gived_date",
|
"tex_passport_gived_date",
|
||||||
"tex_passport_gived_location",
|
"tex_passport_gived_location",
|
||||||
@@ -265,6 +248,11 @@ class CreateAutoevaluationSerializer(serializers.ModelSerializer):
|
|||||||
required=False,
|
required=False,
|
||||||
allow_null=True,
|
allow_null=True,
|
||||||
)
|
)
|
||||||
|
evaluation_request = serializers.PrimaryKeyRelatedField(
|
||||||
|
queryset=EvaluationrequestModel.objects.all(),
|
||||||
|
required=False,
|
||||||
|
allow_null=True,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
@@ -272,6 +260,7 @@ class CreateAutoevaluationSerializer(serializers.ModelSerializer):
|
|||||||
fields = [
|
fields = [
|
||||||
# Step 1
|
# Step 1
|
||||||
"registration_number",
|
"registration_number",
|
||||||
|
"evaluation_request",
|
||||||
"contract_date",
|
"contract_date",
|
||||||
"object_inspection_date",
|
"object_inspection_date",
|
||||||
"rate_date",
|
"rate_date",
|
||||||
@@ -290,17 +279,9 @@ class CreateAutoevaluationSerializer(serializers.ModelSerializer):
|
|||||||
"form_ownership",
|
"form_ownership",
|
||||||
"value_determined",
|
"value_determined",
|
||||||
"rate_type",
|
"rate_type",
|
||||||
# Step 3
|
|
||||||
"object_location_province",
|
|
||||||
"object_location_district",
|
|
||||||
"object_location_city",
|
|
||||||
"object_location_neighborhood",
|
|
||||||
"object_location_street",
|
|
||||||
"object_location_home",
|
|
||||||
"object_location_highways",
|
|
||||||
"object_location_covenience",
|
|
||||||
# Step 4
|
# Step 4
|
||||||
"tex_passport_serie_num",
|
"tex_passport_serie_num",
|
||||||
|
"tex_passport_file",
|
||||||
"tex_passport_gived_date",
|
"tex_passport_gived_date",
|
||||||
"tex_passport_gived_location",
|
"tex_passport_gived_location",
|
||||||
"car_type",
|
"car_type",
|
||||||
@@ -357,6 +338,10 @@ class CreateAutoevaluationSerializer(serializers.ModelSerializer):
|
|||||||
def create(self, validated_data):
|
def create(self, validated_data):
|
||||||
user = self.context.get('request').user
|
user = self.context.get('request').user
|
||||||
validated_data['user'] = user
|
validated_data['user'] = user
|
||||||
|
evaluation_req = validated_data.get("evaluation_request")
|
||||||
|
if evaluation_req:
|
||||||
|
evaluation_req.status = RequestStatus.IN_PROGRESS
|
||||||
|
evaluation_req.save()
|
||||||
return super().create(validated_data)
|
return super().create(validated_data)
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -53,7 +53,6 @@ class RetrieveQuickevaluationSerializer(BaseQuickevaluationSerializer):
|
|||||||
"tex_passport_serie_num",
|
"tex_passport_serie_num",
|
||||||
"tech_passport_issued_date",
|
"tech_passport_issued_date",
|
||||||
"tech_passport_issued_place",
|
"tech_passport_issued_place",
|
||||||
"tex_passport_file",
|
|
||||||
"car_position",
|
"car_position",
|
||||||
"car_position_name",
|
"car_position_name",
|
||||||
"distance_covered",
|
"distance_covered",
|
||||||
@@ -76,7 +75,6 @@ class CreateQuickevaluationSerializer(serializers.ModelSerializer):
|
|||||||
"tex_passport_serie_num",
|
"tex_passport_serie_num",
|
||||||
"tech_passport_issued_date",
|
"tech_passport_issued_date",
|
||||||
"tech_passport_issued_place",
|
"tech_passport_issued_place",
|
||||||
"tex_passport_file",
|
|
||||||
"car_type",
|
"car_type",
|
||||||
"brand",
|
"brand",
|
||||||
"marka",
|
"marka",
|
||||||
|
|||||||
@@ -55,6 +55,7 @@ class BaseEvaluationrequestSerializer(serializers.ModelSerializer):
|
|||||||
"user",
|
"user",
|
||||||
"created_at",
|
"created_at",
|
||||||
"updated_at",
|
"updated_at",
|
||||||
|
"is_archive",
|
||||||
]
|
]
|
||||||
|
|
||||||
def get_location(self, obj):
|
def get_location(self, obj):
|
||||||
@@ -183,3 +184,7 @@ class CreateEvaluationrequestSerializer(serializers.ModelSerializer):
|
|||||||
validated_data["location_name"] = str(location_name)
|
validated_data["location_name"] = str(location_name)
|
||||||
validated_data["user"] = self.context["request"].user
|
validated_data["user"] = self.context["request"].user
|
||||||
return super().create(validated_data)
|
return super().create(validated_data)
|
||||||
|
|
||||||
|
class ArchiveEvaluationrequestSerializer(serializers.Serializer):
|
||||||
|
id = serializers.IntegerField(required=True)
|
||||||
|
is_archive = serializers.BooleanField(required=True)
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
from .tech_passport import * # noqa
|
||||||
@@ -0,0 +1,6 @@
|
|||||||
|
from rest_framework import serializers
|
||||||
|
|
||||||
|
class TechPassportSerializer(serializers.Serializer):
|
||||||
|
autonumber = serializers.CharField(required=True, max_length=20)
|
||||||
|
tech_pass_number = serializers.CharField(required=True, max_length=20)
|
||||||
|
tech_pass_series = serializers.CharField(required=True, max_length=20)
|
||||||
@@ -26,7 +26,10 @@ from .views import (
|
|||||||
AutoEvaluationListAppraisersView,
|
AutoEvaluationListAppraisersView,
|
||||||
AutoEvaluationSetAppraisersView,
|
AutoEvaluationSetAppraisersView,
|
||||||
AutoEvaluationRemoveAppraisersView,
|
AutoEvaluationRemoveAppraisersView,
|
||||||
|
DidoxCompanyInfoAPIView,
|
||||||
|
TechPassportAPIView,
|
||||||
|
EvaluationStatusChange,
|
||||||
|
ArchiveEvaluationrequestView,
|
||||||
)
|
)
|
||||||
|
|
||||||
router = DefaultRouter()
|
router = DefaultRouter()
|
||||||
@@ -60,4 +63,17 @@ urlpatterns = [
|
|||||||
path("<int:id>/remove/", AutoEvaluationRemoveAppraisersView.as_view(), name="auto-evaluation-remove-appraisers"),
|
path("<int:id>/remove/", AutoEvaluationRemoveAppraisersView.as_view(), name="auto-evaluation-remove-appraisers"),
|
||||||
]
|
]
|
||||||
)),
|
)),
|
||||||
|
path(
|
||||||
|
"didox/info/<int:tin>/",
|
||||||
|
DidoxCompanyInfoAPIView.as_view(),
|
||||||
|
name="didox-info"
|
||||||
|
),
|
||||||
|
path(
|
||||||
|
"tech-passport/",
|
||||||
|
TechPassportAPIView.as_view(),
|
||||||
|
name="tech-passport"
|
||||||
|
),
|
||||||
|
path("evaluation-request/<int:pk>/change-status/", EvaluationStatusChange.as_view(),
|
||||||
|
name="evaluation-change-status"),
|
||||||
|
path("evaluation-request/archive/", ArchiveEvaluationrequestView.as_view(), name="evaluation-request-archive"),
|
||||||
]
|
]
|
||||||
|
|||||||
@@ -11,3 +11,5 @@ from .report import * # noqa
|
|||||||
from .request import * # noqa
|
from .request import * # noqa
|
||||||
from .valuation import * # noqa
|
from .valuation import * # noqa
|
||||||
from .vehicle import * # noqa
|
from .vehicle import * # noqa
|
||||||
|
from .didox import * # noqa
|
||||||
|
from .tech_passport import * # noqa
|
||||||
|
|||||||
60
core/apps/evaluation/views/didox.py
Normal file
60
core/apps/evaluation/views/didox.py
Normal file
@@ -0,0 +1,60 @@
|
|||||||
|
from rest_framework.response import Response
|
||||||
|
from rest_framework import status
|
||||||
|
from rest_framework.permissions import AllowAny
|
||||||
|
from rest_framework.generics import GenericAPIView
|
||||||
|
|
||||||
|
|
||||||
|
from drf_spectacular.utils import extend_schema, OpenApiParameter
|
||||||
|
|
||||||
|
from core.services.didox import DidoxService
|
||||||
|
|
||||||
|
|
||||||
|
class DidoxCompanyInfoAPIView(GenericAPIView):
|
||||||
|
authentication_classes = []
|
||||||
|
permission_classes = [AllowAny]
|
||||||
|
|
||||||
|
@extend_schema(
|
||||||
|
tags=["Didox"],
|
||||||
|
summary="Get company info by TIN",
|
||||||
|
description="TIN/JSHSHIR orqali Didoxdan ma'lumot olish",
|
||||||
|
parameters=[
|
||||||
|
OpenApiParameter(
|
||||||
|
name="tin",
|
||||||
|
type=int,
|
||||||
|
location=OpenApiParameter.PATH,
|
||||||
|
required=True,
|
||||||
|
description="TIN / STIR / INN / JSHSHIR"
|
||||||
|
)
|
||||||
|
],
|
||||||
|
responses={200: dict},
|
||||||
|
)
|
||||||
|
def get(self, request, *args, **kwargs):
|
||||||
|
tin = kwargs.get("tin")
|
||||||
|
|
||||||
|
try:
|
||||||
|
tin = int(tin)
|
||||||
|
except (TypeError, ValueError):
|
||||||
|
return Response(
|
||||||
|
{"detail": "TIN must be a valid integer"},
|
||||||
|
status=status.HTTP_400_BAD_REQUEST
|
||||||
|
)
|
||||||
|
|
||||||
|
data = DidoxService.get_company_info(tin)
|
||||||
|
|
||||||
|
if not data:
|
||||||
|
return Response(
|
||||||
|
{"detail": "Didox service unavailable"},
|
||||||
|
status=status.HTTP_502_BAD_GATEWAY
|
||||||
|
)
|
||||||
|
|
||||||
|
# if both name and personalNum are null/empty -> 404
|
||||||
|
name = data.get("name")
|
||||||
|
personal_num = data.get("personalNum")
|
||||||
|
|
||||||
|
if not name and not personal_num:
|
||||||
|
return Response(
|
||||||
|
{"detail": "Company or person not found"},
|
||||||
|
status=status.HTTP_404_NOT_FOUND
|
||||||
|
)
|
||||||
|
|
||||||
|
return Response(data, status=status.HTTP_200_OK)
|
||||||
@@ -1,3 +1,5 @@
|
|||||||
|
from django.shortcuts import get_object_or_404
|
||||||
|
|
||||||
from django_core.mixins import BaseViewSetMixin
|
from django_core.mixins import BaseViewSetMixin
|
||||||
from django_filters.rest_framework import DjangoFilterBackend
|
from django_filters.rest_framework import DjangoFilterBackend
|
||||||
from drf_spectacular.utils import extend_schema
|
from drf_spectacular.utils import extend_schema
|
||||||
@@ -5,6 +7,9 @@ from rest_framework.filters import OrderingFilter, SearchFilter
|
|||||||
from rest_framework.pagination import PageNumberPagination
|
from rest_framework.pagination import PageNumberPagination
|
||||||
from rest_framework.permissions import AllowAny, IsAuthenticated
|
from rest_framework.permissions import AllowAny, IsAuthenticated
|
||||||
from rest_framework.viewsets import ModelViewSet
|
from rest_framework.viewsets import ModelViewSet
|
||||||
|
from rest_framework.response import Response
|
||||||
|
from rest_framework.views import APIView
|
||||||
|
from rest_framework import status
|
||||||
|
|
||||||
from core.apps.evaluation.filters.request import EvaluationrequestFilter
|
from core.apps.evaluation.filters.request import EvaluationrequestFilter
|
||||||
from core.apps.evaluation.models import EvaluationrequestModel
|
from core.apps.evaluation.models import EvaluationrequestModel
|
||||||
@@ -12,7 +17,11 @@ from core.apps.evaluation.serializers.request import (
|
|||||||
CreateEvaluationrequestSerializer,
|
CreateEvaluationrequestSerializer,
|
||||||
ListEvaluationrequestSerializer,
|
ListEvaluationrequestSerializer,
|
||||||
RetrieveEvaluationrequestSerializer,
|
RetrieveEvaluationrequestSerializer,
|
||||||
|
ArchiveEvaluationrequestSerializer,
|
||||||
)
|
)
|
||||||
|
from core.apps.evaluation.choices.request import RequestStatus
|
||||||
|
from rest_framework.generics import GenericAPIView
|
||||||
|
from drf_spectacular.utils import OpenApiResponse
|
||||||
|
|
||||||
|
|
||||||
# class RequestPagination(PageNumberPagination):
|
# class RequestPagination(PageNumberPagination):
|
||||||
@@ -128,3 +137,114 @@ class AdminEvaluationrequestView(BaseViewSetMixin, ModelViewSet):
|
|||||||
|
|
||||||
def serializer_context(self):
|
def serializer_context(self):
|
||||||
return self.serializer_class(context={"request": self.request})
|
return self.serializer_class(context={"request": self.request})
|
||||||
|
|
||||||
|
|
||||||
|
@extend_schema(tags=["EvaluationRequest"])
|
||||||
|
class EvaluationStatusChange(APIView):
|
||||||
|
permission_classes = [IsAuthenticated]
|
||||||
|
|
||||||
|
def post(self, request, pk):
|
||||||
|
if request.user.role not in [RoleChoice.ADMIN, RoleChoice.SUPERUSER]:
|
||||||
|
return Response({'detail': 'Forbidden'}, status=status.HTTP_403_FORBIDDEN)
|
||||||
|
|
||||||
|
evaluation = get_object_or_404(EvaluationrequestModel, pk=pk)
|
||||||
|
|
||||||
|
|
||||||
|
status_value = request.data.get('status')
|
||||||
|
if not status_value:
|
||||||
|
return Response({'detail': 'Status is required'}, status=status.HTTP_400_BAD_REQUEST)
|
||||||
|
|
||||||
|
valid_statuses = [
|
||||||
|
RequestStatus.PENDING,
|
||||||
|
RequestStatus.IN_PROGRESS,
|
||||||
|
RequestStatus.COMPLETED,
|
||||||
|
RequestStatus.REJECTED
|
||||||
|
]
|
||||||
|
|
||||||
|
if status_value not in valid_statuses:
|
||||||
|
return Response(
|
||||||
|
{'detail': f'Invalid status. Must be one of: {valid_statuses}'},
|
||||||
|
status=status.HTTP_400_BAD_REQUEST
|
||||||
|
)
|
||||||
|
|
||||||
|
evaluation.status = status_value
|
||||||
|
evaluation.save()
|
||||||
|
|
||||||
|
return Response({
|
||||||
|
'success': True,
|
||||||
|
'status': evaluation.status,
|
||||||
|
'id': evaluation.pk
|
||||||
|
})
|
||||||
|
|
||||||
|
@extend_schema(tags=["EvaluationRequest"])
|
||||||
|
class ArchiveEvaluationrequestView(GenericAPIView):
|
||||||
|
permission_classes = [IsAuthenticated]
|
||||||
|
|
||||||
|
def get_serializer_class(self):
|
||||||
|
if self.request.method == "GET":
|
||||||
|
return ListEvaluationrequestSerializer
|
||||||
|
return ArchiveEvaluationrequestSerializer
|
||||||
|
|
||||||
|
@extend_schema(
|
||||||
|
tags=["EvaluationRequest"],
|
||||||
|
summary="Get archived evaluation requests list",
|
||||||
|
description="""
|
||||||
|
Returns only archived evaluation requests.
|
||||||
|
|
||||||
|
This endpoint works like evaluation-request/,
|
||||||
|
but only records with is_archive=True are returned.
|
||||||
|
""",
|
||||||
|
responses={200: ListEvaluationrequestSerializer(many=True)},
|
||||||
|
)
|
||||||
|
def get(self, request, *args, **kwargs):
|
||||||
|
queryset = EvaluationrequestModel.objects.filter(
|
||||||
|
is_archive=True
|
||||||
|
).order_by("-created_at")
|
||||||
|
|
||||||
|
serializer = self.get_serializer(queryset, many=True)
|
||||||
|
|
||||||
|
return Response(serializer.data, status=status.HTTP_200_OK)
|
||||||
|
|
||||||
|
@extend_schema(
|
||||||
|
tags=["EvaluationRequest"],
|
||||||
|
summary="Archive or unarchive evaluation request",
|
||||||
|
description="""
|
||||||
|
Update archive status for evaluation request.
|
||||||
|
|
||||||
|
- is_archive=true → archive
|
||||||
|
- is_archive=false → remove from archive
|
||||||
|
""",
|
||||||
|
request=ArchiveEvaluationrequestSerializer,
|
||||||
|
responses={
|
||||||
|
200: OpenApiResponse(
|
||||||
|
description="Archive status updated successfully"
|
||||||
|
),
|
||||||
|
400: OpenApiResponse(
|
||||||
|
description="Validation error"
|
||||||
|
),
|
||||||
|
404: OpenApiResponse(
|
||||||
|
description="Evaluation request not found"
|
||||||
|
),
|
||||||
|
},
|
||||||
|
)
|
||||||
|
def post(self, request, *args, **kwargs):
|
||||||
|
serializer = self.get_serializer(data=request.data)
|
||||||
|
serializer.is_valid(raise_exception=True)
|
||||||
|
|
||||||
|
validated_data = serializer.validated_data
|
||||||
|
|
||||||
|
obj = get_object_or_404(
|
||||||
|
EvaluationrequestModel,
|
||||||
|
id=validated_data["id"]
|
||||||
|
)
|
||||||
|
|
||||||
|
obj.is_archive = validated_data["is_archive"]
|
||||||
|
obj.save(update_fields=["is_archive"])
|
||||||
|
|
||||||
|
return Response(
|
||||||
|
{
|
||||||
|
"success": True,
|
||||||
|
"message": "Archive status updated successfully"
|
||||||
|
},
|
||||||
|
status=status.HTTP_200_OK
|
||||||
|
)
|
||||||
59
core/apps/evaluation/views/tech_passport.py
Normal file
59
core/apps/evaluation/views/tech_passport.py
Normal file
@@ -0,0 +1,59 @@
|
|||||||
|
from rest_framework.response import Response
|
||||||
|
from rest_framework import status
|
||||||
|
from rest_framework.permissions import AllowAny
|
||||||
|
from rest_framework.generics import GenericAPIView
|
||||||
|
|
||||||
|
from drf_spectacular.utils import (
|
||||||
|
extend_schema,
|
||||||
|
OpenApiExample,
|
||||||
|
)
|
||||||
|
|
||||||
|
from core.services.tech_passport import TechPassportService
|
||||||
|
from ..serializers import TechPassportSerializer
|
||||||
|
|
||||||
|
|
||||||
|
class TechPassportAPIView(GenericAPIView):
|
||||||
|
authentication_classes = []
|
||||||
|
permission_classes = [AllowAny]
|
||||||
|
|
||||||
|
@extend_schema(
|
||||||
|
tags=["Tech Passport"],
|
||||||
|
summary="Get vehicle information by technical passport",
|
||||||
|
description=(
|
||||||
|
"This endpoint retrieves vehicle information using "
|
||||||
|
"autonumber, technical passport number, and technical passport series "
|
||||||
|
"via Gross Insurance API integration."
|
||||||
|
),
|
||||||
|
request=TechPassportSerializer,
|
||||||
|
responses={
|
||||||
|
200: dict,
|
||||||
|
400: dict,
|
||||||
|
},
|
||||||
|
)
|
||||||
|
def post(self, request, *args, **kwargs):
|
||||||
|
serializer = TechPassportSerializer(data=request.data)
|
||||||
|
serializer.is_valid(raise_exception=True)
|
||||||
|
|
||||||
|
data = serializer.validated_data
|
||||||
|
|
||||||
|
result = TechPassportService.get_auto_info(
|
||||||
|
autonumber=data["autonumber"],
|
||||||
|
tech_pass_number=data["tech_pass_number"],
|
||||||
|
tech_pass_series=data["tech_pass_series"],
|
||||||
|
)
|
||||||
|
|
||||||
|
response_data = result["data"]
|
||||||
|
status_code = result["status_code"]
|
||||||
|
|
||||||
|
# success bo‘lsa faqat data ichidagi data qaytariladi
|
||||||
|
if status_code == 200:
|
||||||
|
return Response(
|
||||||
|
response_data.get("data", {}),
|
||||||
|
status=status.HTTP_200_OK
|
||||||
|
)
|
||||||
|
|
||||||
|
# error bo‘lsa original response qaytariladi
|
||||||
|
return Response(
|
||||||
|
response_data,
|
||||||
|
status=status_code
|
||||||
|
)
|
||||||
@@ -0,0 +1,28 @@
|
|||||||
|
# Generated by Django 5.2.7 on 2026-04-21 09:48
|
||||||
|
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
('shared', '0003_regionmodel_districtmodel_villagemodel'),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name='districtmodel',
|
||||||
|
name='name',
|
||||||
|
field=models.CharField(max_length=255),
|
||||||
|
),
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name='regionmodel',
|
||||||
|
name='name',
|
||||||
|
field=models.CharField(max_length=255),
|
||||||
|
),
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name='villagemodel',
|
||||||
|
name='name',
|
||||||
|
field=models.CharField(max_length=255),
|
||||||
|
),
|
||||||
|
]
|
||||||
@@ -3,7 +3,7 @@ from django_core.models import AbstractBaseModel
|
|||||||
|
|
||||||
|
|
||||||
class RegionModel(AbstractBaseModel):
|
class RegionModel(AbstractBaseModel):
|
||||||
name = models.CharField(max_length=255, unique=True)
|
name = models.CharField(max_length=255)
|
||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
verbose_name = "Region"
|
verbose_name = "Region"
|
||||||
@@ -11,7 +11,7 @@ class RegionModel(AbstractBaseModel):
|
|||||||
|
|
||||||
|
|
||||||
class DistrictModel(AbstractBaseModel):
|
class DistrictModel(AbstractBaseModel):
|
||||||
name = models.CharField(max_length=255, unique=True)
|
name = models.CharField(max_length=255)
|
||||||
region = models.ForeignKey(RegionModel, on_delete=models.CASCADE, related_name='districts')
|
region = models.ForeignKey(RegionModel, on_delete=models.CASCADE, related_name='districts')
|
||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
@@ -20,7 +20,7 @@ class DistrictModel(AbstractBaseModel):
|
|||||||
|
|
||||||
|
|
||||||
class VillageModel(AbstractBaseModel):
|
class VillageModel(AbstractBaseModel):
|
||||||
name = models.CharField(max_length=255, unique=True)
|
name = models.CharField(max_length=255)
|
||||||
district = models.ForeignKey(DistrictModel, on_delete=models.CASCADE, related_name='villages')
|
district = models.ForeignKey(DistrictModel, on_delete=models.CASCADE, related_name='villages')
|
||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
|
|||||||
@@ -1,10 +1,28 @@
|
|||||||
from rest_framework import generics
|
from rest_framework import generics
|
||||||
from rest_framework.permissions import IsAuthenticated
|
from rest_framework.permissions import IsAuthenticated
|
||||||
|
|
||||||
|
from drf_spectacular.utils import extend_schema, OpenApiParameter
|
||||||
|
from drf_spectacular.types import OpenApiTypes
|
||||||
|
|
||||||
from core.apps.shared.serializers.region.district import DistrictSerializer, VillageSerializer, RegionSerializer
|
from core.apps.shared.serializers.region.district import DistrictSerializer, VillageSerializer, RegionSerializer
|
||||||
from core.apps.shared.models import RegionModel, VillageModel, DistrictModel
|
from core.apps.shared.models import RegionModel, VillageModel, DistrictModel
|
||||||
|
|
||||||
|
@extend_schema(
|
||||||
|
parameters=[
|
||||||
|
OpenApiParameter(
|
||||||
|
name="region",
|
||||||
|
type=OpenApiTypes.INT,
|
||||||
|
location=OpenApiParameter.QUERY,
|
||||||
|
description="Filter by region ID"
|
||||||
|
),
|
||||||
|
OpenApiParameter(
|
||||||
|
name="name",
|
||||||
|
type=OpenApiTypes.STR,
|
||||||
|
location=OpenApiParameter.QUERY,
|
||||||
|
description="Filter by district name"
|
||||||
|
),
|
||||||
|
]
|
||||||
|
)
|
||||||
class DistrictListCreateView(generics.ListCreateAPIView):
|
class DistrictListCreateView(generics.ListCreateAPIView):
|
||||||
permission_classes = [IsAuthenticated]
|
permission_classes = [IsAuthenticated]
|
||||||
serializer_class = DistrictSerializer
|
serializer_class = DistrictSerializer
|
||||||
@@ -19,7 +37,22 @@ class DistrictListCreateView(generics.ListCreateAPIView):
|
|||||||
return self.queryset.filter(region=region)
|
return self.queryset.filter(region=region)
|
||||||
return super().get_queryset()
|
return super().get_queryset()
|
||||||
|
|
||||||
|
@extend_schema(
|
||||||
|
parameters=[
|
||||||
|
OpenApiParameter(
|
||||||
|
name="district",
|
||||||
|
type=OpenApiTypes.INT,
|
||||||
|
location=OpenApiParameter.QUERY,
|
||||||
|
description="Filter by district ID"
|
||||||
|
),
|
||||||
|
OpenApiParameter(
|
||||||
|
name="name",
|
||||||
|
type=OpenApiTypes.STR,
|
||||||
|
location=OpenApiParameter.QUERY,
|
||||||
|
description="Filter by village name"
|
||||||
|
),
|
||||||
|
]
|
||||||
|
)
|
||||||
class VillageListCreateView(generics.ListCreateAPIView):
|
class VillageListCreateView(generics.ListCreateAPIView):
|
||||||
permission_classes = [IsAuthenticated]
|
permission_classes = [IsAuthenticated]
|
||||||
serializer_class = VillageSerializer
|
serializer_class = VillageSerializer
|
||||||
|
|||||||
@@ -1,3 +1,5 @@
|
|||||||
from .otp import * # noqa
|
from .otp import * # noqa
|
||||||
from .sms import * # noqa
|
from .sms import * # noqa
|
||||||
from .user import * # noqa
|
from .user import * # noqa
|
||||||
|
from .didox import * # noqa
|
||||||
|
from .tech_passport import * # noqa
|
||||||
27
core/services/didox.py
Normal file
27
core/services/didox.py
Normal file
@@ -0,0 +1,27 @@
|
|||||||
|
import requests
|
||||||
|
from django.conf import settings
|
||||||
|
import logging
|
||||||
|
|
||||||
|
|
||||||
|
logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
|
||||||
|
class DidoxService:
|
||||||
|
BASE_URL = "https://testapi3.didox.uz/v1"
|
||||||
|
|
||||||
|
@classmethod
|
||||||
|
def get_company_info(cls, tin: int) -> dict:
|
||||||
|
url = f"{cls.BASE_URL}/utils/info/{tin}"
|
||||||
|
|
||||||
|
headers = {"Partner-Authorization": settings.DIDOX_PARTNER_TOKEN}
|
||||||
|
|
||||||
|
try:
|
||||||
|
response = requests.get(url=url, headers=headers, timeout=15,verify=False)
|
||||||
|
|
||||||
|
response.raise_for_status()
|
||||||
|
|
||||||
|
return response.json()
|
||||||
|
|
||||||
|
except requests.RequestException as e:
|
||||||
|
logger.exception(f"Didox API error: {str(e)}")
|
||||||
|
return {}
|
||||||
71
core/services/tech_passport.py
Normal file
71
core/services/tech_passport.py
Normal file
@@ -0,0 +1,71 @@
|
|||||||
|
import requests
|
||||||
|
import logging
|
||||||
|
|
||||||
|
logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
|
||||||
|
class TechPassportService:
|
||||||
|
BASE_URL = "https://api-test.gross.uz/api/v1/osago/check-tech-data"
|
||||||
|
|
||||||
|
@classmethod
|
||||||
|
def get_auto_info(
|
||||||
|
cls,
|
||||||
|
autonumber: str,
|
||||||
|
tech_pass_number: str,
|
||||||
|
tech_pass_series: str
|
||||||
|
):
|
||||||
|
payload = {
|
||||||
|
"tech_data": {
|
||||||
|
"autonumber": autonumber,
|
||||||
|
"tech_pass_number": tech_pass_number,
|
||||||
|
"tech_pass_series": tech_pass_series,
|
||||||
|
},
|
||||||
|
"payload": {
|
||||||
|
"promo": "",
|
||||||
|
"autotype": 1,
|
||||||
|
"citizen": 1,
|
||||||
|
"number": 1,
|
||||||
|
"period": 1,
|
||||||
|
"region": 1,
|
||||||
|
"coeff": 1
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
headers = {
|
||||||
|
"Content-Type": "application/json"
|
||||||
|
}
|
||||||
|
|
||||||
|
try:
|
||||||
|
response = requests.post(
|
||||||
|
cls.BASE_URL,
|
||||||
|
json=payload,
|
||||||
|
headers=headers,
|
||||||
|
timeout=30,
|
||||||
|
verify=False
|
||||||
|
)
|
||||||
|
|
||||||
|
logger.info(
|
||||||
|
f"Tech passport response status: {response.status_code}"
|
||||||
|
)
|
||||||
|
|
||||||
|
try:
|
||||||
|
response_data = response.json()
|
||||||
|
except ValueError:
|
||||||
|
response_data = {
|
||||||
|
"detail": "Invalid response from external service"
|
||||||
|
}
|
||||||
|
|
||||||
|
return {
|
||||||
|
"status_code": response.status_code,
|
||||||
|
"data": response_data
|
||||||
|
}
|
||||||
|
|
||||||
|
except requests.exceptions.RequestException as e:
|
||||||
|
logger.error(str(e))
|
||||||
|
|
||||||
|
return {
|
||||||
|
"status_code": 500,
|
||||||
|
"data": {
|
||||||
|
"detail": str(e)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -84,7 +84,7 @@ services:
|
|||||||
max-file: "5"
|
max-file: "5"
|
||||||
|
|
||||||
web:
|
web:
|
||||||
image: husanjon/sifatbaho:90
|
image: husanjon/sifatbaho:107
|
||||||
env_file:
|
env_file:
|
||||||
- .env
|
- .env
|
||||||
environment:
|
environment:
|
||||||
@@ -129,7 +129,7 @@ services:
|
|||||||
max-file: "5"
|
max-file: "5"
|
||||||
|
|
||||||
celery:
|
celery:
|
||||||
image: husanjon/sifatbaho:90
|
image: husanjon/sifatbaho:107
|
||||||
env_file:
|
env_file:
|
||||||
- .env
|
- .env
|
||||||
environment:
|
environment:
|
||||||
|
|||||||
Reference in New Issue
Block a user