Django-Wanted-Internship-3-Team · Chestnut90 · Oct 31, 2023 · Oct 30, 2023 · Oct 30, 2023 · Oct 30, 2023
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -14,7 +14,7 @@ jobs:
         run: docker compose build
 
       - name: Migration test database
-        run: docker compose run django poetry run python manage.py migrate
+        run: docker compose run django poetry run python src/manage.py migrate
 
       - name: Run isort
         run: docker compose run django poetry run isort . --check
@@ -26,4 +26,4 @@ jobs:
         run: docker compose run django poetry run flake8
 
       - name: Run Test
-        run: docker compose run django poetry run python3 manage.py test
+        run: docker compose run django poetry run python3 src/manage.py test
diff --git a/Dockerfile b/Dockerfile
@@ -13,10 +13,10 @@ RUN python3 -m venv $POETRY_VENV \
 ENV PATH="${PATH}:${POETRY_VENV}/bin"
 
 RUN mkdir /app/
-WORKDIR /app/
+RUN mkdir /app/src/
+WORKDIR /app
 
-COPY pyproject.toml ./
+COPY pyproject.toml /app/
+COPY setup.cfg /app/
 
 RUN poetry install
-
-COPY . /app
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -21,9 +21,12 @@ services:
     build:
       context: .
       dockerfile: Dockerfile
-    command: poetry run python manage.py runserver 0.0.0.0:8000
+    command: >
+      bash -c  "poetry run python src/manage.py makemigrations &&
+       poetry run python src/manage.py migrate &&
+       poetry run python src/manage.py runserver 0.0.0.0:8000"
     volumes:
-      - .:/app
+      - ./src:/app/src/
     environment:
       - POSTGRESQL_HOST=postgres
     ports:

diff --git a/common/__init__.py → src/common/__init__.py b/common/__init__.py → src/common/__init__.py
diff --git a/common/apps.py → src/common/apps.py b/common/apps.py → src/common/apps.py
diff --git a/common/decorator.py → src/common/decorator.py b/common/decorator.py → src/common/decorator.py
diff --git a/common/exceptions.py → src/common/exceptions.py b/common/exceptions.py → src/common/exceptions.py
diff --git a/common/tests/__init__.py → src/common/tests/__init__.py b/common/tests/__init__.py → src/common/tests/__init__.py
diff --git a/common/tests/decorator/__init__.py → src/common/tests/decorator/__init__.py b/common/tests/decorator/__init__.py → src/common/tests/decorator/__init__.py
diff --git a/...corator/test_query_parameter_decorator.py → ...corator/test_query_parameter_decorator.py b/...corator/test_query_parameter_decorator.py → ...corator/test_query_parameter_decorator.py
diff --git a/common/tests/utils/__init__.py → src/common/tests/utils/__init__.py b/common/tests/utils/__init__.py → src/common/tests/utils/__init__.py
diff --git a/common/tests/utils/test_date_utils.py → src/common/tests/utils/test_date_utils.py b/common/tests/utils/test_date_utils.py → src/common/tests/utils/test_date_utils.py
diff --git a/common/urls.py → src/common/urls.py b/common/urls.py → src/common/urls.py
diff --git a/common/utils.py → src/common/utils.py b/common/utils.py → src/common/utils.py
diff --git a/common/views.py → src/common/views.py b/common/views.py → src/common/views.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/settings.py → src/config/settings.py b/config/settings.py → src/config/settings.py
@@ -1,6 +1,7 @@
+import os
 from pathlib import Path
+
 import environ
-import os
 
 BASE_DIR = Path(__file__).resolve().parent.parent
 

diff --git a/config/urls.py → src/config/urls.py b/config/urls.py → src/config/urls.py
@@ -1,12 +1,10 @@
-from rest_framework import permissions
-
-from django.contrib import admin
-from django.urls import path, include
 from django.conf import settings
 from django.conf.urls.static import static
-
-from drf_yasg.views import get_schema_view
+from django.contrib import admin
+from django.urls import include, path
 from drf_yasg import openapi
+from drf_yasg.views import get_schema_view
+from rest_framework import permissions
 
 schema_view = get_schema_view(
     openapi.Info(

diff --git a/config/wsgi.py → src/config/wsgi.py b/config/wsgi.py → src/config/wsgi.py
diff --git a/likes/__init__.py → src/likes/__init__.py b/likes/__init__.py → src/likes/__init__.py
diff --git a/likes/apps.py → src/likes/apps.py b/likes/apps.py → src/likes/apps.py
diff --git a/likes/migrations/__init__.py → src/likes/migrations/__init__.py b/likes/migrations/__init__.py → src/likes/migrations/__init__.py
diff --git a/likes/serializers.py → src/likes/serializers.py b/likes/serializers.py → src/likes/serializers.py
diff --git a/likes/tests.py → src/likes/tests.py b/likes/tests.py → src/likes/tests.py
diff --git a/likes/urls.py → src/likes/urls.py b/likes/urls.py → src/likes/urls.py
diff --git a/likes/views.py → src/likes/views.py b/likes/views.py → src/likes/views.py
diff --git a/manage.py → src/manage.py b/manage.py → src/manage.py
diff --git a/posts/__init__.py → src/posts/__init__.py b/posts/__init__.py → src/posts/__init__.py
diff --git a/posts/admin.py → src/posts/admin.py b/posts/admin.py → src/posts/admin.py
diff --git a/posts/apps.py → src/posts/apps.py b/posts/apps.py → src/posts/apps.py
diff --git a/posts/filters.py → src/posts/filters.py b/posts/filters.py → src/posts/filters.py
diff --git a/posts/migrations/0001_initial.py → src/posts/migrations/0001_initial.py b/posts/migrations/0001_initial.py → src/posts/migrations/0001_initial.py
diff --git a/posts/migrations/0002_post_content_id.py → src/posts/migrations/0002_post_content_id.py b/posts/migrations/0002_post_content_id.py → src/posts/migrations/0002_post_content_id.py
diff --git a/posts/migrations/__init__.py → src/posts/migrations/__init__.py b/posts/migrations/__init__.py → src/posts/migrations/__init__.py
diff --git a/posts/models.py → src/posts/models.py b/posts/models.py → src/posts/models.py
diff --git a/posts/paginations.py → src/posts/paginations.py b/posts/paginations.py → src/posts/paginations.py
diff --git a/posts/serializers.py → src/posts/serializers.py b/posts/serializers.py → src/posts/serializers.py
diff --git a/posts/tests/__init__.py → src/posts/tests/__init__.py b/posts/tests/__init__.py → src/posts/tests/__init__.py
diff --git a/posts/tests/views/__init__.py → src/posts/tests/views/__init__.py b/posts/tests/views/__init__.py → src/posts/tests/views/__init__.py
diff --git a/posts/tests/views/test_posts_list_view.py → ...posts/tests/views/test_posts_list_view.py b/posts/tests/views/test_posts_list_view.py → ...posts/tests/views/test_posts_list_view.py
diff --git a/.../tests/views/test_statistics_list_view.py → .../tests/views/test_statistics_list_view.py b/.../tests/views/test_statistics_list_view.py → .../tests/views/test_statistics_list_view.py
diff --git a/posts/urls.py → src/posts/urls.py b/posts/urls.py → src/posts/urls.py
diff --git a/posts/views.py → src/posts/views.py b/posts/views.py → src/posts/views.py
diff --git a/shares/__init__.py → src/shares/__init__.py b/shares/__init__.py → src/shares/__init__.py
diff --git a/shares/apps.py → src/shares/apps.py b/shares/apps.py → src/shares/apps.py
diff --git a/shares/migrations/__init__.py → src/shares/migrations/__init__.py b/shares/migrations/__init__.py → src/shares/migrations/__init__.py
diff --git a/shares/tests.py → src/shares/tests.py b/shares/tests.py → src/shares/tests.py
diff --git a/shares/views.py → src/shares/views.py b/shares/views.py → src/shares/views.py
diff --git a/users/__init__.py → src/users/__init__.py b/users/__init__.py → src/users/__init__.py
diff --git a/users/admin.py → src/users/admin.py b/users/admin.py → src/users/admin.py
diff --git a/users/apps.py → src/users/apps.py b/users/apps.py → src/users/apps.py
diff --git a/users/managers.py → src/users/managers.py b/users/managers.py → src/users/managers.py
diff --git a/users/migrations/0001_initial.py → src/users/migrations/0001_initial.py b/users/migrations/0001_initial.py → src/users/migrations/0001_initial.py
diff --git a/users/migrations/0002_user_username.py → src/users/migrations/0002_user_username.py b/users/migrations/0002_user_username.py → src/users/migrations/0002_user_username.py
diff --git a/users/migrations/__init__.py → src/users/migrations/__init__.py b/users/migrations/__init__.py → src/users/migrations/__init__.py
diff --git a/users/models.py → src/users/models.py b/users/models.py → src/users/models.py
diff --git a/users/serializers.py → src/users/serializers.py b/users/serializers.py → src/users/serializers.py
diff --git a/users/tests/__init__.py → src/users/tests/__init__.py b/users/tests/__init__.py → src/users/tests/__init__.py
diff --git a/users/tests/views/__init__.py → src/users/tests/views/__init__.py b/users/tests/views/__init__.py → src/users/tests/views/__init__.py
diff --git a/users/tests/views/test_confirm_user_view.py → ...ers/tests/views/test_confirm_user_view.py b/users/tests/views/test_confirm_user_view.py → ...ers/tests/views/test_confirm_user_view.py
diff --git a/users/tests/views/test_signup_view.py → src/users/tests/views/test_signup_view.py b/users/tests/views/test_signup_view.py → src/users/tests/views/test_signup_view.py
diff --git a/users/urls.py → src/users/urls.py b/users/urls.py → src/users/urls.py
diff --git a/users/views.py → src/users/views.py b/users/views.py → src/users/views.py