feat(filters, serializers): add user filtering and enhance user serialization in Payment and Device models ✨

billing/filters.py

@@ -8,6 +8,7 @@ class PaymentFilter(django_filters.FilterSet):
     amount = django_filters.RangeFilter(field_name="amount")
     number_of_months = django_filters.RangeFilter(field_name="number_of_months")
     paid = django_filters.BooleanFilter(field_name="paid")
+    user = django_filters.CharFilter(method="filter_user_search")
     method = django_filters.ChoiceFilter(
         choices=Payment.PAYMENT_TYPES, lookup_expr="iexact"
     )
@@ -16,6 +17,14 @@ class PaymentFilter(django_filters.FilterSet):
     created_at = django_filters.DateFromToRangeFilter()
     is_expired = django_filters.BooleanFilter(method="filter_is_expired")
 
+    def filter_user_search(self, queryset, name, value):
+        return queryset.filter(
+            Q(user__first_name__icontains=value)
+            | Q(user__last_name__icontains=value)
+            | Q(user__id_card__icontains=value)
+            | Q(user__mobile__icontains=value)
+        )
+
     def filter_is_expired(self, queryset, name, value):
         """
         Filter payments based on whether they are expired or not
@@ -29,7 +38,14 @@ class PaymentFilter(django_filters.FilterSet):
 
     class Meta:
         model = Payment
-        fields = "__all__"
+        fields = [
+            "amount",
+            "paid",
+            "method",
+            "user",
+            "created_at",
+            "is_expired",
+        ]
 
 
 class TopupFilter(django_filters.FilterSet):