List text measurement types

This commit is contained in:
Matthew Dillon 2014-11-26 22:51:09 -09:00
parent b1dad9bfbd
commit e368426aad
9 changed files with 152 additions and 0 deletions

View file

@ -55,6 +55,7 @@ func Handler() *mux.Router {
m.Get(router.TextMeasurementType).Handler(handler(serveTextMeasurementType)) m.Get(router.TextMeasurementType).Handler(handler(serveTextMeasurementType))
m.Get(router.CreateTextMeasurementType).Handler(handler(serveCreateTextMeasurementType)) m.Get(router.CreateTextMeasurementType).Handler(handler(serveCreateTextMeasurementType))
m.Get(router.TextMeasurementTypes).Handler(handler(serveTextMeasurementTypeList))
return m return m
} }

View file

@ -40,3 +40,20 @@ func serveCreateTextMeasurementType(w http.ResponseWriter, r *http.Request) erro
return writeJSON(w, text_measurement_type) return writeJSON(w, text_measurement_type)
} }
func serveTextMeasurementTypeList(w http.ResponseWriter, r *http.Request) error {
var opt models.TextMeasurementTypeListOptions
if err := schemaDecoder.Decode(&opt, r.URL.Query()); err != nil {
return err
}
text_measurement_types, err := store.TextMeasurementTypes.List(&opt)
if err != nil {
return err
}
if text_measurement_types == nil {
text_measurement_types = []*models.TextMeasurementType{}
}
return writeJSON(w, text_measurement_types)
}

View file

@ -65,3 +65,32 @@ func TestTextMeasurementType_Create(t *testing.T) {
t.Error("!success") t.Error("!success")
} }
} }
func TestTextMeasurementType_List(t *testing.T) {
setup()
want := []*models.TextMeasurementType{newTextMeasurementType()}
wantOpt := &models.TextMeasurementTypeListOptions{ListOptions: models.ListOptions{Page: 1, PerPage: 10}}
calledList := false
store.TextMeasurementTypes.(*models.MockTextMeasurementTypesService).List_ = func(opt *models.TextMeasurementTypeListOptions) ([]*models.TextMeasurementType, error) {
if !normalizeDeepEqual(wantOpt, opt) {
t.Errorf("wanted options %d but got %d", wantOpt, opt)
}
calledList = true
return want, nil
}
text_measurement_types, err := apiClient.TextMeasurementTypes.List(wantOpt)
if err != nil {
t.Fatal(err)
}
if !calledList {
t.Error("!calledList")
}
if !normalizeDeepEqual(&want, &text_measurement_types) {
t.Errorf("got text_measurement_types %+v but wanted text_measurement_types %+v", text_measurement_types, want)
}
}

View file

@ -34,3 +34,15 @@ func (s *textMeasurementTypesStore) Create(text_measurement_type *models.TextMea
} }
return true, nil return true, nil
} }
func (s *textMeasurementTypesStore) List(opt *models.TextMeasurementTypeListOptions) ([]*models.TextMeasurementType, error) {
if opt == nil {
opt = &models.TextMeasurementTypeListOptions{}
}
var text_measurement_types []*models.TextMeasurementType
err := s.dbh.Select(&text_measurement_types, `SELECT * FROM text_measurement_types LIMIT $1 OFFSET $2;`, opt.PerPageOrDefault(), opt.Offset())
if err != nil {
return nil, err
}
return text_measurement_types, nil
}

View file

@ -62,3 +62,26 @@ func TestTextMeasurementTypesStore_Create_db(t *testing.T) {
t.Error("want nonzero text_measurement_type.Id after submitting") t.Error("want nonzero text_measurement_type.Id after submitting")
} }
} }
func TestTextMeasurementTypesStore_List_db(t *testing.T) {
tx, _ := DB.Begin()
defer tx.Rollback()
want_text_measurement_type := insertTextMeasurementType(t, tx)
want := []*models.TextMeasurementType{want_text_measurement_type}
d := NewDatastore(tx)
text_measurement_types, err := d.TextMeasurementTypes.List(&models.TextMeasurementTypeListOptions{ListOptions: models.ListOptions{Page: 1, PerPage: 10}})
if err != nil {
t.Fatal(err)
}
for i := range want {
normalizeTime(&want[i].CreatedAt, &want[i].UpdatedAt, &want[i].DeletedAt)
normalizeTime(&text_measurement_types[i].CreatedAt, &text_measurement_types[i].UpdatedAt, &text_measurement_types[i].DeletedAt)
}
if !reflect.DeepEqual(text_measurement_types, want) {
t.Errorf("got text_measurement_types %+v, want %+v", text_measurement_types, want)
}
}

View file

@ -29,6 +29,9 @@ type TextMeasurementTypesService interface {
// Get a text measurement type // Get a text measurement type
Get(id int64) (*TextMeasurementType, error) Get(id int64) (*TextMeasurementType, error)
// List all text measurement types
List(opt *TextMeasurementTypeListOptions) ([]*TextMeasurementType, error)
// Create a text measurement type // Create a text measurement type
Create(text_measurement_type *TextMeasurementType) (bool, error) Create(text_measurement_type *TextMeasurementType) (bool, error)
} }
@ -82,8 +85,33 @@ func (s *textMeasurementTypesService) Create(text_measurement_type *TextMeasurem
return resp.StatusCode == http.StatusCreated, nil return resp.StatusCode == http.StatusCreated, nil
} }
type TextMeasurementTypeListOptions struct {
ListOptions
}
func (s *textMeasurementTypesService) List(opt *TextMeasurementTypeListOptions) ([]*TextMeasurementType, error) {
url, err := s.client.url(router.TextMeasurementTypes, nil, opt)
if err != nil {
return nil, err
}
req, err := s.client.NewRequest("GET", url.String(), nil)
if err != nil {
return nil, err
}
var text_measurement_types []*TextMeasurementType
_, err = s.client.Do(req, &text_measurement_types)
if err != nil {
return nil, err
}
return text_measurement_types, nil
}
type MockTextMeasurementTypesService struct { type MockTextMeasurementTypesService struct {
Get_ func(id int64) (*TextMeasurementType, error) Get_ func(id int64) (*TextMeasurementType, error)
List_ func(opt *TextMeasurementTypeListOptions) ([]*TextMeasurementType, error)
Create_ func(text_measurement_type *TextMeasurementType) (bool, error) Create_ func(text_measurement_type *TextMeasurementType) (bool, error)
} }
@ -102,3 +130,10 @@ func (s *MockTextMeasurementTypesService) Create(text_measurement_type *TextMeas
} }
return s.Create_(text_measurement_type) return s.Create_(text_measurement_type)
} }
func (s *MockTextMeasurementTypesService) List(opt *TextMeasurementTypeListOptions) ([]*TextMeasurementType, error) {
if s.List_ == nil {
return nil, nil
}
return s.List_(opt)
}

View file

@ -79,3 +79,36 @@ func TestTextMeasurementTypeService_Create(t *testing.T) {
t.Errorf("TextMeasurementTypes.Create returned %+v, want %+v", text_measurement_type, want) t.Errorf("TextMeasurementTypes.Create returned %+v, want %+v", text_measurement_type, want)
} }
} }
func TestTextMeasurementTypeService_List(t *testing.T) {
setup()
defer teardown()
want := []*TextMeasurementType{newTextMeasurementType()}
var called bool
mux.HandleFunc(urlPath(t, router.TextMeasurementTypes, nil), func(w http.ResponseWriter, r *http.Request) {
called = true
testMethod(t, r, "GET")
testFormValues(t, r, values{})
writeJSON(w, want)
})
text_measurement_type, err := client.TextMeasurementTypes.List(nil)
if err != nil {
t.Errorf("TextMeasurementTypes.List returned error: %v", err)
}
if !called {
t.Fatal("!called")
}
for _, u := range want {
normalizeTime(&u.CreatedAt, &u.UpdatedAt, &u.DeletedAt)
}
if !reflect.DeepEqual(text_measurement_type, want) {
t.Errorf("TextMeasurementTypes.List return %+v, want %+v", text_measurement_type, want)
}
}

View file

@ -46,6 +46,7 @@ func API() *mux.Router {
m.Path("/observations/{Id:.+}").Methods("DELETE").Name(DeleteObservation) m.Path("/observations/{Id:.+}").Methods("DELETE").Name(DeleteObservation)
// TextMeasurementTypes // TextMeasurementTypes
m.Path("/text_measurement_types/").Methods("GET").Name(TextMeasurementTypes)
m.Path("/text_measurement_types/").Methods("POST").Name(CreateTextMeasurementType) m.Path("/text_measurement_types/").Methods("POST").Name(CreateTextMeasurementType)
m.Path("/text_measurement_types/{Id:.+}").Methods("GET").Name(TextMeasurementType) m.Path("/text_measurement_types/{Id:.+}").Methods("GET").Name(TextMeasurementType)

View file

@ -37,4 +37,5 @@ const (
TextMeasurementType = "text_measurement_type:get" TextMeasurementType = "text_measurement_type:get"
CreateTextMeasurementType = "text_measurement_type:create" CreateTextMeasurementType = "text_measurement_type:create"
TextMeasurementTypes = "text_measurement_type:list"
) )