feat: Перенос приложений в отдельную рабочую директорию.

AntonVagabond · Mar 7, 2024 · 5bea293 · 5bea293
1 parent 8aa30cf
commit 5bea293
Show file tree

Hide file tree

Showing 176 changed files with 60 additions and 85 deletions.
diff --git a/.gitignore b/.gitignore
@@ -120,7 +120,7 @@ celerybeat.pid
 *.sage.py
 
 # Environments
-.env
+src/.env
 .venv
 env/
 venv/
@@ -167,9 +167,10 @@ media/
 /media/
 */media/
 
+migrations/
 */migrations/*
 !*/migrations/__init__.py
 
-/.env
+/src/.env
 /.env.docker
 /.idea/
diff --git a/carts/constants.py b/carts/constants.py
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -13,7 +13,7 @@ services:
     ports:
       - "8000:8000"
     env_file:
-      - ./.env
+      - src/.env
     depends_on:
       - db
       - redis

diff --git a/api/__init__.py → src/__init__.py b/api/__init__.py → src/__init__.py
diff --git a/api/migrations/__init__.py → src/api/__init__.py b/api/migrations/__init__.py → src/api/__init__.py
diff --git a/api/admin.py → src/api/admin.py b/api/admin.py → src/api/admin.py
diff --git a/api/apps.py → src/api/apps.py b/api/apps.py → src/api/apps.py
diff --git a/api/spectacular/__init__.py → src/api/migrations/__init__.py b/api/spectacular/__init__.py → src/api/migrations/__init__.py
diff --git a/carts/__init__.py → src/api/spectacular/__init__.py b/carts/__init__.py → src/api/spectacular/__init__.py
diff --git a/api/spectacular/config.py → src/api/spectacular/config.py b/api/spectacular/config.py → src/api/spectacular/config.py
diff --git a/api/spectacular/urls.py → src/api/spectacular/urls.py b/api/spectacular/urls.py → src/api/spectacular/urls.py
diff --git a/api/urls.py → src/api/urls.py b/api/urls.py → src/api/urls.py
diff --git a/carts/managers/__init__.py → src/carts/__init__.py b/carts/managers/__init__.py → src/carts/__init__.py
diff --git a/carts/admin.py → src/carts/admin.py b/carts/admin.py → src/carts/admin.py
diff --git a/carts/apps.py → src/carts/apps.py b/carts/apps.py → src/carts/apps.py
diff --git a/carts/migrations/__init__.py → src/carts/managers/__init__.py b/carts/migrations/__init__.py → src/carts/managers/__init__.py
diff --git a/carts/managers/carts.py → src/carts/managers/carts.py b/carts/managers/carts.py → src/carts/managers/carts.py
diff --git a/carts/models/__init__.py → src/carts/migrations/__init__.py b/carts/models/__init__.py → src/carts/migrations/__init__.py
diff --git a/carts/serializers/__init__.py → src/carts/models/__init__.py b/carts/serializers/__init__.py → src/carts/models/__init__.py
diff --git a/carts/models/carts.py → src/carts/models/carts.py b/carts/models/carts.py → src/carts/models/carts.py
diff --git a/carts/serializers/api/__init__.py → src/carts/serializers/__init__.py b/carts/serializers/api/__init__.py → src/carts/serializers/__init__.py
diff --git a/carts/serializers/nested/__init__.py → src/carts/serializers/api/__init__.py b/carts/serializers/nested/__init__.py → src/carts/serializers/api/__init__.py
diff --git a/carts/serializers/api/carts.py → src/carts/serializers/api/carts.py b/carts/serializers/api/carts.py → src/carts/serializers/api/carts.py
diff --git a/carts/services/__init__.py → src/carts/serializers/nested/__init__.py b/carts/services/__init__.py → src/carts/serializers/nested/__init__.py
diff --git a/carts/serializers/nested/carts.py → src/carts/serializers/nested/carts.py b/carts/serializers/nested/carts.py → src/carts/serializers/nested/carts.py
diff --git a/carts/views/__init__.py → src/carts/services/__init__.py b/carts/views/__init__.py → src/carts/services/__init__.py
diff --git a/carts/services/carts.py → src/carts/services/carts.py b/carts/services/carts.py → src/carts/services/carts.py
diff --git a/carts/urls.py → src/carts/urls.py b/carts/urls.py → src/carts/urls.py
@@ -1,7 +1,7 @@
 from django.urls import path, include
 from rest_framework.routers import DefaultRouter
 
-from carts.views import carts
+from .views import carts
 
 router = DefaultRouter()
 

diff --git a/common/__init__.py → src/carts/views/__init__.py b/common/__init__.py → src/carts/views/__init__.py
diff --git a/carts/views/carts.py → src/carts/views/carts.py b/carts/views/carts.py → src/carts/views/carts.py
diff --git a/common/management/__init__.py → src/common/__init__.py b/common/management/__init__.py → src/common/__init__.py
diff --git a/common/admin.py → src/common/admin.py b/common/admin.py → src/common/admin.py
diff --git a/common/apps.py → src/common/apps.py b/common/apps.py → src/common/apps.py
diff --git a/common/management/commands/__init__.py → src/common/management/__init__.py b/common/management/commands/__init__.py → src/common/management/__init__.py
diff --git a/common/migrations/__init__.py → src/common/management/commands/__init__.py b/common/migrations/__init__.py → src/common/management/commands/__init__.py
diff --git a/common/management/commands/dbackup.py → src/common/management/commands/dbackup.py b/common/management/commands/dbackup.py → src/common/management/commands/dbackup.py
diff --git a/common/models/__init__.py → src/common/migrations/__init__.py b/common/models/__init__.py → src/common/migrations/__init__.py
diff --git a/common/views/__init__.py → src/common/models/__init__.py b/common/views/__init__.py → src/common/models/__init__.py
diff --git a/common/models/base.py → src/common/models/base.py b/common/models/base.py → src/common/models/base.py
diff --git a/common/models/mixins.py → src/common/models/mixins.py b/common/models/mixins.py → src/common/models/mixins.py
@@ -3,7 +3,7 @@
 from django.db import models
 from django.utils import timezone
 
-from common.models.base import BaseModel
+from .base import BaseModel
 
 User = get_user_model()
 

diff --git a/common/pagination.py → src/common/pagination.py b/common/pagination.py → src/common/pagination.py
diff --git a/common/serializers.py → src/common/serializers.py b/common/serializers.py → src/common/serializers.py
diff --git a/common/tasks.py → src/common/tasks.py b/common/tasks.py → src/common/tasks.py
diff --git a/delivers/__init__.py → src/common/views/__init__.py b/delivers/__init__.py → src/common/views/__init__.py
diff --git a/common/views/mixins.py → src/common/views/mixins.py b/common/views/mixins.py → src/common/views/mixins.py
diff --git a/config/__init__.py → src/config/__init__.py b/config/__init__.py → src/config/__init__.py
diff --git a/config/asgi.py → src/config/asgi.py b/config/asgi.py → src/config/asgi.py
diff --git a/config/celery.py → src/config/celery.py b/config/celery.py → src/config/celery.py
diff --git a/config/settings.py → src/config/settings.py b/config/settings.py → src/config/settings.py
@@ -5,7 +5,7 @@
 import sentry_sdk
 from celery.schedules import crontab
 
-root = environ.Path(__file__) - 2
+root = environ.Path(__file__)
 env = environ.Env()
 environ.Env.read_env(env.str(root(), default='.env'))
 

diff --git a/config/urls.py → src/config/urls.py b/config/urls.py → src/config/urls.py
diff --git a/config/wsgi.py → src/config/wsgi.py b/config/wsgi.py → src/config/wsgi.py
diff --git a/delivers/migrations/__init__.py → src/delivers/__init__.py b/delivers/migrations/__init__.py → src/delivers/__init__.py
diff --git a/delivers/admin.py → src/delivers/admin.py b/delivers/admin.py → src/delivers/admin.py
diff --git a/delivers/apps.py → src/delivers/apps.py b/delivers/apps.py → src/delivers/apps.py
diff --git a/delivers/models/__init__.py → src/delivers/migrations/__init__.py b/delivers/models/__init__.py → src/delivers/migrations/__init__.py
diff --git a/delivers/permission/__init__.py → src/delivers/models/__init__.py b/delivers/permission/__init__.py → src/delivers/models/__init__.py
diff --git a/delivers/models/couriers.py → src/delivers/models/couriers.py b/delivers/models/couriers.py → src/delivers/models/couriers.py
diff --git a/delivers/models/delivers.py → src/delivers/models/delivers.py b/delivers/models/delivers.py → src/delivers/models/delivers.py
diff --git a/delivers/serializers/__init__.py → src/delivers/permission/__init__.py b/delivers/serializers/__init__.py → src/delivers/permission/__init__.py
diff --git a/delivers/permission/couriers.py → src/delivers/permission/couriers.py b/delivers/permission/couriers.py → src/delivers/permission/couriers.py
@@ -4,13 +4,13 @@
 
 from rest_framework.permissions import IsAuthenticated
 
-from delivers.models.couriers import Courier
-from delivers.models.delivers import Delivery
+from ..models.couriers import Courier
+from ..models.delivers import Delivery
 
 if TYPE_CHECKING:
     from rest_framework.request import Request
-    from delivers.views.delivers import DeliveryViewSet
-    from delivers.views.couriers import CourierViewSet
+    from ..views.delivers import DeliveryViewSet
+    from ..views.couriers import CourierViewSet
 
 
 class IsCourierOrStaff(IsAuthenticated):

diff --git a/delivers/serializers/api/__init__.py → src/delivers/serializers/__init__.py b/delivers/serializers/api/__init__.py → src/delivers/serializers/__init__.py
diff --git a/delivers/serializers/nested/__init__.py → src/delivers/serializers/api/__init__.py b/delivers/serializers/nested/__init__.py → src/delivers/serializers/api/__init__.py
diff --git a/delivers/serializers/api/couriers.py → src/delivers/serializers/api/couriers.py b/delivers/serializers/api/couriers.py → src/delivers/serializers/api/couriers.py
diff --git a/delivers/serializers/api/delivery.py → src/delivers/serializers/api/delivery.py b/delivers/serializers/api/delivery.py → src/delivers/serializers/api/delivery.py
@@ -1,7 +1,7 @@
 from rest_framework import serializers
 
-from delivers.models.couriers import Courier
-from delivers.models.delivers import Delivery
+from ...models.couriers import Courier
+from ...models.delivers import Delivery
 from orders.models.orders import Order
 
 

diff --git a/delivers/serializers/api/vehicle.py → src/delivers/serializers/api/vehicle.py b/delivers/serializers/api/vehicle.py → src/delivers/serializers/api/vehicle.py
@@ -1,6 +1,6 @@
 from rest_framework import serializers
 
-from delivers.models.couriers import Vehicle
+from ...models.couriers import Vehicle
 
 
 class VehicleListSerializer(serializers.ModelSerializer):

diff --git a/delivers/services/__init__.py → src/delivers/serializers/nested/__init__.py b/delivers/services/__init__.py → src/delivers/serializers/nested/__init__.py
diff --git a/delivers/serializers/nested/delivers.py → src/delivers/serializers/nested/delivers.py b/delivers/serializers/nested/delivers.py → src/delivers/serializers/nested/delivers.py
diff --git a/delivers/views/__init__.py → src/delivers/services/__init__.py b/delivers/views/__init__.py → src/delivers/services/__init__.py
diff --git a/delivers/services/delivers.py → src/delivers/services/delivers.py b/delivers/services/delivers.py → src/delivers/services/delivers.py
diff --git a/delivers/urls.py → src/delivers/urls.py b/delivers/urls.py → src/delivers/urls.py
diff --git a/fixtures/__init__.py → src/delivers/views/__init__.py b/fixtures/__init__.py → src/delivers/views/__init__.py
diff --git a/delivers/views/couriers.py → src/delivers/views/couriers.py b/delivers/views/couriers.py → src/delivers/views/couriers.py
diff --git a/delivers/views/delivers.py → src/delivers/views/delivers.py b/delivers/views/delivers.py → src/delivers/views/delivers.py
diff --git a/delivers/views/vehicle.py → src/delivers/views/vehicle.py b/delivers/views/vehicle.py → src/delivers/views/vehicle.py
diff --git a/orders/__init__.py → src/fixtures/__init__.py b/orders/__init__.py → src/fixtures/__init__.py
diff --git a/fixtures/categories.json → src/fixtures/categories.json b/fixtures/categories.json → src/fixtures/categories.json
diff --git a/fixtures/products.json → src/fixtures/products.json b/fixtures/products.json → src/fixtures/products.json
diff --git a/fixtures/products_description.json → src/fixtures/products_description.json b/fixtures/products_description.json → src/fixtures/products_description.json
diff --git a/fixtures/products_feature.json → src/fixtures/products_feature.json b/fixtures/products_feature.json → src/fixtures/products_feature.json
diff --git a/fixtures/products_images.json → src/fixtures/products_images.json b/fixtures/products_images.json → src/fixtures/products_images.json
diff --git a/fixtures/providers.json → src/fixtures/providers.json b/fixtures/providers.json → src/fixtures/providers.json
diff --git a/fixtures/statuses.json → src/fixtures/statuses.json b/fixtures/statuses.json → src/fixtures/statuses.json
diff --git a/manage.py → src/manage.py b/manage.py → src/manage.py
diff --git a/orders/managers/__init__.py → src/orders/__init__.py b/orders/managers/__init__.py → src/orders/__init__.py
diff --git a/orders/admin.py → src/orders/admin.py b/orders/admin.py → src/orders/admin.py
diff --git a/orders/apps.py → src/orders/apps.py b/orders/apps.py → src/orders/apps.py
diff --git a/orders/migrations/__init__.py → src/orders/managers/__init__.py b/orders/migrations/__init__.py → src/orders/managers/__init__.py
diff --git a/orders/managers/orders.py → src/orders/managers/orders.py b/orders/managers/orders.py → src/orders/managers/orders.py
diff --git a/orders/models/__init__.py → src/orders/migrations/__init__.py b/orders/models/__init__.py → src/orders/migrations/__init__.py
diff --git a/orders/permissions/__init__.py → src/orders/models/__init__.py b/orders/permissions/__init__.py → src/orders/models/__init__.py
diff --git a/orders/models/orders.py → src/orders/models/orders.py b/orders/models/orders.py → src/orders/models/orders.py
diff --git a/orders/serializers/__init__.py → src/orders/permissions/__init__.py b/orders/serializers/__init__.py → src/orders/permissions/__init__.py
diff --git a/orders/permissions/orders.py → src/orders/permissions/orders.py b/orders/permissions/orders.py → src/orders/permissions/orders.py
@@ -6,8 +6,8 @@
 
 if TYPE_CHECKING:
     from rest_framework.request import Request
-    from orders.models.orders import Order
-    from orders.views.orders import OrderDetailViewSet
+    from ..models.orders import Order
+    from ..views.orders import OrderDetailViewSet
 
 
 class CurrentUserOrStaff(IsAuthenticated):

diff --git a/orders/serializers/api/__init__.py → src/orders/serializers/__init__.py b/orders/serializers/api/__init__.py → src/orders/serializers/__init__.py
diff --git a/orders/serializers/nested/__init__.py → src/orders/serializers/api/__init__.py b/orders/serializers/nested/__init__.py → src/orders/serializers/api/__init__.py
diff --git a/orders/serializers/api/orders.py → src/orders/serializers/api/orders.py b/orders/serializers/api/orders.py → src/orders/serializers/api/orders.py
diff --git a/orders/services/__init__.py → src/orders/serializers/nested/__init__.py b/orders/services/__init__.py → src/orders/serializers/nested/__init__.py
diff --git a/orders/serializers/nested/orders.py → src/orders/serializers/nested/orders.py b/orders/serializers/nested/orders.py → src/orders/serializers/nested/orders.py
diff --git a/orders/views/__init__.py → src/orders/services/__init__.py b/orders/views/__init__.py → src/orders/services/__init__.py
diff --git a/orders/services/orders.py → src/orders/services/orders.py b/orders/services/orders.py → src/orders/services/orders.py
diff --git a/orders/urls.py → src/orders/urls.py b/orders/urls.py → src/orders/urls.py
diff --git a/payments/__init__.py → src/orders/views/__init__.py b/payments/__init__.py → src/orders/views/__init__.py
diff --git a/orders/views/orders.py → src/orders/views/orders.py b/orders/views/orders.py → src/orders/views/orders.py
diff --git a/payments/migrations/__init__.py → src/payments/__init__.py b/payments/migrations/__init__.py → src/payments/__init__.py
diff --git a/payments/admin.py → src/payments/admin.py b/payments/admin.py → src/payments/admin.py
diff --git a/payments/apps.py → src/payments/apps.py b/payments/apps.py → src/payments/apps.py
diff --git a/payments/models/__init__.py → src/payments/migrations/__init__.py b/payments/models/__init__.py → src/payments/migrations/__init__.py
diff --git a/payments/serializers/__init__.py → src/payments/models/__init__.py b/payments/serializers/__init__.py → src/payments/models/__init__.py
diff --git a/payments/models/payments.py → src/payments/models/payments.py b/payments/models/payments.py → src/payments/models/payments.py
diff --git a/payments/serializers/api/__init__.py → src/payments/serializers/__init__.py b/payments/serializers/api/__init__.py → src/payments/serializers/__init__.py
diff --git a/payments/serializers/nested/__init__.py → src/payments/serializers/api/__init__.py b/payments/serializers/nested/__init__.py → src/payments/serializers/api/__init__.py
diff --git a/payments/serializers/api/payments.py → src/payments/serializers/api/payments.py b/payments/serializers/api/payments.py → src/payments/serializers/api/payments.py
@@ -1,6 +1,6 @@
 from rest_framework import serializers
 
-from payments.models.payments import OrderPayment
+from ...models.payments import OrderPayment
 
 
 class EmptyPaymentSerializer(serializers.ModelSerializer):

diff --git a/payments/services/__init__.py → src/payments/serializers/nested/__init__.py b/payments/services/__init__.py → src/payments/serializers/nested/__init__.py
diff --git a/payments/serializers/nested/payments.py → src/payments/serializers/nested/payments.py b/payments/serializers/nested/payments.py → src/payments/serializers/nested/payments.py
diff --git a/payments/services/tasks/__init__.py → src/payments/services/__init__.py b/payments/services/tasks/__init__.py → src/payments/services/__init__.py
diff --git a/payments/services/payments.py → src/payments/services/payments.py b/payments/services/payments.py → src/payments/services/payments.py
diff --git a/payments/views/__init__.py → src/payments/services/tasks/__init__.py b/payments/views/__init__.py → src/payments/services/tasks/__init__.py
diff --git a/payments/services/tasks/tasks.py → src/payments/services/tasks/tasks.py b/payments/services/tasks/tasks.py → src/payments/services/tasks/tasks.py
diff --git a/payments/services/webhooks.py → src/payments/services/webhooks.py b/payments/services/webhooks.py → src/payments/services/webhooks.py
diff --git a/payments/urls.py → src/payments/urls.py b/payments/urls.py → src/payments/urls.py
@@ -1,9 +1,7 @@
-from django.urls import path, include
+from django.urls import path
 
 from .views import payments
 
 urlpatterns = [
     path('orders/payment_confirmation/', payments.PaymentConfirmationAPIView.as_view(), name='payment_confirmation')
 ]
-
-
diff --git a/products/__init__.py → src/payments/views/__init__.py b/products/__init__.py → src/payments/views/__init__.py
diff --git a/payments/views/payments.py → src/payments/views/payments.py b/payments/views/payments.py → src/payments/views/payments.py
diff --git a/products/migrations/__init__.py → src/products/__init__.py b/products/migrations/__init__.py → src/products/__init__.py
diff --git a/products/admin.py → src/products/admin.py b/products/admin.py → src/products/admin.py
@@ -4,7 +4,8 @@
 from django.utils.safestring import mark_safe, SafeString
 
 from common.admin import ModelaAdminWithImage
-from products.models import products, categories, providers
+from .models import products, providers
+from .models import categories
 
 Provider: TypeAlias = providers.Provider
 ProductImages: TypeAlias = products.ProductImages

diff --git a/products/apps.py → src/products/apps.py b/products/apps.py → src/products/apps.py
diff --git a/products/models/__init__.py → src/products/migrations/__init__.py b/products/models/__init__.py → src/products/migrations/__init__.py
diff --git a/products/permissions/__init__.py → src/products/models/__init__.py b/products/permissions/__init__.py → src/products/models/__init__.py
diff --git a/products/models/categories.py → src/products/models/categories.py b/products/models/categories.py → src/products/models/categories.py
diff --git a/products/models/products.py → src/products/models/products.py b/products/models/products.py → src/products/models/products.py
diff --git a/products/models/providers.py → src/products/models/providers.py b/products/models/providers.py → src/products/models/providers.py
diff --git a/products/serializers/__init__.py → src/products/permissions/__init__.py b/products/serializers/__init__.py → src/products/permissions/__init__.py
diff --git a/products/permissions/categories.py → src/products/permissions/categories.py b/products/permissions/categories.py → src/products/permissions/categories.py
@@ -6,7 +6,7 @@
 
 if TYPE_CHECKING:
     from rest_framework.request import Request
-    from products.views.categories import CategoryView
+    from ..views.categories import CategoryView
 
 
 class IsStaffOrReadOnly(BasePermission):

diff --git a/products/permissions/products.py → src/products/permissions/products.py b/products/permissions/products.py → src/products/permissions/products.py
@@ -6,8 +6,8 @@
 
 if TYPE_CHECKING:
     from rest_framework.request import Request
-    from products.views.products import ProductView
-    from products.models.products import Product
+    from ..views.products import ProductView
+    from ..models.products import Product
 
 
 class IsProductProviderOrStaff(IsAuthenticated):

diff --git a/products/permissions/providers.py → src/products/permissions/providers.py b/products/permissions/providers.py → src/products/permissions/providers.py
@@ -6,9 +6,9 @@
 
 if TYPE_CHECKING:
     from rest_framework.request import Request
-    from products.views.products import ProductView
-    from products.views.providers import ProviderView
-    from products.models.providers import Provider
+    from ..views.products import ProductView
+    from ..views.providers import ProviderView
+    from ..models.providers import Provider
 
 
 class IsProviderOrStaffOrReadOnly(BasePermission):

diff --git a/products/serializers/api/__init__.py → src/products/serializers/__init__.py b/products/serializers/api/__init__.py → src/products/serializers/__init__.py
diff --git a/products/serializers/internal/__init__.py → src/products/serializers/api/__init__.py b/products/serializers/internal/__init__.py → src/products/serializers/api/__init__.py
diff --git a/products/serializers/api/categories.py → src/products/serializers/api/categories.py b/products/serializers/api/categories.py → src/products/serializers/api/categories.py
@@ -1,7 +1,7 @@
 from rest_framework import serializers
 
 from common.serializers import BaseCategorySerializer
-from products.models.categories import Category
+from ...models.categories import Category
 
 
 class CategorySearchSerializer(BaseCategorySerializer):

diff --git a/products/serializers/api/products.py → src/products/serializers/api/products.py b/products/serializers/api/products.py → src/products/serializers/api/products.py
@@ -1,9 +1,9 @@
 from rest_framework import serializers
 
-from products.models.products import Product
-from products.serializers.nested.categories import CategoryNestedSerializer
-from products.serializers.nested import products
-from products.serializers.nested.providers import ProviderNestedSerializer
+from ...models.products import Product
+from ..nested.categories import CategoryNestedSerializer
+from ..nested import products
+from ..nested.providers import ProviderNestedSerializer
 
 
 class ProductSearchSerializer(serializers.ModelSerializer):

diff --git a/products/serializers/api/providers.py → src/products/serializers/api/providers.py b/products/serializers/api/providers.py → src/products/serializers/api/providers.py
@@ -1,7 +1,7 @@
 from rest_framework import serializers
 
-from products.models.providers import Provider
-from products.serializers.nested.products import ProductNestedSerializer
+from ...models.providers import Provider
+from ..nested.products import ProductNestedSerializer
 
 
 class ProviderSearchSerializer(serializers.ModelSerializer):

diff --git a/products/serializers/nested/__init__.py → ...products/serializers/internal/__init__.py b/products/serializers/nested/__init__.py → ...products/serializers/internal/__init__.py
diff --git a/products/serializers/internal/products.py → ...products/serializers/internal/products.py b/products/serializers/internal/products.py → ...products/serializers/internal/products.py
@@ -1,7 +1,7 @@
 from rest_framework import serializers
 
-from products.models.products import Product
-from products.serializers.nested.products import ProductImagesNestedSerializer
+from ...models.products import Product
+from ..nested.products import ProductImagesNestedSerializer
 
 
 class ProductInternalSerializer(serializers.ModelSerializer):

diff --git a/products/views/__init__.py → src/products/serializers/nested/__init__.py b/products/views/__init__.py → src/products/serializers/nested/__init__.py
diff --git a/products/serializers/nested/categories.py → ...products/serializers/nested/categories.py b/products/serializers/nested/categories.py → ...products/serializers/nested/categories.py
@@ -1,6 +1,6 @@
 from rest_framework import serializers
 
-from products.models.categories import Category
+from ...models.categories import Category
 
 
 class CategoryNestedSerializer(serializers.ModelSerializer):

diff --git a/products/serializers/nested/products.py → src/products/serializers/nested/products.py b/products/serializers/nested/products.py → src/products/serializers/nested/products.py
@@ -1,7 +1,7 @@
 from rest_framework import serializers
 
-from products.models import products
-from products.models.products import Product
+from ...models import products
+from ...models.products import Product
 
 
 class ProductImagesNestedSerializer(serializers.ModelSerializer):

diff --git a/products/serializers/nested/providers.py → src/products/serializers/nested/providers.py b/products/serializers/nested/providers.py → src/products/serializers/nested/providers.py
@@ -1,6 +1,6 @@
 from rest_framework import serializers
 
-from products.models.providers import Provider
+from ...models.providers import Provider
 
 
 class ProviderNestedSerializer(serializers.ModelSerializer):

diff --git a/products/urls.py → src/products/urls.py b/products/urls.py → src/products/urls.py
@@ -1,9 +1,8 @@
 from django.urls import path, include
 from rest_framework.routers import DefaultRouter
 
-from products.views import products
-from products.views import providers
-from products.views import categories
+from .views import products, providers
+from .views import categories
 
 router = DefaultRouter()
 

diff --git a/users/__init__.py → src/products/views/__init__.py b/users/__init__.py → src/products/views/__init__.py
diff --git a/products/views/categories.py → src/products/views/categories.py b/products/views/categories.py → src/products/views/categories.py
@@ -8,9 +8,9 @@
 from rest_framework_simplejwt import authentication as jwt_authentication
 
 from common.views.mixins import CRUDListViewSet
-from products.models.categories import Category
-from products.permissions import categories as permissions_cat
-from products.serializers.api import categories as categories_s
+from ..models.categories import Category
+from ..permissions import categories as permissions_cat
+from ..serializers.api import categories as categories_s
 
 
 @extend_schema_view(

diff --git a/products/views/products.py → src/products/views/products.py b/products/views/products.py → src/products/views/products.py
diff --git a/products/views/providers.py → src/products/views/providers.py b/products/views/providers.py → src/products/views/providers.py
@@ -8,9 +8,9 @@
 from rest_framework_simplejwt import authentication as jwt_authentication
 
 from common.views.mixins import CRUDListViewSet
-from products.models.providers import Provider
-from products.permissions import providers as permissions_prov
-from products.serializers.api import providers as providers_s
+from ..models.providers import Provider
+from ..permissions import providers as permissions_prov
+from ..serializers.api import providers as providers_s
 
 
 @extend_schema_view(

diff --git a/users/managers/__init__.py → src/users/__init__.py b/users/managers/__init__.py → src/users/__init__.py
diff --git a/users/admin.py → src/users/admin.py b/users/admin.py → src/users/admin.py
@@ -1,13 +1,12 @@
 from typing import Union
 
 from django.contrib import admin
-from django.contrib.auth import get_user_model
 from django.contrib.auth.admin import UserAdmin
 from django.utils.safestring import mark_safe, SafeString
 from django.utils.translation import gettext_lazy as _
 
-from users.models.users import User
-from users.models.profile import Profile
+from .models.profile import Profile
+from .models.users import User
 
 
 # region ----------------------------- INLINE ---------------------------------------
@@ -83,4 +82,3 @@ class UserAdmin(UserAdmin):
     inlines = (ProfileAdmin,)
     # endregion ---------------------------------------------------------------------
 # endregion -------------------------------------------------------------------------
-
diff --git a/users/apps.py → src/users/apps.py b/users/apps.py → src/users/apps.py
diff --git a/users/backends.py → src/users/backends.py b/users/backends.py → src/users/backends.py
diff --git a/users/migrations/__init__.py → src/users/managers/__init__.py b/users/migrations/__init__.py → src/users/managers/__init__.py
diff --git a/users/managers/users.py → src/users/managers/users.py b/users/managers/users.py → src/users/managers/users.py
diff --git a/users/middleware.py → src/users/middleware.py b/users/middleware.py → src/users/middleware.py
diff --git a/users/serializers/__init__.py → src/users/migrations/__init__.py b/users/serializers/__init__.py → src/users/migrations/__init__.py
diff --git a/users/models/__init__.py → src/users/models/__init__.py b/users/models/__init__.py → src/users/models/__init__.py
diff --git a/users/models/profile.py → src/users/models/profile.py b/users/models/profile.py → src/users/models/profile.py
diff --git a/users/models/users.py → src/users/models/users.py b/users/models/users.py → src/users/models/users.py
@@ -5,8 +5,8 @@
 from django.dispatch import receiver
 from phonenumber_field.modelfields import PhoneNumberField
 
-from users.managers.users import CustomUserManager
-from users.models.profile import Profile
+from ..managers.users import CustomUserManager
+from ..models.profile import Profile
 
 
 class User(AbstractUser):

diff --git a/users/serializers/api/__init__.py → src/users/serializers/__init__.py b/users/serializers/api/__init__.py → src/users/serializers/__init__.py
diff --git a/users/serializers/internal/__init__.py → src/users/serializers/api/__init__.py b/users/serializers/internal/__init__.py → src/users/serializers/api/__init__.py
diff --git a/users/serializers/api/users.py → src/users/serializers/api/users.py b/users/serializers/api/users.py → src/users/serializers/api/users.py
diff --git a/users/serializers/nested/__init__.py → src/users/serializers/nested/__init__.py b/users/serializers/nested/__init__.py → src/users/serializers/nested/__init__.py
diff --git a/users/serializers/nested/profile.py → src/users/serializers/nested/profile.py b/users/serializers/nested/profile.py → src/users/serializers/nested/profile.py
@@ -1,5 +1,5 @@
 from rest_framework import serializers
-from users.models.profile import Profile
+from ...models.profile import Profile
 
 
 class ProfileShortSerializer(serializers.ModelSerializer):

diff --git a/users/serializers/nested/users.py → src/users/serializers/nested/users.py b/users/serializers/nested/users.py → src/users/serializers/nested/users.py
diff --git a/users/services/__init__.py → src/users/services/__init__.py b/users/services/__init__.py → src/users/services/__init__.py
diff --git a/users/services/tasks/__init__.py → src/users/services/tasks/__init__.py b/users/services/tasks/__init__.py → src/users/services/tasks/__init__.py
diff --git a/users/services/tasks/tasks.py → src/users/services/tasks/tasks.py b/users/services/tasks/tasks.py → src/users/services/tasks/tasks.py
diff --git a/users/services/users.py → src/users/services/users.py b/users/services/users.py → src/users/services/users.py
@@ -7,12 +7,12 @@
 from djoser import signals
 from djoser.conf import settings
 
-from users.views import users as users_views
-from users.services.tasks import tasks
+from ..views import users as users_views
+from ..services.tasks import tasks
 
 if TYPE_CHECKING:
-    from users.models.users import User
-    from users.serializers.api.users import CustomPasswordResetConfirmSerializer
+    from ..models.users import User
+    from ..serializers.api.users import CustomPasswordResetConfirmSerializer
 
 
 class UserSignalActivationService:

diff --git a/users/services/utils.py → src/users/services/utils.py b/users/services/utils.py → src/users/services/utils.py
@@ -4,7 +4,7 @@
 if TYPE_CHECKING:
     from django.urls import URLPattern
     from rest_framework.request import Request
-    from users.models.users import User
+    from ..models.users import User
 
 
 def is_route_selected(url_pattern: URLPattern) -> bool:

diff --git a/users/urls.py → src/users/urls.py b/users/urls.py → src/users/urls.py
@@ -1,9 +1,9 @@
 from django.urls import path, include
 from rest_framework.routers import DefaultRouter
 
-from users.services.utils import is_route_selected
-from users.views import users
-from users.views import auth
+from .services.utils import is_route_selected
+from .views import users
+from .views import auth
 
 router = DefaultRouter()
 

diff --git a/users/views/__init__.py → src/users/views/__init__.py b/users/views/__init__.py → src/users/views/__init__.py
diff --git a/users/views/auth.py → src/users/views/auth.py b/users/views/auth.py → src/users/views/auth.py
diff --git a/users/views/users.py → src/users/views/users.py b/users/views/users.py → src/users/views/users.py