update excel

apps/warehouse/services/search/inventory_search.py

@@ -1,39 +0,0 @@
-from django.db.models import Q
-from apps.warehouse.models import InventoryEntry
-from django.db.models.functions import TruncDate
-
-
-class InventoryEntrySearch:
-    def __init__(self, query: str = None, start_date: str = None, end_date: str = None):
-        self.query = (query or '').strip()
-        self.start_date = start_date
-        self.end_date = end_date
-
-    def search(self):
-        """ multi term search & filter by date range """
-
-        queryset = InventoryEntry.objects.all()
-
-        if self.start_date or self.end_date:
-            queryset = queryset.annotate(date_only=TruncDate('create_date'))
-            if self.start_date:
-                queryset = queryset.filter(date_only__gte=self.start_date)
-            if self.end_date:
-                queryset = queryset.filter(date_only__lte=self.end_date)
-
-        # convert string to list of words
-        if self.query:
-            keywords = [word.strip() for word in self.query.split(',') if word.strip()]
-            if keywords:
-                combined_q = Q()
-                for keyword in keywords:
-                    combined_q |= Q(distribution__distribution_id__icontains=keyword)
-                    combined_q |= Q(organization__name__icontains=keyword)
-                    combined_q |= Q(weight__icontains=keyword)
-                    combined_q |= Q(balance__icontains=keyword)
-                    combined_q |= Q(lading_number__icontains=keyword)
-                    combined_q |= Q(is_confirmed__icontains=keyword)
-
-                queryset = queryset.filter(combined_q)
-
-        return queryset.distinct()

apps/warehouse/web/api/v1/api.py

@@ -1,5 +1,5 @@
 from apps.warehouse.web.api.v1 import serializers as warehouse_serializers
-from apps.warehouse.services.search.inventory_search import InventoryEntrySearch
+from apps.core.mixins.search_mixin import DynamicSearchMixin
 from apps.warehouse import models as warehouse_models
 from common.helpers import get_organization_by_user
 from common.generics import base64_to_image_file
@@ -12,11 +12,19 @@ from rest_framework import status
 import typing
 
 
-class InventoryEntryViewSet(viewsets.ModelViewSet):
+class InventoryEntryViewSet(viewsets.ModelViewSet, DynamicSearchMixin):
     queryset = warehouse_models.InventoryEntry.objects.all()
     serializer_class = warehouse_serializers.InventoryEntrySerializer
-    filter_backends = [filters.SearchFilter]
-    search_fields = ['']
+    # filter_backends = [filters.SearchFilter]
+    search_fields = [
+        "distribution__distribution_id",
+        "organization__name",
+        "weight",
+        "balance",
+        "lading_number",
+        "is_confirmed",
+    ]
+    date_field = "create_date"
 
     def upload_confirmation_document(self, request, inventory: int) -> typing.Any:
         """ upload document for inventory entry confirmation """
@@ -40,24 +48,6 @@ class InventoryEntryViewSet(viewsets.ModelViewSet):
         inventory.save()
         return Response(status=status.HTTP_200_OK)
 
-    @transaction.atomic
-    def list(self, request, *args, **kwargs):
-        """ search & filter by date range or return all objects """
-
-        query_params = self.request.query_params
-        query = query_params.get('search')
-        start_date = query_params.get('start')
-        end_date = query_params.get('end')
-
-        search = InventoryEntrySearch(
-            query,
-            start_date,
-            end_date
-        )
-
-        serializer = self.serializer_class(search.search(), many=True)
-        return Response(serializer.data, status=status.HTTP_200_OK)
-
     @transaction.atomic
     def create(self, request, *args, **kwargs):
         """ custom create of inventory entry  """
@@ -102,9 +92,10 @@ class InventoryEntryViewSet(viewsets.ModelViewSet):
         """ list of my inventory entries """
 
         entries = self.queryset.filter(organization=get_organization_by_user(request.user))
+        queryset = self.filter_query(entries)  # return by search param or all objects
 
         # paginate & response
-        page = self.paginate_queryset(entries)
+        page = self.paginate_queryset(queryset)
         if page is not None:
             serializer = self.get_serializer(page, many=True)
             return self.get_paginated_response(serializer.data)