From 245a59548c6846b69496156ac065bdcd6bc6108e Mon Sep 17 00:00:00 2001 From: Serge Zaitsev Date: Wed, 23 Nov 2022 10:22:52 +0100 Subject: [PATCH] Chore: Remove DeleteOrg method from sqlstore (#59162) remove DeleteOrg method from sqlstore --- pkg/services/org/orgimpl/store_test.go | 2 +- pkg/services/sqlstore/org.go | 41 -------------------------- 2 files changed, 1 insertion(+), 42 deletions(-) diff --git a/pkg/services/org/orgimpl/store_test.go b/pkg/services/org/orgimpl/store_test.go index 357b86c6c82..e14d60369f2 100644 --- a/pkg/services/org/orgimpl/store_test.go +++ b/pkg/services/org/orgimpl/store_test.go @@ -402,7 +402,7 @@ func TestIntegrationOrgUserDataAccess(t *testing.T) { t.Run("Removing user from org should delete user completely if in no other org", func(t *testing.T) { // make sure ac2 has no org - err := ss.DeleteOrg(context.Background(), &models.DeleteOrgCommand{Id: ac2.OrgID}) + err := orgUserStore.Delete(context.Background(), &org.DeleteOrgCommand{ID: ac2.OrgID}) require.NoError(t, err) // remove ac2 user from ac1 org diff --git a/pkg/services/sqlstore/org.go b/pkg/services/sqlstore/org.go index 1231c2ea081..ce5a45e9ea7 100644 --- a/pkg/services/sqlstore/org.go +++ b/pkg/services/sqlstore/org.go @@ -113,47 +113,6 @@ func (ss *SQLStore) UpdateOrgAddress(ctx context.Context, cmd *models.UpdateOrgA }) } -func (ss *SQLStore) DeleteOrg(ctx context.Context, cmd *models.DeleteOrgCommand) error { - return ss.WithTransactionalDbSession(ctx, func(sess *DBSession) error { - if res, err := sess.Query("SELECT 1 from org WHERE id=?", cmd.Id); err != nil { - return err - } else if len(res) != 1 { - return models.ErrOrgNotFound - } - - deletes := []string{ - "DELETE FROM star WHERE EXISTS (SELECT 1 FROM dashboard WHERE org_id = ? AND star.dashboard_id = dashboard.id)", - "DELETE FROM dashboard_tag WHERE EXISTS (SELECT 1 FROM dashboard WHERE org_id = ? AND dashboard_tag.dashboard_id = dashboard.id)", - "DELETE FROM dashboard WHERE org_id = ?", - "DELETE FROM api_key WHERE org_id = ?", - "DELETE FROM data_source WHERE org_id = ?", - "DELETE FROM org_user WHERE org_id = ?", - "DELETE FROM org WHERE id = ?", - "DELETE FROM temp_user WHERE org_id = ?", - "DELETE FROM ngalert_configuration WHERE org_id = ?", - "DELETE FROM alert_configuration WHERE org_id = ?", - "DELETE FROM alert_instance WHERE rule_org_id = ?", - "DELETE FROM alert_notification WHERE org_id = ?", - "DELETE FROM alert_notification_state WHERE org_id = ?", - "DELETE FROM alert_rule WHERE org_id = ?", - "DELETE FROM alert_rule_tag WHERE EXISTS (SELECT 1 FROM alert WHERE alert.org_id = ? AND alert.id = alert_rule_tag.alert_id)", - "DELETE FROM alert_rule_version WHERE rule_org_id = ?", - "DELETE FROM alert WHERE org_id = ?", - "DELETE FROM annotation WHERE org_id = ?", - "DELETE FROM kv_store WHERE org_id = ?", - } - - for _, sql := range deletes { - _, err := sess.Exec(sql, cmd.Id) - if err != nil { - return err - } - } - - return nil - }) -} - func verifyExistingOrg(sess *DBSession, orgId int64) error { var org models.Org has, err := sess.Where("id=?", orgId).Get(&org)