Merge pull request 'shaxob' (#97) from shaxob into main

Reviewed-on: #97

config/urls.py

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

core/apps/accounts/models/user.py

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

core/apps/accounts/serializers/user.py

@@ -30,3 +30,28 @@ 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
+
+
+
+class UserCreateSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = get_user_model()
+        fields = [
+            "phone",
+            "first_name",
+            "last_name",
+            "password",
+            "role"]

core/apps/accounts/urls.py

@@ -4,7 +4,8 @@ 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, AdminCreateAPIView, AdminUpdateAPIView
 from rest_framework.routers import DefaultRouter
 
 router = DefaultRouter()
@@ -12,6 +13,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 = [
@@ -25,4 +27,6 @@ urlpatterns = [
     ),
     path("user/list/", UserListApiView.as_view(), name="user-list"),
     path("admin-user/list/", AdminUserListApiView.as_view(), name="admin-user-list"),
+    path("admin/create/", AdminCreateAPIView.as_view(), name="user-create"),
+    path("admin/update/", AdminUpdateAPIView.as_view(), name="user-update"),
 ]

core/apps/accounts/views/user.py

@@ -1,15 +1,19 @@
 from django.contrib.auth import get_user_model
-
+from django.shortcuts import get_object_or_404
+from django_core.mixins import BaseViewSetMixin
+from drf_spectacular.utils import extend_schema
 from rest_framework import generics, filters
 from rest_framework.permissions import IsAuthenticated
+from rest_framework.response import Response
+from rest_framework.views import APIView
+from rest_framework.viewsets import ModelViewSet
 
-from 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.serializers.user import UserSerializer, AdminUserSerializer, UserCreateSerializer
 
 User = get_user_model()
 
+
 @extend_schema(tags=['User'])
 class UserListApiView(generics.ListAPIView):
     queryset = User.objects.filter(role=RoleChoice.USER)
@@ -29,3 +33,50 @@ 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})
+
+
+@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)

core/apps/evaluation/models/auto.py

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

core/apps/evaluation/permissions/permission.py

@@ -0,0 +1,60 @@
+from django.db import models
+from django.utils.translation import gettext_lazy as _
+from pydantic import BaseModel
+
+
+class PermissionToAction(BaseModel):
+    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(BaseModel):
+    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(BaseModel):
+    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')
+

core/apps/evaluation/serializers/auto/AutoEvaluation.py

@@ -1,18 +1,20 @@
 import re
-from django.contrib.auth import get_user_model
 
+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 AutoEvaluationModel, ReferenceitemModel, EvaluationrequestModel
 from core.apps.evaluation.serializers.reference import ListReferenceitemSerializer
-from core.apps.evaluation.choices.request import RequestStatus
 
 User = get_user_model()
 
+
 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)
-    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)
     value_determined = ListReferenceitemSerializer(read_only=True)
     property_rights = ListReferenceitemSerializer(read_only=True)
@@ -72,6 +74,7 @@ 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)
+
     # object_location_highways_display = serializers.CharField(
     #     source="get_object_location_highways_display", read_only=True, default=None
     # )
@@ -141,7 +144,6 @@ class UpdateAutoevaluationSerializer(serializers.ModelSerializer):
         allow_null=True,
     )
 
-
     class Meta:
         model = AutoEvaluationModel
         fields = [
@@ -222,6 +224,7 @@ class UpdateAutoevaluationSerializer(serializers.ModelSerializer):
 
         return attrs
 
+
 class CreateAutoevaluationSerializer(serializers.ModelSerializer):
     property_rights = serializers.PrimaryKeyRelatedField(
         queryset=ReferenceitemModel.objects.all(),
@@ -254,7 +257,6 @@ class CreateAutoevaluationSerializer(serializers.ModelSerializer):
         allow_null=True,
     )
 
-
     class Meta:
         model = AutoEvaluationModel
         fields = [
@@ -356,3 +358,13 @@ class AutoEvaluationAppraisersSerializer(serializers.Serializer):
             raise serializers.ValidationError("Invalid appraisers IDs.")
         data['users'] = users
         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()

core/apps/evaluation/urls.py

@@ -31,7 +31,7 @@ from .views import (
     EvaluationStatusChange,
     CertificateView,
     ArchiveQuickEvaluationView,
-    ArchiveEvaluationrequestView,
+    ArchiveEvaluationrequestView, GetArchivedEvaluationListAPIView, ArchivedEvaluation,
 )
 
 router = DefaultRouter()
@@ -80,4 +80,11 @@ urlpatterns = [
          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"),
+
+    path("archived-evaluvation/", GetArchivedEvaluationListAPIView.as_view(),
+         name="archived-evaluation"),
+
+    path("auto-evaluvation-change-status/<int:pk>", ArchivedEvaluation.as_view(),
+         name="archived-evaluation"),
+
 ]

core/apps/evaluation/views/auto.py

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

stack.yaml

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