filter qoshildi

core/apps/vendors/filters/category.py

@@ -1,13 +1,12 @@
 from django_filters import rest_framework as filters
-
 from core.apps.vendors.models import CategoryModel
 
-
 class CategoryFilter(filters.FilterSet):
-    # name = filters.CharFilter(field_name="name", lookup_expr="icontains")
+    title = filters.CharFilter(field_name="title", lookup_expr="icontains")
 
     class Meta:
         model = CategoryModel
         fields = [
-            "name",
+            "section",
+            "is_publish",
         ]

core/apps/vendors/filters/vendor.py

@@ -1,13 +1,12 @@
 from django_filters import rest_framework as filters
-
 from core.apps.vendors.models import VendorModel
 
-
 class VendorFilter(filters.FilterSet):
-    # name = filters.CharFilter(field_name="name", lookup_expr="icontains")
+    title = filters.CharFilter(field_name="title", lookup_expr="icontains")
 
     class Meta:
         model = VendorModel
         fields = [
-            "name",
+            "section",
+            "is_active",
         ]

core/apps/vendors/filters/vendor_product.py

@@ -4,20 +4,21 @@ from core.apps.vendors.models import ProductimageModel, VendorproductModel
 
 
 class VendorproductFilter(filters.FilterSet):
-    # name = filters.CharFilter(field_name="name", lookup_expr="icontains")
+    name = filters.CharFilter(field_name="name", lookup_expr="icontains")
 
     class Meta:
         model = VendorproductModel
         fields = [
-            "name",
+            "vendor",
+            "category",
+            "section",
+            "is_publish",
         ]
 
 
 class ProductimageFilter(filters.FilterSet):
-    # name = filters.CharFilter(field_name="name", lookup_expr="icontains")
-
     class Meta:
         model = ProductimageModel
         fields = [
-            "name",
+            "product",
         ]

core/apps/vendors/views/category.py

@@ -1,9 +1,11 @@
+from django_filters.rest_framework import DjangoFilterBackend
 from django_core.mixins import BaseViewSetMixin
 from drf_spectacular.utils import extend_schema
 from rest_framework.permissions import AllowAny
 from rest_framework.viewsets import ReadOnlyModelViewSet
 
 from core.apps.vendors.models import CategoryModel
+from core.apps.vendors.filters.category import CategoryFilter
 from core.apps.vendors.serializers.category import (
     CreateCategorySerializer,
     ListCategorySerializer,
@@ -19,7 +21,8 @@ class CategoryView(BaseViewSetMixin, ModelViewSet):
     lookup_field = "firestore_id"
     serializer_class = ListCategorySerializer
     permission_classes = [AllowAny]
-    filterset_fields = ["section", "is_publish"]
+    filter_backends = [DjangoFilterBackend]
+    filterset_class = CategoryFilter
 
     action_permission_classes = {}
     action_serializer_class = {

core/apps/vendors/views/section.py

@@ -1,3 +1,4 @@
+from django_filters.rest_framework import DjangoFilterBackend
 from django_core.mixins import BaseViewSetMixin
 from drf_spectacular.utils import extend_schema
 from rest_framework.permissions import AllowAny
@@ -16,6 +17,7 @@ class SectionView(BaseViewSetMixin, ModelViewSet):
     queryset = SectionModel.objects.all()
     serializer_class = ListSectionSerializer
     permission_classes = [AllowAny]
+    filter_backends = [DjangoFilterBackend]
     filterset_fields = ["is_active"]
 
     action_permission_classes = {}

core/apps/vendors/views/vendor.py

@@ -1,9 +1,11 @@
+from django_filters.rest_framework import DjangoFilterBackend
 from django_core.mixins import BaseViewSetMixin
 from drf_spectacular.utils import extend_schema
 from rest_framework.permissions import AllowAny
 from rest_framework.viewsets import ReadOnlyModelViewSet
 
 from core.apps.vendors.models import VendorModel
+from core.apps.vendors.filters.vendor import VendorFilter
 from core.apps.vendors.serializers.vendor import CreateVendorSerializer, ListVendorSerializer, RetrieveVendorSerializer
 
 
@@ -15,7 +17,8 @@ class VendorView(BaseViewSetMixin, ModelViewSet):
     lookup_field = "firestore_id"
     serializer_class = ListVendorSerializer
     permission_classes = [AllowAny]
-    filterset_fields = ["section", "is_active"]
+    filter_backends = [DjangoFilterBackend]
+    filterset_class = VendorFilter
 
     action_permission_classes = {}
     action_serializer_class = {

core/apps/vendors/views/vendor_product.py

@@ -15,6 +15,8 @@ from core.apps.vendors.serializers.vendor_product import (
 
 
 from rest_framework.viewsets import ModelViewSet
+from django_filters.rest_framework import DjangoFilterBackend
+from core.apps.vendors.filters.vendor_product import ProductimageFilter, VendorproductFilter
 from core.apps.vendors.pagination import VendorProductCursorPagination
 
 @extend_schema(tags=["VendorProduct"])
@@ -24,7 +26,8 @@ class VendorproductView(BaseViewSetMixin, ModelViewSet):
     serializer_class = ListVendorproductSerializer
     permission_classes = [AllowAny]
     pagination_class = VendorProductCursorPagination
-    filterset_fields = ["vendor", "category", "section"]
+    filter_backends = [DjangoFilterBackend]
+    filterset_class = VendorproductFilter
 
     action_permission_classes = {}
     action_serializer_class = {
@@ -41,6 +44,8 @@ class ProductimageView(BaseViewSetMixin, ReadOnlyModelViewSet):
     queryset = ProductimageModel.objects.all()
     serializer_class = ListProductimageSerializer
     permission_classes = [AllowAny]
+    filter_backends = [DjangoFilterBackend]
+    filterset_class = ProductimageFilter
 
     action_permission_classes = {}
     action_serializer_class = {