diff --git a/pkg/services/sqlstore/dashboard_version.go b/pkg/services/sqlstore/dashboard_version.go index 92bed305a7c..29cedf08be9 100644 --- a/pkg/services/sqlstore/dashboard_version.go +++ b/pkg/services/sqlstore/dashboard_version.go @@ -32,12 +32,12 @@ func init() { // CompareDashboardVersionsCommand computes the JSON diff of two versions, // assigning the delta of the diff to the `Delta` field. func CompareDashboardVersionsCommand(cmd *m.CompareDashboardVersionsCommand) error { - original, err := getDashboardVersion(cmd.DashboardId, cmd.Original, cmd.OrgId) + original, err := getDashboardVersion(cmd.DashboardId, cmd.Original) if err != nil { return err } - newDashboard, err := getDashboardVersion(cmd.DashboardId, cmd.New, cmd.OrgId) + newDashboard, err := getDashboardVersion(cmd.DashboardId, cmd.New) if err != nil { return err } @@ -80,7 +80,7 @@ func CompareDashboardVersionsCommand(cmd *m.CompareDashboardVersionsCommand) err // GetDashboardVersion gets the dashboard version for the given dashboard ID // and version number. func GetDashboardVersion(query *m.GetDashboardVersionQuery) error { - result, err := getDashboardVersion(query.DashboardId, query.Version, query.OrgId) + result, err := getDashboardVersion(query.DashboardId, query.Version) if err != nil { return err } @@ -128,7 +128,7 @@ func RestoreDashboardVersion(cmd *m.RestoreDashboardVersionCommand) error { // session instead of using the global `x`, so we copy those functions // here, replacing `x` with `sess` dashboardVersion := m.DashboardVersion{} - has, err := sess.Where("dashboard_id=? AND version=? AND org_id=?", cmd.DashboardId, cmd.Version, cmd.OrgId).Get(&dashboardVersion) + has, err := sess.Where("dashboard_id=? AND version=?", cmd.DashboardId, cmd.Version).Get(&dashboardVersion) if err != nil { return err } @@ -190,9 +190,9 @@ func RestoreDashboardVersion(cmd *m.RestoreDashboardVersionCommand) error { // getDashboardVersion is a helper function that gets the dashboard version for // the given dashboard ID and version ID. -func getDashboardVersion(dashboardId int64, version int, orgId int64) (*m.DashboardVersion, error) { +func getDashboardVersion(dashboardId int64, version int) (*m.DashboardVersion, error) { dashboardVersion := m.DashboardVersion{} - has, err := x.Where("dashboard_id=? AND version=? AND org_id=?", dashboardId, version, orgId).Get(&dashboardVersion) + has, err := x.Where("dashboard_id=? AND version=?", dashboardId, version).Get(&dashboardVersion) if err != nil { return nil, err } diff --git a/pkg/services/sqlstore/dashboard_version_test.go b/pkg/services/sqlstore/dashboard_version_test.go index 22d98d7c284..31e02cd2b4d 100644 --- a/pkg/services/sqlstore/dashboard_version_test.go +++ b/pkg/services/sqlstore/dashboard_version_test.go @@ -30,15 +30,15 @@ func TestGetDashboardVersion(t *testing.T) { Convey("Get a Dashboard ID and version ID", func() { savedDash := insertTestDashboard("test dash 26", 1, "diff") - cmd := m.GetDashboardVersionCommand{ + query := m.GetDashboardVersionQuery{ DashboardId: savedDash.Id, Version: savedDash.Version, } - err := GetDashboardVersion(&cmd) + err := GetDashboardVersion(&query) So(err, ShouldBeNil) - So(savedDash.Id, ShouldEqual, cmd.DashboardId) - So(savedDash.Version, ShouldEqual, cmd.Version) + So(savedDash.Id, ShouldEqual, query.DashboardId) + So(savedDash.Version, ShouldEqual, query.Version) dashCmd := m.GetDashboardQuery{ OrgId: savedDash.OrgId, @@ -46,17 +46,17 @@ func TestGetDashboardVersion(t *testing.T) { } err = GetDashboard(&dashCmd) So(err, ShouldBeNil) - eq := reflect.DeepEqual(dashCmd.Result.Data, cmd.Result.Data) + eq := reflect.DeepEqual(dashCmd.Result.Data, query.Result.Data) So(eq, ShouldEqual, true) }) Convey("Attempt to get a version that doesn't exist", func() { - cmd := m.GetDashboardVersionCommand{ + query := m.GetDashboardVersionQuery{ DashboardId: int64(999), Version: 123, } - err := GetDashboardVersion(&cmd) + err := GetDashboardVersion(&query) So(err, ShouldNotBeNil) So(err, ShouldEqual, m.ErrDashboardVersionNotFound) }) @@ -69,24 +69,20 @@ func TestGetDashboardVersions(t *testing.T) { savedDash := insertTestDashboard("test dash 43", 1, "diff-all") Convey("Get all versions for a given Dashboard ID", func() { - cmd := m.GetDashboardVersionsCommand{ - DashboardId: savedDash.Id, - } + query := m.GetDashboardVersionsQuery{DashboardId: savedDash.Id, OrgId: 1} - err := GetDashboardVersions(&cmd) + err := GetDashboardVersions(&query) So(err, ShouldBeNil) - So(len(cmd.Result), ShouldEqual, 1) + So(len(query.Result), ShouldEqual, 1) }) Convey("Attempt to get the versions for a non-existent Dashboard ID", func() { - cmd := m.GetDashboardVersionsCommand{ - DashboardId: int64(999), - } + query := m.GetDashboardVersionsQuery{DashboardId: int64(999), OrgId: 1} - err := GetDashboardVersions(&cmd) + err := GetDashboardVersions(&query) So(err, ShouldNotBeNil) So(err, ShouldEqual, m.ErrNoVersionsForDashboardId) - So(len(cmd.Result), ShouldEqual, 0) + So(len(query.Result), ShouldEqual, 0) }) Convey("Get all versions for an updated dashboard", func() { @@ -94,12 +90,11 @@ func TestGetDashboardVersions(t *testing.T) { "tags": "different-tag", }) - cmd := m.GetDashboardVersionsCommand{ - DashboardId: savedDash.Id, - } - err := GetDashboardVersions(&cmd) + query := m.GetDashboardVersionsQuery{DashboardId: savedDash.Id, OrgId: 1} + err := GetDashboardVersions(&query) + So(err, ShouldBeNil) - So(len(cmd.Result), ShouldEqual, 2) + So(len(query.Result), ShouldEqual, 2) }) }) } @@ -114,19 +109,19 @@ func TestCompareDashboardVersions(t *testing.T) { }) Convey("Compare two versions that are different", func() { - getVersionCmd := m.GetDashboardVersionsCommand{ - DashboardId: savedDash.Id, - } - err := GetDashboardVersions(&getVersionCmd) + query := m.GetDashboardVersionsQuery{DashboardId: savedDash.Id, OrgId: 1} + + err := GetDashboardVersions(&query) So(err, ShouldBeNil) - So(len(getVersionCmd.Result), ShouldEqual, 2) + So(len(query.Result), ShouldEqual, 2) cmd := m.CompareDashboardVersionsCommand{ DashboardId: savedDash.Id, - Original: getVersionCmd.Result[0].Version, - New: getVersionCmd.Result[1].Version, + Original: query.Result[0].Version, + New: query.Result[1].Version, DiffType: m.DiffDelta, } + err = CompareDashboardVersionsCommand(&cmd) So(err, ShouldBeNil) So(cmd.Delta, ShouldNotBeNil) @@ -169,10 +164,8 @@ func TestRestoreDashboardVersion(t *testing.T) { }) Convey("Restore dashboard to a previous version", func() { - versionsCmd := m.GetDashboardVersionsCommand{ - DashboardId: savedDash.Id, - } - err := GetDashboardVersions(&versionsCmd) + query := m.GetDashboardVersionsQuery{DashboardId: savedDash.Id, OrgId: 1} + err := GetDashboardVersions(&query) So(err, ShouldBeNil) cmd := m.RestoreDashboardVersionCommand{