Make team assignment endpoint work same as user

Author: AlanCoding

ansible_base/rbac/service_api/views.py

@@ -41,25 +41,13 @@ class RolePermissionTypeViewSet(
 prefetch_related = ('created_by__resource', 'content_type', 'role_definition')
 
 
-class ServiceRoleUserAssignmentViewSet(
+class BaseSerivceRoleAssignmentViewSet(
     AnsibleBaseDjangoAppApiView,
     mixins.ListModelMixin,
     GenericViewSet,
 ):
     """List of assignments for cross-service communication"""
 
-    queryset = RoleUserAssignment.objects.prefetch_related('user__resource', *prefetch_related)
-    serializer_class = service_serializers.RoleUserAssignmentSerializer
-    filter_backends = AnsibleBaseDjangoAppApiView.filter_backends + [
-        ansible_id_backend.UserAnsibleIdAliasFilterBackend,
-        ansible_id_backend.RoleAssignmentFilterBackend,
-    ]
-    permission_classes = try_add_oauth2_scope_permission(
-        [
-            HasResourceRegistryPermissions,
-        ]
-    )
-
     def remote_secondary_sync_assignment(self, assignment, from_service=None):
         """To allow service-specific sync when getting assignment from /service-index/ endpoint
 
@@ -115,6 +103,20 @@ def perform_destroy(self, instance):
                 instance.role_definition.remove_global_permission(instance.actor)
 
 
+class ServiceRoleUserAssignmentViewSet(BaseSerivceRoleAssignmentViewSet):
+    queryset = RoleUserAssignment.objects.prefetch_related('user__resource', *prefetch_related)
+    serializer_class = service_serializers.RoleUserAssignmentSerializer
+    filter_backends = AnsibleBaseDjangoAppApiView.filter_backends + [
+        ansible_id_backend.UserAnsibleIdAliasFilterBackend,
+        ansible_id_backend.RoleAssignmentFilterBackend,
+    ]
+    permission_classes = try_add_oauth2_scope_permission(
+        [
+            HasResourceRegistryPermissions,
+        ]
+    )
+
+
 class ServiceRoleTeamAssignmentViewSet(
     AnsibleBaseDjangoAppApiView,
     mixins.ListModelMixin,

ansible_base/resource_registry/rest_client.py

@@ -207,7 +207,7 @@ def _sync_assignment(self, data, giving=True):
             sub_url = 'unassign'
 
         actor_type = 'user'
-        if 'team' in data:
+        if data.get('team_ansible_id'):
             actor_type = 'team'
 
         url = f'role-{actor_type}-assignments/{sub_url}/'