Skip to content

fix(DB): cleanup items on organization deletion #423

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 9, 2023
Merged

fix(DB): cleanup items on organization deletion #423

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions app/controlplane/internal/data/ent/migrate/migrations/20231108214833.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
-- Modify "cas_mappings" table
ALTER TABLE "cas_mappings" DROP CONSTRAINT "cas_mappings_cas_backends_cas_backend", DROP CONSTRAINT "cas_mappings_organizations_organization", DROP CONSTRAINT "cas_mappings_workflow_runs_workflow_run", ADD CONSTRAINT "cas_mappings_cas_backends_cas_backend" FOREIGN KEY ("cas_mapping_cas_backend") REFERENCES "cas_backends" ("id") ON UPDATE NO ACTION ON DELETE CASCADE, ADD CONSTRAINT "cas_mappings_organizations_organization" FOREIGN KEY ("cas_mapping_organization") REFERENCES "organizations" ("id") ON UPDATE NO ACTION ON DELETE CASCADE, ADD CONSTRAINT "cas_mappings_workflow_runs_workflow_run" FOREIGN KEY ("cas_mapping_workflow_run") REFERENCES "workflow_runs" ("id") ON UPDATE NO ACTION ON DELETE CASCADE;
-- Modify "org_invitations" table
ALTER TABLE "org_invitations" DROP CONSTRAINT "org_invitations_organizations_organization", ADD CONSTRAINT "org_invitations_organizations_organization" FOREIGN KEY ("organization_id") REFERENCES "organizations" ("id") ON UPDATE NO ACTION ON DELETE CASCADE;
3 changes: 2 additions & 1 deletion app/controlplane/internal/data/ent/migrate/migrations/atlas.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
h1:umLlSIQCvc7uyWfzCSY6x/ZzSF4Bm5/ahIM7HN5y1b8=
h1:5aUIvgmC3yamqOydvpGyxXZrwkoXCMOmXpk3tKjU0wc=
20230706165452_init-schema.sql h1:VvqbNFEQnCvUVyj2iDYVQQxDM0+sSXqocpt/5H64k8M=
20230710111950-cas-backend.sql h1:A8iBuSzZIEbdsv9ipBtscZQuaBp3V5/VMw7eZH6GX+g=
20230712094107-cas-backends-workflow-runs.sql h1:a5rzxpVGyd56nLRSsKrmCFc9sebg65RWzLghKHh5xvI=
Expand All @@ -10,3 +10,4 @@ h1:umLlSIQCvc7uyWfzCSY6x/ZzSF4Bm5/ahIM7HN5y1b8=
20230905084357.sql h1:VNLRcY8vRDq5WoHv6JqBMr8HCkxLxr0LFWQzvqVRTYk=
20230914221336.sql h1:MCsBIxQ6Ow1BEhCNEF0QfAkUJxPSPxJ4l5DyAOuKLlc=
20231031124431.sql h1:HxWLbK4otq1uvGWKqngAHcOL+8G+qHbFnhRfLZCboBQ=
20231108214833.sql h1:FWxUM9xcTv2Lt6YoR9zWhhcEIQl9dHswfd/P9dAKhWk=
8 changes: 4 additions & 4 deletions app/controlplane/internal/data/ent/migrate/schema.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,19 +56,19 @@ var (
Symbol: "cas_mappings_cas_backends_cas_backend",
Columns: []*schema.Column{CasMappingsColumns[3]},
RefColumns: []*schema.Column{CasBackendsColumns[0]},
OnDelete: schema.NoAction,
OnDelete: schema.Cascade,
},
{
Symbol: "cas_mappings_workflow_runs_workflow_run",
Columns: []*schema.Column{CasMappingsColumns[4]},
RefColumns: []*schema.Column{WorkflowRunsColumns[0]},
OnDelete: schema.SetNull,
OnDelete: schema.Cascade,
},
{
Symbol: "cas_mappings_organizations_organization",
Columns: []*schema.Column{CasMappingsColumns[5]},
RefColumns: []*schema.Column{OrganizationsColumns[0]},
OnDelete: schema.NoAction,
OnDelete: schema.Cascade,
},
},
Indexes: []*schema.Index{
Expand Down Expand Up @@ -189,7 +189,7 @@ var (
Symbol: "org_invitations_organizations_organization",
Columns: []*schema.Column{OrgInvitationsColumns[5]},
RefColumns: []*schema.Column{OrganizationsColumns[0]},
OnDelete: schema.NoAction,
OnDelete: schema.Cascade,
},
{
Symbol: "org_invitations_users_sender",
Expand Down
6 changes: 3 additions & 3 deletions app/controlplane/internal/data/ent/schema/casmapping.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@ func (CASMapping) Fields() []ent.Field {

func (CASMapping) Edges() []ent.Edge {
return []ent.Edge{
edge.To("cas_backend", CASBackend.Type).Unique().Required().Immutable(),
edge.To("workflow_run", WorkflowRun.Type).Unique().Immutable(),
edge.To("organization", Organization.Type).Unique().Required().Immutable(),
edge.To("cas_backend", CASBackend.Type).Unique().Required().Immutable().Annotations(entsql.Annotation{OnDelete: entsql.Cascade}),
edge.To("workflow_run", WorkflowRun.Type).Unique().Immutable().Annotations(entsql.Annotation{OnDelete: entsql.Cascade}),
edge.To("organization", Organization.Type).Unique().Required().Immutable().Annotations(entsql.Annotation{OnDelete: entsql.Cascade}),
}
}

Expand Down
2 changes: 1 addition & 1 deletion app/controlplane/internal/data/ent/schema/orginvitation.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ func (OrgInvitation) Fields() []ent.Field {

func (OrgInvitation) Edges() []ent.Edge {
return []ent.Edge{
edge.To("organization", Organization.Type).Unique().Required().Field("organization_id"),
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"),
}
}