fix: allow leaving account if invitation sent (#1005)

migmartri · web-flow · commit 944be3f2267d · 2024-06-21T10:24:40.000+02:00
Signed-off-by: Miguel Martinez Trivino &lt;miguel@chainloop.dev&gt;
diff --git a/app/controlplane/pkg/data/ent/migrate/migrations/20240620214339.sql b/app/controlplane/pkg/data/ent/migrate/migrations/20240620214339.sql
@@ -0,0 +1,2 @@
+-- Modify "org_invitations" table
+ALTER TABLE "org_invitations" DROP CONSTRAINT "org_invitations_users_sender", ADD CONSTRAINT "org_invitations_users_sender" FOREIGN KEY ("sender_id") REFERENCES "users" ("id") ON UPDATE NO ACTION ON DELETE CASCADE;
diff --git a/app/controlplane/pkg/data/ent/migrate/migrations/atlas.sum b/app/controlplane/pkg/data/ent/migrate/migrations/atlas.sum
@@ -1,4 +1,4 @@
-h1:82cUwRJAj5kE2XfpFYdbdwE/i7/XKnfPfr8IgG1aslk=
+h1:2bUE9JYemsFf4AISpMSlMxMh6JgV7y7NQOyjg2WMcUM=
 20230706165452_init-schema.sql h1:VvqbNFEQnCvUVyj2iDYVQQxDM0+sSXqocpt/5H64k8M=
 20230710111950-cas-backend.sql h1:A8iBuSzZIEbdsv9ipBtscZQuaBp3V5/VMw7eZH6GX+g=
 20230712094107-cas-backends-workflow-runs.sql h1:a5rzxpVGyd56nLRSsKrmCFc9sebg65RWzLghKHh5xvI=
@@ -34,3 +34,4 @@ h1:82cUwRJAj5kE2XfpFYdbdwE/i7/XKnfPfr8IgG1aslk=
 20240410132210.sql h1:Ed1XXWkREYgOeTAAkVv+j3IV215TxgdXq+U5zIZOWuk=
 20240509153904.sql h1:qjQLIMmKH3CqJ01uMbvfvB8aHct3JBkx5GPoWcqUStU=
 20240619193218.sql h1:hJG4mhjqKQ2E0YEURM1x06MsFWJXUcKSqwNDJXUhGvc=
+20240620214339.sql h1:32nxfoUXtESJp8Du8r9tczQYNKNccUUm3Qp6tu/ixXE=
diff --git a/app/controlplane/pkg/data/ent/migrate/schema.go b/app/controlplane/pkg/data/ent/migrate/schema.go
@@ -255,7 +255,7 @@ var (
 				Symbol:     "org_invitations_users_sender",
 				Columns:    []*schema.Column{OrgInvitationsColumns[7]},
 				RefColumns: []*schema.Column{UsersColumns[0]},
-				OnDelete:   schema.NoAction,
+				OnDelete:   schema.Cascade,
 			},
 		},
 	}
diff --git a/app/controlplane/pkg/data/ent/schema/orginvitation.go b/app/controlplane/pkg/data/ent/schema/orginvitation.go
@@ -55,6 +55,6 @@ func (OrgInvitation) Fields() []ent.Field {
 func (OrgInvitation) Edges() []ent.Edge {
 	return []ent.Edge{
 		edge.To("organization", Organization.Type).Unique().Required().Field("organization_id").Annotations(entsql.Annotation{OnDelete: entsql.Cascade}),
-		edge.To("sender", User.Type).Unique().Required().Field("sender_id"),
+		edge.To("sender", User.Type).Unique().Required().Field("sender_id").Annotations(entsql.Annotation{OnDelete: entsql.Cascade}),
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+-- Modify "org_invitations" table`
	`2`	`+ALTER TABLE "org_invitations" DROP CONSTRAINT "org_invitations_users_sender", ADD CONSTRAINT "org_invitations_users_sender" FOREIGN KEY ("sender_id") REFERENCES "users" ("id") ON UPDATE NO ACTION ON DELETE CASCADE;`
Original file line number	Diff line number	Diff line change
`@@ -255,7 +255,7 @@ var (`
`255`	`255`	`Symbol: "org_invitations_users_sender",`
`256`	`256`	`Columns: []*schema.Column{OrgInvitationsColumns[7]},`
`257`	`257`	`RefColumns: []*schema.Column{UsersColumns[0]},`
`258`		`- OnDelete: schema.NoAction,`
	`258`	`+ OnDelete: schema.Cascade,`
`259`	`259`	`},`
`260`	`260`	`},`
`261`	`261`	`}`
Original file line number	Diff line number	Diff line change
`@@ -55,6 +55,6 @@ func (OrgInvitation) Fields() []ent.Field {`
`55`	`55`	`func (OrgInvitation) Edges() []ent.Edge {`
`56`	`56`	`return []ent.Edge{`
`57`	`57`	`edge.To("organization", Organization.Type).Unique().Required().Field("organization_id").Annotations(entsql.Annotation{OnDelete: entsql.Cascade}),`
`58`		`- edge.To("sender", User.Type).Unique().Required().Field("sender_id"),`
	`58`	`+ edge.To("sender", User.Type).Unique().Required().Field("sender_id").Annotations(entsql.Annotation{OnDelete: entsql.Cascade}),`
`59`	`59`	`}`
`60`	`60`	`}`