smol

pkg/common/requests/requests_builders.go

@@ -69,16 +69,20 @@ func (req *DeleteUserRequest) Build(c GinI) error {
 }
 
 func (req *SearchUsersRequest) Build(c GinI) error {
-	var err error
+	var (
+		err            = error(nil)
+		defaultPage    = "0"
+		defaultPerPage = "10"
+	)
 
 	req.Username = c.Query("username")
 
-	req.Page, err = strconv.Atoi(c.DefaultQuery("page", "0"))
+	req.Page, err = strconv.Atoi(c.DefaultQuery("page", defaultPage))
 	if err != nil {
 		return common.ErrInvalidValue
 	}
 
-	req.PerPage, err = strconv.Atoi(c.DefaultQuery("per_page", "10"))
+	req.PerPage, err = strconv.Atoi(c.DefaultQuery("per_page", defaultPerPage))
 	if err != nil {
 		return common.ErrInvalidValue
 	}

pkg/service/service_users.go

@@ -57,6 +57,7 @@ func (s *service) UpdateUser(updateUserRequest requests.UpdateUserRequest) (resp
 		return responses.UpdateUserResponse{}, common.Wrap("UpdateUser: user.Get", err)
 	}
 
+	// Overwrite fields that aren't empty
 	user.OverwriteFields(updateUserRequest.Username, updateUserRequest.Email, "")
 	user.OverwriteDetails(updateUserRequest.FirstName, updateUserRequest.LastName)
 
@@ -86,14 +87,14 @@ func (s *service) DeleteUser(deleteUserRequest requests.DeleteUserRequest) (resp
 //      SEARCH USERS
 //--------------------------
 
+// SearchUsers is an admins only endpoint
 func (s *service) SearchUsers(searchUsersRequest requests.SearchUsersRequest) (responses.SearchUsersResponse, error) {
 	var (
+		user    = searchUsersRequest.ToUserModel()
 		page    = searchUsersRequest.Page
 		perPage = searchUsersRequest.PerPage
 	)
 
-	user := searchUsersRequest.ToUserModel()
-
 	users, err := user.Search(s.repository, page, perPage)
 	if err != nil {
 		return responses.SearchUsersResponse{}, common.Wrap("SearchUsers: user.Search", err)