Merge branch 'feature/periodic_upgrade' into 'develop'

Control page displays all users from zendesk and db

See merge request 2020-2021/online/s101/group-02/access_controller!52

main/extra_func.py

@@ -263,7 +263,7 @@ def check_user_auth(email: str, password: str) -> bool:
     return True
 
 
-def update_user_in_model(profile: UserProfile, zendesk_user: User) -> UserProfile:
+def update_user_in_model(profile: UserProfile, zendesk_user: User):
     """
     Функция обновляет профиль пользователя при изменении данных пользователя на Zendesk.
 

main/serializers.py

@@ -1,6 +1,7 @@
 from django.contrib.auth.models import User
 from rest_framework import serializers
 from main.models import UserProfile
+from access_controller.settings import ZENDESK_ROLES
 
 
 class UserSerializer(serializers.HyperlinkedModelSerializer):
@@ -13,9 +14,25 @@ class UserSerializer(serializers.HyperlinkedModelSerializer):
 
 
 class ProfileSerializer(serializers.HyperlinkedModelSerializer):
-    """Сериализатор для модели профиля пользователя"""
+    """Класс serializer для модели профиля пользователя"""
     user = UserSerializer()
 
     class Meta:
         model = UserProfile
         fields = ['user', 'id', 'name', 'zendesk_role']
+
+
+class ZendeskUserSerializer(serializers.Serializer):
+    """Класс serializer для объектов пользователей из zenpy"""
+    name = serializers.CharField()
+    zendesk_role = serializers.SerializerMethodField('get_zendesk_role')
+    email = serializers.EmailField()
+
+    @staticmethod
+    def get_zendesk_role(obj):
+        if obj.custom_role_id == ZENDESK_ROLES['engineer']:
+            return 'engineer'
+        elif obj.custom_role_id == ZENDESK_ROLES['light_agent']:
+            return 'light_agent'
+        else:
+            return "empty"

main/templates/pages/adm_ruleset.html

@@ -34,7 +34,7 @@
         <h6 class="table-title">Список сотрудников</h6>
 
         {% block table %}
-        <table class="light-table">
+        <table class="table table-dark light-table">
 
             <thead>
               <th>Name</th>
@@ -42,8 +42,8 @@
               <th>Role</th>
               <th>Checked</th>
             </thead>
-            <tbody id="tbody">
-            </tbody>
+            <tbody id="tbody"></tbody>
+
         </table>
         <p id="loading">Данные загружаются...</p>
         {% endblock %}

main/views.py

@@ -31,7 +31,7 @@ from main.extra_func import check_user_exist, update_profile, get_user_organizat
     make_engineer, make_light_agent, get_users_list, update_users_in_model, count_users, \
     StatisticData, log
 from main.forms import AdminPageUsers, CustomRegistrationForm, CustomAuthenticationForm, StatisticForm
-from main.serializers import ProfileSerializer
+from main.serializers import ProfileSerializer, ZendeskUserSerializer
 from .models import UserProfile
 
 
@@ -239,7 +239,7 @@ def main_page(request: WSGIRequest) -> HttpResponse:
     return render(request, 'pages/index.html')
 
 
-class AdminPageView(LoginRequiredMixin, PermissionRequiredMixin,SuccessMessageMixin, FormView):
+class AdminPageView(LoginRequiredMixin, PermissionRequiredMixin, SuccessMessageMixin, FormView):
     """
     Класс отображения страницы администратора.
 
@@ -319,16 +319,34 @@ class UsersViewSet(viewsets.ReadOnlyModelViewSet):
     serializer_class = ProfileSerializer
 
     def list(self, request, *args, **kwargs):
-        users = update_users_in_model().values
-        count = count_users(users)
+        users = update_users_in_model()
+        count = count_users(users.values)
         profiles = UserProfile.objects.filter(role='agent')
         serializer = self.get_serializer(profiles, many=True)
-        return Response({
+        res = {
             'users': serializer.data,
             'engineers': count[0],
-            'light_agents': count[1]
-        })
+            'light_agents': count[1],
+            "zendesk_users": self.get_zendesk_users(self.choose_users(users.values, profiles))
+        }
+        return Response(res)
 
+    @staticmethod
+    def choose_users(zendesk, model):
+        users = []
+        for zendesk_user in zendesk:
+            if zendesk_user.name not in [user.name for user in model]:
+                users.append(zendesk_user)
+        return users
+
+    @staticmethod
+    def get_zendesk_users(users):
+        zendesk_users = ZendeskUserSerializer(
+            data=[user for user in users if user.role != 'admin'],
+            many=True
+        )
+        zendesk_users.is_valid()
+        return zendesk_users.data
 
 
 @login_required()