feat(hybrid-cloud): Match RpcOrganizationMember data audit log to org member's data audit log (#49038)

Author: dashed

src/sentry/services/hybrid_cloud/organization/model.py

@@ -49,6 +49,7 @@ def class_name(self) -> str:
 
 class RpcTeamMember(RpcModel):
     id: int = -1
+    slug: str = ""
     is_active: bool = False
     role_id: str = ""
     project_ids: List[int] = Field(default_factory=list)
@@ -101,16 +102,25 @@ class RpcOrganizationMember(RpcOrganizationMemberSummary):
     project_ids: List[int] = Field(default_factory=list)
     scopes: List[str] = Field(default_factory=list)
     invite_status: int = Field(default_factory=_DefaultEnumHelpers.get_default_invite_status_value)
+    email: str = ""
+
+    def get_audit_log_metadata(self, user_email: Optional[str] = None) -> Mapping[str, Any]:
+        from sentry.models.organizationmember import invite_status_names
 
-    def get_audit_log_metadata(self, user_email: str) -> Mapping[str, Any]:
         team_ids = [mt.team_id for mt in self.member_teams]
+        team_slugs = [mt.slug for mt in self.member_teams]
+
+        if user_email is None:
+            user_email = self.email
 
         return {
             "email": user_email,
             "teams": team_ids,
             "has_global_access": self.has_global_access,
             "role": self.role,
-            "invite_status": self.invite_status,
+            "invite_status": invite_status_names[self.invite_status],
+            "user": self.user_id,
+            "teams_slugs": team_slugs,
         }
 
 

src/sentry/services/hybrid_cloud/organization/serial.py

@@ -53,6 +53,7 @@ def serialize_member(member: OrganizationMember) -> RpcOrganizationMember:
         scopes=list(member.get_scopes()),
         flags=_serialize_member_flags(member),
         invite_status=member.invite_status,
+        email=member.get_email(),
     )
 
     omts = OrganizationMemberTeam.objects.filter(
@@ -108,6 +109,7 @@ def _serialize_team_member(
 ) -> RpcTeamMember:
     result = RpcTeamMember(
         id=team_member.id,
+        slug=team_member.team.slug,
         is_active=team_member.is_active,
         role_id=team_member.get_team_role().id,
         team_id=team_member.team_id,

tests/sentry/hybrid_cloud/test_organization.py

@@ -20,7 +20,8 @@
     RpcTeamMember,
     organization_service,
 )
-from sentry.services.hybrid_cloud.organization.serial import unescape_flag_name
+from sentry.services.hybrid_cloud.organization.serial import serialize_member, unescape_flag_name
+from sentry.testutils import TestCase
 from sentry.testutils.factories import Factories
 from sentry.testutils.hybrid_cloud import use_real_service
 from sentry.testutils.silo import all_silo_test
@@ -229,3 +230,13 @@ def test_get_top_dog_team_member_ids(org_factory: Callable[[], Organization]):
     all_top_dogs = [members[1].id, members[2].id]
     service_top_dogs = organization_service.get_top_dog_team_member_ids(organization_id=orm_org)
     assert set(all_top_dogs) == set(service_top_dogs)
+
+
+class RpcOrganizationMemberTest(TestCase):
+    def test_get_audit_log_metadata(self):
+        org = self.create_organization(owner=self.user)
+        user = self.create_user(email="[email protected]")
+        member = self.create_member(user_id=user.id, role="owner", organization_id=org.id)
+        self.create_team(organization=org, slug="baz", members=[user])
+        rpc_member = serialize_member(member)
+        assert member.get_audit_log_data() == rpc_member.get_audit_log_metadata()