Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions src/sentry/api/endpoints/organization_onboarding_tasks.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ def post(self, request: Request, organization) -> Response:
if completion_seen:
values["completion_seen"] = timezone.now()

rows_affected, created = onboarding_tasks.create_or_update_onboarding_task(
_, created = onboarding_tasks.create_or_update_onboarding_task(
organization=organization,
task=task_id,
user=request.user,
Expand All @@ -72,8 +72,7 @@ def post(self, request: Request, organization) -> Response:
level="warning",
)

if rows_affected or created:
onboarding_tasks.try_mark_onboarding_complete(organization.id)
onboarding_tasks.try_mark_onboarding_complete(organization.id)

return Response(status=204)

Expand Down
6 changes: 4 additions & 2 deletions src/sentry/models/featureadoption.py
Original file line number Diff line number Diff line change
Expand Up @@ -179,8 +179,10 @@ def record(self, organization_id, feature_slug, **kwargs):
return False

if not self.in_cache(organization_id, feature_id):
row, created = self.create_or_update(
organization_id=organization_id, feature_id=feature_id, complete=True
_, created = self.update_or_create(
organization_id=organization_id,
feature_id=feature_id,
defaults={"complete": True},
)
self.set_cache(organization_id, feature_id)
return created
Expand Down
6 changes: 2 additions & 4 deletions src/sentry/models/options/organization_option.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,9 @@ def unset_value(self, organization: Organization, key: str) -> None:
self.reload_cache(organization.id, "organizationoption.unset_value")

def set_value(self, organization: Organization, key: str, value: Any) -> bool:
inst, created = self.create_or_update(
organization=organization, key=key, values={"value": value}
)
self.update_or_create(organization=organization, key=key, defaults={"value": value})
self.reload_cache(organization.id, "organizationoption.set_value")
return bool(created) or inst > 0
return True

def get_all_values(self, organization: Organization | int) -> Mapping[str, Any]:
if isinstance(organization, models.Model):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,11 @@ def fetch_onboarding_tasks(self, organization, user):
)

def create_or_update_onboarding_task(self, organization, user, task, values):
return self.Model.objects.create_or_update(
return self.Model.objects.update_or_create(
organization=organization,
task=task,
values=values,
defaults={"user_id": user.id},
defaults=values,
create_defaults={"user_id": user.id, **values},
)

def complete_onboarding_task(
Expand Down
6 changes: 3 additions & 3 deletions src/sentry/utils/mockdata/core.py
Original file line number Diff line number Diff line change
Expand Up @@ -391,7 +391,7 @@ def create_member(


def create_access_request(member: OrganizationMember, team: Team) -> None:
OrganizationAccessRequest.objects.create_or_update(member=member, team=team)
OrganizationAccessRequest.objects.get_or_create(member=member, team=team)


def generate_projects(organization: Organization) -> Mapping[str, Any]:
Expand Down Expand Up @@ -586,11 +586,11 @@ def populate_release(
authors=[str(a.id) for a in authors],
)

ReleaseProjectEnvironment.objects.create_or_update(
ReleaseProjectEnvironment.objects.update_or_create(
project=project,
environment=environment,
release=release,
defaults={"last_deploy_id": deploy.id},
create_defaults={"last_deploy_id": deploy.id},
)

Activity.objects.create(
Expand Down
4 changes: 0 additions & 4 deletions tests/sentry/test_no_create_or_update_usage.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,6 @@
"src/sentry/buffer/base.py",
"src/sentry/db/models/manager/base.py",
"src/sentry/nodestore/django/backend.py",
"src/sentry/onboarding_tasks/backends/organization_onboarding_task.py",
"src/sentry/models/featureadoption.py",
"src/sentry/models/options/organization_option.py",
"src/sentry/utils/mockdata/core.py",
"src/sentry/tasks/assemble.py",
"src/sentry/services/nodestore/django/backend.py",
}
Expand Down
Loading