Fix some go lint warnings

Author: sbecker

dao/user_dao.go

@@ -11,8 +11,8 @@ import (
 var users []models.User
 
 func InitDb() {
-	users = append(users, models.User{DefaultModel: models.DefaultModel{Id: "abc", ObjectType: "user"}, AuthToken: "userA", Email: "[email protected]", DOB: "01/23/1984", FavoriteCity: "Dallas"})
-	users = append(users, models.User{DefaultModel: models.DefaultModel{Id: "xyz", ObjectType: "user"}, AuthToken: "userB", Email: "[email protected]", DOB: "02/27/1991", FavoriteCity: "Portland", Admin: true})
+	users = append(users, models.User{DefaultModel: models.DefaultModel{ID: "abc", ObjectType: "user"}, AuthToken: "userA", Email: "[email protected]", DOB: "01/23/1984", FavoriteCity: "Dallas"})
+	users = append(users, models.User{DefaultModel: models.DefaultModel{ID: "xyz", ObjectType: "user"}, AuthToken: "userB", Email: "[email protected]", DOB: "02/27/1991", FavoriteCity: "Portland", Admin: true})
 }
 
 func GetAllUsers(currentUser models.User) []models.User {
@@ -24,26 +24,26 @@ func GetAllUsers(currentUser models.User) []models.User {
 	// if not admin, only return itself
 	var results []models.User
 	for _, u := range users {
-		if u.Id == currentUser.Id {
+		if u.ID == currentUser.ID {
 			results = append(results, u)
 		}
 	}
 	return results
 }
 
-func GetUserById(id string, currentUser models.User) (models.User, error) {
+func GetUserByID(id string, currentUser models.User) (models.User, error) {
 	// if not admin, make only itself findable
 	if !currentUser.Admin {
 		for _, u := range users {
-			if u.Id == id && u.Id == currentUser.Id {
+			if u.ID == id && u.ID == currentUser.ID {
 				return u, nil
 			}
 		}
 		return models.User{}, errors.New("Not found")
 	}
 
 	for _, u := range users {
-		if u.Id == id {
+		if u.ID == id {
 			return u, nil
 		}
 	}

main.go

@@ -11,12 +11,12 @@ func main() {
 	dao.InitDb()
 
 	r := gin.Default()
-	r.Use(middleware.RequestId)
+	r.Use(middleware.RequestID)
 	r.Use(middleware.Auth)
 	r.Use(middleware.CORS)
 
 	r.GET("/users", resources.GetAllUsers)
-	r.GET("/users/:id", resources.GetUserById)
+	r.GET("/users/:id", resources.GetUserByID)
 
 	r.Run(":8080") // listen and serve on 0.0.0.0:8080
 }

middleware/cors.go

@@ -2,7 +2,7 @@ package middleware
 
 import "github.com/gin-gonic/gin"
 
-// from https://github.com/gin-gonic/gin/issues/29#issuecomment-89132826
+// CORS middleware from https://github.com/gin-gonic/gin/issues/29#issuecomment-89132826
 func CORS(c *gin.Context) {
 	c.Writer.Header().Set("Access-Control-Allow-Origin", "*") // allow any origin domain
 	// c.Writer.Header().Set("Access-Control-Allow-Origin", "http://domain.com") // uncomment to restrict to single domain

middleware/request_id.go

@@ -5,13 +5,13 @@ import (
 	"github.com/pborman/uuid"
 )
 
-func RequestId(c *gin.Context) {
+func RequestID(c *gin.Context) {
 	// If Set-Request-Id header is set on request, use that for
 	// Request-Id response header. Otherwise, generate a new one.
-	requestId := c.Request.Header.Get("Set-Request-Id")
-	if requestId == "" {
-		requestId = uuid.New()
+	requestID := c.Request.Header.Get("Set-Request-Id")
+	if requestID == "" {
+		requestID = uuid.New()
 	}
-	c.Writer.Header().Set("Request-Id", requestId)
+	c.Writer.Header().Set("Request-Id", requestID)
 	c.Next()
 }

models/default_model.go

@@ -1,6 +1,6 @@
 package models
 
 type DefaultModel struct {
-	Id         string `json:"id"`
+	ID         string `json:"id"`
 	ObjectType string `json:"object"`
 }

resources/user_resource.go

@@ -12,7 +12,7 @@ func GetAllUsers(c *gin.Context) {
 	c.JSON(200, serializers.SerializeUsers(users, currentUser, "/users"))
 }
 
-func GetUserById(c *gin.Context) {
+func GetUserByID(c *gin.Context) {
 	currentUser := getCurrentUser(c)
 
 	id, err := getStringParam(c, "id")
@@ -21,7 +21,7 @@ func GetUserById(c *gin.Context) {
 		return
 	}
 
-	user, err := dao.GetUserById(id, currentUser)
+	user, err := dao.GetUserByID(id, currentUser)
 	if err != nil {
 		c.JSON(404, "Not Found")
 		return

serializers/user_serializers.go

@@ -55,15 +55,13 @@ func NewUsersSubsetJSON(users []models.User, URL string) UsersSubsetJSON {
 func SerializeUsers(users []models.User, currentUser models.User, URL string) interface{} {
 	if currentUser.Admin {
 		return NewUsersJSON(users, URL)
-	} else {
-		return NewUsersSubsetJSON(users, URL)
 	}
+	return NewUsersSubsetJSON(users, URL)
 }
 
 func SerializeUser(user models.User, currentUser models.User) interface{} {
 	if currentUser.Admin {
 		return user
-	} else {
-		return NewUserSubset(user)
 	}
+	return NewUserSubset(user)
 }