Add test coverage in the existing format and more fixes

Author: AlanCoding

ansible_base/rbac/models/fields.py

@@ -111,7 +111,7 @@ def _is_cached_object_valid(self, rel_obj, ct_id, pk_val):
             return False
 
         ct_match = ct_id == self.get_content_type(obj=rel_obj).id
-        pk_match = ct_match and rel_obj.pk == pk_val
+        pk_match = ct_match and str(rel_obj.pk) == str(pk_val)
         return pk_match
 
     def _fetch_related_object(self, ct_id, pk_val):

ansible_base/rbac/remote.py

@@ -117,7 +117,10 @@ def summary_fields(self):
         This placeholder should be cleary identifable by a client or by the RBAC resource server.
         Then, the idea, is that it can make a request to the remote server to get the summary data.
         """
-        return {'<remote_object_placeholder>': True, 'model_name': self._meta.model_name, 'service': self._meta.service, 'pk': self.pk}
+        pk_val = self.pk
+        if not isinstance(pk_val, int):
+            pk_val = str(pk_val)
+        return {'<remote_object_placeholder>': True, 'model_name': self._meta.model_name, 'service': self._meta.service, 'pk': pk_val}
 
 
 def get_remote_base_class() -> Type[RemoteObject]:

test_app/tests/rbac/remote/test_public_api_compat.py

@@ -6,6 +6,7 @@
 from ansible_base.rbac import permission_registry
 from ansible_base.rbac.models import RoleUserAssignment
 from ansible_base.rbac.remote import RemoteObject
+from ansible_base.rbac.service_api.serializers import ServiceRoleUserAssignmentSerializer
 from test_app.models import Organization
 
 # Role Definitions
@@ -120,9 +121,20 @@ def test_give_permission_to_remote_object_uuid(admin_api_client, rando, foo_type
     valid_items = [item for item in response.data['results'] if item['id'] == assignment.id]
     assert len(valid_items) == 1
     assignment_data = valid_items[0]
-    assert 'summary_fields' in assignment_data
-    sf = assignment_data['summary_fields']
-    assert 'content_object' in sf
-    assert str(sf['content_object']['pk']) == str(a_foo.object_id)
+    assert 'content_object' in assignment_data['summary_fields']
+    assert assignment_data['summary_fields']['content_object']['pk'] == str(a_foo.object_id)
 
     assert rando.has_obj_perm(a_foo, 'foo')
+
+    # Test that we can serialize the assignment in a GET to the service-index endpoint
+    service_url = get_relative_url('serviceuserassignment-list')
+    response = admin_api_client.get(service_url + f'?user={rando.id}', format="json")
+    assert response.status_code == 200, response.data
+    assert response.data['count'] == 1
+    assignment_data = response.data['results'][0]
+    assert assignment_data['object_id'] == str(assignment.object_id)
+
+    # Direct serialization is used for synchronizing, so test that as well here
+    serializer = ServiceRoleUserAssignmentSerializer(assignment)
+    assignment_data = serializer.data
+    assert assignment_data['object_id'] == str(assignment.object_id)

test_app/tests/rbac/remote/test_remote_assignment.py

@@ -36,7 +36,7 @@ def test_give_remote_permission(rando, foo_type, foo_permission, foo_rd):
 
 
 @pytest.mark.django_db
-def test_prefetch_related_objects(foo_type, foo_type_uuid, foo_rd, foo_rd_uuid, inv_rd, inventory):
+def test_prefetch_related_objects(django_assert_num_queries, foo_type, foo_type_uuid, foo_rd, foo_rd_uuid, inv_rd, inventory):
     users = [User.objects.create(username=f'user{i}') for i in range(10)]
 
     a_foo = RemoteObject(content_type=foo_type, object_id=42)
@@ -47,9 +47,12 @@ def test_prefetch_related_objects(foo_type, foo_type_uuid, foo_rd, foo_rd_uuid,
         inv_rd.give_permission(u, inventory)
 
     assert RoleUserAssignment.objects.count() == 10 * 3
-    assert {assignment.content_object for assignment in RoleUserAssignment.objects.all()} == {a_foo, inventory, a_foo_uuid}
-    assert {assignment.content_object for assignment in RoleUserAssignment.objects.all()} == {a_foo, inventory, a_foo_uuid}
-    assert {assignment.content_object for assignment in RoleUserAssignment.objects.prefetch_related('content_object')} == {a_foo, inventory, a_foo_uuid}
+    for _ in range(2):
+        with django_assert_num_queries(11):
+            assert {assignment.content_object for assignment in RoleUserAssignment.objects.all()} == {a_foo, inventory, a_foo_uuid}
+    for _ in range(2):
+        with django_assert_num_queries(2):
+            assert {assignment.content_object for assignment in RoleUserAssignment.objects.prefetch_related('content_object')} == {a_foo, inventory, a_foo_uuid}
 
 
 @pytest.mark.django_db