List observations.
This commit is contained in:
parent
f867e5c424
commit
dac0721a41
9 changed files with 152 additions and 0 deletions
|
@ -49,6 +49,7 @@ func Handler() *mux.Router {
|
|||
|
||||
m.Get(router.Observation).Handler(handler(serveObservation))
|
||||
m.Get(router.CreateObservation).Handler(handler(serveCreateObservation))
|
||||
m.Get(router.Observations).Handler(handler(serveObservationList))
|
||||
|
||||
return m
|
||||
}
|
||||
|
|
|
@ -40,3 +40,20 @@ func serveCreateObservation(w http.ResponseWriter, r *http.Request) error {
|
|||
|
||||
return writeJSON(w, observation)
|
||||
}
|
||||
|
||||
func serveObservationList(w http.ResponseWriter, r *http.Request) error {
|
||||
var opt models.ObservationListOptions
|
||||
if err := schemaDecoder.Decode(&opt, r.URL.Query()); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
observations, err := store.Observations.List(&opt)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if observations == nil {
|
||||
observations = []*models.Observation{}
|
||||
}
|
||||
|
||||
return writeJSON(w, observations)
|
||||
}
|
||||
|
|
|
@ -65,3 +65,32 @@ func TestObservation_Create(t *testing.T) {
|
|||
t.Error("!success")
|
||||
}
|
||||
}
|
||||
|
||||
func TestObservation_List(t *testing.T) {
|
||||
setup()
|
||||
|
||||
want := []*models.Observation{newObservation()}
|
||||
wantOpt := &models.ObservationListOptions{ListOptions: models.ListOptions{Page: 1, PerPage: 10}}
|
||||
|
||||
calledList := false
|
||||
store.Observations.(*models.MockObservationsService).List_ = func(opt *models.ObservationListOptions) ([]*models.Observation, error) {
|
||||
if !normalizeDeepEqual(wantOpt, opt) {
|
||||
t.Errorf("wanted options %d but got %d", wantOpt, opt)
|
||||
}
|
||||
calledList = true
|
||||
return want, nil
|
||||
}
|
||||
|
||||
observations, err := apiClient.Observations.List(wantOpt)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
if !calledList {
|
||||
t.Error("!calledList")
|
||||
}
|
||||
|
||||
if !normalizeDeepEqual(&want, &observations) {
|
||||
t.Errorf("got observations %+v but wanted observations %+v", observations, want)
|
||||
}
|
||||
}
|
||||
|
|
Reference in a new issue