diff --git a/app/WYGIWYH/settings.py b/app/WYGIWYH/settings.py index 0450afc..10a4f17 100644 --- a/app/WYGIWYH/settings.py +++ b/app/WYGIWYH/settings.py @@ -443,8 +443,7 @@ REST_FRAMEWORK = { 'rest_framework.authentication.SessionAuthentication', 'rest_framework.authentication.TokenAuthentication', ], - "DEFAULT_PAGINATION_CLASS": "rest_framework.pagination.PageNumberPagination", - "PAGE_SIZE": 10, + "DEFAULT_PAGINATION_CLASS": "apps.api.custom.pagination.CustomPageNumberPagination", "DEFAULT_SCHEMA_CLASS": "drf_spectacular.openapi.AutoSchema", } diff --git a/app/apps/api/views/accounts.py b/app/apps/api/views/accounts.py index 8220a5b..757001c 100644 --- a/app/apps/api/views/accounts.py +++ b/app/apps/api/views/accounts.py @@ -6,7 +6,6 @@ from rest_framework.response import Response from apps.accounts.models import AccountGroup, Account from apps.accounts.services import get_account_balance -from apps.api.custom.pagination import CustomPageNumberPagination from apps.api.serializers import ( AccountGroupSerializer, AccountSerializer, @@ -19,7 +18,6 @@ class AccountGroupViewSet(viewsets.ModelViewSet): queryset = AccountGroup.objects.all() serializer_class = AccountGroupSerializer - pagination_class = CustomPageNumberPagination filterset_fields = { "name": ["exact", "icontains"], "owner": ["exact"], @@ -44,7 +42,6 @@ class AccountViewSet(viewsets.ModelViewSet): queryset = Account.objects.all() serializer_class = AccountSerializer - pagination_class = CustomPageNumberPagination filterset_fields = { "name": ["exact", "icontains"], "group": ["exact", "isnull"], diff --git a/app/apps/api/views/dca.py b/app/apps/api/views/dca.py index 5dd0f06..9360682 100644 --- a/app/apps/api/views/dca.py +++ b/app/apps/api/views/dca.py @@ -22,9 +22,6 @@ class DCAStrategyViewSet(viewsets.ModelViewSet): def get_queryset(self): return DCAStrategy.objects.all() - def get_queryset(self): - return DCAStrategy.objects.all().order_by("id") - @action(detail=True, methods=["get"]) def investment_frequency(self, request, pk=None): strategy = self.get_object() diff --git a/app/apps/api/views/transactions.py b/app/apps/api/views/transactions.py index 6e9165b..068ef0d 100644 --- a/app/apps/api/views/transactions.py +++ b/app/apps/api/views/transactions.py @@ -2,7 +2,6 @@ from copy import deepcopy from rest_framework import viewsets -from apps.api.custom.pagination import CustomPageNumberPagination from apps.api.serializers import ( TransactionSerializer, TransactionCategorySerializer, @@ -25,7 +24,6 @@ from apps.rules.signals import transaction_updated, transaction_created class TransactionViewSet(viewsets.ModelViewSet): queryset = Transaction.objects.all() serializer_class = TransactionSerializer - pagination_class = CustomPageNumberPagination filterset_fields = { "account": ["exact"], "type": ["exact"], @@ -72,7 +70,6 @@ class TransactionViewSet(viewsets.ModelViewSet): class TransactionCategoryViewSet(viewsets.ModelViewSet): queryset = TransactionCategory.objects.all() serializer_class = TransactionCategorySerializer - pagination_class = CustomPageNumberPagination filterset_fields = { "name": ["exact", "icontains"], "mute": ["exact"], @@ -90,7 +87,6 @@ class TransactionCategoryViewSet(viewsets.ModelViewSet): class TransactionTagViewSet(viewsets.ModelViewSet): queryset = TransactionTag.objects.all() serializer_class = TransactionTagSerializer - pagination_class = CustomPageNumberPagination filterset_fields = { "name": ["exact", "icontains"], "active": ["exact"], @@ -107,7 +103,6 @@ class TransactionTagViewSet(viewsets.ModelViewSet): class TransactionEntityViewSet(viewsets.ModelViewSet): queryset = TransactionEntity.objects.all() serializer_class = TransactionEntitySerializer - pagination_class = CustomPageNumberPagination filterset_fields = { "name": ["exact", "icontains"], "active": ["exact"], @@ -124,7 +119,6 @@ class TransactionEntityViewSet(viewsets.ModelViewSet): class InstallmentPlanViewSet(viewsets.ModelViewSet): queryset = InstallmentPlan.objects.all() serializer_class = InstallmentPlanSerializer - pagination_class = CustomPageNumberPagination filterset_fields = { "account": ["exact"], "type": ["exact"], @@ -153,7 +147,6 @@ class InstallmentPlanViewSet(viewsets.ModelViewSet): class RecurringTransactionViewSet(viewsets.ModelViewSet): queryset = RecurringTransaction.objects.all() serializer_class = RecurringTransactionSerializer - pagination_class = CustomPageNumberPagination filterset_fields = { "is_paused": ["exact"], "account": ["exact"],