From 0c622759ccf05cc6820922bffa9b5bc1ba0ac8fd Mon Sep 17 00:00:00 2001
From: Shaxobff <xunuddinovshaxob@gmail.com>
Date: Mon, 4 May 2026 17:41:50 +0500
Subject: [PATCH] update

---
 core/apps/evaluation/choices/bonus.py          |  8 --------
 .../0042_alter_bonuscategory_category.py       | 18 ++++++++++++++++++
 core/apps/evaluation/models/bonus.py           |  4 ++--
 .../apps/evaluation/serializers/bonus/Bonus.py | 10 +++++-----
 core/apps/tasks/serializers/comment.py         | 15 +++++----------
 5 files changed, 30 insertions(+), 25 deletions(-)
 delete mode 100644 core/apps/evaluation/choices/bonus.py
 create mode 100644 core/apps/evaluation/migrations/0042_alter_bonuscategory_category.py

diff --git a/core/apps/evaluation/choices/bonus.py b/core/apps/evaluation/choices/bonus.py
deleted file mode 100644
index 7c13ce2..0000000
--- a/core/apps/evaluation/choices/bonus.py
+++ /dev/null
@@ -1,8 +0,0 @@
-from django.db import models
-from django.utils.translation import gettext_lazy as _
-
-
-class EvaluationCategory(models.TextChoices):
-    AUTO = "auto_transport", _("Avtotransport")
-    REAL_ESTATE = "real estate", _("ko'chmas mulk")
-    EQUIPMENT = "equipment", _("uskuna va jihozlar")
diff --git a/core/apps/evaluation/migrations/0042_alter_bonuscategory_category.py b/core/apps/evaluation/migrations/0042_alter_bonuscategory_category.py
new file mode 100644
index 0000000..d773dda
--- /dev/null
+++ b/core/apps/evaluation/migrations/0042_alter_bonuscategory_category.py
@@ -0,0 +1,18 @@
+# Generated by Django 5.2.7 on 2026-05-04 12:40
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('evaluation', '0041_rename_bonustype_bonuscategory'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='bonuscategory',
+            name='category',
+            field=models.CharField(choices=[('lightweight_auto', 'Yengil automobil'), ('truck_car', 'Yuk automobil'), ('special_tech', 'Maxsus texnika')], max_length=50),
+        ),
+    ]
diff --git a/core/apps/evaluation/models/bonus.py b/core/apps/evaluation/models/bonus.py
index 784c2da..8e51220 100644
--- a/core/apps/evaluation/models/bonus.py
+++ b/core/apps/evaluation/models/bonus.py
@@ -2,7 +2,7 @@ from django.db import models
 from django.db.models.fields import PositiveIntegerField
 from django_core.models import AbstractBaseModel
 
-from core.apps.evaluation.choices.bonus import EvaluationCategory
+from core.apps.evaluation.choices.auto import AutoObjectType
 
 
 class BaseValueBonus(AbstractBaseModel):
@@ -16,7 +16,7 @@ class BonusCategory(AbstractBaseModel):
     name = models.CharField(max_length=255)
     category = models.CharField(
         max_length=50,
-        choices=EvaluationCategory.choices
+        choices=AutoObjectType.choices
     )
     percentage = PositiveIntegerField()
 
diff --git a/core/apps/evaluation/serializers/bonus/Bonus.py b/core/apps/evaluation/serializers/bonus/Bonus.py
index 501c09a..3f181ef 100644
--- a/core/apps/evaluation/serializers/bonus/Bonus.py
+++ b/core/apps/evaluation/serializers/bonus/Bonus.py
@@ -6,7 +6,7 @@ from core.apps.evaluation.models.bonus import BonusCategory, EmployeeBonus, Base
 class BaseBonusSerializer(serializers.ModelSerializer):
     class Meta:
         model = BaseValueBonus
-        fields = 'id', 'base_price'
+        fields = ['id', 'base_price']
 
     def create(self, validated_data):
         if BaseValueBonus.objects.exists():
@@ -18,7 +18,7 @@ class BaseBonusSerializer(serializers.ModelSerializer):
 class BonusCategorySerializer(serializers.ModelSerializer):
     class Meta:
         model = BonusCategory
-        fields = 'name', 'category', 'percentage'
+        fields = ['name', 'category', 'percentage']
 
 
 class BonusCategoryListSerializer(serializers.ModelSerializer):
@@ -26,7 +26,7 @@ class BonusCategoryListSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = BonusCategory
-        fields = 'id', 'name', 'category', 'percentage' , 'price'
+        fields = ['id', 'name', 'category', 'percentage' , 'price']
 
         def get_price(self, obj):
             base_obj = BaseValueBonus.objects.first()
@@ -39,7 +39,7 @@ class BonusCategoryListSerializer(serializers.ModelSerializer):
 class BonusEmployeeBonusSerializer(serializers.ModelSerializer):
     class Meta:
         model = EmployeeBonus
-        fields = 'user', 'bonus_type', 'percentage'
+        fields = ['user', 'bonus_type', 'percentage']
 
 
 class EmployeeBonusListSerializer(serializers.ModelSerializer):
@@ -47,7 +47,7 @@ class EmployeeBonusListSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = EmployeeBonus
-        fields = 'id', 'user', 'bonus_type', 'percentage' , 'price'
+        fields = ['id', 'user', 'bonus_type', 'percentage' , 'price']
 
         def get_price(self, obj):
             base_obj = BaseValueBonus.objects.first()
diff --git a/core/apps/tasks/serializers/comment.py b/core/apps/tasks/serializers/comment.py
index 3c053af..0d9202d 100644
--- a/core/apps/tasks/serializers/comment.py
+++ b/core/apps/tasks/serializers/comment.py
@@ -30,15 +30,10 @@ class CommentCreateSerializer(serializers.ModelSerializer):
             'id', 'message', 'file', 'type', 'task'
         ]
 
-    def validate(self, data):
-        task = Task.objects.filter(id=data['task']).first()
-        if not task:
-            raise serializers.ValidationError("Task not found")
-        data['task'] = task
-        return data
-
     def create(self, validated_data):
         with transaction.atomic():
-            task = validated_data.pop('task')
-            comment = Comment.objects.create(task=task, created_by=self.context['request'].user, **validated_data)
-            return comment
+            comment = Comment.objects.create(
+                created_by=self.context['request'].user,
+                **validated_data
+            )
+            return comment
\ No newline at end of file