41 Commits

Author SHA1 Message Date
github-actions[bot]
64da9f20d3 🔄 Update image to 158 [CI SKIP] 2026-05-05 12:10:06 +00:00
075188e85d Merge pull request 'add new fields for auto-evalution model' (#138) from behruz into main
All checks were successful
Deploy to Production / build-and-deploy (push) Successful in 2m54s
Reviewed-on: #138
2026-05-05 12:07:47 +00:00
xoliqberdiyev
9a730fa0a3 add new fields for auto-evalution model 2026-05-05 17:07:28 +05:00
github-actions[bot]
91bdeb4b67 🔄 Update image to 157 [CI SKIP] 2026-05-05 11:59:57 +00:00
91073731dc Merge pull request 'change' (#137) from behruz into main
All checks were successful
Deploy to Production / build-and-deploy (push) Successful in 3m1s
Reviewed-on: #137
2026-05-05 11:57:38 +00:00
xoliqberdiyev
e665939b1b change 2026-05-05 16:57:08 +05:00
github-actions[bot]
ee877c0fc6 🔄 Update image to 156 [CI SKIP] 2026-05-05 11:56:32 +00:00
ccb4bd8176 Merge pull request 'feat: add mechnic-auto-model' (#136) from behruz into main
All checks were successful
Deploy to Production / build-and-deploy (push) Successful in 2m55s
Reviewed-on: #136
2026-05-05 11:54:11 +00:00
xoliqberdiyev
928561be51 feat: add mechnic-auto-model 2026-05-05 16:53:49 +05:00
github-actions[bot]
84f0df3f97 🔄 Update image to 155 [CI SKIP] 2026-05-05 11:38:10 +00:00
704d3b9e6b Merge pull request 'feat: add new model for comment files' (#135) from behruz into main
All checks were successful
Deploy to Production / build-and-deploy (push) Successful in 2m49s
Reviewed-on: #135
2026-05-05 11:35:53 +00:00
xoliqberdiyev
9dcce296a6 a lot of changds 2026-05-05 16:35:41 +05:00
xoliqberdiyev
4ac21100a3 feat: add new model for comment files 2026-05-05 16:32:22 +05:00
github-actions[bot]
b0d5a2f334 🔄 Update image to 154 [CI SKIP] 2026-05-05 11:26:19 +00:00
ba3d6c4e47 Merge pull request 'behruz' (#134) from behruz into main
All checks were successful
Deploy to Production / build-and-deploy (push) Successful in 5m12s
Reviewed-on: #134
2026-05-05 11:23:52 +00:00
f3834fad70 Merge pull request 'update' (#133) from shaxob into main
Some checks failed
Deploy to Production / build-and-deploy (push) Has been cancelled
Reviewed-on: #133
2026-05-05 11:23:35 +00:00
xoliqberdiyev
269817f25e write generate pdf api 2026-05-05 16:23:08 +05:00
xoliqberdiyev
8158d7146e a lot of changes 2026-05-05 14:37:37 +05:00
Shaxobff
617bed99ae update 2026-05-05 00:18:41 +05:00
github-actions[bot]
9b782fe7bd 🔄 Update image to 152 [CI SKIP] 2026-05-04 12:51:51 +00:00
135f580db2 Merge pull request 'shaxob' (#132) from shaxob into main
All checks were successful
Deploy to Production / build-and-deploy (push) Successful in 2m23s
Reviewed-on: #132
2026-05-04 12:49:58 +00:00
Shaxobff
0c622759cc update 2026-05-04 17:41:50 +05:00
github-actions[bot]
1d750b1c1c 🔄 Update image to 151 [CI SKIP] 2026-05-04 12:33:34 +00:00
2b26c52a5c Merge pull request 'behruz' (#131) from behruz into main
All checks were successful
Deploy to Production / build-and-deploy (push) Successful in 2m20s
Reviewed-on: #131
2026-05-04 12:31:44 +00:00
xoliqberdiyev
51b3535a80 write 2026-05-04 17:29:20 +05:00
Shaxobff
9028e2f102 Merge branch 'main' of https://gitea.felixits.uz/sifatbaho/backend-v1 into shaxob 2026-05-04 16:17:12 +05:00
Shaxobff
0c9c726756 add generation_pdf pdf , fix 500 error , install reportlab 2026-05-04 16:15:12 +05:00
xoliqberdiyev
c88ea1aa77 Merge branch 'main' of https://gitea.felixits.uz/sifatbaho/backend-v1 into behruz 2026-05-04 14:47:05 +05:00
github-actions[bot]
581021cbb7 🔄 Update image to 150 [CI SKIP] 2026-05-04 05:38:53 +00:00
62f65385e1 fix: DB_HOST=postgres (stack.yaml service nomi bilan mos)
All checks were successful
Deploy to Production / build-and-deploy (push) Successful in 2m13s
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-05-04 10:37:11 +05:00
github-actions[bot]
76d2fe5090 🔄 Update image to 149 [CI SKIP] 2026-05-04 05:14:11 +00:00
92d23901a1 ci cd uchun test commit
All checks were successful
Deploy to Production / build-and-deploy (push) Successful in 4m28s
2026-05-04 10:12:19 +05:00
github-actions[bot]
42987e4154 🔄 Update image to 148 [CI SKIP] 2026-05-04 04:50:59 +00:00
84b14da3f4 ci cd uchun test commit
All checks were successful
Deploy to Production / build-and-deploy (push) Successful in 2m10s
2026-05-04 09:49:08 +05:00
Shaxobff
1ff23af8bf update 2026-05-01 17:15:01 +05:00
Shaxobff
feecb580c1 update 2026-05-01 16:54:38 +05:00
xoliqberdiyev
cb53924f9b change 2026-04-30 16:33:00 +05:00
github-actions[bot]
f53125cfdc 🔄 Update image to 147 [CI SKIP] 2026-04-30 11:05:42 +00:00
65ab51e652 Merge pull request 'update' (#128) from shaxob into main
All checks were successful
Deploy to Production / build-and-deploy (push) Successful in 2m11s
Reviewed-on: #128
2026-04-30 11:03:51 +00:00
2997810fae Merge pull request 'behruz' (#129) from behruz into main
Some checks failed
Deploy to Production / build-and-deploy (push) Has been cancelled
Reviewed-on: #129
2026-04-30 11:03:44 +00:00
Shaxobff
c29546a04b update 2026-04-30 11:11:12 +05:00
59 changed files with 5414 additions and 141 deletions

View File

@@ -23,7 +23,7 @@ DB_ENGINE=django.db.backends.postgresql_psycopg2
DB_NAME=django
DB_USER=postgres
DB_PASSWORD=2309
DB_HOST=db
DB_HOST=postgres
DB_PORT=5432
# Cache

View File

@@ -151,6 +151,11 @@ jobs:
git fetch origin main
git reset --hard origin/main
if [ ! -f .env ]; then
cp .env.example .env
echo ".env yaratildi, production qiymatlarini kiriting!"
fi
export PORT=8085
docker pull ${{ secrets.DOCKER_USERNAME }}/${{ env.PROJECT_NAME }}:${{ github.run_number }}
docker stack deploy -c stack.yaml ${{ env.PROJECT_NAME }} --with-registry-auth

View File

@@ -15,6 +15,7 @@ APPS = [
"django_core",
"core.apps.accounts.apps.AccountsConfig",
'core.apps.tasks.apps.TasksConfig',
'core.apps.documents.apps.DocumentsConfig',
]
if env.bool("SILK_ENABLED", False):

View File

@@ -13,7 +13,7 @@ from config.env import env
def home(request):
return HttpResponse("OK: #3781ce29e5447f1473964c4c47fbdef2a38c6751")
return HttpResponse("OK: #075188e85d4f383f6015cc2b9c3199680f14dd8f")
urlpatterns = [
@@ -24,6 +24,7 @@ urlpatterns = [
path("api/v1/", include("core.apps.payment.urls")),
path("api/v1/", include("core.apps.chat.urls")),
path("api/v1/tasks/", include("core.apps.tasks.urls")),
path("api/v1/documents/", include("core.apps.documents.urls")),
]
urlpatterns += [
path("admin/", admin.site.urls),

View File

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

View File

@@ -87,14 +87,8 @@ 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)
@@ -106,6 +100,7 @@ class UserDetailAPIView(generics.RetrieveAPIView):
class AdminPermissionsAPIView(generics.GenericAPIView):
permission_classes = [IsAuthenticated]
queryset = User.objects.all()
def get(self, request):
if request.user.role.name != RoleChoice.ADMIN:

View File

View File

@@ -0,0 +1,5 @@
from django.apps import AppConfig
class DocumentsConfig(AppConfig):
name = "core.apps.documents"

View File

@@ -0,0 +1,7 @@
from django.urls import path
from core.apps.documents.views.contract import ValuationReportPDFView
urlpatterns = [
path('generate-contract-pdf/<int:pk>/', ValuationReportPDFView.as_view(), name='generate_contract_pdf'),
]

View File

@@ -0,0 +1,387 @@
from datetime import date
from decimal import Decimal
from django.shortcuts import get_object_or_404
from django.template.loader import render_to_string
from django.http import HttpResponse
from rest_framework.views import APIView
from rest_framework.response import Response
from rest_framework import status
from weasyprint import HTML
from core.apps.evaluation.models import AutoEvaluationModel
UZ_MONTHS = {
1: "yanvar", 2: "fevral", 3: "mart", 4: "aprel",
5: "may", 6: "iyun", 7: "iyul", 8: "avgust",
9: "sentabr", 10: "oktabr", 11: "noyabr", 12: "dekabr",
}
UZ_ONES = [
"", "bir", "ikki", "uch", "to'rt", "besh",
"olti", "yetti", "sakkiz", "to'qqiz",
]
UZ_TENS = [
"", "o'n", "yigirma", "o'ttiz", "qirq", "ellik",
"oltmish", "yetmish", "sakson", "to'qson",
]
def _format_currency(value):
if value is None:
return "0"
try:
int_val = int(Decimal(value))
except (ValueError, TypeError):
return "0"
return f"{int_val:,}".replace(",", " ")
def _format_date(value):
if not value:
return ""
return value.strftime("%d.%m.%Y")
def _three_digit_words(num):
if num == 0:
return ""
words = []
hundreds = num // 100
rest = num % 100
if hundreds:
if hundreds == 1:
words.append("bir yuz")
else:
words.append(f"{UZ_ONES[hundreds]} yuz")
tens = rest // 10
ones = rest % 10
if tens:
words.append(UZ_TENS[tens])
if ones:
words.append(UZ_ONES[ones])
return " ".join(words)
def _number_to_uzbek_words(value):
if value is None:
return ""
try:
num = int(Decimal(value))
except (ValueError, TypeError):
return ""
if num == 0:
return "nol"
parts = []
billions = num // 1_000_000_000
millions = (num % 1_000_000_000) // 1_000_000
thousands = (num % 1_000_000) // 1_000
rest = num % 1_000
if billions:
parts.append(f"{_three_digit_words(billions)} milliard")
if millions:
parts.append(f"{_three_digit_words(millions)} million")
if thousands:
parts.append(f"{_three_digit_words(thousands)} ming")
if rest:
parts.append(_three_digit_words(rest))
text = " ".join(parts).strip()
return text[0].upper() + text[1:] if text else ""
class ValuationReportPDFView(APIView):
"""
Baholash hisobotini PDF formatida yuklab olish uchun API.
GET /api/documents/generate-contract-pdf/<pk>/
pk — AutoEvaluationModel id si.
"""
def get(self, request, pk, *args, **kwargs):
return self._generate_pdf(request, pk)
def post(self, request, pk, *args, **kwargs):
return self._generate_pdf(request, pk)
def _generate_pdf(self, request, pk):
auto_evaluation = get_object_or_404(
AutoEvaluationModel.objects.select_related(
"vehicle",
"vehicle__brand",
"vehicle__model",
"vehicle__color",
"vehicle__fuel_type",
"vehicle__body_type",
"valuation",
"valuation__customer",
"valuation__property_owner",
),
pk=pk,
)
context = self._build_context(auto_evaluation)
html_string = render_to_string("documents/contract.html", context)
base_url = request.build_absolute_uri("/")
try:
pdf_file = HTML(string=html_string, base_url=base_url).write_pdf()
except Exception as e:
return Response(
{"error": f"PDF yaratishda xatolik: {str(e)}"},
status=status.HTTP_500_INTERNAL_SERVER_ERROR,
)
report_number = context["report"]["number"]
filename = f"baholash_hisoboti_{report_number}.pdf"
response = HttpResponse(pdf_file, content_type="application/pdf")
response["Content-Disposition"] = f'attachment; filename="{filename}"'
response["Content-Length"] = len(pdf_file)
return response
def _build_context(self, auto):
vehicle = auto.vehicle
valuation = auto.valuation
customer = valuation.customer if valuation else None
owner = valuation.property_owner if valuation and valuation.property_owner else customer
report = getattr(valuation, "report", None) if valuation else None
report_date = (
auto.rate_report_date
or auto.contract_date
or (report.created_at.date() if report else None)
or date.today()
)
valuation_date = auto.rate_date or report_date
inspection_date = auto.object_inspection_date or report_date
report_number = (
(report.report_number if report else None)
or auto.registration_number
or (valuation.conclusion_number if valuation else None)
or f"{auto.pk}/{report_date.year}"
)
final_value = None
if report and report.final_value is not None:
final_value = report.final_value
elif valuation and valuation.final_price is not None:
final_value = valuation.final_price
elif valuation and valuation.estimated_price is not None:
final_value = valuation.estimated_price
market_value_formatted = (
f"{_format_currency(final_value)} so'm" if final_value is not None else "0 so'm"
)
market_value_words = (
f"{_number_to_uzbek_words(final_value)} so'm"
if final_value is not None
else ""
)
cost_final = final_value
comparative_final = final_value
brand_name = ""
model_name = ""
if vehicle:
brand_name = vehicle.brand.name if vehicle.brand else ""
model_name = vehicle.model.name if vehicle.model else ""
if not brand_name:
brand_name = auto.car_brand or ""
if not model_name:
model_name = auto.car_model or ""
full_brand = f"{brand_name} {model_name}".strip()
plate_number = (vehicle.license_plate if vehicle else None) or auto.car_number or ""
manufacture_year = ""
if vehicle and vehicle.manufacture_year:
manufacture_year = str(vehicle.manufacture_year)
elif auto.manufacture_year:
manufacture_year = str(auto.manufacture_year)
production_date = f"{manufacture_year}-yil" if manufacture_year else ""
engine_number = (vehicle.engine_number if vehicle else None) or auto.car_dvigatel_number or ""
body_number = vehicle.vin_number if vehicle and vehicle.vin_number else ""
color_value = ""
if vehicle and vehicle.color:
color_value = vehicle.color.name
elif auto.car_color:
color_value = auto.car_color
fuel_type_value = ""
if vehicle and vehicle.fuel_type:
fuel_type_value = vehicle.fuel_type.name
tech_passport_value = ""
if vehicle and (vehicle.tech_passport_series or vehicle.tech_passport_number):
tech_passport_value = (
f"{vehicle.tech_passport_series or ''}{vehicle.tech_passport_number or ''}"
).strip()
elif auto.tex_passport_serie_num:
tech_passport_value = auto.tex_passport_serie_num
customer_ctx = self._customer_context(customer)
owner_ctx = self._owner_context(owner)
if not owner_ctx["name"]:
owner_ctx = customer_ctx
contract_ctx = self._contract_context(auto, report_date)
director_name = customer.director_name if customer and customer.director_name else ""
ctx = {
"logo_url": "",
"report": {
"number": report_number,
"date": _format_date(report_date),
"valuation_date": _format_date(valuation_date),
"inspection_date": _format_date(inspection_date),
"year": str(report_date.year),
"market_value_formatted": market_value_formatted,
"market_value_words": market_value_words,
},
"vehicle": {
"brand": full_brand,
"plate_number": plate_number,
"production_date": production_date,
"production_year": manufacture_year,
"type": auto.get_object_type_display() if auto.object_type else "",
"engine_number": engine_number,
"body_number": body_number,
"chassis_number": body_number,
"color": color_value,
"tech_passport": tech_passport_value,
"fuel_type": fuel_type_value,
"engine_power": "",
"full_weight": "",
"empty_weight": "",
},
"customer": customer_ctx,
"owner": owner_ctx,
"contract": contract_ctx,
"company": {
"director": director_name,
},
"rates": {
"rur": "",
"usd": "",
"eur": "",
},
"inspection": {
"tires": "",
"engine": "",
"chassis": "",
"transmission": "",
"body": "",
},
"cost": {
"engine_volume": "",
"factory_price": _format_currency(cost_final),
"replacement_value": _format_currency(cost_final),
"wear_percent": "",
"final_value": _format_currency(cost_final),
"final_value_words": _number_to_uzbek_words(cost_final) + (" so'm" if cost_final else ""),
},
"comparative": {
"final_value": _format_currency(comparative_final),
"final_value_usd": "",
"final_value_words": _number_to_uzbek_words(comparative_final) + (" so'm" if comparative_final else ""),
},
"approach": {
"cost": {
"value": _format_currency(cost_final),
"weight": "30%",
"weighted": "",
},
"comparative": {
"value": _format_currency(comparative_final),
"weight": "70%",
"weighted": "",
},
"weighted_total": _format_currency(final_value),
},
"analog_1": self._empty_analog(),
"analog_2": self._empty_analog(),
"analog_3": self._empty_analog(),
}
return ctx
def _customer_context(self, customer):
empty = {
"name": "",
"address": "",
"phone": "",
"tin": "",
"account": "",
"bank": "",
"mfo": "",
}
if not customer:
return empty
if customer.customer_type == "legal":
return {
"name": customer.org_name or "",
"address": customer.org_address or "",
"phone": "",
"tin": customer.inn or "",
"account": customer.bank_account or "",
"bank": "",
"mfo": customer.mfo or "",
}
full_name = " ".join(
filter(None, [customer.last_name, customer.first_name, customer.middle_name])
)
return {
"name": full_name,
"address": customer.address or "",
"phone": "",
"tin": customer.jshshir or "",
"account": "",
"bank": "",
"mfo": "",
}
def _owner_context(self, owner):
empty = {"name": "", "address": ""}
if not owner:
return empty
type_field = getattr(owner, "owner_type", None) or getattr(owner, "customer_type", None)
if type_field == "legal":
return {
"name": owner.org_name or "",
"address": owner.org_address or "",
}
full_name = " ".join(
filter(None, [owner.last_name, owner.first_name, owner.middle_name])
)
return {
"name": full_name,
"address": owner.address or "",
}
def _contract_context(self, auto, fallback_date):
contract_date = auto.contract_date or fallback_date
return {
"number": auto.registration_number or str(auto.pk),
"day": f"{contract_date.day:02d}",
"month": UZ_MONTHS.get(contract_date.month, ""),
"year": str(contract_date.year),
}
def _empty_analog(self):
return {
"source": "",
"phone": "",
"description": "",
"year": "",
"mileage": "",
"price": "",
"adjusted_price_1": "",
"final_price": "",
"weight": "",
}

View File

@@ -55,7 +55,7 @@ class AutoEvaluationAdmin(ModelAdmin):
"fields": (
"tex_passport_serie_num",
("tex_passport_gived_date", "tex_passport_gived_location"),
("car_type", "car_wheel"),
("car_wheel",),
("car_brand", "car_model"),
("car_number", "manufacture_year"),
("car_dvigatel_number", "car_color"),

View File

@@ -6,6 +6,8 @@ class AutoObjectType(models.TextChoices):
LIGHTWEIGHT_AUTO = "lightweight_auto", _("Yengil automobil")
TRUCK_CAR = "truck_car", _("Yuk automobil")
SPECIAL_TECH = "special_tech", _("Maxsus texnika")
BUS = "bus", _("Avtobus")
MOTO = "moto", _("Mototsikl")
class AutoEvaluationStatus(models.TextChoices):

View File

@@ -1,4 +1,5 @@
from .auto import * # noqa
from .mechanic_auto import * # noqa
from .customer import * # noqa
from .document import * # noqa
from .documentcategory import * # noqa

View File

@@ -1,7 +1,11 @@
from django_filters import rest_framework as filters
from core.apps.evaluation.choices.history import EvaluationEventType
from core.apps.evaluation.models import AutoevaluationhistoryModel, QuickevaluationhistoryModel
from core.apps.evaluation.models import (
AutoevaluationhistoryModel,
MechanicAutoevaluationhistoryModel,
QuickevaluationhistoryModel,
)
class AutoevaluationhistoryFilter(filters.FilterSet):
@@ -29,6 +33,31 @@ class AutoevaluationhistoryFilter(filters.FilterSet):
]
class MechanicAutoevaluationhistoryFilter(filters.FilterSet):
mechanic_auto_evaluation = filters.NumberFilter(
field_name="mechanic_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 = MechanicAutoevaluationhistoryModel
fields = [
"mechanic_auto_evaluation",
"event_type",
"created_from",
"created_to",
]
class QuickevaluationhistoryFilter(filters.FilterSet):
quick_evaluation = filters.NumberFilter(
field_name="quick_evaluation", lookup_expr="exact"

View File

@@ -0,0 +1,37 @@
from django_filters import rest_framework as filters
from core.apps.evaluation.models import MechanicAutoEvaluationModel
class MechanicAutoevaluationFilter(filters.FilterSet):
status = filters.CharFilter(method="filter_status")
object_type = filters.CharFilter(field_name="object_type", lookup_expr="exact")
object_owner_type = filters.NumberFilter(field_name="object_owner_type", lookup_expr="exact")
rate_type = filters.NumberFilter(field_name="rate_type", lookup_expr="exact")
value_determined = filters.NumberFilter(field_name="value_determined", lookup_expr="exact")
client = filters.NumberFilter(field_name="valuation__customer", lookup_expr="exact")
created_from = filters.DateFilter(field_name="created_at", lookup_expr="gte")
created_to = filters.DateFilter(field_name="created_at", lookup_expr="lte")
rate_date_from = filters.DateFilter(field_name="rate_date", lookup_expr="gte")
rate_date_to = filters.DateFilter(field_name="rate_date", lookup_expr="lte")
def filter_status(self, queryset, name, value):
if value:
statuses = [s.strip() for s in value.split(",") if s.strip()]
return queryset.filter(status__in=statuses)
return queryset
class Meta:
model = MechanicAutoEvaluationModel
fields = [
"status",
"object_type",
"object_owner_type",
"rate_type",
"value_determined",
"client",
"created_from",
"created_to",
"rate_date_from",
"rate_date_to",
]

View File

@@ -0,0 +1,31 @@
# Generated by Django 5.2.7 on 2026-05-01 06:45
import django.db.models.deletion
from django.conf import settings
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('evaluation', '0038_evaluationrequestmodel_distance_covered_and_more'),
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
]
operations = [
migrations.CreateModel(
name='Bonus',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('updated_at', models.DateTimeField(auto_now=True)),
('bonus_type', models.CharField(choices=[('lightweight_auto', 'Yengil automobil'), ('truck_car', 'Yuk automobil'), ('special_tech', 'Maxsus texnika')], max_length=50)),
('percentage', models.FloatField()),
('created_at', models.DateTimeField(auto_now_add=True)),
('price', models.FloatField()),
('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='bonuses', to=settings.AUTH_USER_MODEL)),
],
options={
'abstract': False,
},
),
]

View File

@@ -0,0 +1,59 @@
# Generated by Django 5.2.7 on 2026-05-01 11:43
import django.db.models.deletion
from django.conf import settings
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('evaluation', '0039_bonus'),
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
]
operations = [
migrations.CreateModel(
name='BaseValueBonus',
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)),
('base_price', models.DecimalField(decimal_places=2, max_digits=12)),
],
options={
'abstract': False,
},
),
migrations.CreateModel(
name='BonusType',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('created_at', models.DateTimeField(auto_now_add=True)),
('updated_at', models.DateTimeField(auto_now=True)),
('name', models.CharField(max_length=255)),
('category', models.CharField(choices=[('auto_transport', 'Avtotransport'), ('real estate', "ko'chmas mulk"), ('equipment', 'uskuna va jihozlar')], max_length=50)),
('percentage', models.PositiveIntegerField()),
],
options={
'abstract': False,
},
),
migrations.CreateModel(
name='EmployeeBonus',
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)),
('percentage', models.PositiveIntegerField()),
('bonus_type', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='evaluation.bonustype')),
('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='bonuses', to=settings.AUTH_USER_MODEL)),
],
options={
'unique_together': {('user', 'bonus_type')},
},
),
migrations.DeleteModel(
name='Bonus',
),
]

View File

@@ -0,0 +1,17 @@
# Generated by Django 5.2.7 on 2026-05-01 12:06
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('evaluation', '0040_basevaluebonus_bonustype_employeebonus_delete_bonus'),
]
operations = [
migrations.RenameModel(
old_name='BonusType',
new_name='BonusCategory',
),
]

View File

@@ -0,0 +1,18 @@
# Generated by Django 5.2.7 on 2026-05-04 12:40
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('evaluation', '0041_rename_bonustype_bonuscategory'),
]
operations = [
migrations.AlterField(
model_name='bonuscategory',
name='category',
field=models.CharField(choices=[('lightweight_auto', 'Yengil automobil'), ('truck_car', 'Yuk automobil'), ('special_tech', 'Maxsus texnika')], max_length=50),
),
]

View File

@@ -0,0 +1,268 @@
# Generated by Django 5.2.7 on 2026-05-05 11:52
import django.db.models.deletion
from django.conf import settings
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
("evaluation", "0042_alter_bonuscategory_category"),
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
]
operations = [
migrations.CreateModel(
name="MechanicAutoEvaluationModel",
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)),
(
"tex_passport_file",
models.FileField(
blank=True,
null=True,
upload_to="mechanic_evaluation/tech_passports/%Y/%m/",
verbose_name="tech passport file",
),
),
(
"registration_number",
models.CharField(blank=True, max_length=50, null=True, verbose_name="registration number"),
),
("contract_date", models.DateField(blank=True, null=True, verbose_name="contract date")),
(
"object_inspection_date",
models.DateField(blank=True, null=True, verbose_name="object inspection date"),
),
("rate_date", models.DateField(blank=True, null=True, verbose_name="rate date")),
("rate_report_date", models.DateField(blank=True, null=True, verbose_name="rate report date")),
(
"object_type",
models.CharField(
blank=True,
choices=[
("lightweight_auto", "Yengil automobil"),
("truck_car", "Yuk automobil"),
("special_tech", "Maxsus texnika"),
],
max_length=50,
null=True,
verbose_name="object type",
),
),
(
"object_owner_type",
models.IntegerField(
blank=True,
choices=[(1, "Jismoniy shaxs"), (2, "Yuridik shaxs")],
null=True,
verbose_name="object owner type",
),
),
(
"object_owner_individual_person_f_name",
models.CharField(blank=True, max_length=100, null=True, verbose_name="owner first name"),
),
(
"object_owner_individual_person_l_name",
models.CharField(blank=True, max_length=100, null=True, verbose_name="owner last name"),
),
(
"object_owner_individual_person_p_name",
models.CharField(blank=True, max_length=100, null=True, verbose_name="owner patronymic"),
),
(
"object_owner_individual_person_passport_num",
models.CharField(blank=True, max_length=20, null=True, verbose_name="owner passport number"),
),
(
"object_owner_legal_entity",
models.CharField(blank=True, max_length=255, null=True, verbose_name="legal entity name"),
),
(
"object_owner_legal_inn",
models.CharField(blank=True, max_length=20, null=True, verbose_name="legal entity INN"),
),
(
"tex_passport_serie_num",
models.CharField(
blank=True, max_length=20, null=True, verbose_name="tech passport series and number"
),
),
(
"tex_passport_gived_date",
models.DateField(blank=True, null=True, verbose_name="tech passport given date"),
),
(
"tex_passport_gived_location",
models.CharField(
blank=True, max_length=255, null=True, verbose_name="tech passport given location"
),
),
(
"car_type",
models.IntegerField(
blank=True, choices=[(1, "Xetchbek"), (2, "Universal")], null=True, verbose_name="car type"
),
),
(
"car_wheel",
models.IntegerField(blank=True, choices=[(1, "4x4")], null=True, verbose_name="car wheel"),
),
("car_brand", models.CharField(blank=True, max_length=100, null=True, verbose_name="car brand")),
("car_model", models.CharField(blank=True, max_length=100, null=True, verbose_name="car model")),
("car_number", models.CharField(blank=True, max_length=20, null=True, verbose_name="car number")),
(
"manufacture_year",
models.CharField(blank=True, max_length=10, null=True, verbose_name="manufacture year"),
),
(
"car_dvigatel_number",
models.CharField(blank=True, max_length=50, null=True, verbose_name="engine number"),
),
("car_color", models.CharField(blank=True, max_length=50, null=True, verbose_name="car color")),
("rating_goal", models.CharField(blank=True, max_length=50, null=True, verbose_name="rating goal")),
(
"status",
models.CharField(
choices=[
("yaratildi", "Yaratildi"),
("baxolovchi_biriktirildi", "Baholovchi biriktirildi"),
("baxolandi", "Baholandi"),
("rad_etildi", "Rad etildi"),
("tasdiqlandi", "Tasdiqlandi"),
],
default="yaratildi",
max_length=50,
verbose_name="status",
),
),
("is_archived", models.BooleanField(default=False, verbose_name="is archived")),
(
"appraisers",
models.ManyToManyField(
blank=True,
related_name="mechanic_auto_evaluation_appraisers",
to=settings.AUTH_USER_MODEL,
verbose_name="appraisers",
),
),
(
"evaluation_request",
models.ForeignKey(
blank=True,
null=True,
on_delete=django.db.models.deletion.SET_NULL,
related_name="mechanic_auto_evaluations_request",
to="evaluation.evaluationrequestmodel",
),
),
(
"rate_type",
models.ForeignKey(
blank=True,
null=True,
on_delete=django.db.models.deletion.SET_NULL,
related_name="evaluation_mechanic_auto_rate_type",
to="evaluation.referenceitemmodel",
verbose_name="rate type",
),
),
(
"user",
models.ForeignKey(
blank=True,
null=True,
on_delete=django.db.models.deletion.SET_NULL,
related_name="mechanic_auto_evaluations_user",
to=settings.AUTH_USER_MODEL,
),
),
(
"valuation",
models.OneToOneField(
blank=True,
null=True,
on_delete=django.db.models.deletion.CASCADE,
related_name="mechanic_auto_detail",
to="evaluation.valuationmodel",
),
),
(
"value_determined",
models.ForeignKey(
blank=True,
null=True,
on_delete=django.db.models.deletion.SET_NULL,
related_name="evaluation_mechanic_auto_value_determined",
to="evaluation.referenceitemmodel",
verbose_name="value determined",
),
),
(
"vehicle",
models.OneToOneField(
blank=True,
null=True,
on_delete=django.db.models.deletion.CASCADE,
related_name="mechanic_evaluation",
to="evaluation.vehiclemodel",
),
),
],
options={
"verbose_name": "Mechanic Auto Evaluation",
"verbose_name_plural": "Mechanic Auto Evaluations",
"db_table": "MechanicAutoEvaluation",
},
),
migrations.CreateModel(
name="MechanicAutoevaluationhistoryModel",
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")),
(
"mechanic_auto_evaluation",
models.ForeignKey(
on_delete=django.db.models.deletion.CASCADE,
related_name="history",
to="evaluation.mechanicautoevaluationmodel",
verbose_name="mechanic auto evaluation",
),
),
],
options={
"verbose_name": "Mechanic Auto Evaluation History",
"verbose_name_plural": "Mechanic Auto Evaluation Histories",
"db_table": "MechanicAutoEvaluationHistory",
"ordering": ["created_at"],
"indexes": [
models.Index(
fields=["mechanic_auto_evaluation_id", "created_at"], name="mech_auto_hist_eval_date_idx"
),
models.Index(fields=["event_type"], name="mech_auto_hist_event_type_idx"),
],
},
),
]

View File

@@ -0,0 +1,167 @@
# Generated by Django 5.2.7 on 2026-05-05 12:06
import django.db.models.deletion
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
("evaluation", "0043_mechanicautoevaluationmodel_and_more"),
]
operations = [
migrations.RemoveField(
model_name="autoevaluationmodel",
name="car_type",
),
migrations.RemoveField(
model_name="autoevaluationmodel",
name="tex_passport_file",
),
migrations.AddField(
model_name="autoevaluationmodel",
name="assessment_task_type",
field=models.ForeignKey(
blank=True,
null=True,
on_delete=django.db.models.deletion.SET_NULL,
related_name="evaluation_auto_assessment_task_type",
to="evaluation.referenceitemmodel",
verbose_name="assessment task type",
),
),
migrations.AddField(
model_name="autoevaluationmodel",
name="body_type",
field=models.ForeignKey(
blank=True,
null=True,
on_delete=django.db.models.deletion.SET_NULL,
related_name="evaluation_auto_body_type",
to="evaluation.referenceitemmodel",
verbose_name="body type",
),
),
migrations.AddField(
model_name="autoevaluationmodel",
name="car_position",
field=models.ForeignKey(
blank=True,
null=True,
on_delete=django.db.models.deletion.SET_NULL,
related_name="evaluation_auto_car_position",
to="evaluation.referenceitemmodel",
verbose_name="car position",
),
),
migrations.AddField(
model_name="autoevaluationmodel",
name="distance_covered",
field=models.PositiveIntegerField(blank=True, null=True, verbose_name="distance covered"),
),
migrations.AddField(
model_name="autoevaluationmodel",
name="fuel_type",
field=models.ForeignKey(
blank=True,
null=True,
on_delete=django.db.models.deletion.SET_NULL,
related_name="evaluation_auto_fuel_type",
to="evaluation.referenceitemmodel",
verbose_name="fuel type",
),
),
migrations.AddField(
model_name="autoevaluationmodel",
name="object_owner_residence",
field=models.CharField(blank=True, max_length=255, null=True, verbose_name="object owner residence"),
),
migrations.AddField(
model_name="autoevaluationmodel",
name="state_car",
field=models.ForeignKey(
blank=True,
null=True,
on_delete=django.db.models.deletion.SET_NULL,
related_name="evaluation_auto_state_car",
to="evaluation.referenceitemmodel",
verbose_name="state car",
),
),
migrations.AlterField(
model_name="autoevaluationmodel",
name="object_type",
field=models.CharField(
blank=True,
choices=[
("lightweight_auto", "Yengil automobil"),
("truck_car", "Yuk automobil"),
("special_tech", "Maxsus texnika"),
("bus", "Avtobus"),
("moto", "Mototsikl"),
],
max_length=50,
null=True,
verbose_name="object type",
),
),
migrations.AlterField(
model_name="bonuscategory",
name="category",
field=models.CharField(
choices=[
("lightweight_auto", "Yengil automobil"),
("truck_car", "Yuk automobil"),
("special_tech", "Maxsus texnika"),
("bus", "Avtobus"),
("moto", "Mototsikl"),
],
max_length=50,
),
),
migrations.AlterField(
model_name="mechanicautoevaluationmodel",
name="object_type",
field=models.CharField(
blank=True,
choices=[
("lightweight_auto", "Yengil automobil"),
("truck_car", "Yuk automobil"),
("special_tech", "Maxsus texnika"),
("bus", "Avtobus"),
("moto", "Mototsikl"),
],
max_length=50,
null=True,
verbose_name="object type",
),
),
migrations.CreateModel(
name="AutoEvaluationTexPassportFile",
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)),
(
"file",
models.FileField(
upload_to="auto_evaluation/tech_passports/%Y/%m/", verbose_name="tech passport file"
),
),
(
"auto_evaluation",
models.ForeignKey(
on_delete=django.db.models.deletion.CASCADE,
related_name="tex_passport_files",
to="evaluation.autoevaluationmodel",
),
),
],
options={
"verbose_name": "Auto Evaluation Tex Passport File",
"verbose_name_plural": "Auto Evaluation Tex Passport Files",
"db_table": "AutoEvaluationTexPassportFile",
},
),
]

View File

@@ -1,4 +1,5 @@
from .auto import * # noqa
from .mechanic_auto import * # noqa
from .customer import * # noqa
from .document import * # noqa
from .documentcategory import * # noqa

View File

@@ -4,19 +4,15 @@ from django_core.models import AbstractBaseModel
from model_bakery import baker
from core.apps.evaluation.choices.auto import (
AutoCarType,
AutoCarWheel,
AutoEvaluationStatus,
AutoObjectType,
# FormOwnership,
LocationConvenience,
LocationHighways,
ObjectOwnerType,
# PropertyRights,
# RateType,
# ValueDetermined,
)
from .valuation import ValuationModel
from .vehicle import VehicleModel
@@ -57,12 +53,57 @@ class AutoEvaluationModel(AbstractBaseModel):
null=True,
)
tex_passport_file = models.FileField(
verbose_name=_("tech passport file"),
upload_to="quick_evaluation/tech_passports/%Y/%m/",
distance_covered = models.PositiveIntegerField(
verbose_name=_("distance covered"),
blank=True,
null=True,
)
object_owner_residence = models.CharField(
verbose_name=_("object owner residence"),
max_length=255,
blank=True,
null=True,
)
car_position = models.ForeignKey(
'evaluation.ReferenceitemModel',
verbose_name=_("car position"),
blank=True,
null=True,
on_delete=models.SET_NULL,
related_name='evaluation_auto_car_position',
)
body_type = models.ForeignKey(
'evaluation.ReferenceitemModel',
verbose_name=_("body type"),
blank=True,
null=True,
on_delete=models.SET_NULL,
related_name='evaluation_auto_body_type',
)
fuel_type = models.ForeignKey(
'evaluation.ReferenceitemModel',
verbose_name=_("fuel type"),
blank=True,
null=True,
on_delete=models.SET_NULL,
related_name='evaluation_auto_fuel_type',
)
state_car = models.ForeignKey(
'evaluation.ReferenceitemModel',
verbose_name=_("state car"),
blank=True,
null=True,
on_delete=models.SET_NULL,
related_name='evaluation_auto_state_car',
)
assessment_task_type = models.ForeignKey(
'evaluation.ReferenceitemModel',
verbose_name=_("assessment task type"),
blank=True,
null=True,
on_delete=models.SET_NULL,
related_name='evaluation_auto_assessment_task_type',
)
# ── Step 1 — Umumiy ma'lumotlar ──────────────────────────────────
registration_number = models.CharField(
@@ -177,12 +218,6 @@ class AutoEvaluationModel(AbstractBaseModel):
blank=True,
null=True,
)
car_type = models.IntegerField(
verbose_name=_("car type"),
choices=AutoCarType.choices,
blank=True,
null=True,
)
car_wheel = models.IntegerField(
verbose_name=_("car wheel"),
choices=AutoCarWheel.choices,
@@ -244,8 +279,6 @@ class AutoEvaluationModel(AbstractBaseModel):
default=False,
)
def __str__(self):
return f"Auto Evaluation {self.registration_number or self.pk}"
@@ -257,3 +290,27 @@ class AutoEvaluationModel(AbstractBaseModel):
db_table = "AutoEvaluation"
verbose_name = _("Auto Evaluation")
verbose_name_plural = _("Auto Evaluations")
class AutoEvaluationTexPassportFile(AbstractBaseModel):
auto_evaluation = models.ForeignKey(
AutoEvaluationModel,
on_delete=models.CASCADE,
related_name="tex_passport_files",
)
file = models.FileField(
verbose_name=_("tech passport file"),
upload_to="auto_evaluation/tech_passports/%Y/%m/",
)
def __str__(self):
return f"Tex passport file for AutoEvaluation #{self.auto_evaluation_id}"
@classmethod
def _baker(cls):
return baker.make(cls)
class Meta:
db_table = "AutoEvaluationTexPassportFile"
verbose_name = _("Auto Evaluation Tex Passport File")
verbose_name_plural = _("Auto Evaluation Tex Passport Files")

View File

@@ -0,0 +1,33 @@
from django.db import models
from django.db.models.fields import PositiveIntegerField
from django_core.models import AbstractBaseModel
from core.apps.evaluation.choices.auto import AutoObjectType
class BaseValueBonus(AbstractBaseModel):
base_price = models.DecimalField(max_digits=12, decimal_places=2)
def __str__(self):
return f"Base: {self.base_price}"
class BonusCategory(AbstractBaseModel):
name = models.CharField(max_length=255)
category = models.CharField(
max_length=50,
choices=AutoObjectType.choices
)
percentage = PositiveIntegerField()
def __str__(self):
return self.name
class EmployeeBonus(AbstractBaseModel):
user = models.ForeignKey("accounts.User", on_delete=models.CASCADE, related_name="bonuses", )
bonus_type = models.ForeignKey(BonusCategory, on_delete=models.CASCADE)
percentage = models.PositiveIntegerField()
class Meta:
unique_together = ("user", "bonus_type")

View File

@@ -69,6 +69,66 @@ class AutoevaluationhistoryModel(models.Model):
]
class MechanicAutoevaluationhistoryModel(models.Model):
"""MechanicAutoEvaluation bo'yicha barcha harakatlar logi — faqat o'qiladi, signallar tomonidan yoziladi."""
mechanic_auto_evaluation = models.ForeignKey(
"evaluation.MechanicAutoEvaluationModel",
on_delete=models.CASCADE,
related_name="history",
verbose_name=_("mechanic auto evaluation"),
)
event_type = models.CharField(
verbose_name=_("event type"),
max_length=50,
choices=EvaluationEventType.choices,
)
actor_id = models.BigIntegerField(
verbose_name=_("actor id"),
null=True,
blank=True,
)
actor_full_name = models.CharField(
verbose_name=_("actor full name"),
max_length=255,
default="Tizim",
)
actor_role = models.CharField(
verbose_name=_("actor role"),
max_length=50,
default="system",
)
meta = models.JSONField(
verbose_name=_("meta"),
default=dict,
blank=True,
)
created_at = models.DateTimeField(
verbose_name=_("created at"),
auto_now_add=True,
)
def __str__(self):
return f"{self.get_event_type_display()} — MechanicAutoEval #{self.mechanic_auto_evaluation_id}"
@classmethod
def _baker(cls):
return baker.make(cls)
class Meta:
db_table = "MechanicAutoEvaluationHistory"
verbose_name = _("Mechanic Auto Evaluation History")
verbose_name_plural = _("Mechanic Auto Evaluation Histories")
ordering = ["created_at"]
indexes = [
models.Index(fields=["mechanic_auto_evaluation_id", "created_at"], name="mech_auto_hist_eval_date_idx"),
models.Index(fields=["event_type"], name="mech_auto_hist_event_type_idx"),
]
class QuickevaluationhistoryModel(models.Model):
"""QuickEvaluation bo'yicha barcha harakatlar logi — faqat o'qiladi, signallar tomonidan yoziladi."""

View File

@@ -0,0 +1,250 @@
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.evaluation.choices.auto import (
AutoCarType,
AutoCarWheel,
AutoEvaluationStatus,
AutoObjectType,
ObjectOwnerType,
)
from .valuation import ValuationModel
from .vehicle import VehicleModel
class MechanicAutoEvaluationModel(AbstractBaseModel):
user = models.ForeignKey(
"accounts.User",
on_delete=models.SET_NULL,
related_name="mechanic_auto_evaluations_user",
null=True,
blank=True,
)
evaluation_request = models.ForeignKey(
"evaluation.EvaluationRequestModel",
on_delete=models.SET_NULL,
related_name="mechanic_auto_evaluations_request",
null=True,
blank=True,
)
valuation = models.OneToOneField(
ValuationModel,
on_delete=models.CASCADE,
related_name="mechanic_auto_detail",
null=True,
blank=True,
)
vehicle = models.OneToOneField(
VehicleModel,
on_delete=models.CASCADE,
related_name="mechanic_evaluation",
null=True,
blank=True,
)
appraisers = models.ManyToManyField(
"accounts.User",
verbose_name=_("appraisers"),
related_name="mechanic_auto_evaluation_appraisers",
blank=True,
)
tex_passport_file = models.FileField(
verbose_name=_("tech passport file"),
upload_to="mechanic_evaluation/tech_passports/%Y/%m/",
blank=True,
null=True,
)
# ── Step 1 — Umumiy ma'lumotlar ──────────────────────────────────
registration_number = models.CharField(
verbose_name=_("registration number"),
max_length=50,
blank=True,
null=True,
)
contract_date = models.DateField(
verbose_name=_("contract date"),
blank=True,
null=True,
)
object_inspection_date = models.DateField(
verbose_name=_("object inspection date"),
blank=True,
null=True,
)
rate_date = models.DateField(
verbose_name=_("rate date"),
blank=True,
null=True,
)
rate_report_date = models.DateField(
verbose_name=_("rate report date"),
blank=True,
null=True,
)
object_type = models.CharField(
verbose_name=_("object type"),
max_length=50,
choices=AutoObjectType.choices,
blank=True,
null=True,
)
# ── Step 2 — Shaxs ma'lumotlari ─────────────────────────────────
object_owner_type = models.IntegerField(
verbose_name=_("object owner type"),
choices=ObjectOwnerType.choices,
blank=True,
null=True,
)
object_owner_individual_person_f_name = models.CharField(
verbose_name=_("owner first name"),
max_length=100,
blank=True,
null=True,
)
object_owner_individual_person_l_name = models.CharField(
verbose_name=_("owner last name"),
max_length=100,
blank=True,
null=True,
)
object_owner_individual_person_p_name = models.CharField(
verbose_name=_("owner patronymic"),
max_length=100,
blank=True,
null=True,
)
object_owner_individual_person_passport_num = models.CharField(
verbose_name=_("owner passport number"),
max_length=20,
blank=True,
null=True,
)
object_owner_legal_entity = models.CharField(
verbose_name=_("legal entity name"),
max_length=255,
blank=True,
null=True,
)
object_owner_legal_inn = models.CharField(
verbose_name=_("legal entity INN"),
max_length=20,
blank=True,
null=True,
)
value_determined = models.ForeignKey(
'evaluation.ReferenceitemModel',
verbose_name=_("value determined"),
blank=True,
null=True,
on_delete=models.SET_NULL,
related_name='evaluation_mechanic_auto_value_determined'
)
rate_type = models.ForeignKey(
'evaluation.ReferenceitemModel',
verbose_name=_("rate type"),
blank=True,
null=True,
on_delete=models.SET_NULL,
related_name='evaluation_mechanic_auto_rate_type'
)
# ── Step 4 — Avtomobil ma'lumotlari ─────────────────────────────
tex_passport_serie_num = models.CharField(
verbose_name=_("tech passport series and number"),
max_length=20,
blank=True,
null=True,
)
tex_passport_gived_date = models.DateField(
verbose_name=_("tech passport given date"),
blank=True,
null=True,
)
tex_passport_gived_location = models.CharField(
verbose_name=_("tech passport given location"),
max_length=255,
blank=True,
null=True,
)
car_type = models.IntegerField(
verbose_name=_("car type"),
choices=AutoCarType.choices,
blank=True,
null=True,
)
car_wheel = models.IntegerField(
verbose_name=_("car wheel"),
choices=AutoCarWheel.choices,
blank=True,
null=True,
)
car_brand = models.CharField(
verbose_name=_("car brand"),
max_length=100,
blank=True,
null=True,
)
car_model = models.CharField(
verbose_name=_("car model"),
max_length=100,
blank=True,
null=True,
)
car_number = models.CharField(
verbose_name=_("car number"),
max_length=20,
blank=True,
null=True,
)
manufacture_year = models.CharField(
verbose_name=_("manufacture year"),
max_length=10,
blank=True,
null=True,
)
car_dvigatel_number = models.CharField(
verbose_name=_("engine number"),
max_length=50,
blank=True,
null=True,
)
car_color = models.CharField(
verbose_name=_("car color"),
max_length=50,
blank=True,
null=True,
)
# ── Natija ───────────────────────────────────────────────────────
rating_goal = models.CharField(
verbose_name=_("rating goal"),
max_length=50,
blank=True,
null=True,
)
status = models.CharField(
verbose_name=_("status"),
max_length=50,
choices=AutoEvaluationStatus.choices,
default=AutoEvaluationStatus.CREATED,
)
is_archived = models.BooleanField(
verbose_name=_("is archived"),
default=False,
)
def __str__(self):
return f"Mechanic Auto Evaluation {self.registration_number or self.pk}"
@classmethod
def _baker(cls):
return baker.make(cls)
class Meta:
db_table = "MechanicAutoEvaluation"
verbose_name = _("Mechanic Auto Evaluation")
verbose_name_plural = _("Mechanic Auto Evaluations")

View File

@@ -3,12 +3,11 @@ from django.utils.translation import gettext_lazy as _
from django_core.models import AbstractBaseModel
from model_bakery import baker
from .valuation import ValuationModel
from core.apps.evaluation.choices.movable import (
MovablePropertyCategory,
MovablePropertyCondition,
)
from .valuation import ValuationModel
class MovablePropertyEvaluationModel(AbstractBaseModel):
@@ -51,4 +50,3 @@ class MovablePropertyEvaluationModel(AbstractBaseModel):
db_table = "MovablePropertyEvaluation"
verbose_name = _("Movable Property Evaluation")
verbose_name_plural = _("Movable Property Evaluations")

View File

@@ -3,13 +3,36 @@ import re
from django.contrib.auth import get_user_model
from rest_framework import serializers
from django.db import transaction
from core.apps.evaluation.choices.request import RequestStatus
from core.apps.evaluation.models import AutoEvaluationModel, ReferenceitemModel, EvaluationrequestModel
from core.apps.evaluation.models import (
AutoEvaluationModel,
AutoEvaluationTexPassportFile,
ReferenceitemModel,
EvaluationrequestModel,
)
from core.apps.evaluation.serializers.reference import ListReferenceitemSerializer
User = get_user_model()
class AutoEvaluationTexPassportFileSerializer(serializers.ModelSerializer):
file = serializers.SerializerMethodField()
class Meta:
model = AutoEvaluationTexPassportFile
fields = ["id", "file"]
def get_file(self, obj):
request = self.context.get("request")
if not obj.file:
return None
if request:
return request.build_absolute_uri(obj.file.url)
return obj.file.url
class BaseAutoevaluationSerializer(serializers.ModelSerializer):
status_display = serializers.CharField(source="get_status_display", read_only=True)
object_type_display = serializers.CharField(source="get_object_type_display", read_only=True, default=None)
@@ -17,6 +40,12 @@ class BaseAutoevaluationSerializer(serializers.ModelSerializer):
default=None)
rate_type = ListReferenceitemSerializer(read_only=True)
value_determined = ListReferenceitemSerializer(read_only=True)
car_position = ListReferenceitemSerializer(read_only=True)
body_type = ListReferenceitemSerializer(read_only=True)
fuel_type = ListReferenceitemSerializer(read_only=True)
state_car = ListReferenceitemSerializer(read_only=True)
assessment_task_type = ListReferenceitemSerializer(read_only=True)
tex_passport_files = AutoEvaluationTexPassportFileSerializer(many=True, read_only=True)
user = serializers.SerializerMethodField(method_name="get_user", read_only=True)
class Meta:
@@ -32,7 +61,9 @@ class BaseAutoevaluationSerializer(serializers.ModelSerializer):
"object_owner_individual_person_p_name",
"object_owner_legal_entity",
"object_owner_legal_inn",
"object_owner_residence",
"tex_passport_serie_num",
"tex_passport_files",
"rating_goal",
"registration_number",
"object_type",
@@ -42,6 +73,12 @@ class BaseAutoevaluationSerializer(serializers.ModelSerializer):
"car_number",
"manufacture_year",
"car_color",
"distance_covered",
"car_position",
"body_type",
"fuel_type",
"state_car",
"assessment_task_type",
"status",
"status_display",
"created_at",
@@ -68,7 +105,6 @@ class ListAutoevaluationSerializer(BaseAutoevaluationSerializer):
class RetrieveAutoevaluationSerializer(BaseAutoevaluationSerializer):
car_type_display = serializers.CharField(source="get_car_type_display", read_only=True, default=None)
car_wheel_display = serializers.CharField(source="get_car_wheel_display", read_only=True, default=None)
class Meta(BaseAutoevaluationSerializer.Meta):
@@ -89,11 +125,8 @@ class RetrieveAutoevaluationSerializer(BaseAutoevaluationSerializer):
"object_owner_legal_inn",
# Step 4
"tex_passport_serie_num",
"tex_passport_file",
"tex_passport_gived_date",
"tex_passport_gived_location",
"car_type",
"car_type_display",
"car_wheel",
"car_wheel_display",
"car_dvigatel_number",
@@ -106,11 +139,6 @@ class RetrieveAutoevaluationSerializer(BaseAutoevaluationSerializer):
class UpdateAutoevaluationSerializer(serializers.ModelSerializer):
value_determined = serializers.PrimaryKeyRelatedField(
queryset=ReferenceitemModel.objects.all(),
required=False,
allow_null=True,
)
value_determined = serializers.PrimaryKeyRelatedField(
queryset=ReferenceitemModel.objects.all(),
required=False,
@@ -121,6 +149,36 @@ class UpdateAutoevaluationSerializer(serializers.ModelSerializer):
required=False,
allow_null=True,
)
car_position = serializers.PrimaryKeyRelatedField(
queryset=ReferenceitemModel.objects.all(),
required=False,
allow_null=True,
)
body_type = serializers.PrimaryKeyRelatedField(
queryset=ReferenceitemModel.objects.all(),
required=False,
allow_null=True,
)
fuel_type = serializers.PrimaryKeyRelatedField(
queryset=ReferenceitemModel.objects.all(),
required=False,
allow_null=True,
)
state_car = serializers.PrimaryKeyRelatedField(
queryset=ReferenceitemModel.objects.all(),
required=False,
allow_null=True,
)
assessment_task_type = serializers.PrimaryKeyRelatedField(
queryset=ReferenceitemModel.objects.all(),
required=False,
allow_null=True,
)
tex_passport_files = serializers.ListField(
child=serializers.FileField(),
required=False,
write_only=True,
)
class Meta:
model = AutoEvaluationModel
@@ -140,14 +198,15 @@ class UpdateAutoevaluationSerializer(serializers.ModelSerializer):
"object_owner_individual_person_passport_num",
"object_owner_legal_entity",
"object_owner_legal_inn",
"object_owner_residence",
"value_determined",
"rate_type",
"assessment_task_type",
# Step 4
"tex_passport_file",
"tex_passport_files",
"tex_passport_serie_num",
"tex_passport_gived_date",
"tex_passport_gived_location",
"car_type",
"car_wheel",
"car_brand",
"car_model",
@@ -155,6 +214,11 @@ class UpdateAutoevaluationSerializer(serializers.ModelSerializer):
"manufacture_year",
"car_dvigatel_number",
"car_color",
"distance_covered",
"car_position",
"body_type",
"fuel_type",
"state_car",
]
def validate_tex_passport_serie_num(self, value):
@@ -199,13 +263,23 @@ class UpdateAutoevaluationSerializer(serializers.ModelSerializer):
return attrs
def update(self, instance, validated_data):
files = validated_data.pop("tex_passport_files", None)
with transaction.atomic():
for attr, value in validated_data.items():
setattr(instance, attr, value)
instance.save()
if files is not None:
AutoEvaluationTexPassportFile.objects.bulk_create([
AutoEvaluationTexPassportFile(auto_evaluation=instance, file=f) for f in files
])
return instance
def to_representation(self, instance):
return RetrieveAutoevaluationSerializer(instance, context=self.context).data
class CreateAutoevaluationSerializer(serializers.ModelSerializer):
value_determined = serializers.PrimaryKeyRelatedField(
queryset=ReferenceitemModel.objects.all(),
required=False,
allow_null=True,
)
value_determined = serializers.PrimaryKeyRelatedField(
queryset=ReferenceitemModel.objects.all(),
required=False,
@@ -216,11 +290,41 @@ class CreateAutoevaluationSerializer(serializers.ModelSerializer):
required=False,
allow_null=True,
)
car_position = serializers.PrimaryKeyRelatedField(
queryset=ReferenceitemModel.objects.all(),
required=False,
allow_null=True,
)
body_type = serializers.PrimaryKeyRelatedField(
queryset=ReferenceitemModel.objects.all(),
required=False,
allow_null=True,
)
fuel_type = serializers.PrimaryKeyRelatedField(
queryset=ReferenceitemModel.objects.all(),
required=False,
allow_null=True,
)
state_car = serializers.PrimaryKeyRelatedField(
queryset=ReferenceitemModel.objects.all(),
required=False,
allow_null=True,
)
assessment_task_type = serializers.PrimaryKeyRelatedField(
queryset=ReferenceitemModel.objects.all(),
required=False,
allow_null=True,
)
evaluation_request = serializers.PrimaryKeyRelatedField(
queryset=EvaluationrequestModel.objects.all(),
required=False,
allow_null=True,
)
tex_passport_files = serializers.ListField(
child=serializers.FileField(),
required=False,
write_only=True,
)
class Meta:
model = AutoEvaluationModel
@@ -241,14 +345,15 @@ class CreateAutoevaluationSerializer(serializers.ModelSerializer):
"object_owner_individual_person_passport_num",
"object_owner_legal_entity",
"object_owner_legal_inn",
"object_owner_residence",
"value_determined",
"rate_type",
"assessment_task_type",
# Step 4
"tex_passport_serie_num",
"tex_passport_file",
"tex_passport_files",
"tex_passport_gived_date",
"tex_passport_gived_location",
"car_type",
"car_wheel",
"car_brand",
"car_model",
@@ -256,6 +361,11 @@ class CreateAutoevaluationSerializer(serializers.ModelSerializer):
"manufacture_year",
"car_dvigatel_number",
"car_color",
"distance_covered",
"car_position",
"body_type",
"fuel_type",
"state_car",
]
def validate_tex_passport_serie_num(self, value):
@@ -300,13 +410,23 @@ class CreateAutoevaluationSerializer(serializers.ModelSerializer):
return attrs
def create(self, validated_data):
files = validated_data.pop("tex_passport_files", [])
user = self.context.get('request').user
validated_data['user'] = user
evaluation_req = validated_data.get("evaluation_request")
if evaluation_req:
evaluation_req.status = RequestStatus.IN_PROGRESS
evaluation_req.save()
return super().create(validated_data)
with transaction.atomic():
instance = super().create(validated_data)
if files:
AutoEvaluationTexPassportFile.objects.bulk_create([
AutoEvaluationTexPassportFile(auto_evaluation=instance, file=f) for f in files
])
return instance
def to_representation(self, instance):
return RetrieveAutoevaluationSerializer(instance, context=self.context).data
class AutoEvaluationAppraisersSerializer(serializers.Serializer):
@@ -321,6 +441,7 @@ class AutoEvaluationAppraisersSerializer(serializers.Serializer):
data['users'] = users
return data
class AutoEvaluationSerializer(serializers.Serializer):
brand = serializers.CharField()
brand_model = serializers.CharField()
@@ -331,7 +452,63 @@ class AutoEvaluationSerializer(serializers.Serializer):
fuel_type = serializers.CharField()
mileage = serializers.CharField()
class AutoEvaluationModelSerializer(serializers.ModelSerializer):
user = serializers.StringRelatedField(read_only=True)
appraisers = serializers.PrimaryKeyRelatedField(
many=True,
queryset=User.objects.all(),
required=False
)
class Meta:
model = AutoEvaluationModel
fields = "__all__"
fields = (
"registration_number",
"contract_date",
"object_inspection_date",
"rate_date",
"rate_report_date",
"object_type",
"object_owner_type",
"object_owner_individual_person_f_name",
"object_owner_individual_person_l_name",
"object_owner_individual_person_p_name",
"object_owner_individual_person_passport_num",
"object_owner_legal_entity",
"object_owner_legal_inn",
"object_owner_residence",
"value_determined",
"rate_type",
"assessment_task_type",
"tex_passport_serie_num",
"tex_passport_gived_date",
"tex_passport_gived_location",
"car_wheel",
"car_brand",
"car_model",
"car_number",
"manufacture_year",
"car_dvigatel_number",
"car_color",
"distance_covered",
"car_position",
"body_type",
"fuel_type",
"state_car",
"rating_goal",
"status",
"is_archived",
"created_at",
"updated_at",
)
read_only_fields = (
"id",
"created_at",
"updated_at",
)

View File

@@ -0,0 +1,370 @@
import re
from django.contrib.auth import get_user_model
from rest_framework import serializers
from core.apps.evaluation.choices.request import RequestStatus
from core.apps.evaluation.models import (
MechanicAutoEvaluationModel,
ReferenceitemModel,
EvaluationrequestModel,
)
from core.apps.evaluation.serializers.reference import ListReferenceitemSerializer
User = get_user_model()
class BaseMechanicAutoevaluationSerializer(serializers.ModelSerializer):
status_display = serializers.CharField(source="get_status_display", read_only=True)
object_type_display = serializers.CharField(source="get_object_type_display", read_only=True, default=None)
object_owner_type_display = serializers.CharField(source="get_object_owner_type_display", read_only=True,
default=None)
rate_type = ListReferenceitemSerializer(read_only=True)
value_determined = ListReferenceitemSerializer(read_only=True)
user = serializers.SerializerMethodField(method_name="get_user", read_only=True)
class Meta:
model = MechanicAutoEvaluationModel
fields = [
"id",
"contract_date",
"object_inspection_date",
"object_owner_individual_person_passport_num",
"object_owner_type",
"object_owner_individual_person_f_name",
"object_owner_individual_person_l_name",
"object_owner_individual_person_p_name",
"object_owner_legal_entity",
"object_owner_legal_inn",
"tex_passport_serie_num",
"rating_goal",
"registration_number",
"object_type",
"object_type_display",
"car_brand",
"car_model",
"car_number",
"manufacture_year",
"car_color",
"status",
"status_display",
"created_at",
"value_determined",
"rate_type",
"user",
"evaluation_request",
]
def get_user(self, obj):
request = self.context.get('request')
return {
"id": obj.user.id,
"phone": obj.user.phone,
"first_name": obj.user.first_name,
"last_name": obj.user.last_name,
"avatar": request.build_absolute_uri(obj.user.avatar.url) if obj.user.avatar else None
} if obj.user else None
class ListMechanicAutoevaluationSerializer(BaseMechanicAutoevaluationSerializer):
class Meta(BaseMechanicAutoevaluationSerializer.Meta):
pass
class RetrieveMechanicAutoevaluationSerializer(BaseMechanicAutoevaluationSerializer):
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)
class Meta(BaseMechanicAutoevaluationSerializer.Meta):
fields = BaseMechanicAutoevaluationSerializer.Meta.fields + [
"contract_date",
"object_inspection_date",
"rate_date",
"rate_report_date",
"object_owner_type",
"object_owner_type_display",
"object_owner_individual_person_f_name",
"object_owner_individual_person_l_name",
"object_owner_individual_person_p_name",
"object_owner_individual_person_passport_num",
"object_owner_legal_entity",
"object_owner_legal_inn",
"tex_passport_serie_num",
"tex_passport_file",
"tex_passport_gived_date",
"tex_passport_gived_location",
"car_type",
"car_type_display",
"car_wheel",
"car_wheel_display",
"car_dvigatel_number",
"valuation",
"vehicle",
"rating_goal",
"updated_at",
]
class UpdateMechanicAutoevaluationSerializer(serializers.ModelSerializer):
value_determined = serializers.PrimaryKeyRelatedField(
queryset=ReferenceitemModel.objects.all(),
required=False,
allow_null=True,
)
rate_type = serializers.PrimaryKeyRelatedField(
queryset=ReferenceitemModel.objects.all(),
required=False,
allow_null=True,
)
user = serializers.PrimaryKeyRelatedField(
queryset=User.objects.all(),
required=False,
allow_null=True,
)
class Meta:
model = MechanicAutoEvaluationModel
fields = [
"user",
"registration_number",
"contract_date",
"object_inspection_date",
"rate_date",
"rate_report_date",
"object_type",
"object_owner_type",
"object_owner_individual_person_f_name",
"object_owner_individual_person_l_name",
"object_owner_individual_person_p_name",
"object_owner_individual_person_passport_num",
"object_owner_legal_entity",
"object_owner_legal_inn",
"value_determined",
"rate_type",
"tex_passport_file",
"tex_passport_serie_num",
"tex_passport_gived_date",
"tex_passport_gived_location",
"car_type",
"car_wheel",
"car_brand",
"car_model",
"car_number",
"manufacture_year",
"car_dvigatel_number",
"car_color",
]
def validate_tex_passport_serie_num(self, value):
if value and not re.match(r"^[A-Z]{3}\s?\d{7}$", value):
raise serializers.ValidationError(
"Format: AAA 1234567 (3 harf + 7 raqam)"
)
return value
def validate_object_owner_individual_person_passport_num(self, value):
if value and not re.match(r"^[A-Z]{2}\s?\d{7}$", value):
raise serializers.ValidationError(
"Format: AA 1234567 (2 harf + 7 raqam)"
)
return value
def validate(self, attrs):
owner_type = attrs.get("object_owner_type")
if owner_type == 1:
required_fields = {
"object_owner_individual_person_f_name": "Ismi",
"object_owner_individual_person_l_name": "Familiyasi",
"object_owner_individual_person_p_name": "Sharifi",
"object_owner_individual_person_passport_num": "Passport raqami",
}
for field, label in required_fields.items():
if not attrs.get(field):
raise serializers.ValidationError(
{field: f"Jismoniy shaxs uchun {label} majburiy."}
)
elif owner_type == 2:
if not attrs.get("object_owner_legal_entity"):
raise serializers.ValidationError(
{"object_owner_legal_entity": "Yuridik shaxs nomi majburiy."}
)
if not attrs.get("object_owner_legal_inn"):
raise serializers.ValidationError(
{"object_owner_legal_inn": "INN raqami majburiy."}
)
return attrs
class CreateMechanicAutoevaluationSerializer(serializers.ModelSerializer):
value_determined = serializers.PrimaryKeyRelatedField(
queryset=ReferenceitemModel.objects.all(),
required=False,
allow_null=True,
)
rate_type = serializers.PrimaryKeyRelatedField(
queryset=ReferenceitemModel.objects.all(),
required=False,
allow_null=True,
)
evaluation_request = serializers.PrimaryKeyRelatedField(
queryset=EvaluationrequestModel.objects.all(),
required=False,
allow_null=True,
)
user = serializers.PrimaryKeyRelatedField(
queryset=User.objects.all(),
required=True,
allow_null=False,
)
class Meta:
model = MechanicAutoEvaluationModel
fields = [
"user",
"registration_number",
"evaluation_request",
"contract_date",
"object_inspection_date",
"rate_date",
"rate_report_date",
"object_type",
"object_owner_type",
"object_owner_individual_person_f_name",
"object_owner_individual_person_l_name",
"object_owner_individual_person_p_name",
"object_owner_individual_person_passport_num",
"object_owner_legal_entity",
"object_owner_legal_inn",
"value_determined",
"rate_type",
"tex_passport_serie_num",
"tex_passport_file",
"tex_passport_gived_date",
"tex_passport_gived_location",
"car_type",
"car_wheel",
"car_brand",
"car_model",
"car_number",
"manufacture_year",
"car_dvigatel_number",
"car_color",
]
def validate_tex_passport_serie_num(self, value):
if value and not re.match(r"^[A-Z]{3}\s?\d{7}$", value):
raise serializers.ValidationError(
"Format: AAA 1234567 (3 harf + 7 raqam)"
)
return value
def validate_object_owner_individual_person_passport_num(self, value):
if value and not re.match(r"^[A-Z]{2}\s?\d{7}$", value):
raise serializers.ValidationError(
"Format: AA 1234567 (2 harf + 7 raqam)"
)
return value
def validate(self, attrs):
owner_type = attrs.get("object_owner_type")
if owner_type == 1:
required_fields = {
"object_owner_individual_person_f_name": "Ismi",
"object_owner_individual_person_l_name": "Familiyasi",
"object_owner_individual_person_p_name": "Sharifi",
"object_owner_individual_person_passport_num": "Passport raqami",
}
for field, label in required_fields.items():
if not attrs.get(field):
raise serializers.ValidationError(
{field: f"Jismoniy shaxs uchun {label} majburiy."}
)
elif owner_type == 2:
if not attrs.get("object_owner_legal_entity"):
raise serializers.ValidationError(
{"object_owner_legal_entity": "Yuridik shaxs nomi majburiy."}
)
if not attrs.get("object_owner_legal_inn"):
raise serializers.ValidationError(
{"object_owner_legal_inn": "INN raqami majburiy."}
)
return attrs
def create(self, validated_data):
evaluation_req = validated_data.get("evaluation_request")
if evaluation_req:
evaluation_req.status = RequestStatus.IN_PROGRESS
evaluation_req.save()
return super().create(validated_data)
class MechanicAutoEvaluationAppraisersSerializer(serializers.Serializer):
ids = serializers.ListField(child=serializers.IntegerField())
def validate(self, data):
if not data.get("ids"):
raise serializers.ValidationError("Appraisers IDs are required.")
users = User.objects.filter(id__in=data["ids"])
if not users:
raise serializers.ValidationError("Invalid appraisers IDs.")
data['users'] = users
return data
class MechanicAutoEvaluationModelSerializer(serializers.ModelSerializer):
user = serializers.StringRelatedField(read_only=True)
appraisers = serializers.PrimaryKeyRelatedField(
many=True,
queryset=User.objects.all(),
required=False
)
class Meta:
model = MechanicAutoEvaluationModel
fields = (
"tex_passport_file",
"registration_number",
"contract_date",
"object_inspection_date",
"rate_date",
"rate_report_date",
"object_type",
"object_owner_type",
"object_owner_individual_person_f_name",
"object_owner_individual_person_l_name",
"object_owner_individual_person_p_name",
"object_owner_individual_person_passport_num",
"object_owner_legal_entity",
"object_owner_legal_inn",
"value_determined",
"rate_type",
"tex_passport_serie_num",
"tex_passport_gived_date",
"tex_passport_gived_location",
"car_type",
"car_wheel",
"car_brand",
"car_model",
"car_number",
"manufacture_year",
"car_dvigatel_number",
"car_color",
"rating_goal",
"status",
"is_archived",
"user",
"appraisers",
"created_at",
"updated_at",
)
read_only_fields = (
"id",
"created_at",
"updated_at",
)

View File

@@ -1 +1,2 @@
from .AutoEvaluation import * # noqa
from .MechanicAutoEvaluation import * # noqa

View File

@@ -0,0 +1,56 @@
from rest_framework import serializers
from core.apps.evaluation.models.bonus import BonusCategory, EmployeeBonus, BaseValueBonus
class BaseBonusSerializer(serializers.ModelSerializer):
class Meta:
model = BaseValueBonus
fields = ['id', 'base_price']
def create(self, validated_data):
if BaseValueBonus.objects.exists():
raise serializers.ValidationError("Base bonus already exists")
return super().create(validated_data)
class BonusCategorySerializer(serializers.ModelSerializer):
class Meta:
model = BonusCategory
fields = ['name', 'category', 'percentage']
class BonusCategoryListSerializer(serializers.ModelSerializer):
price = serializers.DecimalField(max_digits=12, decimal_places=2)
class Meta:
model = BonusCategory
fields = ['id', 'name', 'category', 'percentage' , 'price']
def get_price(self, obj):
base_obj = BaseValueBonus.objects.first()
if not base_obj:
return 0
return (base_obj.base_price * obj.percentage) / 100
class BonusEmployeeBonusSerializer(serializers.ModelSerializer):
class Meta:
model = EmployeeBonus
fields = ['user', 'bonus_type', 'percentage']
class EmployeeBonusListSerializer(serializers.ModelSerializer):
price = serializers.DecimalField(max_digits=12, decimal_places=2)
class Meta:
model = EmployeeBonus
fields = ['id', 'user', 'bonus_type', 'percentage' , 'price']
def get_price(self, obj):
base_obj = BaseValueBonus.objects.first()
if not base_obj:
return 0
return (base_obj.base_price * obj.percentage) / 100

View File

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

View File

@@ -1,2 +1,3 @@
from .AutoEvaluationHistory import * # noqa
from .MechanicAutoEvaluationHistory import * # noqa
from .QuickEvaluationHistory import * # noqa

View File

@@ -131,4 +131,39 @@ class CreateQuickevaluationSerializer(serializers.ModelSerializer):
class QuickEvaluationModelSerializer(serializers.ModelSerializer):
class Meta:
model = QuickEvaluationModel
fields = '__all__'
fields = (
"id",
"created_by",
"brand",
"marka",
"car_position",
"body_type",
"color",
"fuel_type",
"state_car",
"tex_passport_serie_num",
"tech_passport_issued_date",
"tech_passport_issued_place",
"car_type",
"distance_covered",
"vin_number",
"car_number",
"car_manufactured_date",
"engine_number",
"estimated_price",
"status",
"is_archive",
"created_at",
"updated_at",
)
read_only_fields = (
"id",
"created_at",
"updated_at",
)

View File

@@ -87,3 +87,29 @@ class CreateVehicleSerializer(serializers.ModelSerializer):
"condition",
"position",
]
class VehicleApplicationSerializer(serializers.Serializer):
person_name = serializers.CharField()
property_owner = serializers.CharField(max_length=100)
address = serializers.CharField(max_length=255)
marka = serializers.CharField(max_length=100)
model = serializers.CharField(max_length=100)
configuration = serializers.CharField(max_length=100)
auto_number = serializers.CharField(max_length=100)
date_created = serializers.DateTimeField()
mileage = serializers.IntegerField()
vehicle_identification = serializers.CharField(max_length=100)
engine_number = serializers.CharField(max_length=100)
colour = serializers.CharField(max_length=100)
registration_certificate_series = serializers.CharField(max_length=100)
tec_passport_number = serializers.CharField(max_length=100)
tec_passport_date = serializers.DateTimeField()
tec_passport_place = serializers.CharField(max_length=255)
body_type = serializers.CharField(max_length=100)
chassis = serializers.CharField(max_length=100)
plate = serializers.CharField(max_length=100)
value_type = serializers.CharField(max_length=100)
evaluation_purpose = serializers.CharField(max_length=100)
personal_id_number = serializers.IntegerField()
id_number = serializers.CharField(max_length=9)

View File

@@ -8,6 +8,7 @@ router = DefaultRouter()
router.register("document-category", views.DocumentCategoryView, basename="DocumentCategory")
router.register("document", views.DocumentView, basename="Document")
router.register("auto-evaluation-history", views.AutoEvaluationHistoryView, basename="auto-evaluation-history")
router.register("mechanic-auto-evaluation-history", views.MechanicAutoEvaluationHistoryView, basename="mechanic-auto-evaluation-history")
router.register("quick-evaluation-history", views.QuickEvaluationHistoryView, basename="quick-evaluation-history")
router.register("determined-value", views.DeterminedValueView, basename="determined-value")
router.register("evaluation-purpose", views.EvaluationPurposeView, basename="evaluation-purpose")
@@ -22,11 +23,15 @@ router.register("quick-evaluation", views.QuickEvaluationView, basename="quick-e
router.register("movable-property-evaluation", views.MovablePropertyEvaluationView, basename="movable-property-evaluation")
router.register("real-estate-evaluation", views.RealEstateEvaluationView, basename="real-estate-evaluation")
router.register("auto-evaluation", views.AutoEvaluationView, basename="auto-evaluation")
router.register("mechanic-auto-evaluation", views.MechanicAutoEvaluationView, basename="mechanic-auto-evaluation")
router.register("vehicle", views.VehicleView, basename="vehicle")
router.register("valuation", views.ValuationView, basename="valuation")
router.register("property-owner", views.PropertyOwnerView, basename="property-owner")
router.register("customer", views.CustomerView, basename="customer")
router.register("certificate", views.CertificateView, basename="certificate")
router.register("bonus-type", views.BonusTypeView, basename="bonus-type")
router.register("bonus-employee", views.BonusEmployeeViewSet, basename="bonus-employee")
router.register("bonus-base", views.BaseBonusViewSet, basename="bonus-base")
urlpatterns = [
path("", include(router.urls)),
@@ -69,6 +74,26 @@ urlpatterns = [
]
)),
# Mechanic Auto Evaluation
path("mechanic-auto-evaluation/", include(
[
path("admin/", views.AdminMechanicEvaluationsAPIView.as_view(), name="admin-mechanic-evaluations"),
path('archive/', include(
[
path('<int:pk>/', views.MechanicAutoEvaluationArchiveAPIView.as_view()),
path('list/', views.MechanicAutoEvaluationArchivedListAPIView.as_view())
]
)),
path('appraisers/', include(
[
path("<int:id>/list/", views.MechanicAutoEvaluationListAppraisersView.as_view()),
path("<int:id>/set/", views.MechanicAutoEvaluationSetAppraisersView.as_view()),
path("<int:id>/remove/", views.MechanicAutoEvaluationRemoveAppraisersView.as_view()),
]
))
]
)),
# Evaluation Request
path("evaluation-request/", include(
[
@@ -85,4 +110,5 @@ urlpatterns = [
)),
path("calculate_avg_cost/", views.AvgCostAPIView.as_view()),
path("vehicle_document/", views.GeneratePDFView.as_view()),
]

View File

@@ -1,4 +1,5 @@
from .auto import * # noqa
from .mechanic_auto import * # noqa
from .customer import * # noqa
from .document import * # noqa
from .documentcategory import * # noqa
@@ -15,3 +16,4 @@ from .didox import * # noqa
from .tech_passport import * # noqa
from .certificate import * # noqa
from .avg_cost import *
from .bonus import *

View File

@@ -11,7 +11,7 @@ from rest_framework.response import Response
from rest_framework.views import APIView
from rest_framework.viewsets import ModelViewSet
from core.apps.accounts.choices import RoleChoice
from core.apps.accounts.permissions import IsAdminRole
from core.apps.accounts.serializers.user import UserSerializer
from core.apps.evaluation.filters.auto import AutoevaluationFilter
from core.apps.evaluation.models import AutoEvaluationModel
@@ -177,13 +177,14 @@ class AutoEvaluationArchiveAPIView(APIView):
status=200
)
@extend_schema(tags=["AutoEvaluation"])
class AdminEvaluationsAPIView(generics.GenericAPIView):
permission_classes = [IsAuthenticated]
permission_classes = [IsAuthenticated, IsAdminRole]
queryset = AutoEvaluationModel.objects.all()
serializer_class = AutoEvaluationModel
def get(self, request):
if request.user.role != RoleChoice.ADMIN:
return Response({'detail': 'Forbidden'}, status=403)
auto_eval = AutoEvaluationModel.objects.filter(
created_by=self.request.user
).select_related('appraisers').distinct()

View File

@@ -0,0 +1,60 @@
from django_core.mixins import BaseViewSetMixin
from drf_spectacular.utils import extend_schema
from rest_framework import viewsets
from rest_framework.permissions import IsAdminUser
from rest_framework.viewsets import ModelViewSet
# core
from core.apps.evaluation.models.bonus import BonusCategory, EmployeeBonus, BaseValueBonus
from core.apps.evaluation.serializers.bonus.Bonus import BonusCategorySerializer, \
BonusCategoryListSerializer, EmployeeBonusListSerializer, BonusEmployeeBonusSerializer, BaseBonusSerializer
@extend_schema(tags=["BaseBonus"])
class BaseBonusViewSet(BaseViewSetMixin, viewsets.ModelViewSet):
queryset = BaseValueBonus.objects.all()
serializer_class = BaseBonusSerializer
@extend_schema(tags=["Bonus-Category"])
class BonusTypeView(BaseViewSetMixin, ModelViewSet):
queryset = BonusCategory.objects.all()
serializer_class = BonusCategorySerializer
action_serializer_class = {
'create': BonusCategorySerializer,
'update': BonusCategorySerializer,
'partial_update': BonusCategorySerializer,
'list': BonusCategoryListSerializer,
'retrieve': BonusCategoryListSerializer,
}
action_permission_classes = {
'create': [IsAdminUser],
'update': [IsAdminUser],
'partial_update': [IsAdminUser],
'destroy': [IsAdminUser],
'list': [IsAdminUser],
}
class BonusEmployeeViewSet(BaseViewSetMixin, ModelViewSet):
queryset = EmployeeBonus.objects.all()
serializer_class = BonusEmployeeBonusSerializer
action_serializer_class = {
'create': BonusEmployeeBonusSerializer,
'update': BonusEmployeeBonusSerializer,
'partial_update': BonusEmployeeBonusSerializer,
'list': EmployeeBonusListSerializer,
'retrieve': EmployeeBonusListSerializer,
}
action_permission_classes = {
'create': [IsAdminUser],
'update': [IsAdminUser],
'partial_update': [IsAdminUser],
'destroy': [IsAdminUser],
'list': [IsAdminUser],
}

View File

@@ -16,9 +16,14 @@ from rest_framework.viewsets import ReadOnlyModelViewSet
# core apps
from core.apps.evaluation.filters.history import (
AutoevaluationhistoryFilter,
MechanicAutoevaluationhistoryFilter,
QuickevaluationhistoryFilter,
)
from core.apps.evaluation.models import AutoevaluationhistoryModel, QuickevaluationhistoryModel
from core.apps.evaluation.models import (
AutoevaluationhistoryModel,
MechanicAutoevaluationhistoryModel,
QuickevaluationhistoryModel,
)
from core.apps.evaluation.serializers import history as serializers
@@ -72,6 +77,56 @@ class AutoEvaluationHistoryView(BaseViewSetMixin, ReadOnlyModelViewSet):
})
@extend_schema(
tags=["MechanicAutoEvaluationHistory"],
parameters=[
OpenApiParameter("mechanic_auto_evaluation", int, description="MechanicAutoEvaluation ID bo'yicha filter"),
OpenApiParameter("event_type", str, description="Event turi bo'yicha filter"),
OpenApiParameter("created_from", str, description="Boshlanish sanasi (ISO 8601)"),
OpenApiParameter("created_to", str, description="Tugash sanasi (ISO 8601)"),
],
)
class MechanicAutoEvaluationHistoryView(BaseViewSetMixin, ReadOnlyModelViewSet):
queryset = MechanicAutoevaluationhistoryModel.objects.only(
"id", "mechanic_auto_evaluation_id", "event_type",
"actor_id", "actor_full_name", "actor_role",
"meta", "created_at",
)
serializer_class = serializers.ListMechanicAutoevaluationhistorySerializer
permission_classes = [AllowAny]
pagination_class = None
filter_backends = [DjangoFilterBackend, OrderingFilter]
filterset_class = MechanicAutoevaluationhistoryFilter
ordering_fields = [
"id",
"event_type",
"event_type_display",
"actor",
"meta",
"created_at",
]
ordering = ["created_at"]
action_permission_classes = {}
action_serializer_class = {
"list": serializers.ListMechanicAutoevaluationhistorySerializer,
"retrieve": serializers.RetrieveMechanicAutoevaluationhistorySerializer,
"create": serializers.CreateMechanicAutoevaluationhistorySerializer,
}
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(
tags=["QuickEvaluationHistory"],
parameters=[

View File

@@ -0,0 +1,198 @@
from django.db.models import Q
from django.shortcuts import get_object_or_404
from django_core.mixins import BaseViewSetMixin
from django_filters.rest_framework import DjangoFilterBackend
from drf_spectacular.utils import extend_schema, OpenApiParameter
from rest_framework import generics
from rest_framework.filters import OrderingFilter, SearchFilter
from rest_framework.generics import GenericAPIView, ListAPIView
from rest_framework.permissions import AllowAny, IsAuthenticated
from rest_framework.response import Response
from rest_framework.views import APIView
from rest_framework.viewsets import ModelViewSet
from core.apps.accounts.permissions import IsAdminRole
from core.apps.accounts.serializers.user import UserSerializer
from core.apps.evaluation.filters.mechanic_auto import MechanicAutoevaluationFilter
from core.apps.evaluation.models import MechanicAutoEvaluationModel
from core.apps.evaluation.serializers.auto.MechanicAutoEvaluation import (
ListMechanicAutoevaluationSerializer,
RetrieveMechanicAutoevaluationSerializer,
CreateMechanicAutoevaluationSerializer,
UpdateMechanicAutoevaluationSerializer,
MechanicAutoEvaluationAppraisersSerializer,
MechanicAutoEvaluationModelSerializer,
)
@extend_schema(tags=["MechanicAutoEvaluation"])
class MechanicAutoEvaluationView(BaseViewSetMixin, ModelViewSet):
queryset = MechanicAutoEvaluationModel.objects.select_related(
"valuation",
"valuation__customer",
"vehicle",
).filter(is_archived=False)
serializer_class = ListMechanicAutoevaluationSerializer
permission_classes = [AllowAny]
filter_backends = [DjangoFilterBackend, SearchFilter, OrderingFilter]
filterset_class = MechanicAutoevaluationFilter
search_fields = [
"registration_number",
"car_model",
"car_brand",
"car_number",
]
ordering_fields = [
"id",
"contract_date",
"object_inspection_date",
"object_owner_individual_person_passport_num",
"object_owner_type",
"object_owner_individual_person_f_name",
"object_owner_individual_person_l_name",
"object_owner_individual_person_p_name",
"object_owner_legal_entity",
"object_owner_legal_inn",
"tex_passport_serie_num",
"rating_goal",
"registration_number",
"object_type",
"object_type_display",
"car_brand",
"car_model",
"car_number",
"manufacture_year",
"car_color",
"status",
"status_display",
"created_at",
"value_determined",
"rate_type",
]
ordering = ["-created_at"]
action_permission_classes = {}
action_serializer_class = {
"list": ListMechanicAutoevaluationSerializer,
"retrieve": RetrieveMechanicAutoevaluationSerializer,
"create": CreateMechanicAutoevaluationSerializer,
"update": UpdateMechanicAutoevaluationSerializer,
"partial_update": UpdateMechanicAutoevaluationSerializer,
}
def serializer_context(self):
return self.serializer_class(context={'request': self.request})
@extend_schema(tags=["MechanicAutoEvaluation"])
class MechanicAutoEvaluationSetAppraisersView(GenericAPIView):
permission_classes = [IsAuthenticated]
queryset = MechanicAutoEvaluationModel.objects.all()
serializer_class = MechanicAutoEvaluationAppraisersSerializer
def post(self, request, id):
try:
evaluation = get_object_or_404(MechanicAutoEvaluationModel, id=id)
serializer = self.serializer_class(data=request.data)
serializer.is_valid(raise_exception=True)
users = serializer.validated_data.get("users")
evaluation.appraisers.set(users)
evaluation.save()
return Response({"success": True, "data": "Foydalanuvchilar muvaffaqiyatli qo'shildi"})
except Exception as e:
return Response({"error": str(e)}, status=500)
@extend_schema(tags=["MechanicAutoEvaluation"])
class MechanicAutoEvaluationRemoveAppraisersView(GenericAPIView):
permission_classes = [IsAuthenticated]
queryset = MechanicAutoEvaluationModel.objects.all()
serializer_class = MechanicAutoEvaluationAppraisersSerializer
def post(self, request, id):
try:
evaluation = get_object_or_404(MechanicAutoEvaluationModel, id=id)
serializer = self.serializer_class(data=request.data)
serializer.is_valid(raise_exception=True)
users = serializer.validated_data.get("users")
evaluation.appraisers.remove(*users)
evaluation.save()
return Response({"success": True, "data": "Foydalanuvchilar muvaffaqiyatli o'chirildi"})
except Exception as e:
return Response({"error": str(e)}, status=500)
@extend_schema(tags=["MechanicAutoEvaluation"])
class MechanicAutoEvaluationListAppraisersView(GenericAPIView):
permission_classes = [IsAuthenticated]
queryset = MechanicAutoEvaluationModel.objects.all()
serializer_class = UserSerializer
@extend_schema(
parameters=[
OpenApiParameter(
name="search",
type=str,
description="Search query",
required=False,
)
]
)
def get(self, request, id):
try:
search_query = request.query_params.get("search", "")
evaluation = get_object_or_404(MechanicAutoEvaluationModel, id=id)
query = evaluation.appraisers.all()
if search_query:
query = query.filter(
Q(phone__icontains=search_query) |
Q(first_name__icontains=search_query) |
Q(last_name__icontains=search_query)
)
page = self.paginate_queryset(query)
serializer = self.serializer_class(page, many=True)
return self.get_paginated_response(serializer.data)
except Exception as e:
return Response({"error": str(e)}, status=500)
@extend_schema(tags=["MechanicAutoEvaluation"])
class MechanicAutoEvaluationArchivedListAPIView(ListAPIView):
permission_classes = [IsAuthenticated]
serializer_class = ListMechanicAutoevaluationSerializer
def get_queryset(self):
return MechanicAutoEvaluationModel.objects.filter(is_archived=True)
@extend_schema(tags=["MechanicAutoEvaluation"])
class MechanicAutoEvaluationArchiveAPIView(APIView):
permission_classes = [IsAuthenticated]
def post(self, request, pk):
evaluation = get_object_or_404(MechanicAutoEvaluationModel, pk=pk)
evaluation.is_archived = request.data["is_archived"]
evaluation.save()
return Response(
{
"success": True,
"status": evaluation.status,
"id": evaluation.pk
},
status=200
)
@extend_schema(tags=["MechanicAutoEvaluation"])
class AdminMechanicEvaluationsAPIView(generics.GenericAPIView):
permission_classes = [IsAuthenticated, IsAdminRole]
queryset = MechanicAutoEvaluationModel.objects.all()
serializer_class = MechanicAutoEvaluationModelSerializer
def get(self, request):
evaluations = MechanicAutoEvaluationModel.objects.filter(
created_by=self.request.user
).distinct()
serializer = MechanicAutoEvaluationModelSerializer(evaluations, many=True)
return Response(serializer.data)

View File

@@ -16,7 +16,7 @@ from rest_framework.response import Response
from rest_framework.views import APIView
from rest_framework.viewsets import ModelViewSet
from core.apps.accounts.choices import RoleChoice
from core.apps.accounts.permissions import IsAdminRole
# core apps
from core.apps.evaluation.filters.quick import QuickevaluationFilter
from core.apps.evaluation.models import QuickEvaluationModel
@@ -88,11 +88,11 @@ class QuickEvaluationArchivedListAPIView(ListAPIView):
@extend_schema(tags=["QuickEvaluation"])
class AdminQuickEvalAPIView(generics.GenericAPIView):
permission_classes = [IsAuthenticated]
permission_classes = [IsAuthenticated, IsAdminRole]
queryset = QuickEvaluationModel.objects.all()
serializer_class = QuickEvaluationModelSerializer
def get(self, request):
if request.user.role != RoleChoice.ADMIN:
return Response({'detail': 'Forbidden'}, status=403)
quick_eval = QuickEvaluationModel.objects.filter(
created_by=self.request.user
).select_related('created_by').distinct()

View File

@@ -1,16 +1,19 @@
# django core
from django.http import HttpResponse
from django_core.mixins import BaseViewSetMixin
# swagger
from drf_spectacular.utils import extend_schema
# rest framework
from rest_framework.permissions import AllowAny
from rest_framework.permissions import IsAuthenticated
from rest_framework.response import Response
from rest_framework.views import APIView
from rest_framework.viewsets import ReadOnlyModelViewSet
# core apps
from core.apps.evaluation.models import VehicleModel
from core.apps.evaluation.serializers import vehicle as serialziers
from core.apps.evaluation.serializers import vehicle as serialziers, VehicleApplicationSerializer
from core.utils.generation_pdf import PDFService
@extend_schema(tags=["Vehicle"])
@@ -27,3 +30,19 @@ class VehicleView(BaseViewSetMixin, ReadOnlyModelViewSet):
"retrieve": serialziers.RetrieveVehicleSerializer,
"create": serialziers.CreateVehicleSerializer,
}
@extend_schema(tags=['GenerationDocument'], request=VehicleApplicationSerializer)
class GeneratePDFView(APIView):
permission_classes = [IsAuthenticated]
def post(self, request):
serializer = VehicleApplicationSerializer(data=request.data)
if not serializer.is_valid():
return Response(serializer.errors, status=400)
pdf_buffer = PDFService.generate_vehicle_pdf(serializer.validated_data)
response = HttpResponse(pdf_buffer, content_type='application/pdf')
response['Content-Disposition'] = 'attachment; filename="ariza.pdf"'
return response

View File

@@ -0,0 +1,29 @@
import django.db.models.deletion
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('tasks', '0002_alter_comment_created_by'),
]
operations = [
migrations.RemoveField(
model_name='comment',
name='file',
),
migrations.CreateModel(
name='CommentFile',
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)),
('file', models.FileField(upload_to='comments/')),
('comment', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='files', to='tasks.comment')),
],
options={
'abstract': False,
},
),
]

View File

@@ -8,9 +8,18 @@ from core.apps.tasks.choices.comment import MessageChoice
class Comment(AbstractBaseModel):
task = models.ForeignKey('tasks.Task', on_delete=models.CASCADE, related_name='comments')
message = models.TextField()
file = models.FileField(upload_to='comments/', blank=True, null=True)
type = models.CharField(max_length=255, choices=MessageChoice.choices)
created_by = models.ForeignKey('accounts.User', on_delete=models.CASCADE, related_name='comments')
def __str__(self):
return f"{self.content} created by {self.created_by}"
return f"{self.message} created by {self.created_by}"
class CommentFile(AbstractBaseModel):
comment = models.ForeignKey(
'tasks.Comment', on_delete=models.CASCADE, related_name='files'
)
file = models.FileField(upload_to='comments/')
def __str__(self):
return f"File for comment {self.comment_id}"

View File

@@ -2,7 +2,7 @@ from rest_framework import serializers
from core.apps.tasks.serializers.comment import CommentSerializer
from core.apps.tasks.serializers.task import TaskSerializer
from core.apps.tasks.models import Column, Task
from core.apps.tasks.models import Column
class BoardTaskSerializer(TaskSerializer):

View File

@@ -2,43 +2,88 @@ from django.db import transaction
from rest_framework import serializers
from core.apps.tasks.models.comment import Comment
from core.apps.tasks.models.task import Task
from core.apps.tasks.models.comment import Comment, CommentFile
class CommentCreatedBySerializer(serializers.Serializer):
id = serializers.IntegerField()
first_name = serializers.CharField()
last_name = serializers.CharField()
avatar = serializers.SerializerMethodField()
def get_avatar(self, obj):
request = self.context.get('request')
if obj.avatar and request:
return request.build_absolute_uri(obj.avatar.url)
if obj.avatar:
return obj.avatar.url
return None
class CommentFileSerializer(serializers.ModelSerializer):
file = serializers.SerializerMethodField()
class Meta:
model = CommentFile
fields = ['id', 'file']
def get_file(self, obj):
request = self.context.get('request')
if not obj.file:
return None
if request:
return request.build_absolute_uri(obj.file.url)
return obj.file.url
class CommentSerializer(serializers.ModelSerializer):
created_by = CommentCreatedBySerializer(read_only=True)
files = CommentFileSerializer(many=True, read_only=True)
class Meta:
model = Comment
fields = [
'id', 'message', 'file', 'type', 'created_by'
'id', 'message', 'type', 'created_by', 'created_at', 'files'
]
def get_created_by(self, obj):
request = self.context.get('request')
return {
"id": obj.created_by.id,
"first_name": obj.created_by.first_name,
"last_name": obj.created_by.last_name,
"avatar": request.build_absolute_uri(obj.created_by.avatar.url) if obj.created_by.avatar else None
}
class CommentCreateSerializer(serializers.ModelSerializer):
files = serializers.ListField(
child=serializers.FileField(),
required=False,
write_only=True,
)
class Meta:
model = Comment
fields = [
'id', 'message', 'file', 'type', 'task'
'id', 'message', 'type', 'task', 'files', 'created_at'
]
def validate(self, data):
task = Task.objects.filter(id=data['task']).first()
if not task:
raise serializers.ValidationError("Task not found")
data['task'] = task
return data
read_only_fields = ['id', 'created_at']
def create(self, validated_data):
files = validated_data.pop('files', [])
with transaction.atomic():
task = validated_data.pop('task')
comment = Comment.objects.create(task=task, created_by=self.context['request'].user, **validated_data)
comment = Comment.objects.create(
created_by=self.context['request'].user,
**validated_data
)
CommentFile.objects.bulk_create([
CommentFile(comment=comment, file=f) for f in files
])
return comment
def update(self, instance, validated_data):
files = validated_data.pop('files', None)
with transaction.atomic():
for attr, value in validated_data.items():
setattr(instance, attr, value)
instance.save()
if files is not None:
CommentFile.objects.bulk_create([
CommentFile(comment=instance, file=f) for f in files
])
return instance
def to_representation(self, instance):
return CommentSerializer(instance, context=self.context).data

View File

@@ -20,7 +20,7 @@ urlpatterns = [
path('task/', include(
[
path('list/', task.TaskListView.as_view()),
path('<int:id>/', task.TaskDetailView.as_view()),
path('<int:pk>/', task.TaskDetailView.as_view()),
path('create/', task.TaskCreateView.as_view()),
]
)),

View File

@@ -5,6 +5,8 @@ from core.apps.tasks.serializers.board import BoardSerializer
from core.apps.tasks.models import Column
#test commit
class BoardListView(generics.ListAPIView):
queryset = Column.objects.order_by('id')
serializer_class = BoardSerializer

View File

@@ -1,9 +1,7 @@
from django.db import transaction
from rest_framework import permissions, generics
from rest_framework.response import Response
from drf_spectacular.utils import extend_schema
from rest_framework import permissions, generics, status
from rest_framework.response import Response
from core.apps.tasks.models.task import Task
from core.apps.tasks.serializers.task import TaskSerializer, TaskCreateSerializer
@@ -18,7 +16,8 @@ class TaskCreateView(generics.GenericAPIView):
@transaction.atomic
def post(self, request):
serializer = self.get_serializer(data=request.data)
serializer.is_valid(raise_exception=True)
if not serializer.is_valid(raise_exception=True):
return Response(serializer.validated_data, status=status.HTTP_400_BAD_REQUEST)
serializer.save()
return Response(serializer.data)

View File

@@ -0,0 +1,138 @@
# services.py
from io import BytesIO
from reportlab.lib import colors
from reportlab.lib.enums import TA_RIGHT, TA_CENTER
from reportlab.lib.pagesizes import A4
from reportlab.lib.styles import getSampleStyleSheet, ParagraphStyle
from reportlab.platypus import SimpleDocTemplate, Table, TableStyle, Paragraph, Spacer
class PDFService:
@staticmethod
def generate_vehicle_pdf(data):
buffer = BytesIO()
doc = SimpleDocTemplate(
buffer, pagesize=A4,
rightMargin=40, leftMargin=40,
topMargin=40, bottomMargin=40
)
styles = getSampleStyleSheet()
cell_style = ParagraphStyle(
'CellStyle', parent=styles['Normal'],
fontSize=9, leading=11
)
cell_style_bold = ParagraphStyle(
'CellStyleBold', parent=cell_style,
fontName='Helvetica-Bold',
textColor=colors.red
)
header_style = ParagraphStyle(
'HeaderStyle', parent=styles['Normal'],
alignment=TA_RIGHT, fontSize=10, leading=12
)
title_style = ParagraphStyle(
'TitleStyle', parent=styles['Normal'],
alignment=TA_CENTER, fontSize=14, leading=16
)
elements = []
header_text = (
f'<b>"Sifat baholash" MChJ direktori<br/>'
f"T.R.To'rayevga</b><br/><br/>"
f"{data.get('address', '')}<br/>"
f"ro'yxatda turuvchi fuqaro<br/>"
f"<u>{data.get('person_name', '')}</u> tomonidan<br/>"
f"<u>Avtotransport vositasini baholash uchun</u>"
)
elements.append(Paragraph(header_text, header_style))
elements.append(Spacer(1, 25))
elements.append(Paragraph("<b>A R I Z A</b>", title_style))
elements.append(Spacer(1, 10))
elements.append(Paragraph(
"Ushbu orqali quyidagi avtotransport vositasini baholab berishingizni so'rayman:",
cell_style
))
elements.append(Spacer(1, 10))
date_created = data.get('date_created')
year_str = str(date_created.year) + " yil" if date_created else ""
tec_date = data.get('tec_passport_date')
tec_date_str = tec_date.strftime('%d.%m.%Y yil') if tec_date else ""
raw_data = [
["Mulk egasi", data.get('property_owner', '')],
["Manzil", data.get('address', '')],
["Marka", data.get('marka', '')],
["Model", data.get('model', '')],
["Komplektatsiya", data.get('configuration', '')],
["Davlat raqami", data.get('auto_number', '')],
["Ishlab chiqarilgan yili", year_str],
["Bosib o'tgan masofasi", f"{data.get('mileage', 0):,}".replace(',', ' ')],
["№ kuzov (VIN)", data.get('vehicle_identification', '')],
["№ dvigatel", data.get('engine_number', '')],
["Rang", data.get('colour', '')],
["Texnik passport seriyasi", data.get('registration_certificate_series', '')],
["Texnik passport raqami", data.get('tec_passport_number', '')],
["Texnik passport berilgan sanasi", tec_date_str],
["Texnik passport berilgan joyi", data.get('tec_passport_place', '')],
["Kuzov turi", data.get('body_type', '')],
["Shassi", data.get('chassis', '')],
["Davlat belgisi (plate)", data.get('plate', '')], # ← was missing
]
table_data = [
[Paragraph(row[0], cell_style), Paragraph(str(row[1]), cell_style_bold)]
for row in raw_data
]
table = Table(table_data, colWidths=[170, 345])
table.setStyle(TableStyle([
('GRID', (0, 0), (-1, -1), 0.5, colors.black),
('VALIGN', (0, 0), (-1, -1), 'TOP'),
('LEFTPADDING', (0, 0), (-1, -1), 6),
('TOPPADDING', (0, 0), (-1, -1), 4),
('BOTTOMPADDING', (0, 0), (-1, -1), 4),
]))
elements.append(table)
elements.append(Spacer(1, 15))
elements.append(Paragraph("<b>Baholash maqsadi:</b>", cell_style))
purpose_raw = [
["Aniqlanayotgan qiymat turi", data.get('value_type', '')],
["Baholash maqsadi", data.get('evaluation_purpose', '')],
]
purpose_data = [
[Paragraph(r[0], cell_style), Paragraph(str(r[1]), cell_style_bold)]
for r in purpose_raw
]
pt = Table(purpose_data, colWidths=[170, 345])
pt.setStyle(TableStyle([
('GRID', (0, 0), (-1, -1), 0.5, colors.black),
('VALIGN', (0, 0), (-1, -1), 'TOP'),
]))
elements.append(pt)
elements.append(Spacer(1, 15))
elements.append(Paragraph("<b>Buyurtmachi rekvizitlari:</b>", cell_style))
footer_raw = [
["Shaxsiy raqam (PINFL)", str(data.get('personal_id_number', ''))],
["ID karta raqami", data.get('id_number', '')],
]
footer_data = [
[Paragraph(f[0], cell_style), Paragraph(str(f[1]), cell_style_bold)]
for f in footer_raw
]
ft = Table(footer_data, colWidths=[170, 345])
ft.setStyle(TableStyle([
('GRID', (0, 0), (-1, -1), 0.5, colors.black),
('VALIGN', (0, 0), (-1, -1), 'TOP'),
]))
elements.append(ft)
doc.build(elements)
buffer.seek(0)
return buffer

View File

@@ -5,6 +5,17 @@ ENV SCRIPT=$SCRIPT
WORKDIR /code
RUN apk add --no-cache \
glib \
gdk-pixbuf \
pango \
cairo \
libffi \
shared-mime-info \
fontconfig \
ttf-dejavu \
ttf-liberation
COPY requirements.txt /code/requirements.txt
RUN uv pip install -r requirements.txt
@@ -16,5 +27,3 @@ COPY ./resources/scripts/$SCRIPT /code/$SCRIPT
RUN chmod +x /code/resources/scripts/$SCRIPT
CMD sh /code/resources/scripts/$SCRIPT

View File

@@ -1,46 +1,146 @@
backports.tarfile==1.2.0
celery==5.4.0
django-cors-headers==4.6.0
django-environ==0.11.2
django-extensions==3.2.3
django-filter==24.3
django-redis==5.4.0
django-unfold==0.65.0
djangorestframework-simplejwt==5.3.1
drf-spectacular==0.28.0
importlib-metadata==8.5.0
importlib-resources==6.4.5
inflect==7.3.1
jaraco.collections==5.1.0
packaging==24.2
pip-chill==1.0.3
platformdirs==4.3.6
psycopg2-binary==2.9.10
tomli==2.2.1
uvicorn==0.32.1
jst-django-core~=1.2.2
rich
pydantic
aiohappyeyeballs
aiohttp
aiosignal
amqp
annotated-doc
annotated-types
arrow
asgiref
astor
attrs
backports.tarfile
bcrypt
pytest-django
requests
model_bakery
django-modeltranslation~=0.19.11
django-ckeditor-5==0.2.15
django-rosetta==0.10.1
django-cacheops~=7.1
# !NOTE: on-server
# gunicorn
django-storages
billiard
binaryornot
black
boto3
botocore
brotli
celery
certifi
cffi
chardet
charset-normalizer
click
click-didyoumean
click-plugins
click-repl
colorlog
cookiecutter
cssselect2
Django
django-cacheops
django-ckeditor-5
django-cors-headers
django-environ
django-extensions
django-filter
django-modeltranslation
django-redis
django-rosetta
django-storages
django-unfold
djangorestframework
djangorestframework-simplejwt
drf-spectacular
flake8
fonttools
frozenlist
funcy
g4f
grpcio
grpcio-tools
h11
idna
importlib_metadata
importlib_resources
inflect
inflection
iniconfig
isort
jaraco.collections
jaraco.context
jaraco.functools
jaraco.text
Jinja2
jmespath
jsonschema
jsonschema-specifications
jst-aicommit
jst-django
jst-django-core
kombu
markdown-it-py
MarkupSafe
mccabe
mdurl
model-bakery
more-itertools
multidict
mypy-extensions
nest-asyncio
packaging
pathspec
pillow
pip-chill
platformdirs
pluggy
polib
prompt-toolkit
propcache
protobuf
psycopg2-binary
pycodestyle
pycparser
pycryptodome
pydantic
pydantic_core
pydyf
pyflakes
Pygments
PyJWT
pyphen
pytest
pytest-django
python-dateutil
python-slugify
PyYAML
questionary
redis
referencing
reportlab
requests
rich
rpds-py
s3transfer
setuptools
shellingham
six
sqlparse
tenacity
text-unidecode
tinycss2
tinyhtml5
tomli
tqdm
typeguard
typer
typer-slim
types-python-dateutil
typing-inspection
typing_extensions
tzdata
uritemplate
urllib3
uvicorn
vine
wcwidth
weasyprint
webencodings
yarl
zipfile36
zipp
zopfli
# !NOTE: on-websocket
@@ -50,3 +150,5 @@ boto3
grpcio>=1.62.0
grpcio-tools>=1.62.0
protobuf>=4.25.0
reportlab

File diff suppressed because it is too large Load Diff

View File

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

13
task.txt Normal file
View File

@@ -0,0 +1,13 @@
/v1/auto-evaluation/ field qo'shish va o'zgartirish kerak
object_type => Bu hozirda select. Oshanga value qoshish kerak: bus, moto
car_position => Qoshish kerak. Bu hozirda select. /api/v1/reference-item/ apidan value yuboraman
distance_covered => Qoshish kerak. Number. Bosib otilgan masofasi
body_type => Qoshish kerak. Bu hozirda select. /api/v1/reference-item/ apidan value yuboraman
fuel_type => Qoshish kerak. Bu hozirda select. /api/v1/reference-item/ apidan value yuboraman
state_car => Qoshish kerak. Bu hozirda select. /api/v1/reference-item/ apidan value yuboraman
car_type => manashu field ni olib tashlash kerak
tex_passport_file => multiple qilish kerak
assessment_task_type => Baholash vazifasi. Qoshish kerak. Select boladi. /api/v1/reference-item/ apidan value yuboraman
object_owner_residence => Obyekt egasi yashash joyi. Qoshish kerak. string boladi.