From aec78dc3c7e6ccba43db7b92a268d5d00bacd3ae Mon Sep 17 00:00:00 2001
From: Bai <bugatti_it@163.com>
Date: Wed, 6 May 2020 15:31:08 +0800
Subject: [PATCH] =?UTF-8?q?[Update]=20=E6=B7=BB=E5=8A=A0=E7=BB=84=E7=BB=87?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85->=E7=BB=84=E7=BB=87=E7=94=A8=E6=88=B7tab?=
 =?UTF-8?q?=E9=A1=B5=EF=BC=8C=E8=A7=A3=E5=86=B3=E7=BB=84=E7=BB=87=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E9=A1=B5=E9=9D=A2=E5=8A=A0=E8=BD=BD=E8=B6=85=E6=97=B6?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/orgs/api.py           | 18 ++++++++++++++++--
 apps/orgs/serializers.py   | 12 ++++++++++++
 apps/orgs/urls/api_urls.py |  3 ++-
 apps/users/api/mixins.py   |  6 +++++-
 4 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/apps/orgs/api.py b/apps/orgs/api.py
index ea4a48955..63eebb25d 100644
--- a/apps/orgs/api.py
+++ b/apps/orgs/api.py
@@ -1,14 +1,16 @@
 # -*- coding: utf-8 -*-
 #
 
-from rest_framework import status
+from django.shortcuts import get_object_or_404
+from rest_framework import status, generics
 from rest_framework.views import Response
 from rest_framework_bulk import BulkModelViewSet
 
 from common.permissions import IsSuperUserOrAppUser
 from .models import Organization
 from .serializers import OrgSerializer, OrgReadSerializer, \
-    OrgMembershipUserSerializer, OrgMembershipAdminSerializer
+    OrgMembershipUserSerializer, OrgMembershipAdminSerializer, \
+    OrgAllUserSerializer
 from users.models import User, UserGroup
 from assets.models import Asset, Domain, AdminUser, SystemUser, Label
 from perms.models import AssetPermission
@@ -67,3 +69,15 @@ class OrgMembershipUsersViewSet(OrgMembershipModelViewSetMixin, BulkModelViewSet
     membership_class = Organization.users.through
     permission_classes = (IsSuperUserOrAppUser, )
 
+
+class OrgAllUserListApi(generics.ListAPIView):
+    permission_classes = (IsSuperUserOrAppUser,)
+    serializer_class = OrgAllUserSerializer
+    filter_fields = ("username", "name")
+    search_fields = filter_fields
+
+    def get_queryset(self):
+        pk = self.kwargs.get("pk")
+        org = get_object_or_404(Organization, pk=pk)
+        users = org.get_org_users().only(*self.serializer_class.Meta.only_fields)
+        return users
diff --git a/apps/orgs/serializers.py b/apps/orgs/serializers.py
index 281b9ec75..5ff3b5f4d 100644
--- a/apps/orgs/serializers.py
+++ b/apps/orgs/serializers.py
@@ -80,3 +80,15 @@ class OrgMembershipUserSerializer(OrgMembershipSerializerMixin, ModelSerializer)
         model = Organization.users.through
         list_serializer_class = AdaptedBulkListSerializer
         fields = '__all__'
+
+
+class OrgAllUserSerializer(serializers.Serializer):
+    user = serializers.UUIDField(read_only=True, source='id')
+    user_display = serializers.SerializerMethodField()
+
+    class Meta:
+        only_fields = ['id', 'username', 'name']
+
+    @staticmethod
+    def get_user_display(obj):
+        return str(obj)
diff --git a/apps/orgs/urls/api_urls.py b/apps/orgs/urls/api_urls.py
index 782269c81..17f8c3c8a 100644
--- a/apps/orgs/urls/api_urls.py
+++ b/apps/orgs/urls/api_urls.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 
-from django.urls import re_path
+from django.urls import re_path, path
 from rest_framework.routers import DefaultRouter
 
 from common import api as capi
@@ -24,6 +24,7 @@ old_version_urlpatterns = [
 ]
 
 urlpatterns = [
+    path('<uuid:pk>/users/all/', api.OrgAllUserListApi.as_view(), name='org-all-users'),
 ]
 
 urlpatterns += router.urls + old_version_urlpatterns
diff --git a/apps/users/api/mixins.py b/apps/users/api/mixins.py
index 273ab9074..2ff60b615 100644
--- a/apps/users/api/mixins.py
+++ b/apps/users/api/mixins.py
@@ -1,9 +1,13 @@
 # -*- coding: utf-8 -*-
 #
 from .. import utils
+from users.models import User
 
 
 class UserQuerysetMixin:
     def get_queryset(self):
-        queryset = utils.get_current_org_members()
+        if self.request.query_params.get('all'):
+            queryset = User.objects.exclude(role=User.ROLE_APP)
+        else:
+            queryset = utils.get_current_org_members()
         return queryset