Feature/postgres local stage 2

.env.example

@@ -12,3 +12,12 @@ DJANGO_SUPERUSER_ROLE=admin
 DJANGO_SUPERUSER_USERNAME=admin
 DJANGO_SUPERUSER_EMAIL=admin@admin.ru
 DJANGO_SUPERUSER_PASSWORD=admin
+
+# Postgres settings
+
+DB_ENGINE='django.db.backends.postgresql'
+POSTGRES_PASSWORD='1qw2#ER$'
+POSTGRES_USER='django'
+POSTGRES_DB='django'
+DB_HOST='localhost'
+DB_PORT='5432'

Makefile

@@ -4,6 +4,7 @@ MANAGE_DIR := $(PROJECT_DIR)/adaptive_hockey_federation/manage.py
 DJANGO_DIR := $(PROJECT_DIR)/adaptive_hockey_federation
 POETRY_RUN := poetry run python
 DJANGO_RUN := $(POETRY_RUN) $(MANAGE_DIR)
+DEV_DOCK_FILE := $(PROJECT_DIR)/infra/dev/docker-compose.dev.yaml
 SHELL_GREEN = \033[32m
 SHELL_YELLOW = \033[33m
 SHELL_NC := \e[0m
@@ -21,6 +22,9 @@ help:
 	@echo "	collectstatic   - $(SHELL_GREEN)Команда для сбора статики.$(SHELL_NC)"
 	@echo "	migrate         - $(SHELL_GREEN)Команда для применения к базе данных готовых миграций.$(SHELL_NC)"
 	@echo "	createsuperuser - $(SHELL_GREEN)Команда для создания супер-юзера.$(SHELL_NC)"
+	@echo "	start-db        - $(SHELL_GREEN)Команда для запуска локального контейнера postgres.$(SHELL_NC)"
+	@echo "	stop-db         - $(SHELL_GREEN)Команда для остановки локального контейнера postgres.$(SHELL_NC)"
+	@echo "	clear-db        - $(SHELL_GREEN)Команда для очистки volume локального контейнера postgres.$(SHELL_NC)"
 	@echo "	run             - $(SHELL_GREEN)Команда для локального запуска проекта.$(SHELL_NC)"
 	@echo "	fill-db         - $(SHELL_GREEN)Команда для заполнения базы данных с помощью парсера.$(SHELL_NC)"
 	@echo "	pytest          - $(SHELL_GREEN)Команда для прогона юнит тестов pytest.$(SHELL_NC)"
@@ -55,6 +59,31 @@ createsuperuser:
 	cd $(PROJECT_DIR) && $(DJANGO_RUN) createsuperuser --no-input
 
 
+# Запуск локальногоконтейнера Postgres
+start-db:
+	docker-compose -f $(DEV_DOCK_FILE) up -d; \
+	if [ $$? -ne 0 ]; \
+    then \
+        docker compose -f $(DEV_DOCK_FILE) up -d; \
+    fi
+
+# Остановка контейнера Postgres
+stop-db:
+	docker-compose -f $(DEV_DOCK_FILE) down; \
+	if [ $$? -ne 0 ]; \
+    then \
+		docker compose -f $(DEV_DOCK_FILE) down; \
+	fi
+
+# Очистка БД Postgres
+clear-db:
+	docker-compose -f $(DEV_DOCK_FILE) down --volumes; \
+	if [ $$? -ne 0 ]; \
+    then \
+		docker compose -f $(DEV_DOCK_FILE) down --volumes; \
+	fi
+
+
 # Локальный запуск сервера разработки.
 run:
 	cd $(PROJECT_DIR) && $(DJANGO_RUN) runserver

adaptive_hockey_federation/core/config/dev_settings.py

@@ -1,5 +1,3 @@
-import os
-
 from .base_settings import *
 
 ROOT_DIR = BASE_DIR.parent
@@ -15,8 +13,12 @@
 
 DATABASES = {
     'default': {
-        'ENGINE': 'django.db.backends.sqlite3',
-        'NAME': BASE_DIR / 'db.sqlite3',
+        'ENGINE': env('DB_ENGINE', default='django.db.backends.postgresql'),
+        'NAME': env('POSTGRES_DB', default='postgres_db'),
+        'USER': env('POSTGRES_USER', default='postgres_user'),
+        'PASSWORD': env('POSTGRES_PASSWORD', default='postgres_password'),
+        'HOST': env('DB_HOST', default='localhost'),
+        'PORT': env('DB_PORT', default='5432')
     }
 }
 

adaptive_hockey_federation/core/config/test_settings.py

@@ -0,0 +1,8 @@
+from .base_settings import *
+
+DATABASES = {
+    'default': {
+        'ENGINE': 'django.db.backends.sqlite3',
+        'NAME': BASE_DIR / 'db.sqlite3',
+    }
+}

infra/dev/docker-compose.dev.yaml

@@ -1,3 +1,7 @@
+#filename: docker-compose.dev.yaml
+#full path: ./infra/dev/docker-compose.dev.yaml
+#description: docker-compose file for development environment
+
 version: '3.8'
 name: ahf_dev
 
@@ -7,11 +11,11 @@ services:
     image: postgres:13.0-alpine
     restart: always
     volumes:
-      - postgres_data:/var/lib/postgresql/data/
+      - postgres_db_data:/var/lib/postgresql/data/
     env_file:
       - ../../.env
     ports:
       - 5432:5432
 
 volumes:
-  postgres_data:
+  postgres_db_data:

pyproject.toml

@@ -16,6 +16,7 @@ click = "^8.1.7"
 wrapt = "^1.16.0"
 django-phonenumber-field = {extras = ["phonenumbers"], version = "^7.2.0"}
 pytest-django = "^4.7.0"
+psycopg2-binary = "^2.9.9"
 django-environ = "^0.11.2"
 
 [tool.poetry.group.dev.dependencies]

requirements/develop.txt

@@ -23,6 +23,7 @@ phonenumbers==8.13.26 ; python_version >= "3.11" and python_version < "4.0"
 platformdirs==4.1.0 ; python_version >= "3.11" and python_version < "4.0"
 pluggy==1.3.0 ; python_version >= "3.11" and python_version < "4.0"
 pre-commit==3.5.0 ; python_version >= "3.11" and python_version < "4.0"
+psycopg2-binary==2.9.9 ; python_version >= "3.11" and python_version < "4.0"
 pytest-django==4.7.0 ; python_version >= "3.11" and python_version < "4.0"
 pytest==7.4.3 ; python_version >= "3.11" and python_version < "4.0"
 pyyaml==6.0.1 ; python_version >= "3.11" and python_version < "4.0"

requirements/production.txt

@@ -14,6 +14,7 @@ openpyxl==3.1.2 ; python_version >= "3.11" and python_version < "4.0"
 packaging==23.2 ; python_version >= "3.11" and python_version < "4.0"
 phonenumbers==8.13.26 ; python_version >= "3.11" and python_version < "4.0"
 pluggy==1.3.0 ; python_version >= "3.11" and python_version < "4.0"
+psycopg2-binary==2.9.9 ; python_version >= "3.11" and python_version < "4.0"
 pytest-django==4.7.0 ; python_version >= "3.11" and python_version < "4.0"
 pytest==7.4.3 ; python_version >= "3.11" and python_version < "4.0"
 sqlparse==0.4.4 ; python_version >= "3.11" and python_version < "4.0"