Merge branch 'main' of https://gitea.felixits.uz/sifatbaho/backend-v1

config/urls.py

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

core/apps/accounts/serializers/user.py

@@ -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

core/apps/accounts/urls.py

@@ -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 = [

core/apps/accounts/views/user.py

@@ -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})
+

core/apps/evaluation/migrations/0034_remove_certificatemodel_file_url_and_more.py

@@ -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'),
+        ),
+    ]

core/apps/evaluation/models/certificate.py

@@ -1,11 +1,21 @@
 from django.db import models
 from django_core.models import AbstractBaseModel
-from model_bakery import baker
 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, blank=False, null=False)
-    file_url = models.URLField(verbose_name=_("file url"), max_length=255, blank=False, null=False)
+    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

core/apps/evaluation/serializers/certificate/certificate.py

@@ -1,6 +1,7 @@
 from rest_framework import serializers
 from core.apps.evaluation.models import CertificateModel
 
+
 class BaseCertificateSerializer(serializers.ModelSerializer):
 
     class Meta:
@@ -8,5 +9,5 @@ class BaseCertificateSerializer(serializers.ModelSerializer):
         fields = [
             "id",
             "title",
-            "file_url"
+            "file",
         ]

core/apps/evaluation/urls.py

@@ -78,6 +78,6 @@ urlpatterns = [
     ),
     path("evaluation-request/<int:pk>/change-status/", EvaluationStatusChange.as_view(),
          name="evaluation-change-status"),
-    path("quick-evaluation/archive/", ArchiveQuickEvaluationView.as_view(), name="quick-evaluation-archive"),
-    path("evaluation-request/archive/", ArchiveEvaluationrequestView.as_view(), name="evaluation-request-archive"),
+    path("archive/quick-evaluation/", ArchiveQuickEvaluationView.as_view(), name="quick-evaluation-archive"),
+    path("archive/evaluation-request/", ArchiveEvaluationrequestView.as_view(), name="evaluation-request-archive"),
 ]

core/apps/evaluation/views/certificate.py

@@ -5,13 +5,16 @@ 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"])
+@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"]
 

stack.yaml

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