Merge branch 'develop' into feature/documentation

# Conflicts:
#	main/apiauth.py
#	main/tests.py
#	requirements/common.txt
#	requirements/dev.txt

.coveragerc

@@ -0,0 +1,14 @@
+[run]
+command_line = manage.py test
+
+branch = true
+
+source =
+    main/
+
+
+omit =
+    main/migrations/*
+    main/apps.py
+    main/tests.py
+

.gitlab-ci.yml

@@ -0,0 +1,23 @@
+image: python:3-alpine
+
+stages:
+  - test
+
+django_test:
+  stage: test
+  before_script:
+    - pip install -r requirements/dev.txt
+  script:
+    - python manage.py test
+
+coverage:
+  stage: test
+  before_script:
+    - pip install -r requirements/dev.txt
+  script:
+    - coverage run
+    - coverage report -m
+    - coverage html -d public/coverage
+  artifacts:
+    paths:
+      - public/coverage

access_controller/urls.py

@@ -16,10 +16,11 @@ Including another URLconf
 from django.contrib import admin
 from django.urls import path, include
 
+from main.urls import router
 from main.views import main_page, profile_page, CustomRegistrationView, CustomLoginView, registration_error
+from main.views import registration_failed
 from main.views import work_page, work_hand_over, work_become_engineer, work_get_tickets, \
     AdminPageView, statistic_page
-from main.urls import router
 
 
 urlpatterns = [
@@ -35,6 +36,7 @@ urlpatterns = [
     path('work/become_engineer/', work_become_engineer, name="work_become_engineer"),
     path('work/get_tickets', work_get_tickets, name='work_get_tickets'),
     path('accounts/', include('django_registration.backends.activation.urls')),
+    path('registration_failed/', registration_failed, name='registration_failed'),
     path('control/', AdminPageView.as_view(), name='control'),
     path('statistic/', statistic_page, name='statistic'),
 ]
@@ -42,4 +44,5 @@ urlpatterns = [
 # Django REST
 urlpatterns += [
     path('api/', include(router.urls))
+
 ]

docs/source/code.rst

@@ -33,14 +33,6 @@ Serializers
    :members:
 
 
-***************
-API functions
-***************
-
-.. automodule:: main.apiauth
-   :members:
-
-
 *****
 Views
 *****

fixtures/test_users.json

@@ -51,7 +51,7 @@
       "name": "UserForAccessTest",
       "user": 2,
       "role": "agent",
-      "custom_role_id": "360005209000"
+      "custom_role_id": "360005208980"
     }
   },
   {

main/apiauth.py

@@ -1,51 +0,0 @@
-"""
-Авторизация по Zenpy.
-"""
-from zenpy import Zenpy
-from zenpy.lib.api_objects import User as ZenpyUser
-
-from access_controller.settings import ACTRL_ZENDESK_SUBDOMAIN, ACTRL_API_EMAIL, ACTRL_API_TOKEN, ACTRL_API_PASSWORD
-
-
-def api_auth() -> dict:
-    """
-    Функция создания пользователя с использованием Zendesk API.
-
-    Получает из env Zendesk - email, token, password пользователя.
-
-    Если данные валидны и пользователь Zendesk с указанным email и токеном или паролем существует,
-    создается словарь данных пользователя, полученных через API c Zendesk.
-
-    :return: данные пользователя в виде словаря: id, имя, email, роль, аватар
-    """
-    credentials = {
-        'subdomain': ACTRL_ZENDESK_SUBDOMAIN
-    }
-    email = ACTRL_API_EMAIL
-    token = ACTRL_API_TOKEN
-    password = ACTRL_API_PASSWORD
-
-    if email is None:
-        raise ValueError('access_controller email not in env')
-    credentials['email'] = email
-
-    # prefer token, use password if token not provided
-    if token:
-        credentials['token'] = token
-    elif password:
-        credentials['password'] = password
-    else:
-        raise ValueError('access_controller token or password not in env')
-
-    zenpy_client = Zenpy(**credentials)
-    zenpy_user: ZenpyUser = zenpy_client.users.search(email).values[0]
-
-    user = {
-        'id': zenpy_user.id,
-        'name': zenpy_user.name,  # Zendesk doesn't have separate first and last name fields
-        'email': zenpy_user.email,
-        'role': zenpy_user.role,  # str like 'admin' or 'agent', not id
-        'photo': zenpy_user.photo['content_url'] if zenpy_user.photo is not None else None,
-    }
-
-    return user

main/templates/pages/profile.html

@@ -6,7 +6,7 @@
 {% block title %}{{ pagename }}{% endblock %}
 
 
-{% block heading %}Профиль{% endblock %}
+{% block heading %}<h1>Профиль</h1>{% endblock %}
 
 
 {% block extra_css %}
@@ -22,7 +22,7 @@
 
 {% block content %}
 <br>
-<div class="row">
+<div class="row px-4 py-4">
   <div class="col-auto">
     <div class="container">
       <img
@@ -34,22 +34,25 @@
     <a href="{%url 'password_change' %}">Сменить пароль</a>
   </div>
   <div class="col">
-    <h5><span class="badge bg-secondary text-light">Имя пользователя</span> {{ profile.name }}</h5>
+    <h4><span class="badge bg-secondary text-light">Имя пользователя</span></h4> <h5><strong>{{ profile.name }}</strong></h5>
     <br>
-    <h5><span class="badge bg-secondary text-light">Электронная почта</span> {{ profile.user.email }}</h5>
+    <h4><span class="badge bg-secondary text-light">Электронная почта</span></h4> <h5><strong>{{ profile.user.email }}</strong></h5>
     <br>
-    <h5><span class="badge bg-secondary text-light">Текущая роль</span>
+    <h4><span class="badge bg-secondary text-light">Текущая роль</span> </h4>
       {% if profile.custom_role_id == ZENDESK_ROLES.engineer %}
-        engineer
+        <h5><strong>engineer</strong></h5>
       {% elif profile.custom_role_id == ZENDESK_ROLES.light_agent %}
-        light_agent
+        <h5><strong>light_agent</strong></h5>
+      {% else %}
+        <h5><strong><small class="text-muted">None</small></strong></h5>
       {% endif %}
-    </h5>
+
   </div>
 </div>
+<br>
 <div align="center" >
   <form action="">
-    <a href="{% url 'work' profile.user.id %}" class="btn btn-primary"><big>Запросить права доступа</big></a>
+    <a href="{% url 'work' profile.user.id %}" class="btn btn-primary btn-lg">Запросить права доступа</a>
   </form>
 </div>
 {% endblock %}

main/templates/pages/registration_failed.html

@@ -0,0 +1,12 @@
+{% extends 'base/base.html' %}
+
+{% block title %}
+Регистрация закрыта
+{% endblock %}
+
+{% block content %}
+<div style="margin: 10%; text-align: center;">
+	<p style="color: rgb(201, 58, 63); font-size: 72px;">К сожалению, регистрация закрыта.</p>
+	<a type="button" class="btn btn-outline-primary btn-lg" href="/">На главную</a>
+</div>
+{% endblock %}

main/tests.py

@@ -1,66 +1,62 @@
-"""
-Тесты.
-"""
-
-
 import random
 from unittest.mock import patch, Mock
 
-from django.contrib.auth import get_user_model
+from django.contrib.auth.models import User
 from django.core import mail
 from django.http import HttpResponseRedirect
 from django.template.loader import render_to_string
 from django.test import TestCase, Client
 from django.urls import reverse, reverse_lazy
-from django.utils import translation
+from django.utils import translation, timezone
 
 import access_controller.settings as sets
 from main.zendesk_admin import zenpy
 
+from main.extra_func import log
+
+
+class UsersBaseTestCase(TestCase):
+    """Базовый класс загружения данных для тестов с пользователями"""
+    fixtures = ['fixtures/test_users.json']
+
+    def setUp(self):
+        """Добавление в переменные почт и клиентов для пользователей"""
+        self.light_agent = '[email protected]'
+        self.admin = '[email protected]'
+        self.engineer = '[email protected]'
+        self.agent_client = Client()
+        self.agent_client.force_login(User.objects.get(email=self.light_agent))
+        self.admin_client = Client()
+        self.admin_client.force_login(User.objects.get(email=self.admin))
+        self.engineer_client = Client()
+        self.engineer_client.force_login(User.objects.get(email=self.engineer))
+
 
 class RegistrationTestCase(TestCase):
-    """
-    Класс тестирования регистрации пользователя.
-    """
     fixtures = ['fixtures/data.json']
 
-    def setUp(self) -> None:
-        """
-        Функция предтестовых настроек.
-        """
+    def setUp(self):
         self.email_backend = 'django.core.mail.backends.locmem.EmailBackend'
         self.any_zendesk_user_email = '[email protected]'
         self.zendesk_admin_email = '[email protected]'
         self.client = Client()
 
-    def test_registration_complete_redirect(self) -> None:
-        """
-        Функция тестирования успешно завершенной регистрации.
-        """
+    def test_registration_complete_redirect(self):
         with self.settings(EMAIL_BACKEND=self.email_backend):
             resp = self.client.post(reverse('registration'), data={'email': self.any_zendesk_user_email})
         self.assertRedirects(resp, reverse('password_reset_done'))
 
     def test_registration_fail_redirect(self):
-        """
-        Функция тестирования неуспешной регистрации.
-        """
         with self.settings(EMAIL_BACKEND=self.email_backend):
             resp = self.client.post(reverse('registration'), data={'email': self.any_zendesk_user_email + 'asd'})
         self.assertRedirects(resp, reverse('django_registration_disallowed'))
 
     def test_registration_user_already_exist(self):
-        """
-        Функция тестирования попытки регистрации уже зарегистрированного пользователя.
-        """
         with self.settings(EMAIL_BACKEND=self.email_backend) and translation.override('ru'):
             resp = self.client.post(reverse('registration'), data={'email': '[email protected]'})
         self.assertContains(resp, 'Этот адрес электронной почты уже используется', count=1, status_code=200)
 
     def test_registration_send_email(self):
-        """
-        Функция тестирования отправки email.
-        """
         with self.settings(EMAIL_BACKEND=self.email_backend):
             response: HttpResponseRedirect = \
                 self.client.post(reverse('registration'), data={'email': self.any_zendesk_user_email})
@@ -76,90 +72,49 @@ class RegistrationTestCase(TestCase):
         self.assertEqual(mail.outbox[0].body, correct_body)
 
     def test_registration_user_creating(self):
-        """
-        Функция тестирования регистрации пользователя (сверяем имя с именем в Zendesk.
-        """
         with self.settings(EMAIL_BACKEND=self.email_backend):
             self.client.post(reverse('registration'), data={'email': self.any_zendesk_user_email})
-        user = get_user_model().objects.get(email=self.any_zendesk_user_email)
+        user = User.objects.get(email=self.any_zendesk_user_email)
         zendesk_user = zenpy.get_user(self.any_zendesk_user_email)
         self.assertEqual(user.userprofile.name, zendesk_user.name)
 
     def test_permissions_applying(self):
-        """
-        Функция тестирования проверке присвоения роли admin.
-        """
         with self.settings(EMAIL_BACKEND=self.email_backend):
             self.client.post(reverse('registration'), data={'email': self.zendesk_admin_email})
-        user = get_user_model().objects.get(email=self.zendesk_admin_email)
+        user = User.objects.get(email=self.zendesk_admin_email)
         self.assertEqual(user.userprofile.role, 'admin')
         self.assertTrue(user.has_perm('main.has_control_access'))
 
 
-class MakeEngineerTestCase(TestCase):
-    """
-    Класс тестов для проверки функции назначения роли engineer.
-    """
-    fixtures = ['fixtures/test_make_engineer.json']
-
-    def setUp(self):
-        """
-        Предустановленные значения для проведения тестов.
-        """
-        self.light_agent = '[email protected]'
-        self.admin = '[email protected]'
-        self.engineer = '[email protected]'
-        self.client = Client()
-        self.client.force_login(get_user_model().objects.get(email=self.light_agent))
-        self.admin_client = Client()
-        self.admin_client.force_login(get_user_model().objects.get(email=self.admin))
+class MakeEngineerTestCase(UsersBaseTestCase):
 
     @patch('main.extra_func.zenpy')
-    def test_redirect(self, zenpy_mock):
-        """
-        Функция проверки переадресации пользователя на рабочую страницу после назначения роли engineer.
-        """
-        user = get_user_model().objects.get(email=self.light_agent)
-        resp = self.client.post(reverse_lazy('work_become_engineer'))
+    def test_become_engineer_redirect(self, _zenpy_mock):
+        user = User.objects.get(email=self.light_agent)
+        resp = self.agent_client.post(reverse_lazy('work_become_engineer'))
         self.assertRedirects(resp, reverse('work', args=[user.id]))
         self.assertEqual(resp.status_code, 302)
-        self.assertFalse(zenpy_mock.called)
 
     @patch('main.extra_func.zenpy')
     def test_light_agent_make_engineer(self, zenpy_mock):
-        """
-        Функция проверки назначения light_agent на роль engineer.
-        """
-        self.client.post(reverse_lazy('work_become_engineer'))
+        self.agent_client.post(reverse_lazy('work_become_engineer'))
         self.assertEqual(zenpy_mock.update_user.call_args[0][0].custom_role_id, sets.ZENDESK_ROLES['engineer'])
 
     @patch('main.extra_func.zenpy')
     def test_admin_make_engineer(self, zenpy_mock):
-        """
-        Функция проверки назначения admin на роль engineer.
-        """
         self.admin_client.post(reverse_lazy('work_become_engineer'))
         self.assertEqual(zenpy_mock.update_user.call_args[0][0].custom_role_id, sets.ZENDESK_ROLES['engineer'])
 
     @patch('main.extra_func.zenpy')
     def test_engineer_make_engineer(self, zenpy_mock):
-        """
-        Функция проверки назначения engineer на роль engineer.
-        """
-        client = Client()
-        client.force_login(get_user_model().objects.get(email=self.engineer))
-        client.post(reverse_lazy('work_become_engineer'))
+        self.engineer_client.post(reverse_lazy('work_become_engineer'))
         self.assertEqual(zenpy_mock.update_user.call_args[0][0].custom_role_id, sets.ZENDESK_ROLES['engineer'])
 
     @patch('main.extra_func.zenpy')
-    def test_control_page_make_one(self, zenpy_mock):
-        """
-        Функция проверки назначения администратором на роль engineer одного пользователя.
-        """
+    def test_control_page_make_engineer_one(self, zenpy_mock):
         self.admin_client.post(
             reverse_lazy('control'),
-            data={'users': [get_user_model().objects.get(email=self.light_agent).userprofile.id],
-                  'engineer': 'engineer'}
+            data={'users': [User.objects.get(email=self.light_agent).userprofile.id], 'engineer': 'engineer'}
         )
         call_list = zenpy_mock.update_user.call_args_list
         mock_object = call_list[0][0][0]
@@ -167,16 +122,13 @@ class MakeEngineerTestCase(TestCase):
         self.assertEqual(mock_object.custom_role_id, sets.ZENDESK_ROLES['engineer'])
 
     @patch('main.extra_func.zenpy')
-    def test_control_page_make_many(self, zenpy_mock):
-        """
-        Функция проверки назначения администратором на роль engineer нескольких пользователей.
-        """
+    def test_control_page_make_engineer_many(self, zenpy_mock):
         self.admin_client.post(
             reverse_lazy('control'),
             data={
                 'users': [
-                    get_user_model().objects.get(email=self.light_agent).userprofile.id,
-                    get_user_model().objects.get(email=self.engineer).userprofile.id,
+                    User.objects.get(email=self.light_agent).userprofile.id,
+                    User.objects.get(email=self.engineer).userprofile.id,
                 ],
                 'engineer': 'engineer'
             }
@@ -188,40 +140,113 @@ class MakeEngineerTestCase(TestCase):
             self.assertEqual(obj[0][0].custom_role_id, sets.ZENDESK_ROLES['engineer'])
 
 
-class PasswordResetTestCase(TestCase):
-    """
-    Класс тестов сброса пароля.
-    """
-    fixtures = ['fixtures/test_make_engineer.json']
+class MakeLightAgentTestCase(UsersBaseTestCase):
+
+    @patch('main.requester.TicketListRequester.get_tickets_list_for_user', side_effect=[[]])
+    @patch('main.extra_func.zenpy')
+    def test_hand_over_redirect(self, _zenpy_mock, _user_tickets_mock):
+        user = User.objects.get(email=self.engineer)
+        resp = self.engineer_client.post(reverse_lazy('work_hand_over'))
+        self.assertRedirects(resp, reverse('work', args=[user.id]))
+        self.assertEqual(resp.status_code, 302)
+
+    @patch('main.requester.TicketListRequester.get_tickets_list_for_user', side_effect=[[]])
+    @patch('main.extra_func.zenpy')
+    def test_engineer_make_light_agent_no_tickets(self, zenpy_mock, _user_tickets_mock):
+        self.engineer_client.post(reverse_lazy('work_hand_over'))
+        self.assertEqual(zenpy_mock.update_user.call_args[0][0].custom_role_id, sets.ZENDESK_ROLES['light_agent'])
+
+    @patch('main.requester.TicketListRequester.get_tickets_list_for_user', side_effect=[
+        [Mock(id=1, status='solved'), Mock(id=2, status='open'), Mock(id=3, status='open')]
+    ])
+    @patch('main.extra_func.zenpy')
+    def test_engineer_make_light_agent_with_tickets(self, zenpy_mock, _user_tickets_mock):
+        zenpy_mock.solved_tickets_user_id = Mock()
+        self.engineer_client.post(reverse_lazy('work_hand_over'))
+
+        tickets_update = zenpy_mock.admin.tickets.update.call_args[0][0]
+        self.assertEqual(tickets_update[0].assignee_id, zenpy_mock.solved_tickets_user_id)
+        self.assertIsNone(tickets_update[1].assignee)
+        self.assertIsNone(tickets_update[2].assignee)
+        self.assertEqual(zenpy_mock.update_user.call_args[0][0].custom_role_id, sets.ZENDESK_ROLES['light_agent'])
+
+    @patch('main.requester.TicketListRequester.get_tickets_list_for_user', side_effect=[[]])
+    @patch('main.extra_func.zenpy')
+    def test_admin_make_light_agent_no_tickets(self, zenpy_mock, _user_tickets_mock):
+        self.admin_client.post(reverse_lazy('work_hand_over'))
+        self.assertEqual(zenpy_mock.update_user.call_args[0][0].custom_role_id, sets.ZENDESK_ROLES['light_agent'])
+
+    @patch('main.requester.TicketListRequester.get_tickets_list_for_user', side_effect=[
+        [Mock(id=1, status='solved'), Mock(id=2, status='open'), Mock(id=3, status='open')]
+    ])
+    @patch('main.extra_func.zenpy')
+    def test_admin_make_light_agent_with_tickets(self, zenpy_mock, _user_tickets_mock):
+        zenpy_mock.solved_tickets_user_id = Mock()
+        self.admin_client.post(reverse_lazy('work_hand_over'))
+
+        tickets_update = zenpy_mock.admin.tickets.update.call_args[0][0]
+        self.assertEqual(tickets_update[0].assignee_id, zenpy_mock.solved_tickets_user_id)
+        self.assertIsNone(tickets_update[1].assignee)
+        self.assertIsNone(tickets_update[2].assignee)
+        self.assertEqual(zenpy_mock.update_user.call_args[0][0].custom_role_id, sets.ZENDESK_ROLES['light_agent'])
+
+    @patch('main.requester.TicketListRequester.get_tickets_list_for_user', side_effect=[[]])
+    @patch('main.extra_func.zenpy')
+    def test_light_agent_make_light_agent(self, zenpy_mock, _user_tickets_mock):
+        self.agent_client.post(reverse_lazy('work_hand_over'))
+        self.assertEqual(zenpy_mock.update_user.call_args[0][0].custom_role_id, sets.ZENDESK_ROLES['light_agent'])
+
+    @patch('main.requester.TicketListRequester.get_tickets_list_for_user', side_effect=[[]])
+    @patch('main.extra_func.zenpy')
+    def test_control_page_make_light_agent_one(self, zenpy_mock, _user_tickets_mock):
+        self.admin_client.post(
+            reverse_lazy('control'),
+            data={'users': [User.objects.get(email=self.engineer).userprofile.id], 'light_agent': 'light_agent'}
+        )
+        call_list = zenpy_mock.update_user.call_args_list
+        mock_object = call_list[0][0][0]
+        self.assertEqual(len(call_list), 1)
+        self.assertEqual(mock_object.custom_role_id, sets.ZENDESK_ROLES['light_agent'])
+
+    @patch('main.requester.TicketListRequester.get_tickets_list_for_user', side_effect=[[], []])
+    @patch('main.extra_func.zenpy')
+    def test_control_page_make_light_agent_many(self, zenpy_mock, _user_tickets_mock):
+        self.admin_client.post(
+            reverse_lazy('control'),
+            data={
+                'users': [
+                    User.objects.get(email=self.light_agent).userprofile.id,
+                    User.objects.get(email=self.engineer).userprofile.id,
+                ],
+                'light_agent': 'light_agent'
+            }
+        )
+        call_list = zenpy_mock.update_user.call_args_list
+        mock_objects = list(call_list)
+        self.assertEqual(len(call_list), 2)
+        for obj in mock_objects:
+            self.assertEqual(obj[0][0].custom_role_id, sets.ZENDESK_ROLES['light_agent'])
+
+
+class PasswordResetTestCase(UsersBaseTestCase):
 
     def setUp(self):
-        """
-        Предустановленные значения для проведения тестов.
-        """
-        self.user = '[email protected]'
+        super().setUp()
         self.email_backend = 'django.core.mail.backends.locmem.EmailBackend'
-        self.client = Client()
-        self.client.force_login(get_user_model().objects.get(email=self.user))
 
     def test_redirect(self):
-        """
-        Функция проверки переадресации на страницу уведомления о сбросе пароля на  email.
-        """
         with self.settings(EMAIL_BACKEND=self.email_backend):
-            resp = self.client.post(reverse_lazy('password_reset'), data={'email': self.user})
+            resp = self.agent_client.post(reverse_lazy('password_reset'), data={'email': self.light_agent})
         self.assertRedirects(resp, reverse('password_reset_done'))
         self.assertEqual(resp.status_code, 302)
 
     def test_send_email(self):
-        """
-        Функция проверки содержания и отправки письма для установки пароля.
-        """
         with self.settings(EMAIL_BACKEND=self.email_backend):
             response: HttpResponseRedirect = \
-                self.client.post(reverse_lazy('password_reset'), data={'email': self.user})
+                self.agent_client.post(reverse_lazy('password_reset'), data={'email': self.light_agent})
         self.assertEqual(response.status_code, 302)
         self.assertEqual(len(mail.outbox), 1)
-        self.assertEqual(mail.outbox[0].to, [self.user])
+        self.assertEqual(mail.outbox[0].to, [self.light_agent])
 
         # context that the email template was rendered with
         email_context = response.context[0].dicts[1]
@@ -231,53 +256,32 @@ class PasswordResetTestCase(TestCase):
         self.assertEqual(mail.outbox[0].body, correct_body)
 
     def test_email_invalid(self):
-        """
-        Функция проверки уведомления клиента о некорректности введенного email.
-        """
         with self.settings(EMAIL_BACKEND=self.email_backend) and translation.override('ru'):
-            resp = self.client.post(reverse_lazy('password_reset'), data={'email': 1})
+            resp = self.agent_client.post(reverse_lazy('password_reset'), data={'email': 1})
         self.assertContains(resp, 'Введите правильный адрес электронной почты.', count=1, status_code=200)
 
     def test_user_does_not_exist(self):
-        """
-        Функция корректности отработки неверно введенного email.
-        """
         with self.settings(EMAIL_BACKEND=self.email_backend):
-            resp = self.client.post(reverse_lazy('password_reset'), data={'email': self.user + str(random.random())})
+            resp = self.agent_client.post(reverse_lazy('password_reset'), data={'email': self.light_agent + str(random.random())})
         self.assertRedirects(resp, reverse('password_reset_done'))
         self.assertEqual(resp.status_code, 302)
         self.assertEqual(len(mail.outbox), 0)
 
 
-class PasswordChangeTestCase(TestCase):
-    """
-    Класс тестирования смены пароля.
-    """
-    fixtures = ['fixtures/test_make_engineer.json']
+class PasswordChangeTestCase(UsersBaseTestCase):
 
     def setUp(self):
-        """
-        Предустановленные значения для проведения тестов.
-        """
-        self.user = '[email protected]'
-        self.client = Client()
-        self.client.force_login(get_user_model().objects.get(email=self.user))
+        super().setUp()
         self.set_password()
 
     def set_password(self):
-        """
-        Пароль, сформированный для тестирования.
-        """
-        user: get_user_model() = get_user_model().objects.get(email=self.user)
+        user: User = User.objects.get(email=self.light_agent)
         user.set_password('ImpossiblyHardPassword')
         user.save()
-        self.client.force_login(get_user_model().objects.get(email=self.user))
+        self.agent_client.force_login(User.objects.get(email=self.light_agent))
 
     def test_change_successful(self):
-        """
-        Функция тестирования успешного изменения пароля.
-        """
-        self.client.post(
+        self.agent_client.post(
             reverse_lazy('password_change'),
             data={
                 'old_password': 'ImpossiblyHardPassword',
@@ -285,15 +289,12 @@ class PasswordChangeTestCase(TestCase):
                 'new_password2': 'EasyPassword',
             }
         )
-        user = get_user_model().objects.get(email=self.user)
+        user = User.objects.get(email=self.light_agent)
         self.assertTrue(user.check_password('EasyPassword'))
 
     def test_invalid_old_password(self):
-        """
-        Функция тестирования отработки неверно введенного старого пароля при смене.
-        """
         with translation.override('ru'):
-            resp = self.client.post(
+            resp = self.agent_client.post(
                 reverse_lazy('password_change'),
                 data={
                     'old_password': 'EasyPassword',
@@ -304,11 +305,8 @@ class PasswordChangeTestCase(TestCase):
         self.assertContains(resp, 'Ваш старый пароль введен неправильно', count=1, status_code=200)
 
     def test_different_new_passwords(self):
-        """
-        Функция тестирования случая с вводом двух разных новых паролей.
-        """
         with translation.override('ru'):
-            resp = self.client.post(
+            resp = self.agent_client.post(
                 reverse_lazy('password_change'),
                 data={
                     'old_password': 'ImpossiblyHardPassword',
@@ -319,11 +317,8 @@ class PasswordChangeTestCase(TestCase):
         self.assertContains(resp, 'Введенные пароли не совпадают', count=1, status_code=200)
 
     def test_invalid_new_password1(self):
-        """
-        Функция тестирования случая с неправильно подобранным новым паролем (слишком короткий).
-        """
         with translation.override('ru'):
-            resp = self.client.post(
+            resp = self.agent_client.post(
                 reverse_lazy('password_change'),
                 data={
                     'old_password': 'ImpossiblyHardPassword',
@@ -334,11 +329,8 @@ class PasswordChangeTestCase(TestCase):
         self.assertContains(resp, 'Введённый пароль слишком короткий', count=1, status_code=200)
 
     def test_invalid_new_password2(self):
-        """
-        Функция тестирования случая с неправильно подобранным новым паролем (употребляются только цифры).
-        """
         with translation.override('ru'):
-            resp = self.client.post(
+            resp = self.agent_client.post(
                 reverse_lazy('password_change'),
                 data={
                     'old_password': 'ImpossiblyHardPassword',
@@ -349,72 +341,56 @@ class PasswordChangeTestCase(TestCase):
         self.assertContains(resp, 'Введённый пароль состоит только из цифр', count=1, status_code=200)
 
     def test_invalid_new_password3(self):
-        """
-        Функция тестирования случая с неправильно подобранным новым паролем (совпадает с именем пользователя).
-        """
         with translation.override('ru'):
-            resp = self.client.post(
+            resp = self.agent_client.post(
                 reverse_lazy('password_change'),
                 data={
                     'old_password': 'ImpossiblyHardPassword',
-                    'new_password1': self.user,
-                    'new_password2': self.user,
+                    'new_password1': self.light_agent,
+                    'new_password2': self.light_agent,
                 }
             )
         self.assertContains(resp, 'Введённый пароль слишком похож на имя пользователя', count=1, status_code=200)
 
 
-class GetTicketsTestCase(TestCase):
+class GetTicketsTestCase(UsersBaseTestCase):
     """
     Класс тестов для проверки функции получения тикетов.
     """
-    fixtures = ['fixtures/test_make_engineer.json']
-
-    def setUp(self):
-        """
-        Предустановленные значения для проведения тестов.
-        """
-        self.light_agent = '[email protected]'
-        self.engineer = '[email protected]'
-        self.client = Client()
-        self.client.force_login(get_user_model().objects.get(email=self.engineer))
-        self.light_agent_client = Client()
-        self.light_agent_client.force_login(get_user_model().objects.get(email=self.light_agent))
 
     @patch('main.views.zenpy.get_user')
     @patch('main.extra_func.zenpy')
-    def test_redirect(self, zenpy_mock, get_user_mock):
+    def test_redirect(self, _zenpy_mock, get_user_mock):
         """
         Функция проверки переадресации пользователя на рабочую страницу.
         """
         get_user_mock.return_value = Mock()
-        user = get_user_model().objects.get(email=self.engineer)
-        resp = self.client.post(reverse('work_get_tickets'))
+        user = User.objects.get(email=self.engineer)
+        resp = self.engineer_client.post(reverse('work_get_tickets'))
         self.assertRedirects(resp, reverse('work', args=[user.id]))
         self.assertEqual(resp.status_code, 302)
-        self.assertFalse(zenpy_mock.called)
 
     @patch('main.views.zenpy')
     @patch('main.views.get_tickets_list_for_group')
-    def test_take_one_ticket(self, tickets_mock, zenpy_views_mock):
+    def test_take_one_ticket(self, group_tickets_mock, zenpy_mock):
         """
         Функция проверки назначения одного тикета на engineer.
         """
-        tickets_mock.return_value = [Mock()]
-        zenpy_views_mock.get_user.return_value = Mock(role='agent', custom_role_id=sets.ZENDESK_ROLES['engineer'])
-        self.client.post(reverse('work_get_tickets'), data={'count_tickets': 1})
-        tickets = zenpy_views_mock.update_tickets.call_args
-        self.assertEqual(tickets[0][0][0].assignee, zenpy_views_mock.get_user.return_value)
+        group_tickets_mock.return_value = [Mock()]
+        zenpy_mock.get_user.return_value = Mock(role='agent', custom_role_id=sets.ZENDESK_ROLES['engineer'])
+        self.engineer_client.post(reverse('work_get_tickets'), data={'count_tickets': 1})
+        tickets = zenpy_mock.update_tickets.call_args
+        self.assertEqual(tickets[0][0][0].assignee, zenpy_mock.get_user.return_value)
 
     @patch('main.views.get_tickets_list_for_group')
     @patch('main.views.zenpy')
-    def test_take_many_tickets(self, zenpy_mock, tickets_mock):
+    def test_take_many_tickets(self, zenpy_mock, group_tickets_mock):
         """
         Функция проверки назначения нескольких тикетов на engineer.
         """
-        tickets_mock.return_value = [Mock()] * 3
+        group_tickets_mock.return_value = [Mock()] * 3
         zenpy_mock.get_user.return_value = Mock(role='agent', custom_role_id=sets.ZENDESK_ROLES['engineer'])
-        self.client.post(reverse('work_get_tickets'), data={'count_tickets': 3})
+        self.engineer_client.post(reverse('work_get_tickets'), data={'count_tickets': 3})
         tickets = zenpy_mock.update_tickets.call_args
         for ticket in tickets[0][0]:
             self.assertEqual(ticket.assignee, zenpy_mock.get_user.return_value)
@@ -426,31 +402,31 @@ class GetTicketsTestCase(TestCase):
         Функция проверки попытки назначения тикета на light_agent.
         """
         get_user_mock.return_value = Mock(role='agent', custom_role_id=sets.ZENDESK_ROLES['light_agent'])
-        self.light_agent_client.post(reverse('work_get_tickets'), data={'count_tickets': 3})
+        self.agent_client.post(reverse('work_get_tickets'), data={'count_tickets': 3})
         tickets = zenpy_mock.update_tickets.call_args
         self.assertIsNone(tickets)
 
     @patch('main.views.zenpy')
     @patch('main.views.get_tickets_list_for_group')
-    def test_take_zero_tickets(self, tickets_mock, zenpy_mock):
+    def test_take_zero_tickets(self, TicketsMock, zenpy_mock):
         """
         Функция проверки попытки назначения нуля тикета на engineer.
         """
-        tickets_mock.return_value = [Mock()] * 3
+        TicketsMock.return_value = [Mock()] * 3
         zenpy_mock.get_user.return_value = Mock(role='agent', custom_role_id=sets.ZENDESK_ROLES['engineer'])
-        self.client.post(reverse('work_get_tickets'), data={'count_tickets': 0})
+        self.engineer_client.post(reverse('work_get_tickets'), data={'count_tickets': 0})
         tickets = zenpy_mock.update_tickets.call_args[0][0]
         self.assertListEqual(tickets, [])
 
     @patch('main.views.get_tickets_list_for_group')
     @patch('main.views.zenpy')
-    def test_take_invalid_count_tickets(self, zenpy_mock, tickets_mock):
+    def test_take_invalid_count_tickets(self, zenpy_mock, group_tickets_mock):
         """
         Функция проверки попытки назначения нуля тикетов на engineer.
         """
-        tickets_mock.return_value = [Mock()] * 3
+        group_tickets_mock.return_value = [Mock()] * 3
         zenpy_mock.get_user.return_value = Mock(role='agent', custom_role_id=sets.ZENDESK_ROLES['engineer'])
-        self.client.post(reverse('work_get_tickets'), data={'count_tickets': 'asd'})
+        self.engineer_client.post(reverse('work_get_tickets'), data={'count_tickets': 'asd'})
         tickets = zenpy_mock.update_tickets.call_args
         self.assertIsNone(tickets)
 
@@ -468,9 +444,9 @@ class ProfileTestCase(TestCase):
         self.zendesk_agent_email = '[email protected]'
         self.zendesk_admin_email = '[email protected]'
         self.client = Client()
-        self.client.force_login(get_user_model().objects.get(email=self.zendesk_agent_email))
+        self.client.force_login(User.objects.get(email=self.zendesk_agent_email))
         self.admin_client = Client()
-        self.admin_client.force_login(get_user_model().objects.get(email=self.zendesk_admin_email))
+        self.admin_client.force_login(User.objects.get(email=self.zendesk_admin_email))
 
     def test_correct_username(self):
         """
@@ -513,3 +489,43 @@ class ProfileTestCase(TestCase):
         resp = self.client.get(reverse('profile'))
         user = zenpy.get_user(self.zendesk_agent_email)
         self.assertEqual(resp.context['profile'].image, user.photo['content_url'] if user.photo else None)
+
+
+class LoggingTestCase(UsersBaseTestCase):
+
+    def setUp(self):
+        super().setUp()
+        self.admin_profile = User.objects.get(email=self.admin).userprofile
+        self.agent_profile = User.objects.get(email=self.light_agent).userprofile
+        self.engineer_profile = User.objects.get(email=self.engineer).userprofile
+
+    @staticmethod
+    def get_file_output():
+        file = open('logs/logs.csv', 'r')
+        file_output = file.readlines()[-1]
+        file.close()
+        return file_output
+
+    def test_engineer_with_admin(self):
+        log(self.engineer_profile, self.admin_profile)
+        file_output = self.get_file_output()
+        self.assertEqual(file_output, f'UserForAccessTest,engineer,'
+                                      f'{str(timezone.now().today())[:16]},ZendeskAdmin\n')
+
+    def test_engineer_without_admin(self):
+        log(self.engineer_profile)
+        file_output = self.get_file_output()
+        self.assertEqual(file_output, f'UserForAccessTest,engineer,'
+                                      f'{str(timezone.now().today())[:16]},UserForAccessTest\n')
+
+    def test_light_agent_with_admin(self):
+        log(self.agent_profile, self.admin_profile)
+        file_output = self.get_file_output()
+        self.assertEqual(file_output, f'UserForAccessTest,light_agent,'
+                                      f'{str(timezone.now().today())[:16]},ZendeskAdmin\n')
+
+    def test_light_agent_without_admin(self):
+        log(self.agent_profile)
+        file_output = self.get_file_output()
+        self.assertEqual(file_output, f'UserForAccessTest,light_agent,'
+                                      f'{str(timezone.now().today())[:16]},UserForAccessTest\n')

main/views.py

@@ -452,3 +452,6 @@ def statistic_page(request: WSGIRequest) -> HttpResponse:
         form = StatisticForm()
     context['form'] = form
     return render(request, 'pages/statistic.html', context)
+
+def registration_failed(request):
+    return render(request, 'pages/registration_failed.html')

main/zendesk_admin.py

@@ -8,8 +8,8 @@ from zenpy import Zenpy
 from zenpy.lib.api_objects import User as ZenpyUser, Group as ZenpyGroup, Ticket as ZenpyTicket
 from zenpy.lib.exception import APIException
 
-from access_controller.settings import ACTRL_ZENDESK_SUBDOMAIN, ACTRL_API_EMAIL, ACTRL_API_TOKEN, ACTRL_API_PASSWORD, \
-    ZENDESK_GROUPS, SOLVED_TICKETS_EMAIL
+from access_controller.settings import ACTRL_ZENDESK_SUBDOMAIN, ACTRL_API_EMAIL, ACTRL_API_TOKEN,  \
+    ZENDESK_GROUPS, SOLVED_TICKETS_EMAIL #ACTRL_API_PASSWORD,
 
 
 class ZendeskAdmin:
@@ -114,5 +114,5 @@ zenpy = ZendeskAdmin({
     'subdomain': ACTRL_ZENDESK_SUBDOMAIN,
     'email': ACTRL_API_EMAIL,
     'token': ACTRL_API_TOKEN,
-    'password': ACTRL_API_PASSWORD,
+    #'password': ACTRL_API_PASSWORD,
 })

requirements/common.txt

@@ -1,11 +1,10 @@
 # Contains requirements common to all environments
 
 # Engine
-Django==3.1.6
-Pillow==8.1.0
+Django==3.2.3
 zenpy~=2.0.24
-django_registration==3.1.1
-djangorestframework==3.12.2
+django_registration==3.1.2
+djangorestframework==3.12.4
 
 # Misc
 python-dotenv==0.17.1

requirements/dev.txt

@@ -2,14 +2,11 @@
 -r common.txt
 
 # Documentation
-Sphinx==3.4.3
-sphinx-rtd-theme==0.5.1
-sphinx-autodoc-typehints==1.11.1
+Sphinx==3.5.4
+sphinx-rtd-theme==0.5.2
+sphinx-autodoc-typehints==1.12.0
 pyenchant==3.2.0
-sphinxcontrib-spelling==7.1.0
-m2r == 0.2.1
+sphinxcontrib-spelling==7.2.1
 
-# Code style
-pylint == 2.8.2
-pylint-django == 2.4.4
-autopep8 == 1.5.6
+# Tests
+coverage==5.5

requirements/prod.txt

@@ -1,5 +1,5 @@
 # Production specific dependencies
 -r common.txt
 
-daphne==3.0.1
+daphne==3.0.2
 Twisted[tls,http2]==21.2.0