feat(team-workflow): Add team to GroupSubscription #55805

isabellaenriquez · 2023-09-06T20:14:50Z

Adds team to the GroupSubscription table and adds constraint that at least one of team_id or user_id is set.

github-actions · 2023-09-06T20:17:05Z

This PR has a migration; here is the generated SQL for src/sentry/migrations/0544_add_team_id_to_groupsubscription.py ()

--
-- Add field team to groupsubscription
--
ALTER TABLE "sentry_groupsubscription" ADD COLUMN "team_id" bigint NULL;
--
-- Alter field user_id on groupsubscription
--
ALTER TABLE "sentry_groupsubscription" ALTER COLUMN "user_id" DROP NOT NULL;
--
-- Alter unique_together for groupsubscription (2 constraint(s))
--
CREATE UNIQUE INDEX CONCURRENTLY "sentry_groupsubscription_group_id_team_id_ba7c937c_uniq" ON "sentry_groupsubscription" ("group_id", "team_id");
ALTER TABLE "sentry_groupsubscription" ADD CONSTRAINT "sentry_groupsubscription_group_id_team_id_ba7c937c_uniq" UNIQUE USING INDEX "sentry_groupsubscription_group_id_team_id_ba7c937c_uniq";
ALTER TABLE "sentry_groupsubscription" ADD CONSTRAINT "sentry_groupsubscription_team_id_255af5da_fk_sentry_team_id" FOREIGN KEY ("team_id") REFERENCES "sentry_team" ("id") DEFERRABLE INITIALLY DEFERRED NOT VALID;
ALTER TABLE "sentry_groupsubscription" VALIDATE CONSTRAINT "sentry_groupsubscription_team_id_255af5da_fk_sentry_team_id";
CREATE INDEX CONCURRENTLY "sentry_groupsubscription_team_id_255af5da" ON "sentry_groupsubscription" ("team_id");
--
-- Create constraint subscription_team_or_user_check on model groupsubscription
--
ALTER TABLE "sentry_groupsubscription" ADD CONSTRAINT "subscription_team_or_user_check" CHECK ((("team_id" IS NOT NULL AND "user_id" IS NULL) OR ("team_id" IS NULL AND "user_id" IS NOT NULL))) NOT VALID;
ALTER TABLE "sentry_groupsubscription" VALIDATE CONSTRAINT "subscription_team_or_user_check";

scefali · 2023-09-06T20:23:01Z

src/sentry/models/groupsubscription.py

@@ -178,7 +178,8 @@ class GroupSubscription(Model):

    project = FlexibleForeignKey("sentry.Project", related_name="subscription_set")
    group = FlexibleForeignKey("sentry.Group", related_name="subscription_set")
-    user_id = HybridCloudForeignKey(settings.AUTH_USER_MODEL, on_delete="CASCADE")
+    user_id = HybridCloudForeignKey(settings.AUTH_USER_MODEL, null=True, on_delete="CASCADE")
+    team_id = HybridCloudForeignKey("sentry.Team", null=True, db_index=True, on_delete="CASCADE")


@isabellaenriquez since this is in the region silo, I think we can just use FlexibleForeignKey instead of HybridCloudForeignKey

Yes, Steve is correct, HybridCloudForeignKey should only be used when a relationship spans regions. You want FlexibleForeignKey here.

codecov · 2023-09-06T21:09:33Z

Codecov Report

Merging #55805 (965fd43) into master (b00bfce) will increase coverage by 0.00%.
The diff coverage is 100.00%.

@@           Coverage Diff           @@
##           master   #55805   +/-   ##
=======================================
  Coverage   79.96%   79.97%           
=======================================
  Files        5055     5055           
  Lines      217220   217222    +2     
  Branches    36784    36784           
=======================================
+ Hits       173705   173714    +9     
+ Misses      38186    38180    -6     
+ Partials     5329     5328    -1

Files Changed	Coverage
src/sentry/models/groupsubscription.py	`100.00%`

src/sentry/models/groupsubscription.py

markstory · 2023-09-07T14:08:37Z

src/sentry/migrations/0544_add_team_id_to_groupsubscription.py

+    # - Adding indexes to large tables. Since this can take a long time, we'd generally prefer to
+    #   have ops run this and not block the deploy. Note that while adding an index is a schema
+    #   change, it's completely safe to run the operation after the code has deployed.
+    is_dangerous = False


The groupsubscription table has ~30M rows. You should fit within the deployment timeout, but if you want to be cautious you should make this migration is_dangerous = True and have SRE run it.

github-actions · 2023-09-07T17:00:00Z

This PR has a migration; here is the generated SQL for src/sentry/migrations/0543_add_team_id_to_groupsubscription.py ()

--
-- Add field team to groupsubscription
--
ALTER TABLE "sentry_groupsubscription" ADD COLUMN "team_id" bigint NULL;
--
-- Alter field user_id on groupsubscription
--
ALTER TABLE "sentry_groupsubscription" ALTER COLUMN "user_id" DROP NOT NULL;
--
-- Alter unique_together for groupsubscription (2 constraint(s))
--
CREATE UNIQUE INDEX CONCURRENTLY "sentry_groupsubscription_group_id_team_id_ba7c937c_uniq" ON "sentry_groupsubscription" ("group_id", "team_id");
ALTER TABLE "sentry_groupsubscription" ADD CONSTRAINT "sentry_groupsubscription_group_id_team_id_ba7c937c_uniq" UNIQUE USING INDEX "sentry_groupsubscription_group_id_team_id_ba7c937c_uniq";
ALTER TABLE "sentry_groupsubscription" ADD CONSTRAINT "sentry_groupsubscription_team_id_255af5da_fk_sentry_team_id" FOREIGN KEY ("team_id") REFERENCES "sentry_team" ("id") DEFERRABLE INITIALLY DEFERRED NOT VALID;
ALTER TABLE "sentry_groupsubscription" VALIDATE CONSTRAINT "sentry_groupsubscription_team_id_255af5da_fk_sentry_team_id";
CREATE INDEX CONCURRENTLY "sentry_groupsubscription_team_id_255af5da" ON "sentry_groupsubscription" ("team_id");
--
-- Create constraint subscription_team_or_user_check on model groupsubscription
--
ALTER TABLE "sentry_groupsubscription" ADD CONSTRAINT "subscription_team_or_user_check" CHECK ((("team_id" IS NOT NULL AND "user_id" IS NULL) OR ("team_id" IS NULL AND "user_id" IS NOT NULL))) NOT VALID;
ALTER TABLE "sentry_groupsubscription" VALIDATE CONSTRAINT "subscription_team_or_user_check";

getsentry-bot · 2023-09-07T18:35:23Z

revert failed (conflict? already reverted?) -- check the logs

this pr adds back the addition of team as a field on GroupSubscription (originally from #55805 , removed in #55870) .

Add team id to GroupSubscription

04fc8ad

isabellaenriquez requested a review from a team as a code owner September 6, 2023 20:14

github-actions bot added the Scope: Backend Automatically applied to PRs that change backend components label Sep 6, 2023

isabellaenriquez self-assigned this Sep 6, 2023

isabellaenriquez requested a review from a team September 6, 2023 20:16

scefali reviewed Sep 6, 2023

View reviewed changes

Change HybridCloudForeignKey to FlexibleForeignKey

f1261ec

vercel bot deployed to Preview September 6, 2023 20:42 View deployment

isabellaenriquez requested review from scefali and markstory September 6, 2023 20:52

Update test fixtures

44a3218

vercel bot deployed to Preview September 6, 2023 21:56 View deployment

markstory reviewed Sep 6, 2023

View reviewed changes

src/sentry/models/groupsubscription.py Outdated Show resolved Hide resolved

src/sentry/models/groupsubscription.py Outdated Show resolved Hide resolved

isabellaenriquez added 2 commits September 6, 2023 15:32

Rename team_id to team

1f012f7

Update fixture

afc54f8

isabellaenriquez requested a review from markstory September 6, 2023 22:34

vercel bot deployed to Preview September 6, 2023 22:38 View deployment

markstory approved these changes Sep 7, 2023

View reviewed changes

delete migration for regeneration

2fb2929

vercel bot deployed to Preview September 7, 2023 16:13 View deployment

isabellaenriquez changed the title ~~feat(team-workflow): Add team ID to GroupSubscription~~ feat(team-workflow): Add team to GroupSubscription Sep 7, 2023

Merge branch 'master' into isabellaenriquez/team-workflow-constraint

f0bbaa3

vercel bot deployed to Preview September 7, 2023 16:55 View deployment

Regenerate migration + mark dangerous

965fd43

vercel bot deployed to Preview September 7, 2023 16:59 View deployment

scefali approved these changes Sep 7, 2023

View reviewed changes

isabellaenriquez merged commit 3645068 into master Sep 7, 2023
58 checks passed

isabellaenriquez deleted the isabellaenriquez/team-workflow-constraint branch September 7, 2023 17:33

isabellaenriquez added the Trigger: Revert Add to a merged PR to revert it (skips CI) label Sep 7, 2023

This was referenced Sep 7, 2023

revert(team-workflow): Remove changes to migration #55866

Closed

feat(team-workflow): Add team to GroupSubscription #55879

Merged

roggenkemper added a commit that referenced this pull request Sep 12, 2023

feat(team-workflow): Add team to GroupSubscription (#55879)

8a3850a

this pr adds back the addition of team as a field on GroupSubscription (originally from #55805 , removed in #55870) .

github-actions bot locked and limited conversation to collaborators Sep 23, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat(team-workflow): Add team to GroupSubscription #55805

feat(team-workflow): Add team to GroupSubscription #55805

isabellaenriquez commented Sep 6, 2023 •

edited

Loading

github-actions bot commented Sep 6, 2023 •

edited

Loading

scefali Sep 6, 2023

markstory Sep 6, 2023

codecov bot commented Sep 6, 2023 •

edited

Loading

markstory Sep 7, 2023

github-actions bot commented Sep 7, 2023

getsentry-bot commented Sep 7, 2023

feat(team-workflow): Add team to GroupSubscription #55805

feat(team-workflow): Add team to GroupSubscription #55805

Conversation

isabellaenriquez commented Sep 6, 2023 • edited Loading

github-actions bot commented Sep 6, 2023 • edited Loading

scefali Sep 6, 2023

Choose a reason for hiding this comment

markstory Sep 6, 2023

Choose a reason for hiding this comment

codecov bot commented Sep 6, 2023 • edited Loading

Codecov Report

markstory Sep 7, 2023

Choose a reason for hiding this comment

github-actions bot commented Sep 7, 2023

getsentry-bot commented Sep 7, 2023

isabellaenriquez commented Sep 6, 2023 •

edited

Loading

github-actions bot commented Sep 6, 2023 •

edited

Loading

codecov bot commented Sep 6, 2023 •

edited

Loading