Architecture refactoring

.github/workflows/run-linter-and-tests.yaml

@@ -1,11 +1,7 @@
 name: Lint
 on:
   pull_request:
-    branches:
-      - main
   push:
-    branches:
-      - main
 jobs:
   run-linters-and-tests:
     runs-on: ubuntu-latest
@@ -24,6 +20,9 @@ jobs:
       - name: Run all linters and formatters
         run: make lint
 
+      - name: Run type check
+        run: make check-types
+
       - name: Up all containers
         run: docker compose -f dev-docker-compose.yaml up --build --force-recreate --remove-orphans -d
 

Dockerfile

@@ -78,7 +78,7 @@ EXPOSE ${APPLICATION_SERVER_PORT}
 USER 1001
 
 # Run the uvicorn application server.
-CMD exec uvicorn --workers 1 --host 0.0.0.0 --port $APPLICATION_SERVER_PORT app.main:app
+CMD exec uvicorn --workers 1 --host 0.0.0.0 --port $APPLICATION_SERVER_PORT internal:app
 
 FROM server-setup-build-stage as install-dependencies-build-stage
 # install [tool.poetry.dependencies]
@@ -93,4 +93,4 @@ FROM server-setup-build-stage as production-image
 COPY --chown=python_application:python_application --from=install-dependencies-build-stage /application_root/.venv /application_root/.venv
 
 # Copy application files
-COPY --chown=python_application:python_application /app /application_root/app/
+COPY --chown=python_application:python_application /internal /application_root/internal/

Makefile

@@ -1,4 +1,4 @@
-.PHONY: env install-deps up open-db revision migrate downgrade worker app init lint test
+.PHONY: env install-deps up open-db pg-revision pg-migrate pg-downgrade celery-worker app init lint test check-types
 
 ifeq ($(shell test -e '.env' && echo -n yes), yes)
 	include .env
@@ -27,43 +27,46 @@ open-db:
 	docker exec -it desbordante-postgres psql -d $(POSTGRES_DB) -U $(POSTGRES_USER)
 
 ## Create new revision file automatically
-revision:
-	poetry run alembic -c app/settings/alembic.ini revision --autogenerate $(args)
+pg-revision:
+	poetry run alembic -c internal/infrastructure/data_storage/relational/postgres/migrations/alembic.ini revision --autogenerate $(args)
 
 ## Make migrations in database
-migrate:
-	poetry run alembic -c app/settings/alembic.ini upgrade $(args)
+pg-migrate:
+	poetry run alembic -c internal/infrastructure/data_storage/relational/postgres/migrations/alembic.ini upgrade $(args)
 
 ## Downgrade database
-downgrade:
-	poetry run alembic -c app/settings/alembic.ini downgrade $(args)
+pg-downgrade:
+	poetry run alembic -c internal/infrastructure/data_storage/relational/postgres/migrations/alembic.ini downgrade $(args)
 
 ## Run celery worker in watch mode
-worker:
-	watchmedo auto-restart --directory=./ --pattern='*.py' --recursive -- celery -A app.worker worker --loglevel=info --concurrency=1
+celery-worker:
+	watchmedo auto-restart --directory=./ --pattern='*.py' --recursive -- celery -A internal.infrastructure.background_task.celery worker --loglevel=info --concurrency=1
 
 ## Run application server in watch mode
 app:
-	poetry run uvicorn --port 8000 app.main:app --reload
+	poetry run uvicorn --port 8000 internal:app --reload
 
 ## Initiate repository
 init:
 	make env install-deps
 
 ## Run all formatters and linters in project
 lint:
-	poetry run ruff check tests app \
-	& poetry run ruff format --check tests app \
-	& poetry run black --check tests app
+	poetry run ruff check tests internal \
+	& poetry run ruff format --check tests internal \
+	& poetry run black --check tests internal
 
 ## Reformat code
 format:
-	poetry run ruff format tests app & poetry run ruff check --fix & poetry run black tests app
-
+	poetry run ruff format tests internal & poetry run ruff check --fix & poetry run black tests internal
 
 ## Run all tests in project
 test:
-	poetry run pytest -o log_cli=true --verbosity=2 --showlocals --log-cli-level=INFO --test-alembic --cov=app --cov-report term
+	poetry run pytest -o log_cli=true --verbosity=2 --showlocals --log-cli-level=INFO --cov=internal --cov-report term
+
+## Check all types
+check-types:
+	poetry run pyright .
 
 .DEFAULT_GOAL := help
 # See <https://gist.github.com/klmr/575726c7e05d8780505a> for explanation.

README.md

@@ -13,7 +13,7 @@ Execute `make` to see all available rules with documentation
 1. Activate virtual environment: `source .venv/bin/activate`
 2. Don't forget to change values in .env
 3. Run **development-only** containers: `make up`
-4. Run celery worker in watch mode: `make worker`
+4. Run celery worker in watch mode: `make celery-worker`
 5. Run application in watch mode: `make app`
 
 ## Docs