From 4617377e9e3e84f7280aaf9b8d3cc2b481acc9c2 Mon Sep 17 00:00:00 2001
From: behruz-dev <xoliqberdiyevbehruz12@gmail.com>
Date: Thu, 11 Sep 2025 15:02:21 +0500
Subject: [PATCH] fix

---
 core/apps/finance/serializers/expence.py | 3 +--
 core/apps/finance/serializers/income.py  | 3 +--
 core/apps/finance/views/expence.py       | 7 +++++--
 core/apps/finance/views/income.py        | 7 +++++--
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/core/apps/finance/serializers/expence.py b/core/apps/finance/serializers/expence.py
index 8a107b8..175e5e6 100644
--- a/core/apps/finance/serializers/expence.py
+++ b/core/apps/finance/serializers/expence.py
@@ -95,8 +95,7 @@ class ExpenceListSerializer(serializers.ModelSerializer):
     def get_user(self, obj):
         return {
             'id': obj.user.id,
-            'first_name': obj.user.first_name,
-            'last_name': obj.user.last_name,
+            'full_name': obj.user.full_name,
         } if obj.user else None
     
     def get_cash_transaction(self, obj):
diff --git a/core/apps/finance/serializers/income.py b/core/apps/finance/serializers/income.py
index 3f18b67..706cb17 100644
--- a/core/apps/finance/serializers/income.py
+++ b/core/apps/finance/serializers/income.py
@@ -61,8 +61,7 @@ class IncomeListSerializer(serializers.ModelSerializer):
     def get_user(self, obj):
         return {
             'id': obj.user.id,
-            'first_name': obj.user.first_name,
-            'last_name': obj.user.last_name,
+            'full_name': obj.user.full_name,
         } if obj.user else None
 
 
diff --git a/core/apps/finance/views/expence.py b/core/apps/finance/views/expence.py
index 0468c67..54340c3 100644
--- a/core/apps/finance/views/expence.py
+++ b/core/apps/finance/views/expence.py
@@ -1,4 +1,4 @@
-from rest_framework import generics, views, parsers
+from rest_framework import generics, views, parsers, filters
 from rest_framework.response import Response
 
 from django_filters.rest_framework.backends import DjangoFilterBackend
@@ -46,8 +46,11 @@ class ExpenceListApiView(generics.GenericAPIView):
         'counterparty', 'expence_type',
     )
     permission_classes = [HasRolePermission]
-    filter_backends = [DjangoFilterBackend]
+    filter_backends = [DjangoFilterBackend, filters.SearchFilter]
     filterset_class = ExpenceFilter
+    search_fields = [
+        'cash_transaction__name', 'payment_type__name', 'project_folder__name', 'project__name', 'counterparty__name', 'expence_type__name', 'user__full_name'
+    ]
 
     def get(self, request):
         cash_transaction_ids = request.query_params.getlist('cash_transaction')
diff --git a/core/apps/finance/views/income.py b/core/apps/finance/views/income.py
index 9a9d77d..1cafa2c 100644
--- a/core/apps/finance/views/income.py
+++ b/core/apps/finance/views/income.py
@@ -1,6 +1,6 @@
 from django.shortcuts import get_object_or_404
 
-from rest_framework import generics, views, parsers
+from rest_framework import generics, views, parsers, filters
 from rest_framework.response import Response
 
 from django_filters.rest_framework.backends import DjangoFilterBackend
@@ -18,8 +18,11 @@ class IncomeListApiView(generics.GenericAPIView):
         'user'
     )
     permission_classes = [HasRolePermission]
-    filter_backends = [DjangoFilterBackend]
+    filter_backends = [DjangoFilterBackend, filters.SearchFilter]
     filterset_class = IncomeFilter
+    search_fields = [
+        'cash_transaction__name', 'payment_type__name', 'project_folder__name', 'project__name', 'counterparty__name', 'type_income__name', 'user__full_name'
+    ]
 
     def get(self, request):
         cash_transaction_ids = request.query_params.getlist('cash_transaction')