User creation, DB transactions, createdb flag changes.

This commit is contained in:
Matthew Dillon 2014-10-01 13:09:36 -08:00
parent e1685bd32b
commit c0b54d821e
11 changed files with 213 additions and 9 deletions

View file

@ -2,6 +2,7 @@ package models
import (
"errors"
"net/http"
"strconv"
"time"
@ -24,6 +25,9 @@ type UsersService interface {
// List all users.
List(opt *UserListOptions) ([]*User, error)
// Create a new user. The newly created user's ID is written to user.Id
Create(user *User) (created bool, err error)
}
var (
@ -58,6 +62,25 @@ func (s *usersService) Get(id int64) (*User, error) {
return user, nil
}
func (s *usersService) Create(user *User) (bool, error) {
url, err := s.client.url(router.CreateUser, nil, nil)
if err != nil {
return false, err
}
req, err := s.client.NewRequest("POST", url.String(), user)
if err != nil {
return false, err
}
resp, err := s.client.Do(req, &user)
if err != nil {
return false, err
}
return resp.StatusCode == http.StatusCreated, nil
}
type UserListOptions struct {
ListOptions
}
@ -83,10 +106,13 @@ func (s *usersService) List(opt *UserListOptions) ([]*User, error) {
}
type MockUsersService struct {
Get_ func(id int64) (*User, error)
List_ func(opt *UserListOptions) ([]*User, error)
Get_ func(id int64) (*User, error)
List_ func(opt *UserListOptions) ([]*User, error)
Create_ func(post *User) (bool, error)
}
var _ UsersService = &MockUsersService{}
func (s *MockUsersService) Get(id int64) (*User, error) {
if s.Get_ == nil {
return nil, nil
@ -94,6 +120,13 @@ func (s *MockUsersService) Get(id int64) (*User, error) {
return s.Get_(id)
}
func (s *MockUsersService) Create(user *User) (bool, error) {
if s.Create_ == nil {
return false, nil
}
return s.Create_(user)
}
func (s *MockUsersService) List(opt *UserListOptions) ([]*User, error) {
if s.List_ == nil {
return nil, nil

View file

@ -38,6 +38,42 @@ func TestUsersService_Get(t *testing.T) {
}
}
func TestUsersService_Create(t *testing.T) {
setup()
defer teardown()
want := &User{Id: 1, UserName: "Test User"}
var called bool
mux.HandleFunc(urlPath(t, router.CreateUser, nil), func(w http.ResponseWriter, r *http.Request) {
called = true
testMethod(t, r, "POST")
testBody(t, r, `{"id":1,"user_name":"Test User","created_at":"0001-01-01T00:00:00Z","updated_at":"0001-01-01T00:00:00Z","deleted_at":"0001-01-01T00:00:00Z"}`+"\n")
w.WriteHeader(http.StatusCreated)
writeJSON(w, want)
})
user := &User{Id: 1, UserName: "Test User"}
created, err := client.Users.Create(user)
if err != nil {
t.Errorf("Users.Create returned error: %v", err)
}
if !created {
t.Error("!created")
}
if !called {
t.Fatal("!called")
}
normalizeTime(&want.CreatedAt, &want.UpdatedAt, &want.DeletedAt)
if !reflect.DeepEqual(user, want) {
t.Errorf("Users.Create returned %+v, want %+v", user, want)
}
}
func TestUsersService_List(t *testing.T) {
setup()
defer teardown()