diff --git a/apps/wallet/urls.py b/apps/wallet/urls.py index 16940b7..e703e19 100644 --- a/apps/wallet/urls.py +++ b/apps/wallet/urls.py @@ -1,15 +1,20 @@ from django.urls import path +from rest_framework.routers import DefaultRouter from .views import application as application_views from .views import user as user_views +from .views.user import UserTransactionViewSet app_name = "wallet" +router = DefaultRouter() +router.register('api/transactions', UserTransactionViewSet, basename='transactions') + +urlpatterns = router.urls user_urlpatterns = [ path('transactions/', user_views.TransactionListView.as_view(), name='user_transaction_list_page'), path('transactions/', user_views.TransactionDetailView.as_view(), name='user_transaction_detail_page'), path('api/wallets/', user_views.WalletAccountListAPIView.as_view(), name='user_wallet_account_api'), - path('api/transactions/', user_views.TransactionListAPIView.as_view(), name='user_transaction_list_api'), # path('api//balance', user_views.WalletMyAccountBalanceView.as_view(), name='user_wallet_balance_api'), # path('api//transactions/', user_views.WalletTransactionListView.as_view(), name='transaction_list_api'), @@ -35,4 +40,4 @@ application_urlpatterns = [ ] -urlpatterns = user_urlpatterns + application_urlpatterns \ No newline at end of file +urlpatterns += user_urlpatterns + application_urlpatterns \ No newline at end of file diff --git a/apps/wallet/views/user.py b/apps/wallet/views/user.py index f94d541..0e16e49 100755 --- a/apps/wallet/views/user.py +++ b/apps/wallet/views/user.py @@ -336,17 +336,6 @@ class UserTransactionViewSet(mixins.ListModelMixin, return Transaction.objects.filter(Q(payee_account__owner_uuid=user.uuid) | Q(payer_account__owner_uuid=user.uuid)).all() - def list(self, request, *args, **kwargs): - queryset = self.filter_queryset(self.get_queryset()) - - page = self.paginate_queryset(queryset) - if page is not None: - serializer = self.get_serializer(page, many=True) - return self.get_paginated_response(serializer.data) - - serializer = self.get_serializer(queryset, many=True) - return Response(serializer.data) - @extend_schema(responses=TransactionGroupedSerializer(many=True)) @action(detail=False, methods=["GET"], serializer_class=TransactionGroupedSerializer) def grouped(self, request, *args, **kwargs):