🚚(api) split API module in client/resource_server

To improve readability and code sharing we group all
APIs into the same "api" module for each application.

Next submodules might be "scim",
"resource_server_scim", ...

The only shared module is the "permissions" one for now.

src/backend/core/api/client/__init__.py

@@ -0,0 +1 @@
+"""People core client API endpoints"""

src/backend/core/api/client/viewsets.py

@@ -17,8 +17,8 @@ from rest_framework import (
 from rest_framework.permissions import AllowAny
 
 from core import models
-
+from core.api import permissions
-from . import permissions, serializers
+from core.api.client import serializers
 
 SIMILARITY_THRESHOLD = 0.04
 

src/backend/core/api/resource_server/viewsets.py

@@ -10,9 +10,9 @@ from rest_framework import (
 
 from core import models
 from core.api import permissions
+from core.api.client.viewsets import Pagination
 from core.resource_server.mixins import ResourceServerMixin
 
-from ..api.viewsets import Pagination
 from . import serializers
 
 

src/backend/core/tests/resource_server_api/teams/test_update.py

@@ -12,7 +12,7 @@ from rest_framework.status import (
 from rest_framework.test import APIClient
 
 from core import factories
-from core.resource_server_api import serializers
+from core.api.resource_server import serializers
 
 pytestmark = pytest.mark.django_db
 

src/backend/core/tests/team_accesses/test_api_team_accesses_update.py

@@ -9,7 +9,7 @@ import pytest
 from rest_framework.test import APIClient
 
 from core import factories, models
-from core.api import serializers
+from core.api.client import serializers
 
 pytestmark = pytest.mark.django_db
 

src/backend/core/tests/teams/test_core_api_teams_update.py

@@ -14,7 +14,7 @@ from rest_framework.status import (
 from rest_framework.test import APIClient
 
 from core import factories
-from core.api import serializers
+from core.api.client import serializers
 
 pytestmark = pytest.mark.django_db
 

src/backend/core/tests/test_api_contacts.py

@@ -8,7 +8,7 @@ import pytest
 from rest_framework.test import APIClient
 
 from core import factories, models
-from core.api import serializers
+from core.api.client import serializers
 
 pytestmark = pytest.mark.django_db
 

src/backend/core/tests/test_api_team_invitations.py

@@ -9,7 +9,7 @@ from rest_framework import status
 from rest_framework.test import APIClient
 
 from core import factories
-from core.api import serializers
+from core.api.client import serializers
 
 pytestmark = pytest.mark.django_db
 

src/backend/core/tests/test_api_users.py

@@ -14,8 +14,8 @@ from rest_framework.status import (
 from rest_framework.test import APIClient
 
 from core import factories, models
-from core.api import serializers
+from core.api.client import serializers
-from core.api.viewsets import Pagination
+from core.api.client.viewsets import Pagination
 from core.factories import TeamAccessFactory
 
 from mailbox_manager.factories import MailDomainAccessFactory

src/backend/mailbox_manager/api/client/__init__.py

@@ -0,0 +1 @@
+"""Mailbox manager client API module."""

src/backend/mailbox_manager/api/client/serializers.py

@@ -4,7 +4,7 @@ import json
 
 from rest_framework import exceptions, serializers
 
-from core.api.serializers import UserSerializer
+from core.api.client.serializers import UserSerializer
 from core.models import User
 
 from mailbox_manager import enums, models

src/backend/mailbox_manager/api/client/viewsets.py

@@ -7,7 +7,8 @@ from rest_framework import exceptions, filters, mixins, viewsets
 from core import models as core_models
 
 from mailbox_manager import enums, models
-from mailbox_manager.api import permissions, serializers
+from mailbox_manager.api import permissions
+from mailbox_manager.api.client import serializers
 
 
 # pylint: disable=too-many-ancestors

src/backend/mailbox_manager/tests/api/mailboxes/test_api_mailboxes_create.py

@@ -8,7 +8,6 @@ from logging import Logger
 from unittest import mock
 
 from django.test.utils import override_settings
-from django.utils.translation import gettext_lazy as _
 
 import pytest
 import responses
@@ -19,7 +18,7 @@ from rest_framework.test import APIClient
 from core import factories as core_factories
 
 from mailbox_manager import enums, factories, models
-from mailbox_manager.api import serializers
+from mailbox_manager.api.client import serializers
 
 pytestmark = pytest.mark.django_db
 

src/backend/mailbox_manager/urls.py

@@ -4,7 +4,7 @@ from django.urls import include, path, re_path
 
 from rest_framework.routers import DefaultRouter
 
-from mailbox_manager.api import viewsets
+from mailbox_manager.api.client import viewsets
 
 maildomain_router = DefaultRouter()
 maildomain_router.register(

src/backend/people/api_urls.py

@@ -5,7 +5,7 @@ from django.urls import include, path, re_path
 
 from rest_framework.routers import DefaultRouter
 
-from core.api import viewsets
+from core.api.client import viewsets
 from core.authentication.urls import urlpatterns as oidc_urls
 from core.resource_server.urls import urlpatterns as resource_server_urls
 

src/backend/people/resource_server_urls.py

@@ -4,8 +4,8 @@ from django.urls import include, path
 
 from rest_framework.routers import DefaultRouter
 
+from core.api.resource_server import viewsets
 from core.resource_server.urls import urlpatterns as resource_server_urls
-from core.resource_server_api import viewsets
 
 # - Main endpoints
 # Contacts will be added later