style: apply code conventions

BrunoQuaresma · BrunoQuaresma · commit a39ba22a2dc3 · 2022-04-26T18:08:16.000Z
diff --git a/coderd/users.go b/coderd/users.go
@@ -24,8 +24,6 @@ import (
 	"github.com/coder/coder/cryptorand"
 )
 
-type OrganizationsByUserId = map[string][]database.Organization
-
 // Returns whether the initial user has been created or not.
 func (api *api) firstUser(rw http.ResponseWriter, r *http.Request) {
 	userCount, err := api.Database.GetUserCount(r.Context())
@@ -147,9 +145,9 @@ func (api *api) users(rw http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	organizationsByUserId := OrganizationsByUserId{}
+	organizationsByUserId := map[string][]database.Organization{}
 	for _, user := range users {
-		userOrganizations := getUserOrganizations(api, rw, r, user)
+		userOrganizations := userOrganizations(api, rw, r, user)
 		organizationsByUserId[user.ID.String()] = userOrganizations
 	}
 
@@ -221,7 +219,7 @@ func (api *api) postUser(rw http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	organizations := getUserOrganizations(api, rw, r, user)
+	organizations := userOrganizations(api, rw, r, user)
 
 	httpapi.Write(rw, http.StatusCreated, convertUser(user, organizations))
 }
@@ -230,7 +228,7 @@ func (api *api) postUser(rw http.ResponseWriter, r *http.Request) {
 // is completed in the middleware for this route.
 func (api *api) userByName(rw http.ResponseWriter, r *http.Request) {
 	user := httpmw.UserParam(r)
-	organizations := getUserOrganizations(api, rw, r, user)
+	organizations := userOrganizations(api, rw, r, user)
 	httpapi.Write(rw, http.StatusOK, convertUser(user, organizations))
 }
 
@@ -288,7 +286,7 @@ func (api *api) putUserProfile(rw http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	organizations := getUserOrganizations(api, rw, r, user)
+	organizations := userOrganizations(api, rw, r, user)
 
 	httpapi.Write(rw, http.StatusOK, convertUser(updatedUserProfile, organizations))
 }
@@ -309,7 +307,7 @@ func (api *api) putUserSuspend(rw http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	organizations := getUserOrganizations(api, rw, r, user)
+	organizations := userOrganizations(api, rw, r, user)
 
 	httpapi.Write(rw, http.StatusOK, convertUser(suspendedUser, organizations))
 }
@@ -652,11 +650,11 @@ func convertUser(user database.User, organizations []database.Organization) code
 		CreatedAt:       user.CreatedAt,
 		Username:        user.Username,
 		Status:          codersdk.UserStatus(user.Status),
-		OrganizationIds: orgIds,
+		OrganizationIDs: orgIds,
 	}
 }
 
-func convertUsers(users []database.User, organizationsByUserId OrganizationsByUserId) []codersdk.User {
+func convertUsers(users []database.User, organizationsByUserId map[string][]database.Organization) []codersdk.User {
 	converted := make([]codersdk.User, 0, len(users))
 	for _, u := range users {
 		userOrganizations := organizationsByUserId[u.ID.String()]
@@ -665,7 +663,7 @@ func convertUsers(users []database.User, organizationsByUserId OrganizationsByUs
 	return converted
 }
 
-func getUserOrganizations(api *api, rw http.ResponseWriter, r *http.Request, user database.User) []database.Organization {
+func userOrganizations(api *api, rw http.ResponseWriter, r *http.Request, user database.User) []database.Organization {
 	organizations, err := api.Database.GetOrganizationsByUserID(r.Context(), user.ID)
 	if errors.Is(err, sql.ErrNoRows) {
 		err = nil
diff --git a/coderd/users_test.go b/coderd/users_test.go
@@ -325,7 +325,7 @@ func TestUserByName(t *testing.T) {
 	user, err := client.User(context.Background(), codersdk.Me)
 
 	require.NoError(t, err)
-	require.Equal(t, firstUser.OrganizationID, user.OrganizationIds[0])
+	require.Equal(t, firstUser.OrganizationID, user.OrganizationIDs[0])
 }
 
 func TestGetUsers(t *testing.T) {
@@ -342,7 +342,7 @@ func TestGetUsers(t *testing.T) {
 	users, err := client.Users(context.Background(), codersdk.UsersRequest{})
 	require.NoError(t, err)
 	require.Len(t, users, 2)
-	require.Len(t, users[0].OrganizationIds, 1)
+	require.Len(t, users[0].OrganizationIDs, 1)
 }
 
 func TestOrganizationsByUser(t *testing.T) {
diff --git a/codersdk/users.go b/codersdk/users.go
@@ -42,7 +42,7 @@ type User struct {
 	CreatedAt       time.Time   `json:"created_at" validate:"required"`
 	Username        string      `json:"username" validate:"required"`
 	Status          UserStatus  `json:"status"`
-	OrganizationIds []uuid.UUID `json:"organization_ids"`
+	OrganizationIDs []uuid.UUID `json:"organization_ids"`
 }
 
 type CreateFirstUserRequest struct {

Original file line number	Diff line number	Diff line change
`@@ -24,8 +24,6 @@ import (`
`24`	`24`	`"github.com/coder/coder/cryptorand"`
`25`	`25`	`)`
`26`	`26`
`27`		`-type OrganizationsByUserId = map[string][]database.Organization`
`28`		`-`
`29`	`27`	`// Returns whether the initial user has been created or not.`
`30`	`28`	`func (api api) firstUser(rw http.ResponseWriter, r http.Request) {`
`31`	`29`	`userCount, err := api.Database.GetUserCount(r.Context())`
`@@ -147,9 +145,9 @@ func (api api) users(rw http.ResponseWriter, r http.Request) {`
`147`	`145`	`return`
`148`	`146`	`}`
`149`	`147`
`150`		`- organizationsByUserId := OrganizationsByUserId{}`
	`148`	`+ organizationsByUserId := map[string][]database.Organization{}`
`151`	`149`	`for _, user := range users {`
`152`		`- userOrganizations := getUserOrganizations(api, rw, r, user)`
	`150`	`+ userOrganizations := userOrganizations(api, rw, r, user)`
`153`	`151`	`organizationsByUserId[user.ID.String()] = userOrganizations`
`154`	`152`	`}`
`155`	`153`
`@@ -221,7 +219,7 @@ func (api api) postUser(rw http.ResponseWriter, r http.Request) {`
`221`	`219`	`return`
`222`	`220`	`}`
`223`	`221`
`224`		`- organizations := getUserOrganizations(api, rw, r, user)`
	`222`	`+ organizations := userOrganizations(api, rw, r, user)`
`225`	`223`
`226`	`224`	`httpapi.Write(rw, http.StatusCreated, convertUser(user, organizations))`
`227`	`225`	`}`
`@@ -230,7 +228,7 @@ func (api api) postUser(rw http.ResponseWriter, r http.Request) {`
`230`	`228`	`// is completed in the middleware for this route.`
`231`	`229`	`func (api api) userByName(rw http.ResponseWriter, r http.Request) {`
`232`	`230`	`user := httpmw.UserParam(r)`
`233`		`- organizations := getUserOrganizations(api, rw, r, user)`
	`231`	`+ organizations := userOrganizations(api, rw, r, user)`
`234`	`232`	`httpapi.Write(rw, http.StatusOK, convertUser(user, organizations))`
`235`	`233`	`}`
`236`	`234`
`@@ -288,7 +286,7 @@ func (api api) putUserProfile(rw http.ResponseWriter, r http.Request) {`
`288`	`286`	`return`
`289`	`287`	`}`
`290`	`288`
`291`		`- organizations := getUserOrganizations(api, rw, r, user)`
	`289`	`+ organizations := userOrganizations(api, rw, r, user)`
`292`	`290`
`293`	`291`	`httpapi.Write(rw, http.StatusOK, convertUser(updatedUserProfile, organizations))`
`294`	`292`	`}`
`@@ -309,7 +307,7 @@ func (api api) putUserSuspend(rw http.ResponseWriter, r http.Request) {`
`309`	`307`	`return`
`310`	`308`	`}`
`311`	`309`
`312`		`- organizations := getUserOrganizations(api, rw, r, user)`
	`310`	`+ organizations := userOrganizations(api, rw, r, user)`
`313`	`311`
`314`	`312`	`httpapi.Write(rw, http.StatusOK, convertUser(suspendedUser, organizations))`
`315`	`313`	`}`
`@@ -652,11 +650,11 @@ func convertUser(user database.User, organizations []database.Organization) code`
`652`	`650`	`CreatedAt: user.CreatedAt,`
`653`	`651`	`Username: user.Username,`
`654`	`652`	`Status: codersdk.UserStatus(user.Status),`
`655`		`- OrganizationIds: orgIds,`
	`653`	`+ OrganizationIDs: orgIds,`
`656`	`654`	`}`
`657`	`655`	`}`
`658`	`656`
`659`		`-func convertUsers(users []database.User, organizationsByUserId OrganizationsByUserId) []codersdk.User {`
	`657`	`+func convertUsers(users []database.User, organizationsByUserId map[string][]database.Organization) []codersdk.User {`
`660`	`658`	`converted := make([]codersdk.User, 0, len(users))`
`661`	`659`	`for _, u := range users {`
`662`	`660`	`userOrganizations := organizationsByUserId[u.ID.String()]`
`@@ -665,7 +663,7 @@ func convertUsers(users []database.User, organizationsByUserId OrganizationsByUs`
`665`	`663`	`return converted`
`666`	`664`	`}`
`667`	`665`
`668`		`-func getUserOrganizations(api api, rw http.ResponseWriter, r http.Request, user database.User) []database.Organization {`
	`666`	`+func userOrganizations(api api, rw http.ResponseWriter, r http.Request, user database.User) []database.Organization {`
`669`	`667`	`organizations, err := api.Database.GetOrganizationsByUserID(r.Context(), user.ID)`
`670`	`668`	`if errors.Is(err, sql.ErrNoRows) {`
`671`	`669`	`err = nil`
Original file line number	Diff line number	Diff line change
`@@ -325,7 +325,7 @@ func TestUserByName(t *testing.T) {`
`325`	`325`	`user, err := client.User(context.Background(), codersdk.Me)`
`326`	`326`
`327`	`327`	`require.NoError(t, err)`
`328`		`- require.Equal(t, firstUser.OrganizationID, user.OrganizationIds[0])`
	`328`	`+ require.Equal(t, firstUser.OrganizationID, user.OrganizationIDs[0])`
`329`	`329`	`}`
`330`	`330`
`331`	`331`	`func TestGetUsers(t *testing.T) {`
`@@ -342,7 +342,7 @@ func TestGetUsers(t *testing.T) {`
`342`	`342`	`users, err := client.Users(context.Background(), codersdk.UsersRequest{})`
`343`	`343`	`require.NoError(t, err)`
`344`	`344`	`require.Len(t, users, 2)`
`345`		`- require.Len(t, users[0].OrganizationIds, 1)`
	`345`	`+ require.Len(t, users[0].OrganizationIDs, 1)`
`346`	`346`	`}`
`347`	`347`
`348`	`348`	`func TestOrganizationsByUser(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ type User struct {`
`42`	`42`	CreatedAt time.Time `json:"created_at" validate:"required"`
`43`	`43`	Username string `json:"username" validate:"required"`
`44`	`44`	Status UserStatus `json:"status"`
`45`		- OrganizationIds []uuid.UUID `json:"organization_ids"`
	`45`	+ OrganizationIDs []uuid.UUID `json:"organization_ids"`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`type CreateFirstUserRequest struct {`