chore(hybrid-cloud): Update user and inviter reference for org members (#48788)

src/sentry/api/endpoints/organization_teams.py

@@ -176,7 +176,7 @@ class OrganizationTeamsEndpoint(OrganizationEndpoint):
             if self.should_add_creator_to_team(request):
                 try:
                     member = OrganizationMember.objects.get(
-                        user=request.user, organization=organization
+                        user_id=request.user.id, organization=organization
                     )
                 except OrganizationMember.DoesNotExist:
                     pass

src/sentry/api/endpoints/rule_snooze.py

@@ -36,7 +36,7 @@ class RuleSnoozeSerializer(Serializer):  # type: ignore
 def can_edit_alert_rule(rule, organization, user_id, user):
     # make sure user has 'alert:write' scope
     try:
-        org_member = OrganizationMember.objects.get(organization=organization, user=user)
+        org_member = OrganizationMember.objects.get(organization=organization, user_id=user.id)
         if "alerts:write" not in org_member.get_scopes():
             return False
     except OrganizationMember.DoesNotExist:

src/sentry/api/endpoints/user_details.py

@@ -255,7 +255,7 @@ class UserDetailsEndpoint(UserEndpoint):
 
         if remaining_org_ids:
             OrganizationMember.objects.filter(
-                organization__in=remaining_org_ids, user=user
+                organization__in=remaining_org_ids, user_id=user.id
             ).delete()
 
         logging_data = {

src/sentry/api/invite_helper.py

@@ -52,7 +52,7 @@ class ApiInviteHelper:
                 om = OrganizationMember.objects.get(token=invite_token, id=invite_member_id)
             else:
                 om = OrganizationMember.objects.get(
-                    email=email, organization_id=organization_id, user=None
+                    email=email, organization_id=organization_id, user_id=None
                 )
         except OrganizationMember.DoesNotExist:
             # Unable to locate the pending organization member. Cannot setup
@@ -160,7 +160,7 @@ class ApiInviteHelper:
             return False
 
         query = OrganizationMember.objects.filter(
-            organization=self.organization, user=self.request.user
+            organization=self.organization, user_id=self.request.user.id
         )
         return query.exists()  # type: ignore[no-any-return]
 

src/sentry/auth/access.py

@@ -64,7 +64,7 @@ def get_permissions_for_user(user_id: int) -> FrozenSet[str]:
 def has_role_in_organization(role: str, organization: Organization, user_id: int) -> bool:
     query = OrganizationMember.objects.filter(
         user__is_active=True,
-        user=user_id,
+        user_id=user_id,
         organization_id=organization.id,
     )
     teams_with_org_role = organization.get_teams_with_org_roles([role])

src/sentry/incidents/endpoints/organization_alert_rule_details.py

@@ -112,7 +112,7 @@ class OrganizationAlertRuleDetailsEndpoint(OrganizationAlertRuleEndpoint):
             if alert_rule.owner and alert_rule.owner.type == ACTOR_TYPES["team"]:
                 team = alert_rule.owner.resolve()
                 if not OrganizationMemberTeam.objects.filter(
-                    organizationmember__user=request.user, team=team, is_active=True
+                    organizationmember__user_id=request.user.id, team=team, is_active=True
                 ).exists():
                     return False
         return True

src/sentry/incidents/endpoints/organization_alert_rule_index.py

@@ -46,7 +46,7 @@ class OrganizationCombinedRuleIndexEndpoint(OrganizationEndpoint):
                 "id", flat=True
             )
             user_team_list = OrganizationMemberTeam.objects.filter(
-                organizationmember__user=request.user, team__in=org_team_list
+                organizationmember__user_id=request.user.id, team__in=org_team_list
             ).values_list("team", flat=True)
             project_ids = Project.objects.filter(
                 teams__in=user_team_list, status=ObjectStatus.ACTIVE

src/sentry/models/organization.py

@@ -402,7 +402,7 @@ class Organization(Model, SnowflakeIdMixin):
         ):
             try:
                 to_member = OrganizationMember.objects.get(
-                    organization=to_org, user=from_member.user
+                    organization=to_org, user_id=from_member.user.id
                 )
             except OrganizationMember.DoesNotExist:
                 from_member.update(organization=to_org)

src/sentry/models/project.py

@@ -257,7 +257,7 @@ class Project(Model, PendingDeletionMixin, SnowflakeIdMixin):
 
         warnings.warn("Project.has_access is deprecated.", DeprecationWarning)
 
-        queryset = self.member_set.filter(user=user)
+        queryset = self.member_set.filter(user_id=user.id)
 
         if access is not None:
             queryset = queryset.filter(type__lte=access)

src/sentry/models/user.py

@@ -360,7 +360,7 @@ class User(BaseModel, AbstractBaseUser):
             # only applies if both users are members of obj.org
             # if roles are different, grants combined user the higher of the two
             to_member = OrganizationMember.objects.get(
-                organization=obj.organization_id, user=to_user
+                organization=obj.organization_id, user_id=to_user.id
             )
             if roles.get(obj.role).priority > roles.get(to_member.role).priority:
                 to_member.update(role=obj.role)