54 Commits

Author SHA1 Message Date
xoliqberdiyev
21bb61e51c change ci/cd 2026-04-24 17:24:34 +05:00
xoliqberdiyev
2b5238f3c8 add new api 2026-04-24 15:25:57 +05:00
xoliqberdiyev
988d07f4b6 Merge branch 'main' of https://gitea.felixits.uz/sifatbaho/backend-v1 2026-04-24 15:09:16 +05:00
github-actions[bot]
c89f2b32af 🔄 Update image to 115 [CI SKIP] 2026-04-24 06:23:17 +00:00
88dedd85c7 Merge pull request 'Add view for crud user' (#95) from user-crud into main
All checks were successful
Deploy to Production / build-and-deploy (push) Successful in 4m15s
Reviewed-on: #95
2026-04-24 06:21:40 +00:00
komoliddin
fb275a091a Add view for crud user 2026-04-24 11:21:01 +05:00
github-actions[bot]
190480b6f7 🔄 Update image to 114 [CI SKIP] 2026-04-24 05:16:20 +00:00
1a985ffa4b Merge pull request 'Refactor URL patterns for evaluation archiving and remove unused file_url field from BaseCertificateSerializer' (#94) from certificate into main
All checks were successful
Deploy to Production / build-and-deploy (push) Successful in 1m57s
Reviewed-on: #94
2026-04-24 05:14:45 +00:00
komoliddin
3b62c5a7bf Refactor URL patterns for evaluation archiving and remove unused file_url field from BaseCertificateSerializer 2026-04-24 10:14:01 +05:00
github-actions[bot]
07f8d55966 🔄 Update image to 113 [CI SKIP] 2026-04-23 14:02:58 +00:00
b0b4ccfeee Merge pull request 'makemigrations' (#93) from certificate into main
All checks were successful
Deploy to Production / build-and-deploy (push) Successful in 3m52s
Reviewed-on: #93
2026-04-23 14:01:14 +00:00
komoliddin
ccefe9c119 Merge branch 'main' of https://gitea.felixits.uz/sifatbaho/backend-v1 into certificate 2026-04-23 19:00:42 +05:00
komoliddin
6456283f72 makemigrations 2026-04-23 18:59:06 +05:00
github-actions[bot]
6eed2d998e 🔄 Update image to 112 [CI SKIP] 2026-04-23 13:07:08 +00:00
2c82691166 Merge pull request 'Enhance Certificate model and serializer to support file uploads and URL generation' (#92) from certificate into main
All checks were successful
Deploy to Production / build-and-deploy (push) Successful in 4m27s
Reviewed-on: #92
2026-04-23 13:05:27 +00:00
komoliddin
7a88e39b96 Enhance Certificate model and serializer to support file uploads and URL generation 2026-04-23 18:04:09 +05:00
xoliqberdiyev
7961fd76de add grpc client 2026-04-23 17:36:43 +05:00
github-actions[bot]
dc622ce305 🔄 Update image to 111 [CI SKIP] 2026-04-23 11:24:21 +00:00
komoliddin
6e0718c5db merge migrations
All checks were successful
Deploy to Production / build-and-deploy (push) Successful in 1m57s
2026-04-23 16:22:42 +05:00
komoliddin
32d3bea234 Merge branch 'certificate'
Some checks failed
Deploy to Production / build-and-deploy (push) Failing after 47s
2026-04-23 16:18:43 +05:00
komoliddin
129827b495 Merge branch 'main' of https://gitea.felixits.uz/sifatbaho/backend-v1
Some checks failed
Deploy to Production / build-and-deploy (push) Failing after 49s
2026-04-23 16:13:34 +05:00
komoliddin
50cc555783 Merge branch 'request-archive' 2026-04-23 16:10:00 +05:00
komoliddin
76563b3ef0 Add Certificate model and write crud for it 2026-04-23 16:07:37 +05:00
github-actions[bot]
207363dc6a 🔄 Update image to 108 [CI SKIP] 2026-04-23 10:50:59 +00:00
2a08ad9662 Merge pull request 'Add is_archive field to Quickevaluation model. Write apis for update is_archive and list archived quick evaluations' (#89) from tb-archive into main
All checks were successful
Deploy to Production / build-and-deploy (push) Successful in 3m58s
Reviewed-on: #89
2026-04-23 10:49:11 +00:00
komoliddin
5cf4b950fb Make migrations 2026-04-23 12:25:18 +05:00
komoliddin
3a08c81ff3 Add is_archive field to EvaluationRequest model. Write apis for update is_archive and list archived requests 2026-04-23 12:23:55 +05:00
komoliddin
4fee037467 Add is_archive field to Quickevaluation model. Write apis for update is_archive and list archived quick evaluations 2026-04-23 11:49:55 +05:00
github-actions[bot]
320f490d23 🔄 Update image to 107 [CI SKIP] 2026-04-22 10:03:44 +00:00
d4e6d80c86 Merge pull request 'deploy.yaml fixess' (#88) from fix/cicd-env into main
All checks were successful
Deploy to Production / build-and-deploy (push) Successful in 1m55s
Reviewed-on: #88
2026-04-22 10:02:12 +00:00
1f0e942be8 deploy.yaml fixess 2026-04-22 15:01:52 +05:00
github-actions[bot]
2af67333e2 🔄 Update image to 106 [CI SKIP] 2026-04-22 09:21:04 +00:00
81c689e7e9 Merge pull request 'feat: add 404 response for missing company or person in Didox API' (#86) from didox-api into main
All checks were successful
Deploy to Production / build-and-deploy (push) Successful in 1m56s
Reviewed-on: #86
2026-04-22 09:19:30 +00:00
github-actions[bot]
09d2e0954c 🔄 Update image to 105 [CI SKIP] 2026-04-22 09:17:53 +00:00
84a5afb2ee Merge pull request 'add request status change api' (#87) from shaxob into main
All checks were successful
Deploy to Production / build-and-deploy (push) Successful in 1m57s
Reviewed-on: #87
Reviewed-by: xoliqberdiyev <behruz@felixits.uz>
2026-04-22 09:16:19 +00:00
github-actions[bot]
cc8fc345d9 🔄 Update image to 104 [CI SKIP] 2026-04-22 09:11:31 +00:00
03e4387e4d Merge pull request 'fix: handle response errors and improve data return in TechPassportService' (#85) from tech-passport into main
All checks were successful
Deploy to Production / build-and-deploy (push) Successful in 2m16s
Reviewed-on: #85
Reviewed-by: xoliqberdiyev <behruz@felixits.uz>
2026-04-22 09:09:38 +00:00
Shaxobff
64993805af add request status change api 2026-04-22 13:52:39 +05:00
komoliddin
01711b5927 feat: add 404 response for missing company or person in Didox API 2026-04-22 11:28:35 +05:00
komoliddin
33aa06f80b fix: handle response errors and improve data return in TechPassportService 2026-04-22 11:17:09 +05:00
github-actions[bot]
cb2d83b00d 🔄 Update image to 103 [CI SKIP] 2026-04-21 12:36:45 +00:00
46c9621457 Merge pull request 'sort yangilandi' (#84) from fix/evaluation-request-api into main
All checks were successful
Deploy to Production / build-and-deploy (push) Successful in 1m55s
Reviewed-on: #84
2026-04-21 12:35:14 +00:00
github-actions[bot]
8d73fa09a7 🔄 Update image to 102 [CI SKIP] 2026-04-21 11:43:22 +00:00
3367063707 Merge pull request 'write swagger docs' (#82) from behruz into main
All checks were successful
Deploy to Production / build-and-deploy (push) Successful in 1m56s
Reviewed-on: #82
2026-04-21 11:41:48 +00:00
github-actions[bot]
229676be5c 🔄 Update image to 101 [CI SKIP] 2026-04-21 11:27:41 +00:00
d2f517baf4 Merge pull request 'feat: uncomment significant code for ws' (#81) from behruz into main
All checks were successful
Deploy to Production / build-and-deploy (push) Successful in 1m55s
Reviewed-on: #81
2026-04-21 11:26:08 +00:00
github-actions[bot]
fa676bfa96 🔄 Update image to 100 [CI SKIP] 2026-04-21 11:13:53 +00:00
ca9f12ae32 Merge pull request 'fix' (#80) from behruz into main
All checks were successful
Deploy to Production / build-and-deploy (push) Successful in 1m57s
Reviewed-on: #80
2026-04-21 11:12:18 +00:00
github-actions[bot]
5049919865 🔄 Update image to 99 [CI SKIP] 2026-04-21 10:29:59 +00:00
ca3c9bfe4a Merge pull request 'feat: removing location fields from auto-evalutaion model, adding new tex_passport_file field for auto-evalutaion model' (#79) from behruz into main
All checks were successful
Deploy to Production / build-and-deploy (push) Successful in 2m0s
Reviewed-on: #79
2026-04-21 10:28:22 +00:00
github-actions[bot]
7ab1e0b1e0 🔄 Update image to 98 [CI SKIP] 2026-04-21 10:23:04 +00:00
f66a35ec80 Merge pull request 'remote: tex_passport_file field removed from quick evaluation serializers' (#78) from behruz into main
All checks were successful
Deploy to Production / build-and-deploy (push) Successful in 1m56s
Reviewed-on: #78
2026-04-21 10:21:29 +00:00
github-actions[bot]
f68f34178e 🔄 Update image to 97 [CI SKIP] 2026-04-21 10:20:39 +00:00
Husanjonazamov
8207b750b8 sort yangilandi 2026-03-12 17:29:10 +05:00
34 changed files with 724 additions and 59 deletions

View File

@@ -8,7 +8,6 @@ on:
env:
PROJECT_NAME: sifatbaho
permissions:
contents: write
@@ -95,7 +94,6 @@ jobs:
sed -i "s|image: .*/${{ env.PROJECT_NAME }}:.*|image: ${{ secrets.DOCKER_USERNAME }}/${{ env.PROJECT_NAME }}:${{ github.run_number }}|g" stack.yaml
sed -i 's/return HttpResponse("OK.*"/return HttpResponse("OK: #${{ github.sha }}"/' config/urls.py
- name: Commit and push updated version
run: |
git config user.name "github-actions[bot]"
@@ -127,7 +125,6 @@ jobs:
rm -rf "$DIR"
cd "$PROJECTS"
git clone "$REPO_URL" "${{ env.PROJECT_NAME }}"
echo "Clone qilindi"
fi
cd "$DIR"
@@ -135,25 +132,18 @@ jobs:
git fetch origin main
git reset --hard origin/main
cp .env.example .env
cat > .env << 'ENVEOF'
DB_HOST=postgres
DB_NAME=sifatbahodb
DB_PORT=5432
DB_USER=${{ secrets.DB_USER }}
DB_PASSWORD=${{ secrets.DB_PASSWORD }}
REDIS_URL=redis://redis:6379
SECRET_KEY=${{ secrets.SECRET_KEY }}
DIDOX_TOKEN=${{ secrets.DIDOX_TOKEN }}
DEBUG=False
PORT=8085
update_env() {
local env_file=".env"
for kv in "$@"; do
local key="${kv%%=*}"
local value="${kv#*=}"
if grep -q "^$key=" "$env_file"; then
sed -i "s|^$key=.*|$key=$value|" "$env_file"
else
echo "$key=$value" >> "$env_file"
fi
done
}
ENVEOF
update_env \
"DB_HOST=postgres" \
"DB_NAME=sifatbahodb" \
"DB_PORT=5432"
export PORT=8085
docker stack deploy -c stack.yaml ${{ env.PROJECT_NAME }} --with-registry-auth

View File

@@ -13,7 +13,7 @@ from config.env import env
def home(request):
return HttpResponse("OK: #0a74f71efa31f99a832fd38261b2d8f125ad1213")
return HttpResponse("OK: #88dedd85c79ccf732b2adac03616bd14e67a1579")
urlpatterns = [

View File

@@ -30,3 +30,16 @@ class UserUpdateSerializer(serializers.ModelSerializer):
"last_name",
"avatar"
]
class AdminUserSerializer(serializers.ModelSerializer):
avatar = serializers.SerializerMethodField(method_name='get_avatar')
class Meta:
model = get_user_model()
fields = "__all__"
def get_avatar(self, obj):
request = self.context.get('request')
if obj.avatar:
return request.build_absolute_uri(obj.avatar.url)
return None

View File

@@ -4,7 +4,7 @@ Accounts app urls
from django.urls import path, include
from rest_framework_simplejwt import views as jwt_views
from .views import RegisterView, ResetPasswordView, MeView, ChangePasswordView, UserListApiView, AdminUserListApiView
from .views import RegisterView, ResetPasswordView, MeView, ChangePasswordView, UserListApiView, AdminUserListApiView,AdminUserView
from rest_framework.routers import DefaultRouter
router = DefaultRouter()
@@ -12,6 +12,7 @@ router.register("auth", RegisterView, basename="auth")
router.register("auth", ResetPasswordView, basename="reset-password")
router.register("auth", MeView, basename="me")
router.register("auth", ChangePasswordView, basename="change-password")
router.register("user", AdminUserView, basename="user-crud")
urlpatterns = [

View File

@@ -5,8 +5,11 @@ from rest_framework.permissions import IsAuthenticated
from drf_spectacular.utils import extend_schema
from core.apps.accounts.serializers.user import UserSerializer
from core.apps.accounts.serializers.user import UserSerializer, AdminUserSerializer
from core.apps.accounts.choices.user import RoleChoice
from django_core.mixins import BaseViewSetMixin
from rest_framework.viewsets import ModelViewSet
User = get_user_model()
@@ -29,3 +32,16 @@ class AdminUserListApiView(generics.ListAPIView):
permission_classes = [IsAuthenticated]
filter_backends = [filters.SearchFilter]
search_fields = ['phone', 'first_name', 'last_name']
@extend_schema(tags=["User"],request=AdminUserSerializer)
class AdminUserView(BaseViewSetMixin, ModelViewSet):
queryset = User.objects.filter(role=RoleChoice.USER)
serializer_class = AdminUserSerializer
permission_classes = [IsAuthenticated]
filter_backends = [filters.SearchFilter]
search_fields = ['phone', 'first_name', 'last_name']
def serializer_context(self):
return self.serializer_class(context={"request": self.request})

View File

@@ -0,0 +1,28 @@
# Generated by Django 6.0.4 on 2026-04-23 11:07
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('evaluation', '0031_remove_autoevaluationmodel_object_location_city_and_more'),
]
operations = [
migrations.CreateModel(
name='CertificateModel',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('created_at', models.DateTimeField(auto_now_add=True)),
('updated_at', models.DateTimeField(auto_now=True)),
('title', models.CharField(max_length=255, verbose_name='title')),
('file_url', models.URLField(max_length=255, verbose_name='file url')),
],
options={
'verbose_name': 'Certificate',
'verbose_name_plural': 'Certificates',
'db_table': 'certificate',
},
),
]

View File

@@ -0,0 +1,18 @@
# Generated by Django 6.0.4 on 2026-04-23 07:22
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('evaluation', '0031_remove_autoevaluationmodel_object_location_city_and_more'),
]
operations = [
migrations.AddField(
model_name='evaluationrequestmodel',
name='is_archive',
field=models.BooleanField(default=False, verbose_name='is archive'),
),
]

View File

@@ -0,0 +1,18 @@
# Generated by Django 6.0.4 on 2026-04-23 07:24
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('evaluation', '0031_remove_autoevaluationmodel_object_location_city_and_more'),
]
operations = [
migrations.AddField(
model_name='quickevaluationmodel',
name='is_archive',
field=models.BooleanField(default=False, verbose_name='is archive'),
),
]

View File

@@ -0,0 +1,15 @@
# Generated by Django 6.0.4 on 2026-04-23 11:22
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('evaluation', '0032_certificatemodel'),
('evaluation', '0032_evaluationrequestmodel_is_archive'),
('evaluation', '0032_quickevaluationmodel_is_archive'),
]
operations = [
]

View File

@@ -0,0 +1,22 @@
# Generated by Django 6.0.4 on 2026-04-23 13:42
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('evaluation', '0033_merge_20260423_1622'),
]
operations = [
migrations.RemoveField(
model_name='certificatemodel',
name='file_url',
),
migrations.AddField(
model_name='certificatemodel',
name='file',
field=models.FileField(blank=True, null=True, upload_to='certificates/', verbose_name='file'),
),
]

View File

@@ -11,3 +11,4 @@ from .report import * # noqa
from .request import * # noqa
from .valuation import * # noqa
from .vehicle import * # noqa
from .certificate import * # noqa

View File

@@ -0,0 +1,30 @@
from django.db import models
from django_core.models import AbstractBaseModel
from django.utils.translation import gettext_lazy as _
from model_bakery import baker
class CertificateModel(AbstractBaseModel):
title = models.CharField(
verbose_name=_("title"),
max_length=255
)
file = models.FileField(
verbose_name=_("file"),
upload_to="certificates/",
blank=True,
null=True
)
def __str__(self):
return self.title
@classmethod
def _baker(cls):
return baker.make(cls)
class Meta:
db_table = "certificate"
verbose_name = _("Certificate")
verbose_name_plural = _("Certificates")

View File

@@ -132,6 +132,11 @@ class QuickEvaluationModel(AbstractBaseModel):
default=QuickEvaluationStatus.CREATED,
)
is_archive = models.BooleanField(
verbose_name=_("is archive"),
default=False,
)
def __str__(self):
return f"Quick Evaluation {self.pk} by {self.created_by}"

View File

@@ -118,9 +118,12 @@ class EvaluationrequestModel(AbstractBaseModel):
choices=RequestStatus.choices,
default=RequestStatus.PENDING,
)
is_archive = models.BooleanField(
verbose_name=_("is archive"),
default=False,
)
def __str__(self):
return f"Request #{self.pk}{self.get_rate_type_display()}"
return f"Requests #{self.pk}{self.get_rate_type_display()}"
@classmethod
def _baker(cls):

View File

@@ -12,3 +12,4 @@ from .request import * # noqa
from .valuation import * # noqa
from .vehicle import * # noqa
from .tech_passport import * # noqa
from .certificate import * # noqa

View File

@@ -0,0 +1,11 @@
from rest_framework import serializers
class AvgCostSerializer(serializers.Serializer):
brand = serializers.CharField(max_length=100)
condition = serializers.CharField(max_length=100)
model = serializers.CharField(max_length=100)
complication = serializers.CharField(max_length=100)
manufacture_date = serializers.DateField()
distance_covered = serializers.IntegerField()
color = serializers.CharField(max_length=100)

View File

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

View File

@@ -0,0 +1,13 @@
from rest_framework import serializers
from core.apps.evaluation.models import CertificateModel
class BaseCertificateSerializer(serializers.ModelSerializer):
class Meta:
model = CertificateModel
fields = [
"id",
"title",
"file",
]

View File

@@ -38,7 +38,8 @@ class BaseQuickevaluationSerializer(serializers.ModelSerializer):
"state_car_name",
"created_at",
"distance_covered",
"tex_passport_serie_num"
"tex_passport_serie_num",
"is_archive"
]
@@ -125,3 +126,8 @@ class CreateQuickevaluationSerializer(serializers.ModelSerializer):
if request and request.user and request.user.is_authenticated:
validated_data["created_by"] = request.user
return super().create(validated_data)
class ArchiveQuickevaluationSerializer(serializers.Serializer):
id = serializers.IntegerField(required=True)
is_archive = serializers.BooleanField(required=True)

View File

@@ -55,6 +55,7 @@ class BaseEvaluationrequestSerializer(serializers.ModelSerializer):
"user",
"created_at",
"updated_at",
"is_archive",
]
def get_location(self, obj):
@@ -183,3 +184,7 @@ class CreateEvaluationrequestSerializer(serializers.ModelSerializer):
validated_data["location_name"] = str(location_name)
validated_data["user"] = self.context["request"].user
return super().create(validated_data)
class ArchiveEvaluationrequestSerializer(serializers.Serializer):
id = serializers.IntegerField(required=True)
is_archive = serializers.BooleanField(required=True)

View File

@@ -28,6 +28,10 @@ from .views import (
AutoEvaluationRemoveAppraisersView,
DidoxCompanyInfoAPIView,
TechPassportAPIView,
EvaluationStatusChange,
CertificateView,
ArchiveQuickEvaluationView,
ArchiveEvaluationrequestView,
)
router = DefaultRouter()
@@ -52,6 +56,7 @@ router.register("vehicle", VehicleView, basename="vehicle")
router.register("valuation", ValuationView, basename="valuation")
router.register("property-owner", PropertyOwnerView, basename="property-owner")
router.register("customer", CustomerView, basename="customer")
router.register("certificate", CertificateView, basename="certificate")
urlpatterns = [
path("", include(router.urls)),
path("auto-evaluation/appraisers/", include(
@@ -71,4 +76,8 @@ urlpatterns = [
TechPassportAPIView.as_view(),
name="tech-passport"
),
path("evaluation-request/<int:pk>/change-status/", EvaluationStatusChange.as_view(),
name="evaluation-change-status"),
path("archive/quick-evaluation/", ArchiveQuickEvaluationView.as_view(), name="quick-evaluation-archive"),
path("archive/evaluation-request/", ArchiveEvaluationrequestView.as_view(), name="evaluation-request-archive"),
]

View File

@@ -13,3 +13,4 @@ from .valuation import * # noqa
from .vehicle import * # noqa
from .didox import * # noqa
from .tech_passport import * # noqa
from .certificate import * # noqa

View File

@@ -0,0 +1,18 @@
from rest_framework import generics
from rest_framework.response import Response
from rest_framework import permissions
from core.apps.evaluation.serializers.auto.AvgCost import AvgCostSerializer
from core.services.grpc.auto import get_auto_avg_cost
class AvgCostView(generics.GenericAPIView):
serializer_class = AvgCostSerializer
permission_classes = [permissions.IsAuthenticated]
def post(self):
serializer = self.get_serializer(data=self.request.data)
if serializer.is_valid():
avg_cost = get_auto_avg_cost(serializer.validated_data)
return Response(avg_cost, status=200)
return Response(serializer.errors, status=400)

View File

@@ -0,0 +1,23 @@
from django_core.mixins import BaseViewSetMixin
from drf_spectacular.utils import extend_schema
from rest_framework.permissions import IsAuthenticated
from rest_framework.viewsets import ModelViewSet
from core.apps.evaluation.models import CertificateModel
from core.apps.evaluation.serializers.certificate import BaseCertificateSerializer
from rest_framework.filters import SearchFilter
from rest_framework.parsers import MultiPartParser, FormParser
@extend_schema(tags=["Certificate"],request=BaseCertificateSerializer)
class CertificateView(BaseViewSetMixin, ModelViewSet):
queryset = CertificateModel.objects.all()
serializer_class = BaseCertificateSerializer
permission_classes = [IsAuthenticated]
parser_classes = [MultiPartParser, FormParser]
filter_backends = [SearchFilter]
search_fields = ["title"]
pagination_class = None
action_permission_classes = {}

View File

@@ -1,6 +1,6 @@
from rest_framework.response import Response
from rest_framework import status
from rest_framework.permissions import AllowAny
from rest_framework.permissions import IsAuthenticated
from rest_framework.generics import GenericAPIView
@@ -11,7 +11,7 @@ from core.services.didox import DidoxService
class DidoxCompanyInfoAPIView(GenericAPIView):
authentication_classes = []
permission_classes = [AllowAny]
permission_classes = [IsAuthenticated]
@extend_schema(
tags=["Didox"],
@@ -31,7 +31,6 @@ class DidoxCompanyInfoAPIView(GenericAPIView):
def get(self, request, *args, **kwargs):
tin = kwargs.get("tin")
# 🔥 TYPE CHECK
try:
tin = int(tin)
except (TypeError, ValueError):
@@ -48,4 +47,14 @@ class DidoxCompanyInfoAPIView(GenericAPIView):
status=status.HTTP_502_BAD_GATEWAY
)
# if both name and personalNum are null/empty -> 404
name = data.get("name")
personal_num = data.get("personalNum")
if not name and not personal_num:
return Response(
{"detail": "Company or person not found"},
status=status.HTTP_404_NOT_FOUND
)
return Response(data, status=status.HTTP_200_OK)

View File

@@ -1,10 +1,14 @@
from django_core.mixins import BaseViewSetMixin
from django_filters.rest_framework import DjangoFilterBackend
from drf_spectacular.utils import extend_schema
from drf_spectacular.utils import extend_schema, OpenApiResponse
from rest_framework.filters import OrderingFilter, SearchFilter
from rest_framework.parsers import FormParser, MultiPartParser
from rest_framework.permissions import AllowAny
from rest_framework.permissions import AllowAny, IsAuthenticated
from rest_framework.viewsets import ModelViewSet
from rest_framework.generics import GenericAPIView
from rest_framework.response import Response
from rest_framework import status
from django.shortcuts import get_object_or_404
from core.apps.evaluation.filters.quick import QuickevaluationFilter
from core.apps.evaluation.models import QuickEvaluationModel
@@ -12,6 +16,7 @@ from core.apps.evaluation.serializers.quick import (
CreateQuickevaluationSerializer,
ListQuickevaluationSerializer,
RetrieveQuickevaluationSerializer,
ArchiveQuickevaluationSerializer,
)
@@ -20,7 +25,7 @@ class QuickEvaluationView(BaseViewSetMixin, ModelViewSet):
queryset = QuickEvaluationModel.objects.select_related(
"created_by", "brand", "marka", "color", "fuel_type",
"body_type", "state_car", "car_position",
).all()
).filter(is_archive=False)
serializer_class = ListQuickevaluationSerializer
permission_classes = [AllowAny]
parser_classes = [MultiPartParser, FormParser]
@@ -50,3 +55,76 @@ class QuickEvaluationView(BaseViewSetMixin, ModelViewSet):
"retrieve": RetrieveQuickevaluationSerializer,
"create": CreateQuickevaluationSerializer,
}
@extend_schema(tags=["QuickEvaluation"])
class ArchiveQuickEvaluationView(GenericAPIView):
permission_classes = [IsAuthenticated]
def get_serializer_class(self):
if self.request.method == "GET":
return ListQuickevaluationSerializer
return ArchiveQuickevaluationSerializer
@extend_schema(
tags=["QuickEvaluation"],
summary="Get archived quick evaluations list",
description="""
Returns only archived quick evaluations.
This endpoint works like quick-evaluation/,
but only records with is_archive=True are returned.
""",
responses={200: ListQuickevaluationSerializer(many=True)},
)
def get(self, request, *args, **kwargs):
queryset = QuickEvaluationModel.objects.filter(
is_archive=True
).order_by("-created_at")
serializer = self.get_serializer(queryset, many=True)
return Response(serializer.data, status=status.HTTP_200_OK)
@extend_schema(
tags=["QuickEvaluation"],
summary="Archive or unarchive quick evaluation",
description="""
Update archive status for quick evaluation.
- is_archive=true → archive
- is_archive=false → remove from archive
""",
request=ArchiveQuickevaluationSerializer,
responses={
200: OpenApiResponse(
description="Archive status updated successfully"
),
400: OpenApiResponse(
description="Validation error"
),
404: OpenApiResponse(
description="Quick evaluation not found"
),
},
)
def post(self, request, *args, **kwargs):
serializer = self.get_serializer(data=request.data)
serializer.is_valid(raise_exception=True)
validated_data = serializer.validated_data
obj = get_object_or_404(
QuickEvaluationModel,
id=validated_data["id"]
)
obj.is_archive = validated_data["is_archive"]
obj.save(update_fields=["is_archive"])
return Response(
{
"success": True,
"message": "Archive status updated successfully"
},
status=status.HTTP_200_OK
)

View File

@@ -1,3 +1,5 @@
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
@@ -5,6 +7,9 @@ from rest_framework.filters import OrderingFilter, SearchFilter
from rest_framework.pagination import PageNumberPagination
from rest_framework.permissions import AllowAny, IsAuthenticated
from rest_framework.viewsets import ModelViewSet
from rest_framework.response import Response
from rest_framework.views import APIView
from rest_framework import status
from core.apps.evaluation.filters.request import EvaluationrequestFilter
from core.apps.evaluation.models import EvaluationrequestModel
@@ -12,7 +17,11 @@ from core.apps.evaluation.serializers.request import (
CreateEvaluationrequestSerializer,
ListEvaluationrequestSerializer,
RetrieveEvaluationrequestSerializer,
ArchiveEvaluationrequestSerializer,
)
from core.apps.evaluation.choices.request import RequestStatus
from rest_framework.generics import GenericAPIView
from drf_spectacular.utils import OpenApiResponse
# class RequestPagination(PageNumberPagination):
@@ -128,3 +137,114 @@ class AdminEvaluationrequestView(BaseViewSetMixin, ModelViewSet):
def serializer_context(self):
return self.serializer_class(context={"request": self.request})
@extend_schema(tags=["EvaluationRequest"])
class EvaluationStatusChange(APIView):
permission_classes = [IsAuthenticated]
def post(self, request, pk):
if request.user.role not in [RoleChoice.ADMIN, RoleChoice.SUPERUSER]:
return Response({'detail': 'Forbidden'}, status=status.HTTP_403_FORBIDDEN)
evaluation = get_object_or_404(EvaluationrequestModel, pk=pk)
status_value = request.data.get('status')
if not status_value:
return Response({'detail': 'Status is required'}, status=status.HTTP_400_BAD_REQUEST)
valid_statuses = [
RequestStatus.PENDING,
RequestStatus.IN_PROGRESS,
RequestStatus.COMPLETED,
RequestStatus.REJECTED
]
if status_value not in valid_statuses:
return Response(
{'detail': f'Invalid status. Must be one of: {valid_statuses}'},
status=status.HTTP_400_BAD_REQUEST
)
evaluation.status = status_value
evaluation.save()
return Response({
'success': True,
'status': evaluation.status,
'id': evaluation.pk
})
@extend_schema(tags=["EvaluationRequest"])
class ArchiveEvaluationrequestView(GenericAPIView):
permission_classes = [IsAuthenticated]
def get_serializer_class(self):
if self.request.method == "GET":
return ListEvaluationrequestSerializer
return ArchiveEvaluationrequestSerializer
@extend_schema(
tags=["EvaluationRequest"],
summary="Get archived evaluation requests list",
description="""
Returns only archived evaluation requests.
This endpoint works like evaluation-request/,
but only records with is_archive=True are returned.
""",
responses={200: ListEvaluationrequestSerializer(many=True)},
)
def get(self, request, *args, **kwargs):
queryset = EvaluationrequestModel.objects.filter(
is_archive=True
).order_by("-created_at")
serializer = self.get_serializer(queryset, many=True)
return Response(serializer.data, status=status.HTTP_200_OK)
@extend_schema(
tags=["EvaluationRequest"],
summary="Archive or unarchive evaluation request",
description="""
Update archive status for evaluation request.
- is_archive=true → archive
- is_archive=false → remove from archive
""",
request=ArchiveEvaluationrequestSerializer,
responses={
200: OpenApiResponse(
description="Archive status updated successfully"
),
400: OpenApiResponse(
description="Validation error"
),
404: OpenApiResponse(
description="Evaluation request not found"
),
},
)
def post(self, request, *args, **kwargs):
serializer = self.get_serializer(data=request.data)
serializer.is_valid(raise_exception=True)
validated_data = serializer.validated_data
obj = get_object_or_404(
EvaluationrequestModel,
id=validated_data["id"]
)
obj.is_archive = validated_data["is_archive"]
obj.save(update_fields=["is_archive"])
return Response(
{
"success": True,
"message": "Archive status updated successfully"
},
status=status.HTTP_200_OK
)

View File

@@ -1,6 +1,6 @@
from rest_framework.response import Response
from rest_framework import status
from rest_framework.permissions import AllowAny
from rest_framework.permissions import IsAuthenticated
from rest_framework.generics import GenericAPIView
from drf_spectacular.utils import (
@@ -14,7 +14,7 @@ from ..serializers import TechPassportSerializer
class TechPassportAPIView(GenericAPIView):
authentication_classes = []
permission_classes = [AllowAny]
permission_classes = [IsAuthenticated]
@extend_schema(
tags=["Tech Passport"],
@@ -33,18 +33,27 @@ class TechPassportAPIView(GenericAPIView):
def post(self, request, *args, **kwargs):
serializer = TechPassportSerializer(data=request.data)
serializer.is_valid(raise_exception=True)
data = serializer.validated_data
try:
result = TechPassportService.get_auto_info(
autonumber=data["autonumber"],
tech_pass_number=data["tech_pass_number"],
tech_pass_series=data["tech_pass_series"],
)
return Response(result, status=status.HTTP_200_OK)
except Exception as e:
response_data = result["data"]
status_code = result["status_code"]
# success bolsa faqat data ichidagi data qaytariladi
if status_code == 200:
return Response(
{"detail": str(e)},
status=status.HTTP_400_BAD_REQUEST
response_data.get("data", {}),
status=status.HTTP_200_OK
)
# error bolsa original response qaytariladi
return Response(
response_data,
status=status_code
)

View File

@@ -0,0 +1,45 @@
# -*- coding: utf-8 -*-
# Generated by the protocol buffer compiler. DO NOT EDIT!
# NO CHECKED-IN PROTOBUF GENCODE
# source: auto.proto
# Protobuf Python Version: 6.31.1
"""Generated protocol buffer code."""
from google.protobuf import descriptor as _descriptor
from google.protobuf import descriptor_pool as _descriptor_pool
from google.protobuf import runtime_version as _runtime_version
from google.protobuf import symbol_database as _symbol_database
from google.protobuf.internal import builder as _builder
_runtime_version.ValidateProtobufRuntimeVersion(
_runtime_version.Domain.PUBLIC,
6,
31,
1,
'',
'auto.proto'
)
# @@protoc_insertion_point(imports)
_sym_db = _symbol_database.Default()
from google.protobuf import timestamp_pb2 as google_dot_protobuf_dot_timestamp__pb2
DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\nauto.proto\x12\x04\x61uto\x1a\x1fgoogle/protobuf/timestamp.proto\"\xba\x01\n\x12\x41utoAvgCostRequest\x12\r\n\x05\x62rand\x18\x01 \x01(\t\x12\x11\n\tcondition\x18\x02 \x01(\t\x12\r\n\x05model\x18\x03 \x01(\t\x12\x14\n\x0c\x63omplication\x18\x04 \x01(\t\x12\x34\n\x10manufacture_date\x18\x05 \x01(\x0b\x32\x1a.google.protobuf.Timestamp\x12\x18\n\x10\x64istance_covered\x18\x06 \x01(\t\x12\r\n\x05\x63olor\x18\x07 \x01(\t\"$\n\x13\x41\x64ImageListResponse\x12\r\n\x05image\x18\x01 \x01(\t\"t\n\x0e\x41\x64ListResponse\x12\n\n\x02id\x18\x01 \x01(\t\x12)\n\x06images\x18\x02 \x03(\x0b\x32\x19.auto.AdImageListResponse\x12\r\n\x05title\x18\x03 \x01(\t\x12\r\n\x05price\x18\x04 \x01(\t\x12\r\n\x05model\x18\x05 \x01(\t\"J\n\x13\x41utoAvgCostResponse\x12\x10\n\x08\x61vg_cost\x18\x01 \x01(\x01\x12!\n\x03\x61\x64s\x18\x02 \x03(\x0b\x32\x14.auto.AdListResponse2X\n\x12\x41utoAvgCostService\x12\x42\n\x0b\x41utoAvgCost\x12\x18.auto.AutoAvgCostRequest\x1a\x19.auto.AutoAvgCostResponseb\x06proto3')
_globals = globals()
_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'auto_pb2', _globals)
if not _descriptor._USE_C_DESCRIPTORS:
DESCRIPTOR._loaded_options = None
_globals['_AUTOAVGCOSTREQUEST']._serialized_start=54
_globals['_AUTOAVGCOSTREQUEST']._serialized_end=240
_globals['_ADIMAGELISTRESPONSE']._serialized_start=242
_globals['_ADIMAGELISTRESPONSE']._serialized_end=278
_globals['_ADLISTRESPONSE']._serialized_start=280
_globals['_ADLISTRESPONSE']._serialized_end=396
_globals['_AUTOAVGCOSTRESPONSE']._serialized_start=398
_globals['_AUTOAVGCOSTRESPONSE']._serialized_end=472
_globals['_AUTOAVGCOSTSERVICE']._serialized_start=474
_globals['_AUTOAVGCOSTSERVICE']._serialized_end=562
# @@protoc_insertion_point(module_scope)

View File

@@ -0,0 +1,97 @@
# Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT!
"""Client and server classes corresponding to protobuf-defined services."""
import grpc
import warnings
from core.generated import auto_pb2 as auto__pb2
GRPC_GENERATED_VERSION = '1.80.0'
GRPC_VERSION = grpc.__version__
_version_not_supported = False
try:
from grpc._utilities import first_version_is_lower
_version_not_supported = first_version_is_lower(GRPC_VERSION, GRPC_GENERATED_VERSION)
except ImportError:
_version_not_supported = True
if _version_not_supported:
raise RuntimeError(
f'The grpc package installed is at version {GRPC_VERSION},'
+ ' but the generated code in auto_pb2_grpc.py depends on'
+ f' grpcio>={GRPC_GENERATED_VERSION}.'
+ f' Please upgrade your grpc module to grpcio>={GRPC_GENERATED_VERSION}'
+ f' or downgrade your generated code using grpcio-tools<={GRPC_VERSION}.'
)
class AutoAvgCostServiceStub(object):
"""Missing associated documentation comment in .proto file."""
def __init__(self, channel):
"""Constructor.
Args:
channel: A grpc.Channel.
"""
self.AutoAvgCost = channel.unary_unary(
'/auto.AutoAvgCostService/AutoAvgCost',
request_serializer=auto__pb2.AutoAvgCostRequest.SerializeToString,
response_deserializer=auto__pb2.AutoAvgCostResponse.FromString,
_registered_method=True)
class AutoAvgCostServiceServicer(object):
"""Missing associated documentation comment in .proto file."""
def AutoAvgCost(self, request, context):
"""Missing associated documentation comment in .proto file."""
context.set_code(grpc.StatusCode.UNIMPLEMENTED)
context.set_details('Method not implemented!')
raise NotImplementedError('Method not implemented!')
def add_AutoAvgCostServiceServicer_to_server(servicer, server):
rpc_method_handlers = {
'AutoAvgCost': grpc.unary_unary_rpc_method_handler(
servicer.AutoAvgCost,
request_deserializer=auto__pb2.AutoAvgCostRequest.FromString,
response_serializer=auto__pb2.AutoAvgCostResponse.SerializeToString,
),
}
generic_handler = grpc.method_handlers_generic_handler(
'auto.AutoAvgCostService', rpc_method_handlers)
server.add_generic_rpc_handlers((generic_handler,))
server.add_registered_method_handlers('auto.AutoAvgCostService', rpc_method_handlers)
# This class is part of an EXPERIMENTAL API.
class AutoAvgCostService(object):
"""Missing associated documentation comment in .proto file."""
@staticmethod
def AutoAvgCost(request,
target,
options=(),
channel_credentials=None,
call_credentials=None,
insecure=False,
compression=None,
wait_for_ready=None,
timeout=None,
metadata=None):
return grpc.experimental.unary_unary(
request,
target,
'/auto.AutoAvgCostService/AutoAvgCost',
auto__pb2.AutoAvgCostRequest.SerializeToString,
auto__pb2.AutoAvgCostResponse.FromString,
options,
channel_credentials,
insecure,
call_credentials,
compression,
wait_for_ready,
timeout,
metadata,
_registered_method=True)

View File

@@ -0,0 +1,48 @@
import grpc
from google.protobuf.timestamp_pb2 import Timestamp
from datetime import datetime
from config.env import env
from core.generated import auto_pb2, auto_pb2_grpc
def get_auto_avg_cost(
brand,
condition,
model,
complication,
manufacture_date: datetime,
distance_covered,
color
):
# url = f"{env.str('RPC_IP')}:{env.str('RPC_PORT')}"
# channel = grpc.insecure_channel(url)
channel = grpc.insecure_channel("192.168.1.120:50051")
stub = auto_pb2_grpc.AutoAvgCostServiceStub(channel)
ts = Timestamp()
ts.FromDatetime(manufacture_date)
response = stub.AutoAvgCost(auto_pb2.AutoAvgCostRequest(
brand=brand,
condition=condition,
model=model,
complication=complication,
manufacture_date=ts,
distance_covered=distance_covered,
color=color,
))
return {
"avg_cost": response.avg_cost,
"ads": [
{
"id": ad.id,
"title": ad.title,
"price": ad.price,
"model": ad.model,
"images": [img.image for img in ad.images],
}
for ad in response.ads
]
}

View File

@@ -44,21 +44,28 @@ class TechPassportService:
verify=False
)
response.raise_for_status()
logger.info(
f"Tech passport info fetched successfully: {response.status_code}"
f"Tech passport response status: {response.status_code}"
)
try:
response_data = response.json()
except ValueError:
response_data = {
"detail": "Invalid response from external service"
}
return response_data.get("data", {})
return {
"status_code": response.status_code,
"data": response_data
}
except requests.exceptions.RequestException as e:
logger.error(
f"Error while fetching tech passport info: {str(e)}"
)
logger.error(str(e))
return {
"success": False,
"message": str(e)
"status_code": 500,
"data": {
"detail": str(e)
}
}

View File

@@ -46,3 +46,7 @@ boto3
# !NOTE: on-websocket
# websockets
# channels-redis
grpcio>=1.62.0
grpcio-tools>=1.62.0
protobuf>=4.25.0

View File

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