clean up

Author: arrestle

ansible_base/activitystream/models/entry.py

@@ -63,6 +63,13 @@ class Meta:
     )
 
     def __str__(self):
+        # Enhanced display for RBAC role assignments
+        if self.content_type and 'roleassignment' in self.content_type.model.lower():
+            operation_text = self.get_operation_display()
+            created_by_text = str(self.created_by) if self.created_by else "Unknown"
+            return f'[{self.created}] Role assignment {operation_text.lower()} by {created_by_text}'
+        
+        # Standard format for other entry types
         return f'[{self.created}] {self.get_operation_display()} by {self.created_by}: {self.content_type} {self.object_id}'
 
     @functools.cached_property

test_app/tests/rbac/test_rbac_activity_stream.py

@@ -56,6 +56,11 @@ def test_role_user_assignment_activity_stream_lifecycle(system_user, admin_user,
     assert assignment.activity_stream_entries.count() == 1
     create_entry = assignment.activity_stream_entries.last()
     verify_activity_entry_fields(create_entry, 'create', admin_user, test_user.id, role_def.id, 'user')
+    
+    # Verify enhanced string representation
+    entry_str = str(create_entry)
+    assert "Role assignment entity created by" in entry_str
+    assert str(admin_user) in entry_str
 
     # Delete assignment and verify DELETE entry
     assignment_id = assignment.id
@@ -73,6 +78,11 @@ def test_role_user_assignment_activity_stream_lifecycle(system_user, admin_user,
     assert assignment_entries.count() == 2
     delete_entry = assignment_entries.last()
     verify_activity_entry_fields(delete_entry, 'delete', admin_user, test_user.id, role_def.id, 'user')
+    
+    # Verify enhanced string representation for delete
+    delete_str = str(delete_entry)
+    assert "Role assignment entity deleted by" in delete_str
+    assert str(admin_user) in delete_str
 
 
 @pytest.mark.skipif(not apps.is_installed('ansible_base.activitystream'), reason="Activity stream tests only run when activitystream app is installed")
@@ -100,6 +110,11 @@ def test_role_team_assignment_activity_stream(admin_user, team, organization):
     assert assignment.activity_stream_entries.count() == 1
     create_entry = assignment.activity_stream_entries.last()
     verify_activity_entry_fields(create_entry, 'create', admin_user, team.id, role_def.id, 'team')
+    
+    # Verify enhanced string representation
+    entry_str = str(create_entry)
+    assert "Role assignment entity created by" in entry_str
+    assert str(admin_user) in entry_str
 
     # Delete assignment and verify DELETE entry
     assignment_id = assignment.id