Рефакторинг и деплоинг

2025-11-09 23:46:08 +03:00
parent 331a9e41cb
commit a0f20f9a60
65 changed files with 5925 additions and 2003 deletions
--- a/dbapp/dbapp/settings/init.py
+++ b/dbapp/dbapp/settings/init.py
@@ -1,13 +1,25 @@
+"""
+Settings module initialization.
+
+Automatically determines the environment and loads appropriate settings.
+Set DJANGO_ENVIRONMENT environment variable to 'production' or 'development'.
+Defaults to 'development' if not set.
+"""
+
 import os
+
 from dotenv import load_dotenv

-# Load environment variables
+# Load environment variables from .env file
 load_dotenv()

-# Determine the environment and import the appropriate settings
-ENVIRONMENT = os.getenv('ENVIRONMENT', 'development')
+# Determine the environment from DJANGO_ENVIRONMENT variable
+# Defaults to 'development' for safety
+ENVIRONMENT = os.getenv('DJANGO_ENVIRONMENT', 'development').lower()

 if ENVIRONMENT == 'production':
    from .production import *
+    print("Loading production settings...")
 else:
-    from .development import *
+    from .development import *
+    print("Loading development settings...")
--- a/dbapp/dbapp/settings/base.py
+++ b/dbapp/dbapp/settings/base.py
@@ -1,22 +1,26 @@
 """
 Django settings for dbapp project.

-Generated by 'django-admin startproject' using Django 5.2.7.
-
-For more information on this file, see
-https://docs.djangoproject.com/en/5.2/topics/settings/
-
-For the full list of settings and their values, see
-https://docs.djangoproject.com/en/5.2/ref/settings/
+Base settings shared across all environments.
+Environment-specific settings are in development.py and production.py
 """

-from pathlib import Path
 import os
+from pathlib import Path
+
 from dotenv import load_dotenv

 # Load environment variables from .env file
 load_dotenv()

+# ============================================================================
+# PATH CONFIGURATION
+# ============================================================================
+
+# Build paths inside the project like this: BASE_DIR / 'subdir'.
+BASE_DIR = Path(__file__).resolve().parent.parent
+
+# GDAL/GEOS configuration for Windows
 if os.name == 'nt':
    OSGEO4W = r"C:\Program Files\OSGeo4W"
    assert os.path.isdir(OSGEO4W), "Directory does not exist: " + OSGEO4W
@@ -24,58 +28,71 @@ if os.name == 'nt':
    os.environ['PROJ_LIB'] = os.path.join(OSGEO4W, r"share\proj")
    os.environ['PATH'] = OSGEO4W + r"\bin;" + os.environ['PATH']

-# Build paths inside the project like this: BASE_DIR / 'subdir'.
-BASE_DIR = Path(__file__).resolve().parent.parent
-
-
-# GDAL_LIBRARY_PATH = r'C:/Program Files/OSGeo4W/bin/gdall311.dll'
-# Quick-start development settings - unsuitable for production
-# See https://docs.djangoproject.com/en/5.2/howto/deployment/checklist/
+# ============================================================================
+# SECURITY SETTINGS
+# ============================================================================

 # SECURITY WARNING: keep the secret key used in production secret!
 SECRET_KEY = os.getenv('SECRET_KEY', 'django-insecure-7etj5f7buo2a57xv=w3^&llusq8rii7b_gd)9$t_1xcnao!^tq')

 # SECURITY WARNING: don't run with debug turned on in production!
-DEBUG = os.getenv('DEBUG', 'True').lower() == 'true'
+# This should be overridden in environment-specific settings
+DEBUG = False

-ALLOWED_HOSTS = os.getenv('ALLOWED_HOSTS', 'localhost,127.0.0.1').split(',')
+# Allowed hosts - should be overridden in environment-specific settings
+ALLOWED_HOSTS = []


-# Application definition
+# ============================================================================
+# APPLICATION DEFINITION
+# ============================================================================

 INSTALLED_APPS = [
+    # Django Autocomplete Light (must be before admin)
    'dal',
    'dal_select2',
-    "admin_interface",
-    "colorfield",
+    
+    # Admin interface customization
+    'admin_interface',
+    'colorfield',
+    
+    # Django GIS
    'django.contrib.gis',
-    'leaflet',
-    'dynamic_raw_id',
+    
+    # Django core apps
    'django.contrib.admin',
-    'django.contrib.humanize',
    'django.contrib.auth',
    'django.contrib.contenttypes',
    'django.contrib.sessions',
    'django.contrib.messages',
    'django.contrib.staticfiles',
-    'mainapp',
-    'mapsapp',
+    'django.contrib.humanize',
+    
+    # Third-party apps
+    'leaflet',
+    'dynamic_raw_id',
    'rangefilter',
    'django_admin_multiple_choice_list_filter',
    'more_admin_filters',
    'import_export',
-    'debug_toolbar'
+    
+    # Project apps
+    'mainapp',
+    'mapsapp',
 ]

 # Note: Custom user model is implemented via OneToOneField relationship
+# If you need a custom user model, uncomment and configure:
 # AUTH_USER_MODEL = 'mainapp.CustomUser'

+# ============================================================================
+# MIDDLEWARE CONFIGURATION
+# ============================================================================
+
 MIDDLEWARE = [
-    "debug_toolbar.middleware.DebugToolbarMiddleware", #Добавил
-    'django.middleware.locale.LocaleMiddleware', #Добавил
    'django.middleware.security.SecurityMiddleware',
    'django.contrib.sessions.middleware.SessionMiddleware',
-    'django.contrib.messages.middleware.MessageMiddleware', #Добавил
+    'django.middleware.locale.LocaleMiddleware',
    'django.middleware.common.CommonMiddleware',
    'django.middleware.csrf.CsrfViewMiddleware',
    'django.contrib.auth.middleware.AuthenticationMiddleware',
@@ -85,15 +102,20 @@ MIDDLEWARE = [

 ROOT_URLCONF = 'dbapp.urls'

+# ============================================================================
+# TEMPLATES CONFIGURATION
+# ============================================================================
+
 TEMPLATES = [
    {
        'BACKEND': 'django.template.backends.django.DjangoTemplates',
        'DIRS': [
-            BASE_DIR / 'templates',  # Main project templates directory
+            BASE_DIR / 'templates',
        ],
        'APP_DIRS': True,
        'OPTIONS': {
            'context_processors': [
+                'django.template.context_processors.debug',
                'django.template.context_processors.request',
                'django.contrib.auth.context_processors.auth',
                'django.contrib.messages.context_processors.messages',
@@ -104,9 +126,9 @@ TEMPLATES = [

 WSGI_APPLICATION = 'dbapp.wsgi.application'

-
-# Database
-# https://docs.djangoproject.com/en/5.2/ref/settings/#databases
+# ============================================================================
+# DATABASE CONFIGURATION
+# ============================================================================

 DATABASES = {
    'default': {
@@ -120,27 +142,28 @@ DATABASES = {
 }


-# Password validation
-# https://docs.djangoproject.com/en/5.2/ref/settings/#auth-password-validators
+# ============================================================================
+# PASSWORD VALIDATION
+# ============================================================================

 AUTH_PASSWORD_VALIDATORS = [
-    # {
-    #     'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator',
-    # },
-    # {
-    #     'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator',
-    # },
-    # {
-    #     'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator',
-    # },
-    # {
-    #     'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator',
-    # },
+    {
+        'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator',
+    },
+    {
+        'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator',
+    },
+    {
+        'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator',
+    },
+    {
+        'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator',
+    },
 ]

-
-# Internationalization
-# https://docs.djangoproject.com/en/5.2/topics/i18n/
+# ============================================================================
+# INTERNATIONALIZATION
+# ============================================================================

 LANGUAGE_CODE = 'ru'

@@ -150,51 +173,54 @@ USE_I18N = True

 USE_TZ = True

-# Authentication settings
+# ============================================================================
+# AUTHENTICATION CONFIGURATION
+# ============================================================================
+
 LOGIN_URL = 'login'
 LOGIN_REDIRECT_URL = 'home'
 LOGOUT_REDIRECT_URL = 'home'

-
-# Static files (CSS, JavaScript, Images)
-# https://docs.djangoproject.com/en/5.2/howto/static-files/
+# ============================================================================
+# STATIC FILES CONFIGURATION
+# ============================================================================

 STATIC_URL = '/static/'
+
 STATICFILES_DIRS = [
-    BASE_DIR.parent / 'static',  # Reference to the static directory at project root
+    BASE_DIR.parent / 'static',
 ]

-# Default primary key field type
-# https://docs.djangoproject.com/en/5.2/ref/settings/#default-auto-field
+# STATIC_ROOT will be set in production.py

+# ============================================================================
+# DEFAULT SETTINGS
+# ============================================================================
+
+# Default primary key field type
 DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'

+# ============================================================================
+# THIRD-PARTY APP CONFIGURATION
+# ============================================================================

-# AUTH_USER_MODEL = 'mainapp.CustomUser'
+# Admin Interface
 X_FRAME_OPTIONS = "SAMEORIGIN"
 SILENCED_SYSTEM_CHECKS = ["security.W019"]

+# Leaflet Configuration
 LEAFLET_CONFIG = {
    'ATTRIBUTION_PREFIX': '',
-    'TILES': [('Satellite', 'https://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/tile/{z}/{y}/{x}', {'attribution': '&copy; Esri', 'maxZoom': 16}),
-          ('Streets', 'http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {'attribution': '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a>'})
+    'TILES': [
+        (
+            'Satellite',
+            'https://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/tile/{z}/{y}/{x}',
+            {'attribution': '&copy; Esri', 'maxZoom': 16}
+        ),
+        (
+            'Streets',
+            'http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
+            {'attribution': '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a>'}
+        )
    ],
-    # 'RESET_VIEW': False,
-    # 'NO_GLOBALS': False,
-    # 'PLUGINS': {
-    #     'leaflet-measure': {
-    #         'css': ['https://cdn.jsdelivr.net/npm/leaflet-measure@3.1.0/dist/leaflet-measure.min.css'],
-    #         'js': 'https://cdn.jsdelivr.net/npm/leaflet-measure@3.1.0/dist/leaflet-measure.min.js',
-    #         'auto-include': True,
-    #     },
-        # 'leaflet-featuregroup': {
-        #     # 'css': ['https://cdn.jsdelivr.net/npm/leaflet-measure@3.1.0/dist/leaflet-measure.min.css'],
-        #     'js': 'https://cdn.jsdelivr.net/npm/leaflet.featuregroup.subgroup@1.0.2/dist/leaflet.featuregroup.subgroup.min.js',
-        #     'auto-include': True,
-        # },
-    # }
-}
-
-INTERNAL_IPS = [
-    '127.0.0.1',
-]
+}
--- a/dbapp/dbapp/settings/development.py
+++ b/dbapp/dbapp/settings/development.py
@@ -1,9 +1,48 @@
+"""
+Development-specific settings.
+"""
+
 from .base import *

-# Development-specific settings
+# ============================================================================
+# DEBUG CONFIGURATION
+# ============================================================================
+
 DEBUG = True

+# ============================================================================
+# ALLOWED HOSTS
+# ============================================================================
+
 # Allow all hosts in development
 ALLOWED_HOSTS = ['*']

-# Additional development settings can go here
+# ============================================================================
+# INSTALLED APPS - Development additions
+# ============================================================================
+
+INSTALLED_APPS += [
+    'debug_toolbar',
+]
+
+# ============================================================================
+# MIDDLEWARE - Development additions
+# ============================================================================
+
+# Add debug toolbar middleware at the beginning
+MIDDLEWARE = ['debug_toolbar.middleware.DebugToolbarMiddleware'] + MIDDLEWARE
+
+# ============================================================================
+# DEBUG TOOLBAR CONFIGURATION
+# ============================================================================
+
+INTERNAL_IPS = [
+    '127.0.0.1',
+]
+
+# ============================================================================
+# EMAIL CONFIGURATION
+# ============================================================================
+
+# Use console backend for development
+EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'
--- a/dbapp/dbapp/settings/production.py
+++ b/dbapp/dbapp/settings/production.py
@@ -1,48 +1,135 @@
-from .base import *
+"""
+Production-specific settings.
+"""
+
 import os
-from dotenv import load_dotenv

-# Production-specific settings
+from .base import *
+
+# ============================================================================
+# DEBUG CONFIGURATION
+# ============================================================================
+
 DEBUG = False
-TEMPLATE_DEBUG = DEBUG

-# In production, specify allowed hosts explicitly
-ALLOWED_HOSTS = os.getenv('ALLOWED_HOSTS_PROD', 'localhost,127.0.0.1').split(',')
+# ============================================================================
+# ALLOWED HOSTS
+# ============================================================================

-# Security settings for production
-SECURE_BROWSER_XSS_FILTER = True
-SECURE_CONTENT_TYPE_NOSNIFF = True
-SECURE_HSTS_INCLUDE_SUBDOMAINS = True
-SECURE_HSTS_SECONDS = 31536000
-SECURE_REDIRECT_EXEMPT = []
+# In production, specify allowed hosts explicitly from environment variable
+ALLOWED_HOSTS = os.getenv("ALLOWED_HOSTS", "localhost,127.0.0.1").split(",")
+
+# ============================================================================
+# SECURITY SETTINGS
+# ============================================================================
+
+# SSL/HTTPS settings
 SECURE_SSL_REDIRECT = True
 SESSION_COOKIE_SECURE = True
 CSRF_COOKIE_SECURE = True

-# Template caching for production
+# Security headers
+SECURE_BROWSER_XSS_FILTER = True
+SECURE_CONTENT_TYPE_NOSNIFF = True
+
+# HSTS settings
+SECURE_HSTS_SECONDS = 31536000  # 1 year
+SECURE_HSTS_INCLUDE_SUBDOMAINS = True
+SECURE_HSTS_PRELOAD = True
+
+# Additional security settings
+SECURE_REDIRECT_EXEMPT = []
+X_FRAME_OPTIONS = "DENY"
+
+# ============================================================================
+# TEMPLATE CACHING
+# ============================================================================
+
 TEMPLATES = [
    {
-        'BACKEND': 'django.template.backends.django.DjangoTemplates',
-        'DIRS': [
-            BASE_DIR / 'templates',  # Main project templates directory
+        "BACKEND": "django.template.backends.django.DjangoTemplates",
+        "DIRS": [
+            BASE_DIR / "templates",
        ],
-        'APP_DIRS': True,
-        'OPTIONS': {
-            'context_processors': [
-                'django.template.context_processors.request',
-                'django.contrib.auth.context_processors.auth',
-                'django.contrib.messages.context_processors.messages',
+        "APP_DIRS": True,
+        "OPTIONS": {
+            "context_processors": [
+                "django.template.context_processors.debug",
+                "django.template.context_processors.request",
+                "django.contrib.auth.context_processors.auth",
+                "django.contrib.messages.context_processors.messages",
            ],
-            'loaders': [
-                ('django.template.loaders.cached.Loader', [
-                    'django.template.loaders.filesystem.Loader',
-                    'django.template.loaders.app_directories.Loader',
-                ]),
+            "loaders": [
+                (
+                    "django.template.loaders.cached.Loader",
+                    [
+                        "django.template.loaders.filesystem.Loader",
+                        "django.template.loaders.app_directories.Loader",
+                    ],
+                ),
            ],
        },
    },
 ]

-# Static files settings for production
-STATIC_ROOT = os.path.join(BASE_DIR, 'staticfiles')
-STATICFILES_STORAGE = 'django.contrib.staticfiles.storage.ManifestStaticFilesStorage'
+# ============================================================================
+# STATIC FILES CONFIGURATION
+# ============================================================================
+
+STATIC_ROOT = BASE_DIR.parent / "staticfiles"
+STATICFILES_STORAGE = "django.contrib.staticfiles.storage.ManifestStaticFilesStorage"
+
+# ============================================================================
+# LOGGING CONFIGURATION
+# ============================================================================
+
+LOGGING = {
+    "version": 1,
+    "disable_existing_loggers": False,
+    "formatters": {
+        "verbose": {
+            "format": "{levelname} {asctime} {module} {process:d} {thread:d} {message}",
+            "style": "{",
+        },
+        "simple": {
+            "format": "{levelname} {message}",
+            "style": "{",
+        },
+    },
+    "filters": {
+        "require_debug_false": {
+            "()": "django.utils.log.RequireDebugFalse",
+        },
+    },
+    "handlers": {
+        "console": {
+            "level": "INFO",
+            "class": "logging.StreamHandler",
+            "formatter": "simple",
+        },
+        "file": {
+            "level": "ERROR",
+            "class": "logging.FileHandler",
+            "filename": BASE_DIR.parent / "logs" / "django_errors.log",
+            "formatter": "verbose",
+        },
+        "mail_admins": {
+            "level": "ERROR",
+            "class": "django.utils.log.AdminEmailHandler",
+            "filters": ["require_debug_false"],
+            "formatter": "verbose",
+        },
+    },
+    "loggers": {
+        "django": {
+            "handlers": ["console", "file"],
+            "level": "INFO",
+            "propagate": True,
+        },
+        "django.request": {
+            "handlers": ["mail_admins", "file"],
+            "level": "ERROR",
+            "propagate": False,
+        },
+    },
+}
--- a/dbapp/dbapp/urls.py
+++ b/dbapp/dbapp/urls.py
@@ -21,11 +21,9 @@ from django.contrib.auth import views as auth_views
 from debug_toolbar.toolbar import debug_toolbar_urls 

 urlpatterns = [
-    # path('admin/dynamic_raw_id/', include('dynamic_raw_id.urls')),
    path('admin/', admin.site.urls, name='admin'),
-    # path('admin/map/', views.show_map_view, name='admin_show_map'),
-    path('', include('mainapp.urls')),
-    path('', include('mapsapp.urls')),
+    path('', include('mainapp.urls', namespace='mainapp')),
+    path('', include('mapsapp.urls', namespace='mapsapp')),
    # Authentication URLs
    path('login/', auth_views.LoginView.as_view(), name='login'),
    path('logout/', views.custom_logout, name='logout'),