Refactor: Enhance maintainability by improving code base structure

accounts/api/routers.py

@@ -0,0 +1,15 @@
+from django.urls import path
+
+from accounts.api.views import (
+    UserListView,
+    CurrentUserView,
+    UserDetailView,
+)
+
+
+urlpatterns = [
+    # Users endpoints
+    path("users", UserListView.as_view(), name="user-list"),
+    path("users/current", CurrentUserView.as_view(), name="current-user"),
+    path("users/<int:pk>", UserDetailView.as_view(), name="user-detail"),
+]

accounts/views.py → accounts/api/views.py

@@ -15,7 +15,7 @@
 )
 
 from accounts.models import User
-from accounts.serializers import UserSerializer
+from accounts.api.serializers import UserSerializer
 
 
 class UserViewMixin:

accounts/tests.py

@@ -7,7 +7,7 @@
 from rest_framework.test import APIClient
 
 from accounts.models import User
-from accounts.serializers import UserSerializer
+from accounts.api.serializers import UserSerializer
 
 from accounts.utils import create_test_user
 

assets/routers.py → assets/api/routers.py

@@ -1,27 +1,32 @@
 from django.urls import path
 
-from assets import views
+from assets.api.views import (
+    CurrencyListView,
+    CurrencyDetailView,
+    CurrencyPairListView,
+    CurrencyPairDetailView,
+)
 
 
 urlpatterns = [
     path(
         "currencies",
-        views.CurrencyListView.as_view(),
+        CurrencyListView.as_view(),
         name="currency-list",
     ),
     path(
         "currencies/<int:pk>",
-        views.CurrencyDetailView.as_view(),
+        CurrencyDetailView.as_view(),
         name="currency-detail",
     ),
     path(
         "assets/",
-        views.CurrencyPairListView.as_view(),
+        CurrencyPairListView.as_view(),
         name="pair-list",
     ),
     path(
         "assets/<int:pk>",
-        views.CurrencyPairDetailView.as_view(),
+        CurrencyPairDetailView.as_view(),
         name="pair-detail",
     ),
 ]

assets/views.py → assets/api/views.py

@@ -9,7 +9,7 @@
 )
 
 from assets.models import Currency, CurrencyPair
-from assets.serializers import (
+from assets.api.serializers import (
     CurrencySerializer,
     CurrencyPairSerializer,
 )

assets/tests/test_currency_endpoints.py

@@ -7,7 +7,7 @@
 from rest_framework.test import APIClient
 
 from assets.models import Currency
-from assets.serializers import CurrencySerializer
+from assets.api.serializers import CurrencySerializer
 
 from accounts.utils import create_test_admin, create_test_user
 from assets.helpers.test_utils import (

assets/tests/test_currency_pair_endpoints.py

@@ -7,7 +7,7 @@
 from rest_framework.test import APIClient
 
 from assets.models import CurrencyPair
-from assets.serializers import CurrencyPairSerializer
+from assets.api.serializers import CurrencyPairSerializer
 
 from accounts.utils import create_test_admin, create_test_user
 from assets.helpers.test_utils import (

config/settings.py

@@ -36,6 +36,7 @@
     "tokens.apps.TokensConfig",
     "assets.apps.AssetsConfig",
     "trades.apps.TradesConfig",
+    "metrics.apps.MetricsConfig",
 ]
 
 MIDDLEWARE = [

config/urls.py

@@ -3,8 +3,9 @@
 
 urlpatterns = [
     path("admin/", admin.site.urls),
-    path("api/", include("accounts.routers")),
     path("api/", include("tokens.routers")),
-    path("api/", include("assets.routers")),
-    path("api/", include("trades.routers")),
+    path("api/", include("accounts.api.routers")),
+    path("api/", include("assets.api.routers")),
+    path("api/", include("trades.api.routers")),
+    path("api/", include("metrics.api.routers.trades")),
 ]

trades/routers.py → metrics/api/routers/trades.py

@@ -1,8 +1,6 @@
 from django.urls import path
 
-from trades.views import (
-    TradeListView,
-    TradeDetailView,
+from metrics.api.views.trades import (
     MetricsSummaryView,
     ProfitAndLossView,
     TotalTradesView,
@@ -12,16 +10,6 @@
 
 
 urlpatterns = [
-    path(
-        "trades",
-        TradeListView.as_view(),
-        name="trade-list",
-    ),
-    path(
-        "trades/<int:pk>",
-        TradeDetailView.as_view(),
-        name="trade-detail",
-    ),
     path(
         "trades/metrics",
         MetricsSummaryView.as_view(),