Merge branch 'develop' into feature/react_test

# Conflicts:
#	README.md
#	main/tests.py

access_controller/asgi.py

@@ -8,10 +8,7 @@ https://docs.djangoproject.com/en/3.1/howto/deployment/asgi/
 """
 
 import os
-
-
-
-os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'access_controller.settings')
 from django.core.asgi import get_asgi_application
 
+os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'access_controller.settings')
 application = get_asgi_application()

access_controller/auth.py

@@ -1,19 +1,31 @@
+"""
+Авторизация пользователя.
+"""
 from django.contrib.auth.backends import ModelBackend
-from django.contrib.auth.models import User
+from django.contrib.auth import get_user_model
 
 
 class EmailAuthBackend(ModelBackend):
+    """
+    Класс авторизации пользователя по email.
+    """
     def authenticate(self, request, username=None, password=None, **kwargs):
+        """
+        Функция получения пользователя (модель User) по email.
+        """
         try:
-            user = User.objects.get(email=username)
+            user = get_user_model().objects.get(email=username)
             if user.check_password(password):
                 return user
             return None
-        except User.DoesNotExist:
+        except get_user_model().DoesNotExist:
             return None
 
     def get_user(self, user_id):
+        """
+        Функция получения пользователя по id.
+        """
         try:
-            return User.objects.get(pk=user_id)
-        except User.DoesNotExist:
+            return get_user_model().objects.get(pk=user_id)
+        except get_user_model().DoesNotExist:
             return None

access_controller/settings.py

@@ -14,6 +14,8 @@ from pathlib import Path
 from dotenv import load_dotenv
 
 # Build paths inside the project like this: BASE_DIR / 'subdir'.
+
+
 BASE_DIR = Path(__file__).resolve().parent.parent
 
 # Quick-start development settings - unsuitable for production
@@ -26,7 +28,7 @@ load_dotenv()
 SECRET_KEY = os.getenv('ACTRL_SECRET_KEY', 'empty')
 
 # SECURITY WARNING: don't run with debug turned on in production!
-DEBUG = bool(int(os.getenv('ACTRL_DEBUG', 1)))
+DEBUG = bool(int(os.getenv('ACTRL_DEBUG', '1')))
 
 ALLOWED_HOSTS = [
     '127.0.0.1',
@@ -62,8 +64,8 @@ ROOT_URLCONF = 'access_controller.urls'
 
 EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
 EMAIL_HOST = os.getenv('ACTRL_EMAIL_HOST', 'smtp.gmail.com')
-EMAIL_PORT = int(os.getenv('ACTRL_EMAIL_PORT', 587))
-EMAIL_USE_TLS = bool(int(os.getenv('ACTRL_EMAIL_TLS', 1)))
+EMAIL_PORT = int(os.getenv('ACTRL_EMAIL_PORT', '587'))
+EMAIL_USE_TLS = bool(int(os.getenv('ACTRL_EMAIL_TLS', '1')))
 EMAIL_HOST_USER = os.getenv('ACTRL_EMAIL_HOST_USER', 'group02django@gmail.com')
 EMAIL_HOST_PASSWORD = os.getenv('ACTRL_EMAIL_HOST_PASSWORD', 'djangogroup02')
 DEFAULT_FROM_EMAIL = os.getenv('ACTRL_FROM_EMAIL', EMAIL_HOST_USER)
@@ -148,6 +150,8 @@ ACCOUNT_ACTIVATION_DAYS = 7
 LOGIN_REDIRECT_URL = '/'
 LOGOUT_REDIRECT_URL = '/'
 
+
+
 #  Название_приложения.Название_файла.Название_класса_обработчика
 AUTHENTICATION_BACKENDS = [
     'access_controller.auth.EmailAuthBackend',
@@ -158,8 +162,8 @@ AUTHENTICATION_BACKENDS = [
 
 
 ZENDESK_ROLES = {
-    'engineer': int(os.getenv('ENG_CROLE_ID', 0)),
-    'light_agent': int(os.getenv('LA_CROLE_ID', 0)),
+    'engineer': int(os.getenv('ENG_CROLE_ID', '0')),
+    'light_agent': int(os.getenv('LA_CROLE_ID', '0')),
 }
 
 ZENDESK_GROUPS = {
@@ -169,7 +173,7 @@ ZENDESK_GROUPS = {
 
 SOLVED_TICKETS_EMAIL = os.getenv('ST_EMAIL')
 
-ZENDESK_MAX_AGENTS = int(os.getenv('LICENSE_NO', 0))
+ZENDESK_MAX_AGENTS = int(os.getenv('LICENSE_NO', '0'))
 
 REST_FRAMEWORK = {
     # Use Django's standard `django.contrib.auth` permissions,
@@ -179,7 +183,7 @@ REST_FRAMEWORK = {
     ]
 }
 
-ONE_DAY = int(os.getenv('SHIFTH', 0))  # Количество часов в 1 рабочем дне
+ONE_DAY = int(os.getenv('SHIFTH', '0'))  # Количество часов в 1 рабочем дне
 
 ACTRL_ZENDESK_SUBDOMAIN = os.getenv('ACTRL_ZENDESK_SUBDOMAIN') or os.getenv('ZD_DOMAIN')
 ACTRL_API_EMAIL = os.getenv('ACTRL_API_EMAIL') or os.getenv('ACCESS_CONTROLLER_API_EMAIL')

access_controller/urls.py

@@ -31,7 +31,7 @@ urlpatterns = [
     path('accounts/register/error/', registration_error, name='registration_email_error'),
     path('accounts/login/', CustomLoginView.as_view(), name='login'),
     path('accounts/', include('django.contrib.auth.urls')),
-    path('work/<int:id>', work_page, name="work"),
+    path('work/<int:required_id>', work_page, name="work"),
     path('work/hand_over/', work_hand_over, name="work_hand_over"),
     path('work/become_engineer/', work_become_engineer, name="work_become_engineer"),
     path('work/get_tickets', work_get_tickets, name='work_get_tickets'),