Dashboard snapshot: added delete key which can be used to delete snapshots, #1623

pkg/services/sqlstore/dashboard_snapshot.go

@@ -11,6 +11,7 @@ import (
 func init() {
 	bus.AddHandler("sql", CreateDashboardSnapshot)
 	bus.AddHandler("sql", GetDashboardSnapshot)
+	bus.AddHandler("sql", DeleteDashboardSnapshot)
 }
 
 func CreateDashboardSnapshot(cmd *m.CreateDashboardSnapshotCommand) error {
@@ -23,12 +24,16 @@ func CreateDashboardSnapshot(cmd *m.CreateDashboardSnapshotCommand) error {
 		}
 
 		snapshot := &m.DashboardSnapshot{
-			Key:       cmd.Key,
-			OrgId:     cmd.OrgId,
-			Dashboard: cmd.Dashboard,
-			Expires:   expires,
-			Created:   time.Now(),
-			Updated:   time.Now(),
+			Key:         cmd.Key,
+			DeleteKey:   cmd.DeleteKey,
+			OrgId:       cmd.OrgId,
+			UserId:      cmd.UserId,
+			External:    cmd.External,
+			ExternalUrl: cmd.ExternalUrl,
+			Dashboard:   cmd.Dashboard,
+			Expires:     expires,
+			Created:     time.Now(),
+			Updated:     time.Now(),
 		}
 
 		_, err := sess.Insert(snapshot)
@@ -38,6 +43,14 @@ func CreateDashboardSnapshot(cmd *m.CreateDashboardSnapshotCommand) error {
 	})
 }
 
+func DeleteDashboardSnapshot(cmd *m.DeleteDashboardSnapshotCommand) error {
+	return inTransaction(func(sess *xorm.Session) error {
+		var rawSql = "DELETE FROM dashboard_snapshot WHERE delete_key=?"
+		_, err := sess.Exec(rawSql, cmd.DeleteKey)
+		return err
+	})
+}
+
 func GetDashboardSnapshot(query *m.GetDashboardSnapshotQuery) error {
 	snapshot := m.DashboardSnapshot{Key: query.Key}
 	has, err := x.Get(&snapshot)

pkg/services/sqlstore/migrations/dashboard_snapshot_mig.go

@@ -19,12 +19,36 @@ func addDashboardSnapshotMigrations(mg *Migrator) {
 		},
 	}
 
+	// add v4
 	mg.AddMigration("create dashboard_snapshot table v4", NewAddTableMigration(snapshotV4))
-	addTableIndicesMigrations(mg, "v4", snapshotV4)
 
-	mg.AddMigration("add org_id to dashboard_snapshot", new(AddColumnMigration).
-		Table("dashboard_snapshot").Column(&Column{Name: "org_id", Type: DB_BigInt, Nullable: true}))
+	// drop v4
+	addDropAllIndicesMigrations(mg, "v4", snapshotV4)
+	mg.AddMigration("drop table dashboard_snapshot_v4 #1", NewDropTableMigration("dashboard_snapshot"))
 
-	mg.AddMigration("add index org_id to dashboard_snapshot",
-		NewAddIndexMigration(snapshotV4, &Index{Cols: []string{"org_id"}}))
+	snapshotV5 := Table{
+		Name: "dashboard_snapshot",
+		Columns: []*Column{
+			{Name: "id", Type: DB_BigInt, IsPrimaryKey: true, IsAutoIncrement: true},
+			{Name: "name", Type: DB_NVarchar, Length: 255, Nullable: false},
+			{Name: "key", Type: DB_NVarchar, Length: 255, Nullable: false},
+			{Name: "delete_key", Type: DB_NVarchar, Length: 255, Nullable: false},
+			{Name: "org_id", Type: DB_BigInt, Nullable: false},
+			{Name: "user_id", Type: DB_BigInt, Nullable: false},
+			{Name: "external", Type: DB_Bool, Nullable: false},
+			{Name: "external_url", Type: DB_NVarchar, Length: 255, Nullable: false},
+			{Name: "dashboard", Type: DB_Text, Nullable: false},
+			{Name: "expires", Type: DB_DateTime, Nullable: false},
+			{Name: "created", Type: DB_DateTime, Nullable: false},
+			{Name: "updated", Type: DB_DateTime, Nullable: false},
+		},
+		Indices: []*Index{
+			{Cols: []string{"key"}, Type: UniqueIndex},
+			{Cols: []string{"delete_key"}, Type: UniqueIndex},
+			{Cols: []string{"user_id"}},
+		},
+	}
+
+	mg.AddMigration("create dashboard_snapshot table v5 #2", NewAddTableMigration(snapshotV5))
+	addTableIndicesMigrations(mg, "v5", snapshotV5)
 }