From 8996c7d70a01ccfcbdd77a883cf7360a65e9288e Mon Sep 17 00:00:00 2001 From: Vadim Melnikov Date: Sun, 14 Feb 2021 22:48:55 +0300 Subject: [PATCH 01/11] Added registration failed layout --- .../registration_failed/registration_failed.png | Bin 0 -> 27266 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 layouts/registration_failed/registration_failed.png diff --git a/layouts/registration_failed/registration_failed.png b/layouts/registration_failed/registration_failed.png new file mode 100644 index 0000000000000000000000000000000000000000..766452cb295032c3bef9fa1299c8b49d94cde644 GIT binary patch literal 27266 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 literal 0 HcmV?d00001 From d3313c7ecf633ae892468aae391649725640c76d Mon Sep 17 00:00:00 2001 From: Vadim Melnikov Date: Thu, 25 Feb 2021 18:52:57 +0300 Subject: [PATCH 02/11] Added kind of dirty registration failed html --- access_controller/urls.py | 3 ++- main/templates/pages/registration_failed.html | 21 +++++++++++++++++++ main/views.py | 3 +++ 3 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 main/templates/pages/registration_failed.html diff --git a/access_controller/urls.py b/access_controller/urls.py index b2603b2..c35ae58 100644 --- a/access_controller/urls.py +++ b/access_controller/urls.py @@ -20,7 +20,7 @@ from django.urls import path, include from access_controller import settings from access_controller.settings import DEBUG -from main.views import main_page, profile_page, CustomRegistrationView +from main.views import main_page, profile_page, CustomRegistrationView, registration_failed urlpatterns = [ path('admin/', admin.site.urls, name='admin'), @@ -30,4 +30,5 @@ urlpatterns = [ path('accounts/login/', LoginView.as_view(extra_context={}), name='login'), # TODO add extra context path('accounts/', include('django.contrib.auth.urls')), path('accounts/', include('django_registration.backends.one_step.urls')), + path('registration_failed/', registration_failed, name='registration_failed'), ] diff --git a/main/templates/pages/registration_failed.html b/main/templates/pages/registration_failed.html new file mode 100644 index 0000000..91e2258 --- /dev/null +++ b/main/templates/pages/registration_failed.html @@ -0,0 +1,21 @@ + + + + + + + +
+
+

К сожалению, регистрация закрыта.

+
+ +
+ + \ No newline at end of file diff --git a/main/views.py b/main/views.py index 797ea8b..5348642 100644 --- a/main/views.py +++ b/main/views.py @@ -70,3 +70,6 @@ def profile_page(request): def main_page(request): return render(request, 'pages/index.html') + +def registration_failed(request): + return render(request, 'pages/registration_failed.html') From c9875596c09ae86b464fc69fda8c6eecbb14e688 Mon Sep 17 00:00:00 2001 From: Vadim Melnikov Date: Fri, 26 Feb 2021 18:18:33 +0300 Subject: [PATCH 03/11] Improved registration failed html a bit --- main/templates/pages/registration_failed.html | 23 +++++++++---------- 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/main/templates/pages/registration_failed.html b/main/templates/pages/registration_failed.html index 91e2258..736a5ac 100644 --- a/main/templates/pages/registration_failed.html +++ b/main/templates/pages/registration_failed.html @@ -2,20 +2,19 @@ + Регистрация закрыта - -
-
-

К сожалению, регистрация закрыта.

-
- +
+ +
+
+

К сожалению, регистрация закрыта.

+ На главную
\ No newline at end of file From 4ab15526eec1c6f046a9d608126322197d5f9433 Mon Sep 17 00:00:00 2001 From: Vadim Melnikov Date: Fri, 5 Mar 2021 14:31:45 +0300 Subject: [PATCH 04/11] Final registration failed html page --- main/templates/pages/registration_failed.html | 32 +++++++------------ 1 file changed, 12 insertions(+), 20 deletions(-) diff --git a/main/templates/pages/registration_failed.html b/main/templates/pages/registration_failed.html index 736a5ac..5cae8c3 100644 --- a/main/templates/pages/registration_failed.html +++ b/main/templates/pages/registration_failed.html @@ -1,20 +1,12 @@ - - - - - Регистрация закрыта - - -
- -
-
-

К сожалению, регистрация закрыта.

- На главную -
- - \ No newline at end of file +{% extends 'base/base.html' %} + +{% block title %} +Регистрация закрыта +{% endblock %} + +{% block content %} +
+

К сожалению, регистрация закрыта.

+ На главную +
+{% endblock %} \ No newline at end of file From 6b9cd05227ef708e77b37bca22703dbb3d0344ba Mon Sep 17 00:00:00 2001 From: Dmitriy Andreev Date: Wed, 28 Apr 2021 22:21:37 +0300 Subject: [PATCH 05/11] Profile page lookfix --- main/templates/pages/profile.html | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/main/templates/pages/profile.html b/main/templates/pages/profile.html index 1dd6005..c97fa4d 100644 --- a/main/templates/pages/profile.html +++ b/main/templates/pages/profile.html @@ -6,7 +6,7 @@ {% block title %}{{ pagename }}{% endblock %} -{% block heading %}Профиль{% endblock %} +{% block heading %}

Профиль

{% endblock %} {% block extra_css %} @@ -22,7 +22,7 @@ {% block content %}
-
+
-
Имя пользователя {{ profile.name }}
+

Имя пользователя

{{ profile.name }}

-
Электронная почта {{ profile.user.email }}
+

Электронная почта

{{ profile.user.email }}

-
Текущая роль +

Текущая роль

{% if profile.custom_role_id == ZENDESK_ROLES.engineer %} - engineer +
engineer
{% elif profile.custom_role_id == ZENDESK_ROLES.light_agent %} - light_agent +
light_agent
+ {% else %} +
None
{% endif %} - +
-
+
+ {% endblock %} From cb3d244f908a6a953c86d2d6f4fa529ae3093b8f Mon Sep 17 00:00:00 2001 From: Iurii Tatishchev Date: Wed, 19 May 2021 11:37:33 -0700 Subject: [PATCH 06/11] Update requirements --- requirements/common.txt | 15 +++------------ requirements/dev.txt | 6 ++++++ requirements/prod.txt | 2 +- 3 files changed, 10 insertions(+), 13 deletions(-) diff --git a/requirements/common.txt b/requirements/common.txt index 0bbb21b..7452fc5 100644 --- a/requirements/common.txt +++ b/requirements/common.txt @@ -1,19 +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 - - -# Documentation -Sphinx==3.4.3 -sphinx-rtd-theme==0.5.1 -sphinx-autodoc-typehints==1.11.1 -pyenchant==3.2.0 -sphinxcontrib-spelling==7.1.0 +django_registration==3.1.2 +djangorestframework==3.12.4 # Misc python-dotenv==0.17.1 diff --git a/requirements/dev.txt b/requirements/dev.txt index 73c27d0..be32176 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -1,3 +1,9 @@ # Development specific dependencies -r common.txt +# Documentation +Sphinx==3.5.4 +sphinx-rtd-theme==0.5.2 +sphinx-autodoc-typehints==1.12.0 +pyenchant==3.2.0 +sphinxcontrib-spelling==7.2.1 diff --git a/requirements/prod.txt b/requirements/prod.txt index b0e6925..479c608 100644 --- a/requirements/prod.txt +++ b/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 From 0a9f57155c51995dc432301184725345766c1e42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A2=D0=B0=D1=82=D0=B8=D1=89=D0=B5=D0=B2=20=D0=AE=D1=80?= =?UTF-8?q?=D0=B8=D0=B9?= Date: Wed, 19 May 2021 22:16:58 +0000 Subject: [PATCH 07/11] =?UTF-8?q?#71=20|=20=D0=A2=D0=B5=D1=81=D1=82=D1=8B?= =?UTF-8?q?=20=D0=9F=D0=BE=D0=BB=D1=83=D1=87=D0=B5=D0=BD=D0=B8=D1=8F=20?= =?UTF-8?q?=D0=9F=D1=80=D0=B0=D0=B2=20=D0=9B=D0=B5=D0=B3=D0=BA=D0=BE=D0=B3?= =?UTF-8?q?=D0=BE=20=D0=90=D0=B3=D0=B5=D0=BD=D1=82=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...est_make_engineer.json => test_users.json} | 2 +- main/tests.py | 263 +++++++++++------- 2 files changed, 170 insertions(+), 95 deletions(-) rename fixtures/{test_make_engineer.json => test_users.json} (98%) diff --git a/fixtures/test_make_engineer.json b/fixtures/test_users.json similarity index 98% rename from fixtures/test_make_engineer.json rename to fixtures/test_users.json index 1154342..d9e164d 100644 --- a/fixtures/test_make_engineer.json +++ b/fixtures/test_users.json @@ -51,7 +51,7 @@ "name": "UserForAccessTest", "user": 2, "role": "agent", - "custom_role_id": "360005209000" + "custom_role_id": "360005208980" } }, { diff --git a/main/tests.py b/main/tests.py index b086488..d1ce390 100644 --- a/main/tests.py +++ b/main/tests.py @@ -13,6 +13,23 @@ import access_controller.settings as sets from main.zendesk_admin import zenpy +class UsersBaseTestCase(TestCase): + """Базовый класс загружения данных для тестов с пользователями""" + fixtures = ['fixtures/test_users.json'] + + def setUp(self): + """Добавление в переменные почт и клиентов для пользователей""" + self.light_agent = '123@test.ru' + self.admin = 'admin@gmail.com' + self.engineer = 'customer@example.com' + 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'] @@ -67,55 +84,43 @@ class RegistrationTestCase(TestCase): self.assertTrue(user.has_perm('main.has_control_access')) -class MakeEngineerTestCase(TestCase): - fixtures = ['fixtures/test_make_engineer.json'] - - def setUp(self): - self.light_agent = '123@test.ru' - self.admin = 'admin@gmail.com' - self.engineer = 'customer@example.com' - self.client = Client() - self.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)) +class MakeEngineerTestCase(UsersBaseTestCase): @patch('main.extra_func.zenpy') - def test_redirect(self, ZenpyMock): + def test_become_engineer_redirect(self, _zenpy_mock): user = User.objects.get(email=self.light_agent) - resp = self.client.post(reverse_lazy('work_become_engineer')) + resp = self.agent_client.post(reverse_lazy('work_become_engineer')) self.assertRedirects(resp, reverse('work', args=[user.id])) self.assertEqual(resp.status_code, 302) @patch('main.extra_func.zenpy') - def test_light_agent_make_engineer(self, ZenpyMock): - self.client.post(reverse_lazy('work_become_engineer')) - self.assertEqual(ZenpyMock.update_user.call_args[0][0].custom_role_id, sets.ZENDESK_ROLES['engineer']) + def test_light_agent_make_engineer(self, zenpy_mock): + 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, ZenpyMock): + def test_admin_make_engineer(self, zenpy_mock): self.admin_client.post(reverse_lazy('work_become_engineer')) - self.assertEqual(ZenpyMock.update_user.call_args[0][0].custom_role_id, sets.ZENDESK_ROLES['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, ZenpyMock): - client = Client() - client.force_login(User.objects.get(email=self.engineer)) - client.post(reverse_lazy('work_become_engineer')) - self.assertEqual(ZenpyMock.update_user.call_args[0][0].custom_role_id, sets.ZENDESK_ROLES['engineer']) + def test_engineer_make_engineer(self, zenpy_mock): + 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, ZenpyMock): + def test_control_page_make_engineer_one(self, zenpy_mock): self.admin_client.post( reverse_lazy('control'), data={'users': [User.objects.get(email=self.light_agent).userprofile.id], 'engineer': 'engineer'} ) - call_list = ZenpyMock.update_user.call_args_list + 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['engineer']) @patch('main.extra_func.zenpy') - def test_control_page_make_many(self, ZenpyMock): + def test_control_page_make_engineer_many(self, zenpy_mock): self.admin_client.post( reverse_lazy('control'), data={ @@ -126,35 +131,120 @@ class MakeEngineerTestCase(TestCase): 'engineer': 'engineer' } ) - call_list = ZenpyMock.update_user.call_args_list + 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['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 = '123@test.ru' + super().setUp() self.email_backend = 'django.core.mail.backends.locmem.EmailBackend' - self.client = Client() - self.client.force_login(User.objects.get(email=self.user)) def test_redirect(self): 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] @@ -165,34 +255,31 @@ class PasswordResetTestCase(TestCase): def test_email_invalid(self): 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): 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 = '123@test.ru' - self.client = Client() - self.client.force_login(User.objects.get(email=self.user)) + super().setUp() self.set_password() def set_password(self): - user: User = User.objects.get(email=self.user) + user: User = User.objects.get(email=self.light_agent) user.set_password('ImpossiblyHardPassword') user.save() - self.client.force_login(User.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', @@ -200,12 +287,12 @@ class PasswordChangeTestCase(TestCase): 'new_password2': 'EasyPassword', } ) - user = User.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', @@ -217,7 +304,7 @@ class PasswordChangeTestCase(TestCase): 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', @@ -229,7 +316,7 @@ class PasswordChangeTestCase(TestCase): 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', @@ -241,7 +328,7 @@ class PasswordChangeTestCase(TestCase): 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', @@ -253,104 +340,92 @@ class PasswordChangeTestCase(TestCase): 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 = '123@test.ru' - self.engineer = 'customer@example.com' - self.client = Client() - self.client.force_login(User.objects.get(email=self.engineer)) - self.light_agent_client = Client() - self.light_agent_client.force_login(User.objects.get(email=self.light_agent)) @patch('main.views.zenpy.get_user') @patch('main.extra_func.zenpy') - def test_redirect(self, ZenpyMock, GetUserMock): + def test_redirect(self, _zenpy_mock, get_user_mock): """ Функция проверки переадресации пользователя на рабочую страницу. """ - GetUserMock.return_value = Mock() + get_user_mock.return_value = Mock() user = User.objects.get(email=self.engineer) - resp = self.client.post(reverse('work_get_tickets')) + resp = self.engineer_client.post(reverse('work_get_tickets')) self.assertRedirects(resp, reverse('work', args=[user.id])) self.assertEqual(resp.status_code, 302) @patch('main.views.zenpy') @patch('main.views.get_tickets_list_for_group') - def test_take_one_ticket(self, TicketsMock, ZenpyViewsMock): + def test_take_one_ticket(self, group_tickets_mock, zenpy_mock): """ Функция проверки назначения одного тикета на engineer. """ - TicketsMock.return_value = [Mock()] - ZenpyViewsMock.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 = ZenpyViewsMock.update_tickets.call_args - self.assertEqual(tickets[0][0][0].assignee, ZenpyViewsMock.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, ZenpyMock, TicketsMock): + def test_take_many_tickets(self, zenpy_mock, group_tickets_mock): """ Функция проверки назначения нескольких тикетов на engineer. """ - TicketsMock.return_value = [Mock()] * 3 - ZenpyMock.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}) - tickets = ZenpyMock.update_tickets.call_args + group_tickets_mock.return_value = [Mock()] * 3 + 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': 3}) + tickets = zenpy_mock.update_tickets.call_args for ticket in tickets[0][0]: - self.assertEqual(ticket.assignee, ZenpyMock.get_user.return_value) + self.assertEqual(ticket.assignee, zenpy_mock.get_user.return_value) @patch('main.views.zenpy.get_user') @patch('main.views.zenpy') - def test_light_agent_take_ticket(self, ZenpyMock, GetUserMock): + def test_light_agent_take_ticket(self, zenpy_mock, get_user_mock): """ Функция проверки попытки назначения тикета на light_agent. """ - GetUserMock.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}) - tickets = ZenpyMock.update_tickets.call_args + get_user_mock.return_value = Mock(role='agent', custom_role_id=sets.ZENDESK_ROLES['light_agent']) + 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, TicketsMock, ZenpyMock): + def test_take_zero_tickets(self, TicketsMock, zenpy_mock): """ Функция проверки попытки назначения нуля тикета на engineer. """ TicketsMock.return_value = [Mock()] * 3 - ZenpyMock.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}) - tickets = ZenpyMock.update_tickets.call_args[0][0] + 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': 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, ZenpyMock, TicketsMock, ): + def test_take_invalid_count_tickets(self, zenpy_mock, group_tickets_mock): """ Функция проверки попытки назначения нуля тикетов на engineer. """ - TicketsMock.return_value = [Mock()] * 3 - ZenpyMock.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'}) - tickets = ZenpyMock.update_tickets.call_args + group_tickets_mock.return_value = [Mock()] * 3 + 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': 'asd'}) + tickets = zenpy_mock.update_tickets.call_args self.assertIsNone(tickets) From e0ca38cd6deea3776583b0d73c6fb6bf917fe7e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9C=D0=B0=D0=B7=D1=83=D1=80=D0=BE=D0=B2=20=D0=A2=D0=B8?= =?UTF-8?q?=D0=BC=D0=BE=D1=84=D0=B5=D0=B9?= Date: Wed, 19 May 2021 22:57:37 +0000 Subject: [PATCH 08/11] Issue #75 --- main/tests.py | 44 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 43 insertions(+), 1 deletion(-) diff --git a/main/tests.py b/main/tests.py index d1ce390..60f31ed 100644 --- a/main/tests.py +++ b/main/tests.py @@ -7,11 +7,13 @@ 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): """Базовый класс загружения данных для тестов с пользователями""" @@ -487,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') From c95c0fe00b30b6d2c3be06ade572599a72e07b6c Mon Sep 17 00:00:00 2001 From: Iurii Tatishchev Date: Wed, 19 May 2021 21:46:30 -0700 Subject: [PATCH 09/11] Delete unused `main/apiauth.py` --- docs/source/code.rst | 8 -------- main/apiauth.py | 49 -------------------------------------------- 2 files changed, 57 deletions(-) delete mode 100644 main/apiauth.py diff --git a/docs/source/code.rst b/docs/source/code.rst index 7479081..ac37e3d 100644 --- a/docs/source/code.rst +++ b/docs/source/code.rst @@ -33,14 +33,6 @@ Serializers :members: -*************** -API functions -*************** - -.. automodule:: main.apiauth - :members: - - ***** Views ***** diff --git a/main/apiauth.py b/main/apiauth.py deleted file mode 100644 index 08a018c..0000000 --- a/main/apiauth.py +++ /dev/null @@ -1,49 +0,0 @@ -import os - -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: данные пользователя - """ - 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 From de0da89f0a00dd6f5bf5897ad0bd59d54d0390a1 Mon Sep 17 00:00:00 2001 From: Iurii Tatishchev Date: Wed, 19 May 2021 23:27:46 -0700 Subject: [PATCH 10/11] Add coverage, set up CI. --- .coveragerc | 14 ++++++++++++++ .gitlab-ci.yml | 23 +++++++++++++++++++++++ requirements/dev.txt | 3 +++ 3 files changed, 40 insertions(+) create mode 100644 .coveragerc create mode 100644 .gitlab-ci.yml diff --git a/.coveragerc b/.coveragerc new file mode 100644 index 0000000..8499040 --- /dev/null +++ b/.coveragerc @@ -0,0 +1,14 @@ +[run] +command_line = manage.py test + +branch = true + +source = + main/ + + +omit = + main/migrations/* + main/apps.py + main/tests.py + diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000..ef3bf26 --- /dev/null +++ b/.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 diff --git a/requirements/dev.txt b/requirements/dev.txt index be32176..64a12ad 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -7,3 +7,6 @@ sphinx-rtd-theme==0.5.2 sphinx-autodoc-typehints==1.12.0 pyenchant==3.2.0 sphinxcontrib-spelling==7.2.1 + +# Tests +coverage==5.5 From 832889ec8ab9f5de06a6942a797f61435f4fed15 Mon Sep 17 00:00:00 2001 From: Kanris Date: Thu, 20 May 2021 18:13:08 +0300 Subject: [PATCH 11/11] fixed bug password and token a mutually exclusive --- main/zendesk_admin.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/main/zendesk_admin.py b/main/zendesk_admin.py index 627d900..c7ecc1c 100644 --- a/main/zendesk_admin.py +++ b/main/zendesk_admin.py @@ -4,8 +4,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: @@ -106,5 +106,5 @@ zenpy = ZendeskAdmin({ 'subdomain': ACTRL_ZENDESK_SUBDOMAIN, 'email': ACTRL_API_EMAIL, 'token': ACTRL_API_TOKEN, - 'password': ACTRL_API_PASSWORD, + #'password': ACTRL_API_PASSWORD, })