From 26281dd9d8995b39be3b6316b23cb64c48c11f31 Mon Sep 17 00:00:00 2001 From: Alexander Zobnin Date: Mon, 11 Dec 2017 19:46:05 +0300 Subject: [PATCH] refactor: format files by gofmt --- pkg/api/dashboard_acl.go | 2 +- pkg/api/dashboard_acl_test.go | 2 +- pkg/api/dtos/acl.go | 8 ++++---- pkg/models/dashboard_acl.go | 14 ++++++------- pkg/models/team.go | 10 +++++----- pkg/models/team_member.go | 22 ++++++++++----------- pkg/services/sqlstore/dashboard_acl.go | 2 +- pkg/services/sqlstore/dashboard_acl_test.go | 4 ++-- pkg/services/sqlstore/team.go | 10 +++++----- 9 files changed, 37 insertions(+), 37 deletions(-) diff --git a/pkg/api/dashboard_acl.go b/pkg/api/dashboard_acl.go index c40d6b767f7..88cc74b9d1c 100644 --- a/pkg/api/dashboard_acl.go +++ b/pkg/api/dashboard_acl.go @@ -43,7 +43,7 @@ func UpdateDashboardAcl(c *middleware.Context, apiCmd dtos.UpdateDashboardAclCom OrgId: c.OrgId, DashboardId: dashId, UserId: item.UserId, - TeamId: item.TeamId, + TeamId: item.TeamId, Role: item.Role, Permission: item.Permission, Created: time.Now(), diff --git a/pkg/api/dashboard_acl_test.go b/pkg/api/dashboard_acl_test.go index 82fb6244a23..e22e625dcf9 100644 --- a/pkg/api/dashboard_acl_test.go +++ b/pkg/api/dashboard_acl_test.go @@ -165,7 +165,7 @@ func transformDashboardAclsToDTOs(acls []*m.DashboardAclInfoDTO) []*m.DashboardA DashboardId: acl.DashboardId, Permission: acl.Permission, UserId: acl.UserId, - TeamId: acl.TeamId, + TeamId: acl.TeamId, } dtos = append(dtos, dto) } diff --git a/pkg/api/dtos/acl.go b/pkg/api/dtos/acl.go index 9a481c02f1a..6c74e68ce0d 100644 --- a/pkg/api/dtos/acl.go +++ b/pkg/api/dtos/acl.go @@ -9,8 +9,8 @@ type UpdateDashboardAclCommand struct { } type DashboardAclUpdateItem struct { - UserId int64 `json:"userId"` - TeamId int64 `json:"teamId"` - Role *m.RoleType `json:"role,omitempty"` - Permission m.PermissionType `json:"permission"` + UserId int64 `json:"userId"` + TeamId int64 `json:"teamId"` + Role *m.RoleType `json:"role,omitempty"` + Permission m.PermissionType `json:"permission"` } diff --git a/pkg/models/dashboard_acl.go b/pkg/models/dashboard_acl.go index 601cc16c80c..fa7ad00de7f 100644 --- a/pkg/models/dashboard_acl.go +++ b/pkg/models/dashboard_acl.go @@ -34,10 +34,10 @@ type DashboardAcl struct { OrgId int64 DashboardId int64 - UserId int64 - TeamId int64 - Role *RoleType // pointer to be nullable - Permission PermissionType + UserId int64 + TeamId int64 + Role *RoleType // pointer to be nullable + Permission PermissionType Created time.Time Updated time.Time @@ -54,8 +54,8 @@ type DashboardAclInfoDTO struct { UserId int64 `json:"userId"` UserLogin string `json:"userLogin"` UserEmail string `json:"userEmail"` - TeamId int64 `json:"teamId"` - Team string `json:"team"` + TeamId int64 `json:"teamId"` + Team string `json:"team"` Role *RoleType `json:"role,omitempty"` Permission PermissionType `json:"permission"` PermissionName string `json:"permissionName"` @@ -74,7 +74,7 @@ type SetDashboardAclCommand struct { DashboardId int64 OrgId int64 UserId int64 - TeamId int64 + TeamId int64 Permission PermissionType Result DashboardAcl diff --git a/pkg/models/team.go b/pkg/models/team.go index 7de69b9c133..a8f53e81a1e 100644 --- a/pkg/models/team.go +++ b/pkg/models/team.go @@ -46,7 +46,7 @@ type GetTeamByIdQuery struct { } type GetTeamsByUserQuery struct { - UserId int64 `json:"userId"` + UserId int64 `json:"userId"` Result []*Team `json:"teams"` } @@ -61,8 +61,8 @@ type SearchTeamsQuery struct { } type SearchTeamQueryResult struct { - TotalCount int64 `json:"totalCount"` - Teams []*Team `json:"teams"` - Page int `json:"page"` - PerPage int `json:"perPage"` + TotalCount int64 `json:"totalCount"` + Teams []*Team `json:"teams"` + Page int `json:"page"` + PerPage int `json:"perPage"` } diff --git a/pkg/models/team_member.go b/pkg/models/team_member.go index d2c646b0893..71e5cd4ba12 100644 --- a/pkg/models/team_member.go +++ b/pkg/models/team_member.go @@ -12,10 +12,10 @@ var ( // TeamMember model type TeamMember struct { - Id int64 - OrgId int64 + Id int64 + OrgId int64 TeamId int64 - UserId int64 + UserId int64 Created time.Time Updated time.Time @@ -25,13 +25,13 @@ type TeamMember struct { // COMMANDS type AddTeamMemberCommand struct { - UserId int64 `json:"userId" binding:"Required"` - OrgId int64 `json:"-"` + UserId int64 `json:"userId" binding:"Required"` + OrgId int64 `json:"-"` TeamId int64 `json:"-"` } type RemoveTeamMemberCommand struct { - UserId int64 + UserId int64 TeamId int64 } @@ -40,16 +40,16 @@ type RemoveTeamMemberCommand struct { type GetTeamMembersQuery struct { TeamId int64 - Result []*TeamMemberDTO + Result []*TeamMemberDTO } // ---------------------- // Projections and DTOs type TeamMemberDTO struct { - OrgId int64 `json:"orgId"` + OrgId int64 `json:"orgId"` TeamId int64 `json:"teamId"` - UserId int64 `json:"userId"` - Email string `json:"email"` - Login string `json:"login"` + UserId int64 `json:"userId"` + Email string `json:"email"` + Login string `json:"login"` } diff --git a/pkg/services/sqlstore/dashboard_acl.go b/pkg/services/sqlstore/dashboard_acl.go index cb4ded42f66..3ab0361d175 100644 --- a/pkg/services/sqlstore/dashboard_acl.go +++ b/pkg/services/sqlstore/dashboard_acl.go @@ -75,7 +75,7 @@ func SetDashboardAcl(cmd *m.SetDashboardAclCommand) error { entity := m.DashboardAcl{ OrgId: cmd.OrgId, - TeamId: cmd.TeamId, + TeamId: cmd.TeamId, UserId: cmd.UserId, Created: time.Now(), Updated: time.Now(), diff --git a/pkg/services/sqlstore/dashboard_acl_test.go b/pkg/services/sqlstore/dashboard_acl_test.go index aa8e8ab13bf..bb6363883d6 100644 --- a/pkg/services/sqlstore/dashboard_acl_test.go +++ b/pkg/services/sqlstore/dashboard_acl_test.go @@ -183,7 +183,7 @@ func TestDashboardAclDataAccess(t *testing.T) { Convey("Should be able to add a user permission for a team", func() { setDashAclCmd := m.SetDashboardAclCommand{ OrgId: 1, - TeamId: group1.Result.Id, + TeamId: group1.Result.Id, DashboardId: savedFolder.Id, Permission: m.PERMISSION_EDIT, } @@ -215,7 +215,7 @@ func TestDashboardAclDataAccess(t *testing.T) { Convey("Should be able to update an existing permission for a team", func() { err := SetDashboardAcl(&m.SetDashboardAclCommand{ OrgId: 1, - TeamId: group1.Result.Id, + TeamId: group1.Result.Id, DashboardId: savedFolder.Id, Permission: m.PERMISSION_ADMIN, }) diff --git a/pkg/services/sqlstore/team.go b/pkg/services/sqlstore/team.go index 252bb39cef0..2bc04bad0c6 100644 --- a/pkg/services/sqlstore/team.go +++ b/pkg/services/sqlstore/team.go @@ -196,11 +196,11 @@ func AddTeamMember(cmd *m.AddTeamMemberCommand) error { } entity := m.TeamMember{ - OrgId: cmd.OrgId, - TeamId: cmd.TeamId, - UserId: cmd.UserId, - Created: time.Now(), - Updated: time.Now(), + OrgId: cmd.OrgId, + TeamId: cmd.TeamId, + UserId: cmd.UserId, + Created: time.Now(), + Updated: time.Now(), } _, err := sess.Insert(&entity)