Revert "folder restructuring"

This reverts commit 89752a1.

.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'

backend/Dockerfile → 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 . .

Procfile

@@ -1,2 +1,2 @@
-release: python ./backend/manage.py migrate
-web: gunicorn backend.src.wsgi --log-file
+release: python manage.py migrate
+web: gunicorn lavocat.wsgi --log-file -

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

conftest.py

@@ -0,0 +1,3 @@
+from lavocat.test_fixtures.attendance import *
+from lavocat.test_fixtures.note import *
+from lavocat.test_fixtures.utils import *

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

backend/src/api/v1/attendances/filters.py → 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):

backend/src/api/v1/attendances/serializers.py → 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,

backend/src/api/v1/attendances/tests/test_serializers.py → 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

backend/src/api/v1/attendances/tests/test_views.py → 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,

backend/src/api/v1/attendances/urls.py → 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,

backend/src/api/v1/attendances/views.py → 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,

backend/src/api/v1/urls.py → 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')),
 ]

backend/src/asgi.py → 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()

backend/src/attendances/apps.py → lavocat/attendances/apps.py

@@ -2,4 +2,4 @@
 
 
 class AttendancesConfig(AppConfig):
-    name = 'src.attendances'
+    name = 'lavocat.attendances'

backend/src/attendances/migrations/0008_auto_20210327_2300.py → 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),
         ),
     ]

backend/src/attendances/migrations/0009_auto_20210328_0545.py → 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]),
         ),
     ]

backend/src/attendances/migrations/0010_auto_20210407_0425.py → 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),
         ),
     ]

backend/src/attendances/migrations/0011_auto_20210423_0559.py → 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]),
         ),
     ]

backend/src/attendances/migrations/0012_auto_20210427_1550.py → 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]),
         ),
     ]

backend/src/attendances/models.py → 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

backend/src/attendances/tests/test_models.py → 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):

backend/src/core/admin.py → 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)

backend/src/core/apps.py → lavocat/core/apps.py

@@ -2,4 +2,4 @@
 
 
 class CoreConfig(AppConfig):
-    name = 'src.core'
+    name = 'lavocat.core'

backend/src/core/tests/test_models.py → 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

backend/src/data_migrations/backfill_notes.py → 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():

backend/src/data_migrations/backfill_services_types.py → 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),

backend/src/settings.py → 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

backend/src/test_fixtures/attendance.py → 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,

backend/src/test_fixtures/note.py → 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

backend/src/test_fixtures/utils.py → 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)

backend/src/urls.py → 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')),
 ]
 

backend/src/wsgi.py → 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())

backend/manage.py → 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:

backend/pytest.ini → 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