48 Commits

Author SHA1 Message Date
7e778d3a3e Merge pull request 'shaxob' (#106) from shaxob into main
Some checks failed
Deploy to Production / build-and-deploy (push) Failing after 10m36s
Reviewed-on: #106
2026-04-27 09:02:37 +00:00
Shaxobff
81a4287db1 update 2026-04-27 11:57:27 +05:00
Shaxobff
e560fdaf2d fix bug 2026-04-27 11:28:18 +05:00
Shaxobff
0d96167a7b fix bug 2026-04-27 10:58:02 +05:00
Shaxobff
ae65d9d793 resolve migrations conflict 2026-04-25 12:52:15 +05:00
Shaxobff
5249f7e6f7 my migrations 2026-04-25 12:36:33 +05:00
Shaxobff
e1b771e166 app permission api 20 (api) 2026-04-25 12:32:56 +05:00
github-actions[bot]
eded642bd7 🔄 Update image to 124 [CI SKIP] 2026-04-24 13:57:50 +00:00
f830235813 Merge pull request 'fix' (#105) from behruz into main
All checks were successful
Deploy to Production / build-and-deploy (push) Successful in 2m15s
Reviewed-on: #105
2026-04-24 13:55:58 +00:00
xoliqberdiyev
a62cf3a1ee fix 2026-04-24 18:55:42 +05:00
github-actions[bot]
2f471173c3 🔄 Update image to 123 [CI SKIP] 2026-04-24 13:52:45 +00:00
3838fbaa47 Merge pull request 'change ci/cd folder' (#104) from behruz into main
All checks were successful
Deploy to Production / build-and-deploy (push) Successful in 2m16s
Reviewed-on: #104
2026-04-24 13:50:51 +00:00
xoliqberdiyev
b02078e618 cha 2026-04-24 18:49:34 +05:00
xoliqberdiyev
1f59347d87 fix 2026-04-24 18:42:11 +05:00
github-actions[bot]
fe40057d95 🔄 Update image to 122 [CI SKIP] 2026-04-24 13:40:38 +00:00
550da049b9 Merge pull request 'fix' (#103) from behruz into main
All checks were successful
Deploy to Production / build-and-deploy (push) Successful in 2m17s
Reviewed-on: #103
2026-04-24 13:38:42 +00:00
xoliqberdiyev
bdd5aa9ce2 fix 2026-04-24 18:36:39 +05:00
github-actions[bot]
bd27205252 🔄 Update image to 121 [CI SKIP] 2026-04-24 13:34:27 +00:00
34aba90ebd Merge pull request 'behruz' (#102) from behruz into main
Some checks failed
Deploy to Production / build-and-deploy (push) Failing after 2m6s
Reviewed-on: #102
2026-04-24 13:32:26 +00:00
xoliqberdiyev
260bc9101e Merge branch 'main' of https://gitea.felixits.uz/sifatbaho/backend-v1 into behruz 2026-04-24 18:30:52 +05:00
xoliqberdiyev
f46dac515a fix 2026-04-24 18:30:41 +05:00
github-actions[bot]
c6fc150162 🔄 Update image to 120 [CI SKIP] 2026-04-24 12:57:55 +00:00
7272ef3fce Merge pull request 'fix migrations error' (#101) from behruz into main
Some checks failed
Deploy to Production / build-and-deploy (push) Failing after 2m3s
Reviewed-on: #101
2026-04-24 12:56:01 +00:00
xoliqberdiyev
1db936126d fix migrations error 2026-04-24 17:55:19 +05:00
5e1b02064e Merge pull request 'UPDATE' (#100) from shaxob into main
Some checks failed
Deploy to Production / build-and-deploy (push) Failing after 1m55s
Reviewed-on: #100
2026-04-24 12:37:17 +00:00
Shaxobff
4e242a4358 UPDATE 2026-04-24 17:34:34 +05:00
bcb453d52a Merge pull request 'UPDATE' (#98) from shaxob into main
Some checks failed
Deploy to Production / build-and-deploy (push) Failing after 1m51s
Reviewed-on: #98
2026-04-24 12:27:09 +00:00
039ca92031 Merge pull request 'behruz' (#99) from behruz into main
Some checks failed
Deploy to Production / build-and-deploy (push) Failing after 1m0s
Reviewed-on: #99
2026-04-24 12:25:44 +00:00
xoliqberdiyev
21bb61e51c change ci/cd 2026-04-24 17:24:34 +05:00
Shaxobff
c9d60acfc9 UPDATE 2026-04-24 17:07:36 +05:00
Shaxobff
127a2073f8 UPDATE 2026-04-24 16:51:15 +05:00
1ad2016790 Merge pull request 'shaxob' (#97) from shaxob into main
Some checks failed
Deploy to Production / build-and-deploy (push) Failing after 49s
Reviewed-on: #97
2026-04-24 11:40:31 +00:00
Shaxobff
3fd0f9959b Merge branch 'main' of https://gitea.felixits.uz/sifatbaho/backend-v1 into shaxob
# Conflicts:
#	core/apps/accounts/serializers/user.py
#	core/apps/accounts/urls.py
#	core/apps/accounts/views/user.py
#	core/apps/evaluation/urls.py
#	core/apps/evaluation/views/request.py
2026-04-24 16:34:02 +05:00
Shaxobff
84cc11fe2a UPDATE 2026-04-24 16:21:19 +05:00
Shaxobff
deebae384c UPDATE 2026-04-24 16:00:17 +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
Shaxobff
e27a9b7f11 UPDATE 2026-04-24 11:28:29 +05:00
github-actions[bot]
c89f2b32af 🔄 Update image to 115 [CI SKIP] 2026-04-24 06:23:17 +00:00
Shaxobff
82489cf64c ADD archivedet evaluvation 2026-04-24 11:22:58 +05: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
Shaxobff
af559dadda ADD permission 2026-04-24 11:04:37 +05:00
Shaxobff
d2f8d73cdd /api/v1/admin-user/list/ edit va post 2026-04-23 20:05:16 +05:00
Shaxobff
c4b2a80b2e /api/v1/admin-user/list/ edit va post 2026-04-23 20:03:58 +05:00
xoliqberdiyev
7961fd76de add grpc client 2026-04-23 17:36:43 +05:00
Shaxobff
049cd6ff25 /api/v1/admin-user/list/ edit va post 2026-04-23 13:54:31 +05:00
Shaxobff
b8021c7728 add AutoEvaluationRequestView 2026-04-22 14:23:52 +05:00
27 changed files with 583 additions and 119 deletions

View File

@@ -75,7 +75,3 @@ STORAGE_PROTOCOL=http:
# Didox configs # Didox configs
DIDOX_PARTNER_TOKEN=... DIDOX_PARTNER_TOKEN=...
# Celery configs

View File

@@ -8,7 +8,6 @@ on:
env: env:
PROJECT_NAME: sifatbaho PROJECT_NAME: sifatbaho
permissions: permissions:
contents: write 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|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 sed -i 's/return HttpResponse("OK.*"/return HttpResponse("OK: #${{ github.sha }}"/' config/urls.py
- name: Commit and push updated version - name: Commit and push updated version
run: | run: |
git config user.name "github-actions[bot]" git config user.name "github-actions[bot]"
@@ -154,6 +152,6 @@ jobs:
"DB_HOST=postgres" \ "DB_HOST=postgres" \
"DB_NAME=sifatbahodb" \ "DB_NAME=sifatbahodb" \
"DB_PORT=5432" \ "DB_PORT=5432" \
"DIDOX_TOKEN=${{ secrets.DIDOX_TOKEN }}" "DIDOX_PARTNER_TOKEN=${{ secrets.DIDOX_TOKEN }}"
export PORT=8085 export PORT=8085
docker stack deploy -c stack.yaml ${{ env.PROJECT_NAME }} --with-registry-auth docker stack deploy -c stack.yaml ${{ env.PROJECT_NAME }} --with-registry-auth

View File

@@ -13,7 +13,7 @@ from config.env import env
def home(request): def home(request):
return HttpResponse("OK: #1a985ffa4b785b63a71b9e0cdd78042c3fcda239") return HttpResponse("OK: #f83023581352d6c1a13ed27703ccd356a1f40df9")
urlpatterns = [ urlpatterns = [

View File

@@ -0,0 +1,60 @@
from django.db import models
from django.utils.translation import gettext_lazy as _
from django_core.models import AbstractBaseModel
class PermissionToAction(AbstractBaseModel):
name = models.CharField(max_length=200)
code = models.CharField(max_length=100, unique=True)
def __str__(self):
return f"{self.name} - {self.code}"
class Meta:
verbose_name = _('Harakatlar uchun ruxsatnoma')
verbose_name_plural = _('Harakatlar uchun ruxsatnomalar')
class PermissionToTab(AbstractBaseModel):
name = models.CharField(max_length=200)
code = models.CharField(max_length=100, unique=True)
permission_to_actions = models.ManyToManyField(
PermissionToAction, related_name='permission_to_tabs'
)
def __str__(self):
return f'{self.name} - {self.code}'
class Meta:
verbose_name = _("Bo'lim uchun ruxsatnoma")
verbose_name_plural = _("Bo'lim uchun ruxsatnomalar")
class Permission(AbstractBaseModel):
name = models.CharField(max_length=200)
code = models.CharField(max_length=100, unique=True)
permission_tab = models.ManyToManyField(PermissionToTab, related_name='permissions')
def __str__(self):
return f'{self.name} - {self.code}'
class Meta:
verbose_name = _('Sahifa uchun ruxsatnoma')
verbose_name_plural = _('Sahifa uchun ruxsatnomalar')
class Role(models.Model):
name = models.CharField(max_length=200, unique=True)
permissions = models.ManyToManyField(Permission, related_name='roles', blank=True)
permission_to_tabs = models.ManyToManyField(PermissionToTab, related_name='roles', blank=True)
permission_to_actions = models.ManyToManyField(
PermissionToAction, related_name='roles', blank=True
)
comment = models.CharField(max_length=200, null=True, blank=True)
def __str__(self):
return self.name
class Meta:
verbose_name = _('Rol')
verbose_name_plural = _('Rollar')

View File

@@ -1,6 +1,7 @@
from django.contrib.auth import models as auth_models from django.contrib.auth import models as auth_models
from django.db import models from django.db import models
from .permission import Role
from ..choices import RoleChoice from ..choices import RoleChoice
from ..managers import UserManager from ..managers import UserManager
@@ -17,6 +18,7 @@ class User(auth_models.AbstractUser):
default=RoleChoice.USER, default=RoleChoice.USER,
) )
avatar = models.ImageField(upload_to="avatars/", null=True, blank=True) avatar = models.ImageField(upload_to="avatars/", null=True, blank=True)
permission = models.ForeignKey(Role, on_delete=models.SET_NULL, null=True, blank=True, related_name='users')
USERNAME_FIELD = "phone" USERNAME_FIELD = "phone"
objects = UserManager() objects = UserManager()

View File

@@ -0,0 +1,26 @@
from rest_framework import serializers
from core.apps.accounts.models.permission import PermissionToAction, PermissionToTab, Permission, Role
class PermissionToActionSerializer(serializers.ModelSerializer):
class Meta:
model = PermissionToAction
fields = "__all__"
class PermissionToTabSerializer(serializers.ModelSerializer):
class Meta:
model = PermissionToTab
fields = '__all__'
class PermissionSerializer(serializers.ModelSerializer):
class Meta:
model = Permission
fields = '__all__'
class RoleSerializer(serializers.ModelSerializer):
class Meta:
model = Role
fields = '__all__'

View File

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

View File

@@ -4,14 +4,22 @@ Accounts app urls
from django.urls import path, include from django.urls import path, include
from rest_framework_simplejwt import views as jwt_views 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, AdminCreateAPIView, AdminUpdateAPIView
from rest_framework.routers import DefaultRouter from rest_framework.routers import DefaultRouter
from .views.permission import PermissionToActionViewSet, PermissionToTabViewSet, PermissionViewSet, RoleViewSet
router = DefaultRouter() router = DefaultRouter()
router.register("auth", RegisterView, basename="auth") router.register("auth", RegisterView, basename="auth")
router.register("auth", ResetPasswordView, basename="reset-password") router.register("auth", ResetPasswordView, basename="reset-password")
router.register("auth", MeView, basename="me") router.register("auth", MeView, basename="me")
router.register("auth", ChangePasswordView, basename="change-password") router.register("auth", ChangePasswordView, basename="change-password")
router.register("user", AdminUserView, basename="user-crud")
router.register("action", PermissionToActionViewSet, basename="action")
router.register("permission-to-tab", PermissionToTabViewSet, basename="permission-to-tab")
router.register("permission", PermissionViewSet, basename="permission")
router.register("permission-role", RoleViewSet, basename="permission-role")
urlpatterns = [ urlpatterns = [
@@ -25,4 +33,6 @@ urlpatterns = [
), ),
path("user/list/", UserListApiView.as_view(), name="user-list"), path("user/list/", UserListApiView.as_view(), name="user-list"),
path("admin-user/list/", AdminUserListApiView.as_view(), name="admin-user-list"), path("admin-user/list/", AdminUserListApiView.as_view(), name="admin-user-list"),
path("admin/create/", AdminCreateAPIView.as_view(), name="user-create"),
path("admin/update/", AdminUpdateAPIView.as_view(), name="user-update"),
] ]

View File

@@ -0,0 +1,42 @@
from django_core.mixins import BaseViewSetMixin
from drf_spectacular.utils import extend_schema
from rest_framework.permissions import AllowAny, IsAdminUser
from rest_framework.viewsets import ModelViewSet
from core.apps.accounts.models.permission import PermissionToAction, PermissionToTab, Permission, Role
from core.apps.accounts.serializers.permission import PermissionToActionSerializer, PermissionToTabSerializer, \
PermissionSerializer, RoleSerializer
@extend_schema(tags=["permission"])
class PermissionToActionViewSet(BaseViewSetMixin, ModelViewSet):
queryset = PermissionToAction.objects.all()
serializer_class = PermissionToActionSerializer
action_serializer_class = {
'create': PermissionToActionSerializer,
'update': PermissionToActionSerializer,
}
action_permission_classes = {
'create': [AllowAny],
'destroy': [IsAdminUser],
}
@extend_schema(tags=["permission"])
class PermissionToTabViewSet(BaseViewSetMixin, ModelViewSet):
queryset = PermissionToTab.objects.all()
serializer_class = PermissionToTabSerializer
@extend_schema(tags=["permission"])
class PermissionViewSet(BaseViewSetMixin, ModelViewSet):
queryset = Permission.objects.all()
serializer_class = PermissionSerializer
class RoleViewSet(BaseViewSetMixin, ModelViewSet):
queryset = Role.objects.all()
serializer_class = RoleSerializer

View File

@@ -1,15 +1,19 @@
from django.contrib.auth import get_user_model from django.contrib.auth import get_user_model
from django.shortcuts import get_object_or_404
from django_core.mixins import BaseViewSetMixin
from drf_spectacular.utils import extend_schema
from rest_framework import generics, filters from rest_framework import generics, filters
from rest_framework.permissions import IsAuthenticated from rest_framework.permissions import IsAuthenticated
from rest_framework.response import Response
from rest_framework.views import APIView
from rest_framework.viewsets import ModelViewSet
from drf_spectacular.utils import extend_schema
from core.apps.accounts.serializers.user import UserSerializer
from core.apps.accounts.choices.user import RoleChoice from core.apps.accounts.choices.user import RoleChoice
from core.apps.accounts.serializers.user import UserSerializer, AdminUserSerializer, UserCreateSerializer
User = get_user_model() User = get_user_model()
@extend_schema(tags=['User']) @extend_schema(tags=['User'])
class UserListApiView(generics.ListAPIView): class UserListApiView(generics.ListAPIView):
queryset = User.objects.filter(role=RoleChoice.USER) queryset = User.objects.filter(role=RoleChoice.USER)
@@ -29,3 +33,50 @@ class AdminUserListApiView(generics.ListAPIView):
permission_classes = [IsAuthenticated] permission_classes = [IsAuthenticated]
filter_backends = [filters.SearchFilter] filter_backends = [filters.SearchFilter]
search_fields = ['phone', 'first_name', 'last_name'] search_fields = ['phone', 'first_name', 'last_name']
@extend_schema(tags=["User"], request=AdminUserSerializer)
class AdminUserView(BaseViewSetMixin, ModelViewSet):
queryset = User.objects.filter(role=RoleChoice.USER)
serializer_class = AdminUserSerializer
permission_classes = [IsAuthenticated]
filter_backends = [filters.SearchFilter]
search_fields = ['phone', 'first_name', 'last_name']
def serializer_context(self):
return self.serializer_class(context={"request": self.request})
@extend_schema(tags=['User'],
responses={200: UserSerializer},
request=UserCreateSerializer)
class AdminCreateAPIView(APIView):
permission_classes = [IsAuthenticated]
def post(self, request):
if request.user.role not in (RoleChoice.SUPERUSER, RoleChoice.ADMIN):
return Response({'detail': 'Forbidden'}, status=403)
serializer = UserCreateSerializer(data=request.data)
serializer.is_valid(raise_exception=True)
serializer.save()
return Response(serializer.data, status=201)
@extend_schema(tags=['User'],
responses={200: UserSerializer},
request=UserCreateSerializer)
class AdminUpdateAPIView(APIView):
permission_classes = [IsAuthenticated]
def put(self, request, pk):
if request.user.role not in (RoleChoice.SUPERUSER, RoleChoice.ADMIN):
return Response({'detail': 'Forbidden'}, status=403)
user = get_object_or_404(User, pk=pk)
serializer = UserCreateSerializer(user, data=request.data)
serializer.is_valid(raise_exception=True)
serializer.save()
return Response(serializer.data, status=200)

View File

@@ -267,6 +267,12 @@ class AutoEvaluationModel(AbstractBaseModel):
choices=AutoEvaluationStatus.choices, choices=AutoEvaluationStatus.choices,
default=AutoEvaluationStatus.CREATED, default=AutoEvaluationStatus.CREATED,
) )
is_archived = models.BooleanField(
verbose_name=_("is archived"),
default=False,
)
def __str__(self): def __str__(self):
return f"Auto Evaluation {self.registration_number or self.pk}" return f"Auto Evaluation {self.registration_number or self.pk}"

View File

@@ -1,18 +1,20 @@
import re import re
from django.contrib.auth import get_user_model
from django.contrib.auth import get_user_model
from rest_framework import serializers from rest_framework import serializers
from core.apps.evaluation.models import AutoEvaluationModel,ReferenceitemModel, EvaluationrequestModel
from core.apps.evaluation.serializers.reference import ListReferenceitemSerializer
from core.apps.evaluation.choices.request import RequestStatus from core.apps.evaluation.choices.request import RequestStatus
from core.apps.evaluation.models import AutoEvaluationModel, ReferenceitemModel, EvaluationrequestModel
from core.apps.evaluation.serializers.reference import ListReferenceitemSerializer
User = get_user_model() User = get_user_model()
class BaseAutoevaluationSerializer(serializers.ModelSerializer): class BaseAutoevaluationSerializer(serializers.ModelSerializer):
status_display = serializers.CharField(source="get_status_display", read_only=True) 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_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) object_owner_type_display = serializers.CharField(source="get_object_owner_type_display", read_only=True,
default=None)
rate_type = ListReferenceitemSerializer(read_only=True) rate_type = ListReferenceitemSerializer(read_only=True)
value_determined = ListReferenceitemSerializer(read_only=True) value_determined = ListReferenceitemSerializer(read_only=True)
property_rights = ListReferenceitemSerializer(read_only=True) property_rights = ListReferenceitemSerializer(read_only=True)
@@ -72,6 +74,7 @@ class ListAutoevaluationSerializer(BaseAutoevaluationSerializer):
class RetrieveAutoevaluationSerializer(BaseAutoevaluationSerializer): class RetrieveAutoevaluationSerializer(BaseAutoevaluationSerializer):
car_type_display = serializers.CharField(source="get_car_type_display", read_only=True, default=None) car_type_display = serializers.CharField(source="get_car_type_display", read_only=True, default=None)
car_wheel_display = serializers.CharField(source="get_car_wheel_display", read_only=True, default=None) car_wheel_display = serializers.CharField(source="get_car_wheel_display", read_only=True, default=None)
# object_location_highways_display = serializers.CharField( # object_location_highways_display = serializers.CharField(
# source="get_object_location_highways_display", read_only=True, default=None # source="get_object_location_highways_display", read_only=True, default=None
# ) # )
@@ -141,7 +144,6 @@ class UpdateAutoevaluationSerializer(serializers.ModelSerializer):
allow_null=True, allow_null=True,
) )
class Meta: class Meta:
model = AutoEvaluationModel model = AutoEvaluationModel
fields = [ fields = [
@@ -222,6 +224,7 @@ class UpdateAutoevaluationSerializer(serializers.ModelSerializer):
return attrs return attrs
class CreateAutoevaluationSerializer(serializers.ModelSerializer): class CreateAutoevaluationSerializer(serializers.ModelSerializer):
property_rights = serializers.PrimaryKeyRelatedField( property_rights = serializers.PrimaryKeyRelatedField(
queryset=ReferenceitemModel.objects.all(), queryset=ReferenceitemModel.objects.all(),
@@ -254,7 +257,6 @@ class CreateAutoevaluationSerializer(serializers.ModelSerializer):
allow_null=True, allow_null=True,
) )
class Meta: class Meta:
model = AutoEvaluationModel model = AutoEvaluationModel
fields = [ fields = [
@@ -356,3 +358,13 @@ class AutoEvaluationAppraisersSerializer(serializers.Serializer):
raise serializers.ValidationError("Invalid appraisers IDs.") raise serializers.ValidationError("Invalid appraisers IDs.")
data['users'] = users data['users'] = users
return data return data
class AutoEvaluationSerializer(serializers.Serializer):
brand = serializers.CharField()
brand_model = serializers.CharField()
year = serializers.CharField()
color = serializers.CharField()
transmission = serializers.CharField()
condition = serializers.CharField()
fuel_type = serializers.CharField()
mileage = serializers.CharField()

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

@@ -3,6 +3,7 @@ from core.apps.evaluation.models import CertificateModel
class BaseCertificateSerializer(serializers.ModelSerializer): class BaseCertificateSerializer(serializers.ModelSerializer):
file = serializers.SerializerMethodField()
class Meta: class Meta:
model = CertificateModel model = CertificateModel
@@ -11,3 +12,11 @@ class BaseCertificateSerializer(serializers.ModelSerializer):
"title", "title",
"file", "file",
] ]
def get_file(self, obj):
if obj.file:
request = self.context.get('request')
if request:
return request.build_absolute_uri(obj.file.url)
return obj.file.url
return None

View File

@@ -128,6 +128,3 @@ class CreateQuickevaluationSerializer(serializers.ModelSerializer):
return super().create(validated_data) return super().create(validated_data)
class ArchiveQuickevaluationSerializer(serializers.Serializer):
id = serializers.IntegerField(required=True)
is_archive = serializers.BooleanField(required=True)

View File

@@ -30,8 +30,9 @@ from .views import (
TechPassportAPIView, TechPassportAPIView,
EvaluationStatusChange, EvaluationStatusChange,
CertificateView, CertificateView,
ArchiveQuickEvaluationView, ArchiveEvaluationrequestView, GetArchivedAutoEvaluationListAPIView, ArchivedAutoEvaluation,
ArchiveEvaluationrequestView, GetArchivedQuickevaluationListAPIView, ChangeQuickevaluationAPIView, ArchivedReqEvaluation,
GetArchivedReqEvaluationListAPIView,
) )
router = DefaultRouter() router = DefaultRouter()
@@ -78,6 +79,21 @@ urlpatterns = [
), ),
path("evaluation-request/<int:pk>/change-status/", EvaluationStatusChange.as_view(), path("evaluation-request/<int:pk>/change-status/", EvaluationStatusChange.as_view(),
name="evaluation-change-status"), name="evaluation-change-status"),
path("archive/quick-evaluation/", ArchiveQuickEvaluationView.as_view(), name="quick-evaluation-archive"), path("archive/quick-evaluation/", GetArchivedQuickevaluationListAPIView.as_view(), name="get-quick-evaluation-archive"),
path("archive/quick-evaluation/<int:pk>", ChangeQuickevaluationAPIView.as_view(), name="change-quick-evaluation-archive"),
path("archive/evaluation-request/", ArchiveEvaluationrequestView.as_view(), name="evaluation-request-archive"), path("archive/evaluation-request/", ArchiveEvaluationrequestView.as_view(), name="evaluation-request-archive"),
path("archived-evaluvation/", GetArchivedAutoEvaluationListAPIView.as_view(),
name="archived-evaluation"),
path("auto-evaluvation-change-status/<int:pk>", ArchivedAutoEvaluation.as_view(),
name="archived-evaluation"),
path("req-evaluvation-change-status/<int:pk>", ArchivedReqEvaluation.as_view(),
name="archived-req-evaluation"),
path("req-evaluvation-change-status/", GetArchivedReqEvaluationListAPIView.as_view(),
name="archived-req-evaluation"),
] ]

View File

@@ -1,13 +1,14 @@
from django.db.models import Q from django.db.models import Q
from django_core.mixins import BaseViewSetMixin
from django.shortcuts import get_object_or_404 from django.shortcuts import get_object_or_404
from django_core.mixins import BaseViewSetMixin
from django_filters.rest_framework import DjangoFilterBackend from django_filters.rest_framework import DjangoFilterBackend
from drf_spectacular.utils import extend_schema, OpenApiParameter from drf_spectacular.utils import extend_schema, OpenApiParameter
from rest_framework.filters import OrderingFilter, SearchFilter from rest_framework.filters import OrderingFilter, SearchFilter
from rest_framework.generics import GenericAPIView, ListAPIView
from rest_framework.permissions import AllowAny, IsAuthenticated 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.response import Response
from rest_framework.views import APIView
from rest_framework.viewsets import ModelViewSet
from core.apps.accounts.serializers.user import UserSerializer from core.apps.accounts.serializers.user import UserSerializer
from core.apps.evaluation.filters.auto import AutoevaluationFilter from core.apps.evaluation.filters.auto import AutoevaluationFilter
@@ -154,3 +155,21 @@ class AutoEvaluationListAppraisersView(GenericAPIView):
return self.get_paginated_response(serializer.data) return self.get_paginated_response(serializer.data)
except Exception as e: except Exception as e:
return Response({"error": str(e)}, status=500) return Response({"error": str(e)}, status=500)
@extend_schema(tags=["AutoEvaluation"])
class GetArchivedAutoEvaluationListAPIView(ListAPIView):
permission_classes = [IsAuthenticated]
def get_queryset(self):
return AutoEvaluationModel.objects.filter(is_archived=True)
@extend_schema(tags=["AutoEvaluation"])
class ArchivedAutoEvaluation(APIView):
permission_classes = [IsAuthenticated]
def post(self, request, pk):
auto_evaluation = get_object_or_404(AutoEvaluationModel, pk=pk)
auto_evaluation.is_archived = request.data["is_archived"]
auto_evaluation.save()
return Response({"success": True}, status=200)

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

View File

@@ -1,14 +1,15 @@
from django.shortcuts import get_object_or_404
from django_core.mixins import BaseViewSetMixin from django_core.mixins import BaseViewSetMixin
from django_filters.rest_framework import DjangoFilterBackend from django_filters.rest_framework import DjangoFilterBackend
from drf_spectacular.utils import extend_schema, OpenApiResponse from drf_spectacular.utils import extend_schema
from rest_framework import status
from rest_framework.filters import OrderingFilter, SearchFilter from rest_framework.filters import OrderingFilter, SearchFilter
from rest_framework.generics import ListAPIView
from rest_framework.parsers import FormParser, MultiPartParser from rest_framework.parsers import FormParser, MultiPartParser
from rest_framework.permissions import AllowAny, IsAuthenticated 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.response import Response
from rest_framework import status from rest_framework.views import APIView
from django.shortcuts import get_object_or_404 from rest_framework.viewsets import ModelViewSet
from core.apps.evaluation.filters.quick import QuickevaluationFilter from core.apps.evaluation.filters.quick import QuickevaluationFilter
from core.apps.evaluation.models import QuickEvaluationModel from core.apps.evaluation.models import QuickEvaluationModel
@@ -16,7 +17,6 @@ from core.apps.evaluation.serializers.quick import (
CreateQuickevaluationSerializer, CreateQuickevaluationSerializer,
ListQuickevaluationSerializer, ListQuickevaluationSerializer,
RetrieveQuickevaluationSerializer, RetrieveQuickevaluationSerializer,
ArchiveQuickevaluationSerializer,
) )
@@ -56,75 +56,27 @@ class QuickEvaluationView(BaseViewSetMixin, ModelViewSet):
"create": CreateQuickevaluationSerializer, "create": CreateQuickevaluationSerializer,
} }
@extend_schema(tags=["QuickEvaluation"]) @extend_schema(tags=["QuickEvaluation"])
class ArchiveQuickEvaluationView(GenericAPIView): class ChangeQuickevaluationAPIView(APIView):
def post(self, request, pk):
instance = get_object_or_404(QuickEvaluationModel, pk=pk)
is_archived = request.data.get("is_archived")
if is_archived is None:
return Response(
{"error": "Поле 'is_archived' обязательно"},
status=status.HTTP_400_BAD_REQUEST
)
instance.is_archived = is_archived
instance.save()
return Response({"success": True}, status=200)
@extend_schema(tags=["QuickEvaluation"])
class GetArchivedQuickevaluationListAPIView(ListAPIView):
permission_classes = [IsAuthenticated] permission_classes = [IsAuthenticated]
def get_serializer_class(self): def get_queryset(self):
if self.request.method == "GET": return QuickEvaluationModel.objects.filter(is_archived=True)
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,16 +1,18 @@
from django.shortcuts import get_object_or_404 from django.shortcuts import get_object_or_404
from django_core.mixins import BaseViewSetMixin from django_core.mixins import BaseViewSetMixin
from django_filters.rest_framework import DjangoFilterBackend from django_filters.rest_framework import DjangoFilterBackend
from drf_spectacular.utils import OpenApiResponse
from drf_spectacular.utils import extend_schema from drf_spectacular.utils import extend_schema
from rest_framework import status
from rest_framework.filters import OrderingFilter, SearchFilter from rest_framework.filters import OrderingFilter, SearchFilter
from rest_framework.pagination import PageNumberPagination from rest_framework.generics import GenericAPIView, ListAPIView
from rest_framework.permissions import AllowAny, IsAuthenticated from rest_framework.permissions import IsAuthenticated
from rest_framework.viewsets import ModelViewSet
from rest_framework.response import Response from rest_framework.response import Response
from rest_framework.views import APIView from rest_framework.views import APIView
from rest_framework import status from rest_framework.viewsets import ModelViewSet
from core.apps.accounts.choices import RoleChoice
from core.apps.evaluation.choices.request import RequestStatus
from core.apps.evaluation.filters.request import EvaluationrequestFilter from core.apps.evaluation.filters.request import EvaluationrequestFilter
from core.apps.evaluation.models import EvaluationrequestModel from core.apps.evaluation.models import EvaluationrequestModel
from core.apps.evaluation.serializers.request import ( from core.apps.evaluation.serializers.request import (
@@ -19,9 +21,6 @@ from core.apps.evaluation.serializers.request import (
RetrieveEvaluationrequestSerializer, RetrieveEvaluationrequestSerializer,
ArchiveEvaluationrequestSerializer, ArchiveEvaluationrequestSerializer,
) )
from core.apps.evaluation.choices.request import RequestStatus
from rest_framework.generics import GenericAPIView
from drf_spectacular.utils import OpenApiResponse
# class RequestPagination(PageNumberPagination): # class RequestPagination(PageNumberPagination):
@@ -85,7 +84,6 @@ class EvaluationrequestView(BaseViewSetMixin, ModelViewSet):
).order_by("-created_at") ).order_by("-created_at")
@extend_schema(tags=["EvaluationRequest"]) @extend_schema(tags=["EvaluationRequest"])
class AdminEvaluationrequestView(BaseViewSetMixin, ModelViewSet): class AdminEvaluationrequestView(BaseViewSetMixin, ModelViewSet):
serializer_class = ListEvaluationrequestSerializer serializer_class = ListEvaluationrequestSerializer
@@ -133,7 +131,8 @@ class AdminEvaluationrequestView(BaseViewSetMixin, ModelViewSet):
} }
def get_queryset(self): def get_queryset(self):
return EvaluationrequestModel.objects.select_related("value_determined", "rate_goal", "property_rights", "form_ownership", "user").order_by("-created_at") return EvaluationrequestModel.objects.select_related("value_determined", "rate_goal", "property_rights",
"form_ownership", "user").order_by("-created_at")
def serializer_context(self): def serializer_context(self):
return self.serializer_class(context={"request": self.request}) return self.serializer_class(context={"request": self.request})
@@ -149,7 +148,6 @@ class EvaluationStatusChange(APIView):
evaluation = get_object_or_404(EvaluationrequestModel, pk=pk) evaluation = get_object_or_404(EvaluationrequestModel, pk=pk)
status_value = request.data.get('status') status_value = request.data.get('status')
if not status_value: if not status_value:
return Response({'detail': 'Status is required'}, status=status.HTTP_400_BAD_REQUEST) return Response({'detail': 'Status is required'}, status=status.HTTP_400_BAD_REQUEST)
@@ -176,6 +174,7 @@ class EvaluationStatusChange(APIView):
'id': evaluation.pk 'id': evaluation.pk
}) })
@extend_schema(tags=["EvaluationRequest"]) @extend_schema(tags=["EvaluationRequest"])
class ArchiveEvaluationrequestView(GenericAPIView): class ArchiveEvaluationrequestView(GenericAPIView):
permission_classes = [IsAuthenticated] permission_classes = [IsAuthenticated]
@@ -248,3 +247,24 @@ class ArchiveEvaluationrequestView(GenericAPIView):
}, },
status=status.HTTP_200_OK status=status.HTTP_200_OK
) )
@extend_schema(tags=["EvaluationRequest"])
class GetArchivedReqEvaluationListAPIView(ListAPIView):
permission_classes = [IsAuthenticated]
def get_queryset(self):
return EvaluationrequestModel.objects.filter(is_archived=True)
@extend_schema(tags=["EvaluationRequest"])
class ArchivedReqEvaluation(APIView):
permission_classes = [IsAuthenticated]
def post(self, request, pk):
req_evaluation = get_object_or_404(EvaluationrequestModel, pk=pk)
req_evaluation.is_archived = request.data["is_archived"]
req_evaluation.save()
return Response({"success": True,
"status": req_evaluation.status,
"id": req_evaluation.pk}, status=200)

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

@@ -46,3 +46,7 @@ boto3
# !NOTE: on-websocket # !NOTE: on-websocket
# websockets # websockets
# channels-redis # 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" max-file: "5"
web: web:
image: husanjon/sifatbaho:114 image: husanjon/sifatbaho:124
env_file: env_file:
- .env - .env
environment: environment:
@@ -129,7 +129,7 @@ services:
max-file: "5" max-file: "5"
celery: celery:
image: husanjon/sifatbaho:114 image: husanjon/sifatbaho:124
env_file: env_file:
- .env - .env
environment: environment: