From 857edd9aa645ecaa3fcf6c6800f63050c81ade4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Fern=C3=A1ndez=20Poyatos?= Date: Wed, 7 Aug 2024 22:40:18 +0200 Subject: [PATCH] chore(Backend,API): PRWLR-4341 restructure project based on versions (#25) --- src/backend/api/{views => }/base_views.py | 0 src/backend/api/urls/v1/__init__.py | 0 src/backend/api/{urls => v1}/__init__.py | 0 src/backend/api/{ => v1}/serializers.py | 0 src/backend/api/{urls => }/v1/urls.py | 2 +- src/backend/api/{views => }/v1/views.py | 8 ++++---- src/backend/api/views/__init__.py | 0 src/backend/api/views/v1/__init__.py | 0 src/backend/config/urls.py | 2 +- 9 files changed, 6 insertions(+), 6 deletions(-) rename src/backend/api/{views => }/base_views.py (100%) delete mode 100644 src/backend/api/urls/v1/__init__.py rename src/backend/api/{urls => v1}/__init__.py (100%) rename src/backend/api/{ => v1}/serializers.py (100%) rename src/backend/api/{urls => }/v1/urls.py (87%) rename src/backend/api/{views => }/v1/views.py (96%) delete mode 100644 src/backend/api/views/__init__.py delete mode 100644 src/backend/api/views/v1/__init__.py diff --git a/src/backend/api/views/base_views.py b/src/backend/api/base_views.py similarity index 100% rename from src/backend/api/views/base_views.py rename to src/backend/api/base_views.py diff --git a/src/backend/api/urls/v1/__init__.py b/src/backend/api/urls/v1/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/src/backend/api/urls/__init__.py b/src/backend/api/v1/__init__.py similarity index 100% rename from src/backend/api/urls/__init__.py rename to src/backend/api/v1/__init__.py diff --git a/src/backend/api/serializers.py b/src/backend/api/v1/serializers.py similarity index 100% rename from src/backend/api/serializers.py rename to src/backend/api/v1/serializers.py diff --git a/src/backend/api/urls/v1/urls.py b/src/backend/api/v1/urls.py similarity index 87% rename from src/backend/api/urls/v1/urls.py rename to src/backend/api/v1/urls.py index 5f7e599c99..842e00ff13 100644 --- a/src/backend/api/urls/v1/urls.py +++ b/src/backend/api/v1/urls.py @@ -2,7 +2,7 @@ from django.urls import path, include from drf_spectacular.views import SpectacularRedocView from rest_framework import routers -from api.views.v1.views import SchemaView, TenantViewSet, ProviderViewSet +from api.v1.views import SchemaView, TenantViewSet, ProviderViewSet router = routers.DefaultRouter(trailing_slash=False) diff --git a/src/backend/api/views/v1/views.py b/src/backend/api/v1/views.py similarity index 96% rename from src/backend/api/views/v1/views.py rename to src/backend/api/v1/views.py index decce4db55..79693aedd3 100644 --- a/src/backend/api/views/v1/views.py +++ b/src/backend/api/v1/views.py @@ -11,14 +11,14 @@ from rest_framework.decorators import action from rest_framework.generics import get_object_or_404 from rest_framework_json_api.views import Response +from api.base_views import BaseRLSViewSet +from api.base_views import BaseViewSet from api.filters import ProviderFilter from api.filters import TenantFilter from api.models import Provider from api.rls import Tenant -from api.serializers import ProviderSerializer, ProviderUpdateSerializer -from api.serializers import TenantSerializer -from api.views.base_views import BaseRLSViewSet -from api.views.base_views import BaseViewSet +from api.v1.serializers import ProviderSerializer, ProviderUpdateSerializer +from api.v1.serializers import TenantSerializer CACHE_DECORATOR = cache_control( max_age=django_settings.CACHE_MAX_AGE, diff --git a/src/backend/api/views/__init__.py b/src/backend/api/views/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/src/backend/api/views/v1/__init__.py b/src/backend/api/views/v1/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/src/backend/config/urls.py b/src/backend/config/urls.py index 813a607ab6..195329d171 100644 --- a/src/backend/config/urls.py +++ b/src/backend/config/urls.py @@ -3,5 +3,5 @@ from django.urls import include, path urlpatterns = [ path("admin/", admin.site.urls), - path("api/v1/", include("api.urls.v1.urls")), + path("api/v1/", include("api.v1.urls")), ]