diff --git a/api/handler.go b/api/handler.go index 2ffc70e..928f165 100644 --- a/api/handler.go +++ b/api/handler.go @@ -37,6 +37,7 @@ func Handler() *mux.Router { m.Get(router.Strain).Handler(handler(serveStrain)) m.Get(router.CreateStrain).Handler(handler(serveCreateStrain)) + m.Get(router.Strains).Handler(handler(serveStrainList)) return m } diff --git a/api/strains.go b/api/strains.go index eb388e7..159796b 100644 --- a/api/strains.go +++ b/api/strains.go @@ -40,3 +40,20 @@ func serveCreateStrain(w http.ResponseWriter, r *http.Request) error { return writeJSON(w, strain) } + +func serveStrainList(w http.ResponseWriter, r *http.Request) error { + var opt models.StrainListOptions + if err := schemaDecoder.Decode(&opt, r.URL.Query()); err != nil { + return err + } + + strains, err := store.Strains.List(&opt) + if err != nil { + return err + } + if strains == nil { + strains = []*models.Strain{} + } + + return writeJSON(w, strains) +} diff --git a/api/strains_test.go b/api/strains_test.go index f0d234e..d0dd5cb 100644 --- a/api/strains_test.go +++ b/api/strains_test.go @@ -67,3 +67,32 @@ func TestStrain_Create(t *testing.T) { t.Error("!success") } } + +func TestStrain_List(t *testing.T) { + setup() + + want := []*models.Strain{newStrain()} + wantOpt := &models.StrainListOptions{ListOptions: models.ListOptions{Page: 1, PerPage: 10}} + + calledList := false + store.Strains.(*models.MockStrainsService).List_ = func(opt *models.StrainListOptions) ([]*models.Strain, error) { + if !normalizeDeepEqual(wantOpt, opt) { + t.Errorf("wanted options %d but got %d", wantOpt, opt) + } + calledList = true + return want, nil + } + + strains, err := apiClient.Strains.List(wantOpt) + if err != nil { + t.Fatal(err) + } + + if !calledList { + t.Error("!calledList") + } + + if !normalizeDeepEqual(&want, &strains) { + t.Errorf("got strains %+v but wanted strains %+v", strains, want) + } +} diff --git a/datastore/strains.go b/datastore/strains.go index bd16d93..25c77ba 100644 --- a/datastore/strains.go +++ b/datastore/strains.go @@ -27,3 +27,15 @@ func (s *strainsStore) Create(strain *models.Strain) (bool, error) { } return true, nil } + +func (s *strainsStore) List(opt *models.StrainListOptions) ([]*models.Strain, error) { + if opt == nil { + opt = &models.StrainListOptions{} + } + var strains []*models.Strain + err := s.dbh.Select(&strains, `SELECT * FROM strains LIMIT $1 OFFSET $2;`, opt.PerPageOrDefault(), opt.Offset()) + if err != nil { + return nil, err + } + return strains, nil +} diff --git a/datastore/strains_test.go b/datastore/strains_test.go index cc35e31..bc2c6bc 100644 --- a/datastore/strains_test.go +++ b/datastore/strains_test.go @@ -65,3 +65,25 @@ func TestStrainsStore_Create_db(t *testing.T) { t.Error("want nonzero strain.Id after submitting") } } + +func TestStrainsStore_List_db(t *testing.T) { + tx, _ := DB.Begin() + defer tx.Rollback() + + want_strain := insertStrain(t, tx) + want := []*models.Strain{want_strain} + + d := NewDatastore(tx) + + strains, err := d.Strains.List(&models.StrainListOptions{ListOptions: models.ListOptions{Page: 1, PerPage: 10}}) + if err != nil { + t.Fatal(err) + } + + for _, g := range want { + normalizeTime(&g.CreatedAt, &g.UpdatedAt, &g.DeletedAt) + } + if !reflect.DeepEqual(strains, want) { + t.Errorf("got strains %+v, want %+v", strains, want) + } +} diff --git a/models/strains.go b/models/strains.go index d802f71..d6b044e 100644 --- a/models/strains.go +++ b/models/strains.go @@ -32,6 +32,9 @@ type StrainsService interface { // Get a strain Get(id int64) (*Strain, error) + // List all strains + List(opt *StrainListOptions) ([]*Strain, error) + // Create a strain record Create(strain *Strain) (bool, error) } @@ -85,8 +88,33 @@ func (s *strainsService) Create(strain *Strain) (bool, error) { return resp.StatusCode == http.StatusCreated, nil } +type StrainListOptions struct { + ListOptions +} + +func (s *strainsService) List(opt *StrainListOptions) ([]*Strain, error) { + url, err := s.client.url(router.Strains, nil, opt) + if err != nil { + return nil, err + } + + req, err := s.client.NewRequest("GET", url.String(), nil) + if err != nil { + return nil, err + } + + var strains []*Strain + _, err = s.client.Do(req, &strains) + if err != nil { + return nil, err + } + + return strains, nil +} + type MockStrainsService struct { Get_ func(id int64) (*Strain, error) + List_ func(opt *StrainListOptions) ([]*Strain, error) Create_ func(strain *Strain) (bool, error) } @@ -105,3 +133,10 @@ func (s *MockStrainsService) Create(strain *Strain) (bool, error) { } return s.Create_(strain) } + +func (s *MockStrainsService) List(opt *StrainListOptions) ([]*Strain, error) { + if s.List_ == nil { + return nil, nil + } + return s.List_(opt) +} diff --git a/models/strains_test.go b/models/strains_test.go index 797276a..d0ee0e6 100644 --- a/models/strains_test.go +++ b/models/strains_test.go @@ -80,3 +80,36 @@ func TestStrainService_Create(t *testing.T) { t.Errorf("Strains.Create returned %+v, want %+v", strain, want) } } + +func TestStrainService_List(t *testing.T) { + setup() + defer teardown() + + want := []*Strain{newStrain()} + + var called bool + mux.HandleFunc(urlPath(t, router.Strains, nil), func(w http.ResponseWriter, r *http.Request) { + called = true + testMethod(t, r, "GET") + testFormValues(t, r, values{}) + + writeJSON(w, want) + }) + + strains, err := client.Strains.List(nil) + if err != nil { + t.Errorf("Strains.List returned error: %v", err) + } + + if !called { + t.Fatal("!called") + } + + for _, u := range want { + normalizeTime(&u.CreatedAt, &u.UpdatedAt, &u.DeletedAt) + } + + if !reflect.DeepEqual(strains, want) { + t.Errorf("Strains.List return %+v, want %+v", strains, want) + } +} diff --git a/router/api.go b/router/api.go index cff06b6..7678abc 100644 --- a/router/api.go +++ b/router/api.go @@ -25,6 +25,7 @@ func API() *mux.Router { m.Path("/species/{Id:.+}").Methods("DELETE").Name(DeleteSpecies) // Strains + m.Path("/strains").Methods("GET").Name(Strains) m.Path("/strains").Methods("POST").Name(CreateStrain) m.Path("/strains/{Id:.+}").Methods("GET").Name(Strain) diff --git a/router/routes.go b/router/routes.go index 6a6fc10..068b179 100644 --- a/router/routes.go +++ b/router/routes.go @@ -19,4 +19,5 @@ const ( Strain = "strain:get" CreateStrain = "strain:create" + Strains = "strain:list" )