cleanup unused fields (#54115)

This PR removes unused struct fields in SavePublicDashboardCommand
This commit is contained in:
Jeff Levin
2022-08-24 17:29:01 -08:00
committed by GitHub
parent fe87ffdda0
commit 6128cb60b4
3 changed files with 0 additions and 22 deletions

View File

@@ -68,8 +68,6 @@ func TestIntegrationGetPublicDashboard(t *testing.T) {
setup() setup()
_, err := publicdashboardStore.SavePublicDashboardConfig(context.Background(), SavePublicDashboardConfigCommand{ _, err := publicdashboardStore.SavePublicDashboardConfig(context.Background(), SavePublicDashboardConfigCommand{
DashboardUid: savedDashboard.Uid,
OrgId: savedDashboard.OrgId,
PublicDashboard: PublicDashboard{ PublicDashboard: PublicDashboard{
IsEnabled: true, IsEnabled: true,
Uid: "abc123", Uid: "abc123",
@@ -101,8 +99,6 @@ func TestIntegrationGetPublicDashboard(t *testing.T) {
setup() setup()
_, err := publicdashboardStore.SavePublicDashboardConfig(context.Background(), SavePublicDashboardConfigCommand{ _, err := publicdashboardStore.SavePublicDashboardConfig(context.Background(), SavePublicDashboardConfigCommand{
DashboardUid: savedDashboard.Uid,
OrgId: savedDashboard.OrgId,
PublicDashboard: PublicDashboard{ PublicDashboard: PublicDashboard{
IsEnabled: true, IsEnabled: true,
Uid: "abc123", Uid: "abc123",
@@ -125,8 +121,6 @@ func TestIntegrationGetPublicDashboard(t *testing.T) {
setup() setup()
_, err := publicdashboardStore.SavePublicDashboardConfig(context.Background(), SavePublicDashboardConfigCommand{ _, err := publicdashboardStore.SavePublicDashboardConfig(context.Background(), SavePublicDashboardConfigCommand{
DashboardUid: savedDashboard.Uid,
OrgId: savedDashboard.OrgId,
PublicDashboard: PublicDashboard{ PublicDashboard: PublicDashboard{
IsEnabled: false, IsEnabled: false,
Uid: "abc123", Uid: "abc123",
@@ -183,8 +177,6 @@ func TestIntegrationGetPublicDashboard(t *testing.T) {
t.Run("returns ErrDashboardNotFound when Dashboard not found", func(t *testing.T) { t.Run("returns ErrDashboardNotFound when Dashboard not found", func(t *testing.T) {
setup() setup()
_, err := publicdashboardStore.SavePublicDashboardConfig(context.Background(), SavePublicDashboardConfigCommand{ _, err := publicdashboardStore.SavePublicDashboardConfig(context.Background(), SavePublicDashboardConfigCommand{
DashboardUid: savedDashboard.Uid,
OrgId: savedDashboard.OrgId,
PublicDashboard: PublicDashboard{ PublicDashboard: PublicDashboard{
IsEnabled: true, IsEnabled: true,
Uid: "abc1234", Uid: "abc1234",
@@ -231,8 +223,6 @@ func TestIntegrationGetPublicDashboardConfig(t *testing.T) {
setup() setup()
// insert test public dashboard // insert test public dashboard
resp, err := publicdashboardStore.SavePublicDashboardConfig(context.Background(), SavePublicDashboardConfigCommand{ resp, err := publicdashboardStore.SavePublicDashboardConfig(context.Background(), SavePublicDashboardConfigCommand{
DashboardUid: savedDashboard.Uid,
OrgId: savedDashboard.OrgId,
PublicDashboard: PublicDashboard{ PublicDashboard: PublicDashboard{
IsEnabled: true, IsEnabled: true,
Uid: "pubdash-uid", Uid: "pubdash-uid",
@@ -272,8 +262,6 @@ func TestIntegrationSavePublicDashboardConfig(t *testing.T) {
t.Run("saves new public dashboard", func(t *testing.T) { t.Run("saves new public dashboard", func(t *testing.T) {
setup() setup()
resp, err := publicdashboardStore.SavePublicDashboardConfig(context.Background(), SavePublicDashboardConfigCommand{ resp, err := publicdashboardStore.SavePublicDashboardConfig(context.Background(), SavePublicDashboardConfigCommand{
DashboardUid: savedDashboard.Uid,
OrgId: savedDashboard.OrgId,
PublicDashboard: PublicDashboard{ PublicDashboard: PublicDashboard{
IsEnabled: true, IsEnabled: true,
Uid: "pubdash-uid", Uid: "pubdash-uid",
@@ -323,8 +311,6 @@ func TestIntegrationUpdatePublicDashboard(t *testing.T) {
pdUid := "asdf1234" pdUid := "asdf1234"
_, err := publicdashboardStore.SavePublicDashboardConfig(context.Background(), SavePublicDashboardConfigCommand{ _, err := publicdashboardStore.SavePublicDashboardConfig(context.Background(), SavePublicDashboardConfigCommand{
DashboardUid: savedDashboard.Uid,
OrgId: savedDashboard.OrgId,
PublicDashboard: PublicDashboard{ PublicDashboard: PublicDashboard{
Uid: pdUid, Uid: pdUid,
DashboardUid: savedDashboard.Uid, DashboardUid: savedDashboard.Uid,
@@ -340,8 +326,6 @@ func TestIntegrationUpdatePublicDashboard(t *testing.T) {
// inserting two different public dashboards to test update works and only affect the desired pd by uid // inserting two different public dashboards to test update works and only affect the desired pd by uid
anotherPdUid := "anotherUid" anotherPdUid := "anotherUid"
_, err = publicdashboardStore.SavePublicDashboardConfig(context.Background(), SavePublicDashboardConfigCommand{ _, err = publicdashboardStore.SavePublicDashboardConfig(context.Background(), SavePublicDashboardConfigCommand{
DashboardUid: anotherSavedDashboard.Uid,
OrgId: anotherSavedDashboard.OrgId,
PublicDashboard: PublicDashboard{ PublicDashboard: PublicDashboard{
Uid: anotherPdUid, Uid: anotherPdUid,
DashboardUid: anotherSavedDashboard.Uid, DashboardUid: anotherSavedDashboard.Uid,
@@ -365,8 +349,6 @@ func TestIntegrationUpdatePublicDashboard(t *testing.T) {
} }
// update initial record // update initial record
err = publicdashboardStore.UpdatePublicDashboardConfig(context.Background(), SavePublicDashboardConfigCommand{ err = publicdashboardStore.UpdatePublicDashboardConfig(context.Background(), SavePublicDashboardConfigCommand{
DashboardUid: savedDashboard.Uid,
OrgId: savedDashboard.OrgId,
PublicDashboard: updatedPublicDashboard, PublicDashboard: updatedPublicDashboard,
}) })
require.NoError(t, err) require.NoError(t, err)

View File

@@ -113,7 +113,5 @@ type SavePublicDashboardConfigDTO struct {
// //
type SavePublicDashboardConfigCommand struct { type SavePublicDashboardConfigCommand struct {
DashboardUid string
OrgId int64
PublicDashboard PublicDashboard PublicDashboard PublicDashboard
} }

View File

@@ -124,8 +124,6 @@ func (pd *PublicDashboardServiceImpl) savePublicDashboardConfig(ctx context.Cont
} }
cmd := SavePublicDashboardConfigCommand{ cmd := SavePublicDashboardConfigCommand{
DashboardUid: dto.DashboardUid,
OrgId: dto.OrgId,
PublicDashboard: PublicDashboard{ PublicDashboard: PublicDashboard{
Uid: uid, Uid: uid,
DashboardUid: dto.DashboardUid, DashboardUid: dto.DashboardUid,