perf(orgs): 优化组织用户添加

apps/orgs/api.py

@@ -75,56 +75,10 @@ class OrgMemberRelationBulkViewSet(JMSBulkRelationModelViewSet):
     serializer_class = OrgMemberSerializer
     filterset_class = OrgMemberRelationFilterSet
 
-    @staticmethod
+    def perform_bulk_create(self, serializer):
-    def clear_request_data(request):
+        data = serializer.validated_data
-        data = request.data
+        relations = [OrganizationMember(**i) for i in data]
-
+        OrganizationMember.objects.bulk_create(relations, ignore_conflicts=True)
-        ignore_already_exist = request.query_params.get('ignore_already_exist')
-        if not ignore_already_exist:
-            return data
-
-        query_params = Q()
-        for _data in data:
-            query_fields = {}
-            org = _data.get('org')
-            if org:
-                query_fields.update({'org': org})
-            user = _data.get('user')
-            if user:
-                query_fields.update({'user': user})
-            role = _data.get('role')
-            if role:
-                query_fields.update({'role': role})
-            query_params |= Q(**query_fields)
-
-        if not query_params:
-            return data
-
-        members = OrganizationMember.objects.filter(query_params)
-        members = [
-            {'org': str(member.org_id), 'user': str(member.user_id), 'role': member.role}
-            for member in members
-        ]
-        if not members:
-            return data
-
-        for member in members:
-            if member in data:
-                data.remove(member)
-        return data
-
-    def create(self, request, *args, **kwargs):
-        bulk = isinstance(request.data, list)
-
-        if not bulk:
-            return CreateModelMixin.create(self, request, *args, **kwargs)
-
-        else:
-            data = self.clear_request_data(request)
-            serializer = self.get_serializer(data=data, many=True)
-            serializer.is_valid(raise_exception=True)
-            self.perform_bulk_create(serializer)
-            return Response(serializer.data, status=status.HTTP_201_CREATED)
 
     def perform_bulk_destroy(self, queryset):
         objs = list(queryset.all().prefetch_related('user', 'org'))

apps/orgs/filters.py

@@ -13,4 +13,4 @@ class OrgMemberRelationFilterSet(filterset.FilterSet):
 
     class Meta:
         model = OrganizationMember
-        fields = ('org_id', 'user_id', 'role', 'id')
+        fields = ('org_id', 'user_id', 'org', 'user', 'role', 'id')

apps/orgs/serializers.py

@@ -60,6 +60,11 @@ class OrgMemberSerializer(BulkModelSerializer):
         model = OrganizationMember
         fields = ('id', 'org', 'user', 'role', 'org_display', 'user_display', 'role_display')
 
+    def get_unique_together_validators(self):
+        if self.parent:
+            return []
+        return super().get_unique_together_validators()
+
     @classmethod
     def setup_eager_loading(cls, queryset):
         return queryset.annotate(