From 9a5ee597cb3f8aed3ee6dbdb7a4340250e8dec45 Mon Sep 17 00:00:00 2001 From: leonardoaugusto Date: Sat, 30 Mar 2024 18:31:38 -0300 Subject: [PATCH] Revert "folder restructuring" This reverts commit 89752a13d52c3eeec9264d744ab7bebe3ff5334a. --- .github/workflows/ci-cd.yaml | 3 +-- backend/Dockerfile => Dockerfile | 3 +-- Procfile | 4 ++-- README.md | 2 +- backend/conftest.py | 3 --- conftest.py | 3 +++ {backend/contrib => contrib}/env-sample | 0 docker-compose.yml | 10 +++++----- {backend/src => lavocat}/__init__.py | 0 {backend/src => lavocat}/api/__init__.py | 0 {backend/src => lavocat}/api/v1/__init__.py | 0 .../src => lavocat}/api/v1/attendances/__init__.py | 0 {backend/src => lavocat}/api/v1/attendances/filters.py | 2 +- .../src => lavocat}/api/v1/attendances/serializers.py | 2 +- .../api/v1/attendances/tests/__init__.py | 0 .../api/v1/attendances/tests/test_serializers.py | 4 ++-- .../api/v1/attendances/tests/test_views.py | 2 +- {backend/src => lavocat}/api/v1/attendances/urls.py | 2 +- {backend/src => lavocat}/api/v1/attendances/views.py | 6 +++--- .../api/v1/core/tests/test_view_jwt_auth.py | 0 {backend/src => lavocat}/api/v1/core/urls.py | 0 {backend/src => lavocat}/api/v1/urls.py | 4 ++-- {backend/src => lavocat}/asgi.py | 2 +- {backend/src => lavocat}/attendances/__init__.py | 0 {backend/src => lavocat}/attendances/apps.py | 2 +- .../attendances/migrations/0001_initial.py | 0 .../attendances/migrations/0002_auto_20210315_0524.py | 0 .../attendances/migrations/0003_auto_20210315_0549.py | 0 .../attendances/migrations/0004_auto_20210315_1257.py | 0 .../attendances/migrations/0005_auto_20210324_1536.py | 0 .../attendances/migrations/0006_auto_20210324_1758.py | 0 .../attendances/migrations/0007_attendance_resume.py | 0 .../attendances/migrations/0008_auto_20210327_2300.py | 4 ++-- .../attendances/migrations/0009_auto_20210328_0545.py | 4 ++-- .../attendances/migrations/0010_auto_20210407_0425.py | 4 ++-- .../attendances/migrations/0011_auto_20210423_0559.py | 4 ++-- .../attendances/migrations/0012_auto_20210427_1550.py | 4 ++-- .../attendances/migrations/0013_auto_20210528_0407.py | 0 .../migrations/0014_attendance_status_resume.py | 0 .../attendances/migrations/0015_auto_20221213_2350.py | 0 .../migrations/0016_attendancefile_filename.py | 0 .../migrations/0017_attendance_services_provided.py | 0 .../attendances/migrations/0018_auto_20230904_1536.py | 0 .../attendances/migrations/0019_auto_20230904_1813.py | 0 .../attendances/migrations/0020_auto_20230905_0217.py | 0 .../attendances/migrations/0021_auto_20231209_2011.py | 0 .../attendances/migrations/0022_attendance_source.py | 0 .../attendances/migrations/0023_note.py | 0 .../migrations/0024_attendance_is_client.py | 0 .../src => lavocat}/attendances/migrations/__init__.py | 0 {backend/src => lavocat}/attendances/models.py | 4 ++-- {backend/src => lavocat}/attendances/tests/__init__.py | 0 .../src => lavocat}/attendances/tests/test_models.py | 2 +- {backend/src => lavocat}/attendances/validators.py | 0 {backend/src => lavocat}/core/__init__.py | 0 {backend/src => lavocat}/core/admin.py | 2 +- {backend/src => lavocat}/core/apps.py | 2 +- .../src => lavocat}/core/migrations/0001_initial.py | 0 .../core/migrations/0002_userallowed_deleted_at.py | 0 {backend/src => lavocat}/core/migrations/__init__.py | 0 {backend/src => lavocat}/core/models.py | 0 {backend/src => lavocat}/core/tests/__init__.py | 0 {backend/src => lavocat}/core/tests/test_models.py | 2 +- {backend/src => lavocat}/custom_assertions.py | 0 .../src => lavocat}/data_migrations/backfill_notes.py | 2 +- .../data_migrations/backfill_services_types.py | 2 +- {backend/src => lavocat}/settings.py | 8 ++++---- {backend/src => lavocat}/test_fixtures/attendance.py | 2 +- {backend/src => lavocat}/test_fixtures/note.py | 2 +- {backend/src => lavocat}/test_fixtures/utils.py | 2 +- {backend/src => lavocat}/urls.py | 2 +- {backend/src => lavocat}/wsgi.py | 2 +- backend/manage.py => manage.py | 2 +- backend/pytest.ini => pytest.ini | 2 +- backend/requirements.txt => requirements.txt | 0 backend/storage_backends.py => storage_backends.py | 0 76 files changed, 55 insertions(+), 57 deletions(-) rename backend/Dockerfile => Dockerfile (92%) delete mode 100644 backend/conftest.py create mode 100644 conftest.py rename {backend/contrib => contrib}/env-sample (100%) rename {backend/src => lavocat}/__init__.py (100%) rename {backend/src => lavocat}/api/__init__.py (100%) rename {backend/src => lavocat}/api/v1/__init__.py (100%) rename {backend/src => lavocat}/api/v1/attendances/__init__.py (100%) rename {backend/src => lavocat}/api/v1/attendances/filters.py (86%) rename {backend/src => lavocat}/api/v1/attendances/serializers.py (98%) rename {backend/src => lavocat}/api/v1/attendances/tests/__init__.py (100%) rename {backend/src => lavocat}/api/v1/attendances/tests/test_serializers.py (95%) rename {backend/src => lavocat}/api/v1/attendances/tests/test_views.py (99%) rename {backend/src => lavocat}/api/v1/attendances/urls.py (95%) rename {backend/src => lavocat}/api/v1/attendances/views.py (89%) rename {backend/src => lavocat}/api/v1/core/tests/test_view_jwt_auth.py (100%) rename {backend/src => lavocat}/api/v1/core/urls.py (100%) rename {backend/src => lavocat}/api/v1/urls.py (80%) rename {backend/src => lavocat}/asgi.py (82%) rename {backend/src => lavocat}/attendances/__init__.py (100%) rename {backend/src => lavocat}/attendances/apps.py (68%) rename {backend/src => lavocat}/attendances/migrations/0001_initial.py (100%) rename {backend/src => lavocat}/attendances/migrations/0002_auto_20210315_0524.py (100%) rename {backend/src => lavocat}/attendances/migrations/0003_auto_20210315_0549.py (100%) rename {backend/src => lavocat}/attendances/migrations/0004_auto_20210315_1257.py (100%) rename {backend/src => lavocat}/attendances/migrations/0005_auto_20210324_1536.py (100%) rename {backend/src => lavocat}/attendances/migrations/0006_auto_20210324_1758.py (100%) rename {backend/src => lavocat}/attendances/migrations/0007_attendance_resume.py (100%) rename {backend/src => lavocat}/attendances/migrations/0008_auto_20210327_2300.py (74%) rename {backend/src => lavocat}/attendances/migrations/0009_auto_20210328_0545.py (69%) rename {backend/src => lavocat}/attendances/migrations/0010_auto_20210407_0425.py (87%) rename {backend/src => lavocat}/attendances/migrations/0011_auto_20210423_0559.py (80%) rename {backend/src => lavocat}/attendances/migrations/0012_auto_20210427_1550.py (78%) rename {backend/src => lavocat}/attendances/migrations/0013_auto_20210528_0407.py (100%) rename {backend/src => lavocat}/attendances/migrations/0014_attendance_status_resume.py (100%) rename {backend/src => lavocat}/attendances/migrations/0015_auto_20221213_2350.py (100%) rename {backend/src => lavocat}/attendances/migrations/0016_attendancefile_filename.py (100%) rename {backend/src => lavocat}/attendances/migrations/0017_attendance_services_provided.py (100%) rename {backend/src => lavocat}/attendances/migrations/0018_auto_20230904_1536.py (100%) rename {backend/src => lavocat}/attendances/migrations/0019_auto_20230904_1813.py (100%) rename {backend/src => lavocat}/attendances/migrations/0020_auto_20230905_0217.py (100%) rename {backend/src => lavocat}/attendances/migrations/0021_auto_20231209_2011.py (100%) rename {backend/src => lavocat}/attendances/migrations/0022_attendance_source.py (100%) rename {backend/src => lavocat}/attendances/migrations/0023_note.py (100%) rename {backend/src => lavocat}/attendances/migrations/0024_attendance_is_client.py (100%) rename {backend/src => lavocat}/attendances/migrations/__init__.py (100%) rename {backend/src => lavocat}/attendances/models.py (96%) rename {backend/src => lavocat}/attendances/tests/__init__.py (100%) rename {backend/src => lavocat}/attendances/tests/test_models.py (91%) rename {backend/src => lavocat}/attendances/validators.py (100%) rename {backend/src => lavocat}/core/__init__.py (100%) rename {backend/src => lavocat}/core/admin.py (72%) rename {backend/src => lavocat}/core/apps.py (71%) rename {backend/src => lavocat}/core/migrations/0001_initial.py (100%) rename {backend/src => lavocat}/core/migrations/0002_userallowed_deleted_at.py (100%) rename {backend/src => lavocat}/core/migrations/__init__.py (100%) rename {backend/src => lavocat}/core/models.py (100%) rename {backend/src => lavocat}/core/tests/__init__.py (100%) rename {backend/src => lavocat}/core/tests/test_models.py (81%) rename {backend/src => lavocat}/custom_assertions.py (100%) rename {backend/src => lavocat}/data_migrations/backfill_notes.py (77%) rename {backend/src => lavocat}/data_migrations/backfill_services_types.py (93%) rename {backend/src => lavocat}/settings.py (97%) rename {backend/src => lavocat}/test_fixtures/attendance.py (96%) rename {backend/src => lavocat}/test_fixtures/note.py (94%) rename {backend/src => lavocat}/test_fixtures/utils.py (94%) rename {backend/src => lavocat}/urls.py (94%) rename {backend/src => lavocat}/wsgi.py (84%) rename backend/manage.py => manage.py (89%) rename backend/pytest.ini => pytest.ini (65%) rename backend/requirements.txt => requirements.txt (100%) rename backend/storage_backends.py => storage_backends.py (100%) diff --git a/.github/workflows/ci-cd.yaml b/.github/workflows/ci-cd.yaml index 0aa7873..9b8afa9 100644 --- a/.github/workflows/ci-cd.yaml +++ b/.github/workflows/ci-cd.yaml @@ -10,9 +10,8 @@ jobs: with: python-version: '3.9.0' - name: Install Dependencies - run: pip install -r ./backend/requirements.txt + run: pip install -r requirements.txt - name: Run Tests - working-directory: ./backend env: SECRET_KEY: 'secret' ALLOWED_HOSTS: 'localhost' diff --git a/backend/Dockerfile b/Dockerfile similarity index 92% rename from backend/Dockerfile rename to Dockerfile index 40e19ba..eb869b9 100644 --- a/backend/Dockerfile +++ b/Dockerfile @@ -13,11 +13,10 @@ RUN apk add --no-cache postgresql-dev build-base \ && apk update \ && apk add bash -COPY ./requirements.txt . +COPY . . RUN pip install --upgrade pip RUN pip install -r requirements.txt -RUN ls # copy project COPY . . \ No newline at end of file diff --git a/Procfile b/Procfile index fd70101..1d4bc97 100644 --- a/Procfile +++ b/Procfile @@ -1,2 +1,2 @@ -release: python ./backend/manage.py migrate -web: gunicorn backend.src.wsgi --log-file \ No newline at end of file +release: python manage.py migrate +web: gunicorn lavocat.wsgi --log-file - \ No newline at end of file diff --git a/README.md b/README.md index f871199..75c52e9 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ A lawyer system. ```console git clone git@github.com:sleonardoaugusto/lavocat_backend.git -cd lavocat/backend/ +cd lavocat_backend python -m venv .venv source .venv/bin/activate pip install -r requirements.txt diff --git a/backend/conftest.py b/backend/conftest.py deleted file mode 100644 index 599753e..0000000 --- a/backend/conftest.py +++ /dev/null @@ -1,3 +0,0 @@ -from src.test_fixtures.attendance import * -from src.test_fixtures.note import * -from src.test_fixtures.utils import * diff --git a/conftest.py b/conftest.py new file mode 100644 index 0000000..d6d53a7 --- /dev/null +++ b/conftest.py @@ -0,0 +1,3 @@ +from lavocat.test_fixtures.attendance import * +from lavocat.test_fixtures.note import * +from lavocat.test_fixtures.utils import * diff --git a/backend/contrib/env-sample b/contrib/env-sample similarity index 100% rename from backend/contrib/env-sample rename to contrib/env-sample diff --git a/docker-compose.yml b/docker-compose.yml index d75ddb6..d33dcef 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,20 +1,20 @@ version: '3.1' services: - backend: - container_name: backend + lavocat_backend: + container_name: lavocat_backend image: lavocat_backend build: - context: ./backend + context: . depends_on: - db command: python manage.py runserver 0.0.0.0:8000 volumes: - - ./backend:/usr/src/app/ + - ./:/usr/src/app/ ports: - 8000:8000 env_file: - - ./backend/.env + - .env db: image: postgres:14 restart: always diff --git a/backend/src/__init__.py b/lavocat/__init__.py similarity index 100% rename from backend/src/__init__.py rename to lavocat/__init__.py diff --git a/backend/src/api/__init__.py b/lavocat/api/__init__.py similarity index 100% rename from backend/src/api/__init__.py rename to lavocat/api/__init__.py diff --git a/backend/src/api/v1/__init__.py b/lavocat/api/v1/__init__.py similarity index 100% rename from backend/src/api/v1/__init__.py rename to lavocat/api/v1/__init__.py diff --git a/backend/src/api/v1/attendances/__init__.py b/lavocat/api/v1/attendances/__init__.py similarity index 100% rename from backend/src/api/v1/attendances/__init__.py rename to lavocat/api/v1/attendances/__init__.py diff --git a/backend/src/api/v1/attendances/filters.py b/lavocat/api/v1/attendances/filters.py similarity index 86% rename from backend/src/api/v1/attendances/filters.py rename to lavocat/api/v1/attendances/filters.py index d7a0326..c818dc4 100644 --- a/backend/src/api/v1/attendances/filters.py +++ b/lavocat/api/v1/attendances/filters.py @@ -1,6 +1,6 @@ import django_filters -from src.attendances.models import Attendance, ServicesTypesOptions +from lavocat.attendances.models import Attendance, ServicesTypesOptions class AttendanceFilter(django_filters.FilterSet): diff --git a/backend/src/api/v1/attendances/serializers.py b/lavocat/api/v1/attendances/serializers.py similarity index 98% rename from backend/src/api/v1/attendances/serializers.py rename to lavocat/api/v1/attendances/serializers.py index f347178..7bce786 100644 --- a/backend/src/api/v1/attendances/serializers.py +++ b/lavocat/api/v1/attendances/serializers.py @@ -1,7 +1,7 @@ from rest_framework import serializers from rest_framework.fields import MultipleChoiceField -from src.attendances.models import ( +from lavocat.attendances.models import ( Attendance, AttendanceFile, ServicesTypesOptions, diff --git a/backend/src/api/v1/attendances/tests/__init__.py b/lavocat/api/v1/attendances/tests/__init__.py similarity index 100% rename from backend/src/api/v1/attendances/tests/__init__.py rename to lavocat/api/v1/attendances/tests/__init__.py diff --git a/backend/src/api/v1/attendances/tests/test_serializers.py b/lavocat/api/v1/attendances/tests/test_serializers.py similarity index 95% rename from backend/src/api/v1/attendances/tests/test_serializers.py rename to lavocat/api/v1/attendances/tests/test_serializers.py index dbbc34b..59f7865 100644 --- a/backend/src/api/v1/attendances/tests/test_serializers.py +++ b/lavocat/api/v1/attendances/tests/test_serializers.py @@ -1,11 +1,11 @@ import pytest -from src.api.v1.attendances.serializers import ( +from lavocat.api.v1.attendances.serializers import ( AttendanceSerializer, AttendanceFileSerializer, NoteSerializer, ) -from src.custom_assertions import assert_validation_error_code +from lavocat.custom_assertions import assert_validation_error_code @pytest.fixture diff --git a/backend/src/api/v1/attendances/tests/test_views.py b/lavocat/api/v1/attendances/tests/test_views.py similarity index 99% rename from backend/src/api/v1/attendances/tests/test_views.py rename to lavocat/api/v1/attendances/tests/test_views.py index 9d554a5..108316b 100644 --- a/backend/src/api/v1/attendances/tests/test_views.py +++ b/lavocat/api/v1/attendances/tests/test_views.py @@ -4,7 +4,7 @@ from rest_framework import status from rest_framework.reverse import reverse -from src.attendances.models import ( +from lavocat.attendances.models import ( Attendance, AttendanceFile, ServicesTypesOptions, diff --git a/backend/src/api/v1/attendances/urls.py b/lavocat/api/v1/attendances/urls.py similarity index 95% rename from backend/src/api/v1/attendances/urls.py rename to lavocat/api/v1/attendances/urls.py index 4127afe..9f44974 100644 --- a/backend/src/api/v1/attendances/urls.py +++ b/lavocat/api/v1/attendances/urls.py @@ -2,7 +2,7 @@ from rest_framework.routers import SimpleRouter from rest_framework_nested import routers -from src.api.v1.attendances.views import ( +from lavocat.api.v1.attendances.views import ( AttendanceViewSet, AttendanceFileViewSet, AttendanceStatusesView, diff --git a/backend/src/api/v1/attendances/views.py b/lavocat/api/v1/attendances/views.py similarity index 89% rename from backend/src/api/v1/attendances/views.py rename to lavocat/api/v1/attendances/views.py index 93dbed4..e86eccb 100644 --- a/backend/src/api/v1/attendances/views.py +++ b/lavocat/api/v1/attendances/views.py @@ -2,13 +2,13 @@ from rest_framework import viewsets, views from rest_framework.response import Response -from src.api.v1.attendances.filters import AttendanceFilter -from src.api.v1.attendances.serializers import ( +from lavocat.api.v1.attendances.filters import AttendanceFilter +from lavocat.api.v1.attendances.serializers import ( AttendanceSerializer, AttendanceFileSerializer, NoteSerializer, ) -from src.attendances.models import ( +from lavocat.attendances.models import ( Attendance, AttendanceFile, AttendanceStatus, diff --git a/backend/src/api/v1/core/tests/test_view_jwt_auth.py b/lavocat/api/v1/core/tests/test_view_jwt_auth.py similarity index 100% rename from backend/src/api/v1/core/tests/test_view_jwt_auth.py rename to lavocat/api/v1/core/tests/test_view_jwt_auth.py diff --git a/backend/src/api/v1/core/urls.py b/lavocat/api/v1/core/urls.py similarity index 100% rename from backend/src/api/v1/core/urls.py rename to lavocat/api/v1/core/urls.py diff --git a/backend/src/api/v1/urls.py b/lavocat/api/v1/urls.py similarity index 80% rename from backend/src/api/v1/urls.py rename to lavocat/api/v1/urls.py index 35bc45e..b73db67 100644 --- a/backend/src/api/v1/urls.py +++ b/lavocat/api/v1/urls.py @@ -17,6 +17,6 @@ urlpatterns = [ path('', schema_view.with_ui('swagger', cache_timeout=0), name='docs'), - path('', include('src.api.v1.attendances.urls')), - path('', include('src.api.v1.core.urls')), + path('', include('lavocat.api.v1.attendances.urls')), + path('', include('lavocat.api.v1.core.urls')), ] diff --git a/backend/src/asgi.py b/lavocat/asgi.py similarity index 82% rename from backend/src/asgi.py rename to lavocat/asgi.py index 6032246..d8fc7f5 100644 --- a/backend/src/asgi.py +++ b/lavocat/asgi.py @@ -11,6 +11,6 @@ from django.core.asgi import get_asgi_application -os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'src.settings') +os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'lavocat.settings') application = get_asgi_application() diff --git a/backend/src/attendances/__init__.py b/lavocat/attendances/__init__.py similarity index 100% rename from backend/src/attendances/__init__.py rename to lavocat/attendances/__init__.py diff --git a/backend/src/attendances/apps.py b/lavocat/attendances/apps.py similarity index 68% rename from backend/src/attendances/apps.py rename to lavocat/attendances/apps.py index 2486ad4..bd8cc3c 100644 --- a/backend/src/attendances/apps.py +++ b/lavocat/attendances/apps.py @@ -2,4 +2,4 @@ class AttendancesConfig(AppConfig): - name = 'src.attendances' + name = 'lavocat.attendances' diff --git a/backend/src/attendances/migrations/0001_initial.py b/lavocat/attendances/migrations/0001_initial.py similarity index 100% rename from backend/src/attendances/migrations/0001_initial.py rename to lavocat/attendances/migrations/0001_initial.py diff --git a/backend/src/attendances/migrations/0002_auto_20210315_0524.py b/lavocat/attendances/migrations/0002_auto_20210315_0524.py similarity index 100% rename from backend/src/attendances/migrations/0002_auto_20210315_0524.py rename to lavocat/attendances/migrations/0002_auto_20210315_0524.py diff --git a/backend/src/attendances/migrations/0003_auto_20210315_0549.py b/lavocat/attendances/migrations/0003_auto_20210315_0549.py similarity index 100% rename from backend/src/attendances/migrations/0003_auto_20210315_0549.py rename to lavocat/attendances/migrations/0003_auto_20210315_0549.py diff --git a/backend/src/attendances/migrations/0004_auto_20210315_1257.py b/lavocat/attendances/migrations/0004_auto_20210315_1257.py similarity index 100% rename from backend/src/attendances/migrations/0004_auto_20210315_1257.py rename to lavocat/attendances/migrations/0004_auto_20210315_1257.py diff --git a/backend/src/attendances/migrations/0005_auto_20210324_1536.py b/lavocat/attendances/migrations/0005_auto_20210324_1536.py similarity index 100% rename from backend/src/attendances/migrations/0005_auto_20210324_1536.py rename to lavocat/attendances/migrations/0005_auto_20210324_1536.py diff --git a/backend/src/attendances/migrations/0006_auto_20210324_1758.py b/lavocat/attendances/migrations/0006_auto_20210324_1758.py similarity index 100% rename from backend/src/attendances/migrations/0006_auto_20210324_1758.py rename to lavocat/attendances/migrations/0006_auto_20210324_1758.py diff --git a/backend/src/attendances/migrations/0007_attendance_resume.py b/lavocat/attendances/migrations/0007_attendance_resume.py similarity index 100% rename from backend/src/attendances/migrations/0007_attendance_resume.py rename to lavocat/attendances/migrations/0007_attendance_resume.py diff --git a/backend/src/attendances/migrations/0008_auto_20210327_2300.py b/lavocat/attendances/migrations/0008_auto_20210327_2300.py similarity index 74% rename from backend/src/attendances/migrations/0008_auto_20210327_2300.py rename to lavocat/attendances/migrations/0008_auto_20210327_2300.py index 94d9329..d00401e 100644 --- a/backend/src/attendances/migrations/0008_auto_20210327_2300.py +++ b/lavocat/attendances/migrations/0008_auto_20210327_2300.py @@ -1,7 +1,7 @@ # Generated by Django 3.1.7 on 2021-03-27 23:00 from django.db import migrations, models -import src.attendances.models +import lavocat.attendances.models class Migration(migrations.Migration): @@ -14,6 +14,6 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='attendancefile', name='file', - field=models.FileField(upload_to=src.attendances.models.upload_to), + field=models.FileField(upload_to=lavocat.attendances.models.upload_to), ), ] diff --git a/backend/src/attendances/migrations/0009_auto_20210328_0545.py b/lavocat/attendances/migrations/0009_auto_20210328_0545.py similarity index 69% rename from backend/src/attendances/migrations/0009_auto_20210328_0545.py rename to lavocat/attendances/migrations/0009_auto_20210328_0545.py index bb9be05..a1dd1c7 100644 --- a/backend/src/attendances/migrations/0009_auto_20210328_0545.py +++ b/lavocat/attendances/migrations/0009_auto_20210328_0545.py @@ -1,7 +1,7 @@ # Generated by Django 3.1.7 on 2021-03-28 05:45 from django.db import migrations, models -import src.attendances.validators +import lavocat.attendances.validators class Migration(migrations.Migration): @@ -14,6 +14,6 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='attendance', name='document_id', - field=models.CharField(max_length=11, validators=[src.attendances.validators.validate_document_id]), + field=models.CharField(max_length=11, validators=[lavocat.attendances.validators.validate_document_id]), ), ] diff --git a/backend/src/attendances/migrations/0010_auto_20210407_0425.py b/lavocat/attendances/migrations/0010_auto_20210407_0425.py similarity index 87% rename from backend/src/attendances/migrations/0010_auto_20210407_0425.py rename to lavocat/attendances/migrations/0010_auto_20210407_0425.py index 52164b7..bcee744 100644 --- a/backend/src/attendances/migrations/0010_auto_20210407_0425.py +++ b/lavocat/attendances/migrations/0010_auto_20210407_0425.py @@ -1,7 +1,7 @@ # Generated by Django 3.1.7 on 2021-04-07 04:25 from django.db import migrations, models -import src.attendances.models +import lavocat.attendances.models import storage_backends @@ -20,6 +20,6 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='attendancefile', name='file', - field=models.FileField(storage=storage_backends.MediaStorage(), upload_to=src.attendances.models.upload_to), + field=models.FileField(storage=storage_backends.MediaStorage(), upload_to=lavocat.attendances.models.upload_to), ), ] diff --git a/backend/src/attendances/migrations/0011_auto_20210423_0559.py b/lavocat/attendances/migrations/0011_auto_20210423_0559.py similarity index 80% rename from backend/src/attendances/migrations/0011_auto_20210423_0559.py rename to lavocat/attendances/migrations/0011_auto_20210423_0559.py index 226c40d..7250a68 100644 --- a/backend/src/attendances/migrations/0011_auto_20210423_0559.py +++ b/lavocat/attendances/migrations/0011_auto_20210423_0559.py @@ -1,7 +1,7 @@ # Generated by Django 3.1.7 on 2021-04-23 05:59 from django.db import migrations, models -import src.attendances.validators +import lavocat.attendances.validators class Migration(migrations.Migration): @@ -14,6 +14,6 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='attendance', name='document_id', - field=models.CharField(max_length=11, null=True, validators=[src.attendances.validators.validate_document_id]), + field=models.CharField(max_length=11, null=True, validators=[lavocat.attendances.validators.validate_document_id]), ), ] diff --git a/backend/src/attendances/migrations/0012_auto_20210427_1550.py b/lavocat/attendances/migrations/0012_auto_20210427_1550.py similarity index 78% rename from backend/src/attendances/migrations/0012_auto_20210427_1550.py rename to lavocat/attendances/migrations/0012_auto_20210427_1550.py index 84483b4..b309881 100644 --- a/backend/src/attendances/migrations/0012_auto_20210427_1550.py +++ b/lavocat/attendances/migrations/0012_auto_20210427_1550.py @@ -1,7 +1,7 @@ # Generated by Django 3.1.7 on 2021-04-27 15:50 from django.db import migrations, models -import src.attendances.validators +import lavocat.attendances.validators class Migration(migrations.Migration): @@ -14,6 +14,6 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='attendance', name='document_id', - field=models.CharField(blank=True, max_length=11, null=True, validators=[src.attendances.validators.validate_document_id]), + field=models.CharField(blank=True, max_length=11, null=True, validators=[lavocat.attendances.validators.validate_document_id]), ), ] diff --git a/backend/src/attendances/migrations/0013_auto_20210528_0407.py b/lavocat/attendances/migrations/0013_auto_20210528_0407.py similarity index 100% rename from backend/src/attendances/migrations/0013_auto_20210528_0407.py rename to lavocat/attendances/migrations/0013_auto_20210528_0407.py diff --git a/backend/src/attendances/migrations/0014_attendance_status_resume.py b/lavocat/attendances/migrations/0014_attendance_status_resume.py similarity index 100% rename from backend/src/attendances/migrations/0014_attendance_status_resume.py rename to lavocat/attendances/migrations/0014_attendance_status_resume.py diff --git a/backend/src/attendances/migrations/0015_auto_20221213_2350.py b/lavocat/attendances/migrations/0015_auto_20221213_2350.py similarity index 100% rename from backend/src/attendances/migrations/0015_auto_20221213_2350.py rename to lavocat/attendances/migrations/0015_auto_20221213_2350.py diff --git a/backend/src/attendances/migrations/0016_attendancefile_filename.py b/lavocat/attendances/migrations/0016_attendancefile_filename.py similarity index 100% rename from backend/src/attendances/migrations/0016_attendancefile_filename.py rename to lavocat/attendances/migrations/0016_attendancefile_filename.py diff --git a/backend/src/attendances/migrations/0017_attendance_services_provided.py b/lavocat/attendances/migrations/0017_attendance_services_provided.py similarity index 100% rename from backend/src/attendances/migrations/0017_attendance_services_provided.py rename to lavocat/attendances/migrations/0017_attendance_services_provided.py diff --git a/backend/src/attendances/migrations/0018_auto_20230904_1536.py b/lavocat/attendances/migrations/0018_auto_20230904_1536.py similarity index 100% rename from backend/src/attendances/migrations/0018_auto_20230904_1536.py rename to lavocat/attendances/migrations/0018_auto_20230904_1536.py diff --git a/backend/src/attendances/migrations/0019_auto_20230904_1813.py b/lavocat/attendances/migrations/0019_auto_20230904_1813.py similarity index 100% rename from backend/src/attendances/migrations/0019_auto_20230904_1813.py rename to lavocat/attendances/migrations/0019_auto_20230904_1813.py diff --git a/backend/src/attendances/migrations/0020_auto_20230905_0217.py b/lavocat/attendances/migrations/0020_auto_20230905_0217.py similarity index 100% rename from backend/src/attendances/migrations/0020_auto_20230905_0217.py rename to lavocat/attendances/migrations/0020_auto_20230905_0217.py diff --git a/backend/src/attendances/migrations/0021_auto_20231209_2011.py b/lavocat/attendances/migrations/0021_auto_20231209_2011.py similarity index 100% rename from backend/src/attendances/migrations/0021_auto_20231209_2011.py rename to lavocat/attendances/migrations/0021_auto_20231209_2011.py diff --git a/backend/src/attendances/migrations/0022_attendance_source.py b/lavocat/attendances/migrations/0022_attendance_source.py similarity index 100% rename from backend/src/attendances/migrations/0022_attendance_source.py rename to lavocat/attendances/migrations/0022_attendance_source.py diff --git a/backend/src/attendances/migrations/0023_note.py b/lavocat/attendances/migrations/0023_note.py similarity index 100% rename from backend/src/attendances/migrations/0023_note.py rename to lavocat/attendances/migrations/0023_note.py diff --git a/backend/src/attendances/migrations/0024_attendance_is_client.py b/lavocat/attendances/migrations/0024_attendance_is_client.py similarity index 100% rename from backend/src/attendances/migrations/0024_attendance_is_client.py rename to lavocat/attendances/migrations/0024_attendance_is_client.py diff --git a/backend/src/attendances/migrations/__init__.py b/lavocat/attendances/migrations/__init__.py similarity index 100% rename from backend/src/attendances/migrations/__init__.py rename to lavocat/attendances/migrations/__init__.py diff --git a/backend/src/attendances/models.py b/lavocat/attendances/models.py similarity index 96% rename from backend/src/attendances/models.py rename to lavocat/attendances/models.py index eb9069d..fa71e74 100644 --- a/backend/src/attendances/models.py +++ b/lavocat/attendances/models.py @@ -1,8 +1,8 @@ from django.db import models from multiselectfield import MultiSelectField -from src.attendances.validators import validate_document_id -from src.core.models import ModelBase +from lavocat.attendances.validators import validate_document_id +from lavocat.core.models import ModelBase from storage_backends import MediaStorage import uuid diff --git a/backend/src/attendances/tests/__init__.py b/lavocat/attendances/tests/__init__.py similarity index 100% rename from backend/src/attendances/tests/__init__.py rename to lavocat/attendances/tests/__init__.py diff --git a/backend/src/attendances/tests/test_models.py b/lavocat/attendances/tests/test_models.py similarity index 91% rename from backend/src/attendances/tests/test_models.py rename to lavocat/attendances/tests/test_models.py index 2feaf1f..94fa017 100644 --- a/backend/src/attendances/tests/test_models.py +++ b/lavocat/attendances/tests/test_models.py @@ -3,7 +3,7 @@ from django.db.models.fields.files import FieldFile from model_bakery import baker -from src.attendances.models import Attendance, AttendanceFile +from lavocat.attendances.models import Attendance, AttendanceFile def test_should_exist_attendance_model(attendance): diff --git a/backend/src/attendances/validators.py b/lavocat/attendances/validators.py similarity index 100% rename from backend/src/attendances/validators.py rename to lavocat/attendances/validators.py diff --git a/backend/src/core/__init__.py b/lavocat/core/__init__.py similarity index 100% rename from backend/src/core/__init__.py rename to lavocat/core/__init__.py diff --git a/backend/src/core/admin.py b/lavocat/core/admin.py similarity index 72% rename from backend/src/core/admin.py rename to lavocat/core/admin.py index 009c12f..7c7507c 100644 --- a/backend/src/core/admin.py +++ b/lavocat/core/admin.py @@ -1,6 +1,6 @@ from django.contrib import admin -from src.core.models import UserAllowed +from lavocat.core.models import UserAllowed @admin.register(UserAllowed) diff --git a/backend/src/core/apps.py b/lavocat/core/apps.py similarity index 71% rename from backend/src/core/apps.py rename to lavocat/core/apps.py index aadf746..1c9ec01 100644 --- a/backend/src/core/apps.py +++ b/lavocat/core/apps.py @@ -2,4 +2,4 @@ class CoreConfig(AppConfig): - name = 'src.core' + name = 'lavocat.core' diff --git a/backend/src/core/migrations/0001_initial.py b/lavocat/core/migrations/0001_initial.py similarity index 100% rename from backend/src/core/migrations/0001_initial.py rename to lavocat/core/migrations/0001_initial.py diff --git a/backend/src/core/migrations/0002_userallowed_deleted_at.py b/lavocat/core/migrations/0002_userallowed_deleted_at.py similarity index 100% rename from backend/src/core/migrations/0002_userallowed_deleted_at.py rename to lavocat/core/migrations/0002_userallowed_deleted_at.py diff --git a/backend/src/core/migrations/__init__.py b/lavocat/core/migrations/__init__.py similarity index 100% rename from backend/src/core/migrations/__init__.py rename to lavocat/core/migrations/__init__.py diff --git a/backend/src/core/models.py b/lavocat/core/models.py similarity index 100% rename from backend/src/core/models.py rename to lavocat/core/models.py diff --git a/backend/src/core/tests/__init__.py b/lavocat/core/tests/__init__.py similarity index 100% rename from backend/src/core/tests/__init__.py rename to lavocat/core/tests/__init__.py diff --git a/backend/src/core/tests/test_models.py b/lavocat/core/tests/test_models.py similarity index 81% rename from backend/src/core/tests/test_models.py rename to lavocat/core/tests/test_models.py index fdadf62..b364e3c 100644 --- a/backend/src/core/tests/test_models.py +++ b/lavocat/core/tests/test_models.py @@ -1,7 +1,7 @@ import pytest from model_bakery import baker -from src.core.models import UserAllowed +from lavocat.core.models import UserAllowed @pytest.fixture diff --git a/backend/src/custom_assertions.py b/lavocat/custom_assertions.py similarity index 100% rename from backend/src/custom_assertions.py rename to lavocat/custom_assertions.py diff --git a/backend/src/data_migrations/backfill_notes.py b/lavocat/data_migrations/backfill_notes.py similarity index 77% rename from backend/src/data_migrations/backfill_notes.py rename to lavocat/data_migrations/backfill_notes.py index 0e2f306..056dad3 100644 --- a/backend/src/data_migrations/backfill_notes.py +++ b/lavocat/data_migrations/backfill_notes.py @@ -1,4 +1,4 @@ -from src.attendances.models import Attendance, ServicesTypesOptions, Note +from lavocat.attendances.models import Attendance, ServicesTypesOptions, Note for attendance in Attendance.objects.all(): diff --git a/backend/src/data_migrations/backfill_services_types.py b/lavocat/data_migrations/backfill_services_types.py similarity index 93% rename from backend/src/data_migrations/backfill_services_types.py rename to lavocat/data_migrations/backfill_services_types.py index 87d0f77..99a0c92 100644 --- a/backend/src/data_migrations/backfill_services_types.py +++ b/lavocat/data_migrations/backfill_services_types.py @@ -1,4 +1,4 @@ -from src.attendances.models import Attendance, ServicesTypesOptions +from lavocat.attendances.models import Attendance, ServicesTypesOptions FROM_TO = ( (['DPVAT'], ServicesTypesOptions.DPVAT), diff --git a/backend/src/settings.py b/lavocat/settings.py similarity index 97% rename from backend/src/settings.py rename to lavocat/settings.py index 53de715..3be38ba 100644 --- a/backend/src/settings.py +++ b/lavocat/settings.py @@ -49,8 +49,8 @@ 'rest_framework', 'drf_yasg', 'django_filters', - 'src.core', - 'src.attendances', + 'lavocat.core', + 'lavocat.attendances', 'storages', ] @@ -81,7 +81,7 @@ 'ACCESS_TOKEN_LIFETIME': timedelta(hours=10), } -ROOT_URLCONF = 'src.urls' +ROOT_URLCONF = 'lavocat.urls' LOGIN_REDIRECT_URL = '/' LOGOUT_REDIRECT_URL = '/accounts/login/' @@ -102,7 +102,7 @@ }, ] -WSGI_APPLICATION = 'src.wsgi.application' +WSGI_APPLICATION = 'lavocat.wsgi.application' # Database # https://docs.djangoproject.com/en/3.1/ref/settings/#databases diff --git a/backend/src/test_fixtures/attendance.py b/lavocat/test_fixtures/attendance.py similarity index 96% rename from backend/src/test_fixtures/attendance.py rename to lavocat/test_fixtures/attendance.py index 8f88616..1394a48 100644 --- a/backend/src/test_fixtures/attendance.py +++ b/lavocat/test_fixtures/attendance.py @@ -2,7 +2,7 @@ from django.core.files.storage import FileSystemStorage from model_bakery import baker -from src.attendances.models import ( +from lavocat.attendances.models import ( ServicesTypesOptions, AttendanceFile, Attendance, diff --git a/backend/src/test_fixtures/note.py b/lavocat/test_fixtures/note.py similarity index 94% rename from backend/src/test_fixtures/note.py rename to lavocat/test_fixtures/note.py index 4aabea5..10d42b1 100644 --- a/backend/src/test_fixtures/note.py +++ b/lavocat/test_fixtures/note.py @@ -1,7 +1,7 @@ import pytest from model_bakery import baker -from src.attendances.models import Note, ServicesTypesOptions +from lavocat.attendances.models import Note, ServicesTypesOptions @pytest.fixture diff --git a/backend/src/test_fixtures/utils.py b/lavocat/test_fixtures/utils.py similarity index 94% rename from backend/src/test_fixtures/utils.py rename to lavocat/test_fixtures/utils.py index 8255bab..60f5314 100644 --- a/backend/src/test_fixtures/utils.py +++ b/lavocat/test_fixtures/utils.py @@ -7,7 +7,7 @@ from rest_framework.test import APIClient from rest_framework_simplejwt.tokens import RefreshToken -from src.attendances.models import AttendanceFile +from lavocat.attendances.models import AttendanceFile @pytest.fixture(autouse=True) diff --git a/backend/src/urls.py b/lavocat/urls.py similarity index 94% rename from backend/src/urls.py rename to lavocat/urls.py index 5a86e4f..10bce94 100644 --- a/backend/src/urls.py +++ b/lavocat/urls.py @@ -23,7 +23,7 @@ urlpatterns = [ path('', lambda *args: redirect(reverse('api-v1:docs'))), path('admin/', admin.site.urls), - path('api/v1/', include('src.api.v1.urls', namespace='api-v1')), + path('api/v1/', include('lavocat.api.v1.urls', namespace='api-v1')), path('accounts/', include('rest_framework.urls')), ] diff --git a/backend/src/wsgi.py b/lavocat/wsgi.py similarity index 84% rename from backend/src/wsgi.py rename to lavocat/wsgi.py index 666c5dd..4dd72ed 100644 --- a/backend/src/wsgi.py +++ b/lavocat/wsgi.py @@ -12,6 +12,6 @@ from dj_static import Cling from django.core.wsgi import get_wsgi_application -os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'src.settings') +os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'lavocat.settings') application = Cling(get_wsgi_application()) diff --git a/backend/manage.py b/manage.py similarity index 89% rename from backend/manage.py rename to manage.py index 48e05a7..d4274c4 100755 --- a/backend/manage.py +++ b/manage.py @@ -6,7 +6,7 @@ def main(): """Run administrative tasks.""" - os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'src.settings') + os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'lavocat.settings') try: from django.core.management import execute_from_command_line except ImportError as exc: diff --git a/backend/pytest.ini b/pytest.ini similarity index 65% rename from backend/pytest.ini rename to pytest.ini index 1265936..4b7fb0a 100644 --- a/backend/pytest.ini +++ b/pytest.ini @@ -1,4 +1,4 @@ [pytest] -DJANGO_SETTINGS_MODULE = src.settings +DJANGO_SETTINGS_MODULE = lavocat.settings python_files = tests.py test_*.py *_tests.py addopts = -p no:warnings \ No newline at end of file diff --git a/backend/requirements.txt b/requirements.txt similarity index 100% rename from backend/requirements.txt rename to requirements.txt diff --git a/backend/storage_backends.py b/storage_backends.py similarity index 100% rename from backend/storage_backends.py rename to storage_backends.py