List observations.

api/handler.go

@@ -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
 }

api/observations.go

@@ -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)
+}

api/observations_test.go

@@ -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)
+	}
+}

datastore/observations.go

@@ -34,3 +34,15 @@ func (s *observationsStore) Create(observation *models.Observation) (bool, error
 	}
 	return true, nil
 }
+
+func (s *observationsStore) List(opt *models.ObservationListOptions) ([]*models.Observation, error) {
+	if opt == nil {
+		opt = &models.ObservationListOptions{}
+	}
+	var observations []*models.Observation
+	err := s.dbh.Select(&observations, `SELECT * FROM observations LIMIT $1 OFFSET $2;`, opt.PerPageOrDefault(), opt.Offset())
+	if err != nil {
+		return nil, err
+	}
+	return observations, nil
+}

datastore/observations_test.go

@@ -65,3 +65,26 @@ func TestObservationsStore_Create_db(t *testing.T) {
 		t.Error("want nonzero observation.Id after submitting")
 	}
 }
+
+func TestObservationsStore_List_db(t *testing.T) {
+	tx, _ := DB.Begin()
+	defer tx.Rollback()
+
+	want_observation := insertObservation(t, tx)
+	want := []*models.Observation{want_observation}
+
+	d := NewDatastore(tx)
+
+	observations, err := d.Observations.List(&models.ObservationListOptions{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(&observations[i].CreatedAt, &observations[i].UpdatedAt, &observations[i].DeletedAt)
+	}
+	if !reflect.DeepEqual(observations, want) {
+		t.Errorf("got observations %+v, want %+v", observations, want)
+	}
+}

models/observations.go

@@ -30,6 +30,9 @@ type ObservationsService interface {
 	// Get an observation
 	Get(id int64) (*Observation, error)
 
+	// List all observations
+	List(opt *ObservationListOptions) ([]*Observation, error)
+
 	// Create an observation
 	Create(observation *Observation) (bool, error)
 }
@@ -83,8 +86,33 @@ func (s *observationsService) Create(observation *Observation) (bool, error) {
 	return resp.StatusCode == http.StatusCreated, nil
 }
 
+type ObservationListOptions struct {
+	ListOptions
+}
+
+func (s *observationsService) List(opt *ObservationListOptions) ([]*Observation, error) {
+	url, err := s.client.url(router.Observations, nil, opt)
+	if err != nil {
+		return nil, err
+	}
+
+	req, err := s.client.NewRequest("GET", url.String(), nil)
+	if err != nil {
+		return nil, err
+	}
+
+	var observations []*Observation
+	_, err = s.client.Do(req, &observations)
+	if err != nil {
+		return nil, err
+	}
+
+	return observations, nil
+}
+
 type MockObservationsService struct {
 	Get_    func(id int64) (*Observation, error)
+	List_   func(opt *ObservationListOptions) ([]*Observation, error)
 	Create_ func(observation *Observation) (bool, error)
 }
 
@@ -103,3 +131,10 @@ func (s *MockObservationsService) Create(observation *Observation) (bool, error)
 	}
 	return s.Create_(observation)
 }
+
+func (s *MockObservationsService) List(opt *ObservationListOptions) ([]*Observation, error) {
+	if s.List_ == nil {
+		return nil, nil
+	}
+	return s.List_(opt)
+}

models/observations_test.go

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

router/api.go

@@ -39,6 +39,7 @@ func API() *mux.Router {
 	m.Path("/observation_types/{Id:.+}").Methods("DELETE").Name(DeleteObservationType)
 
 	// Observations
+	m.Path("/observations").Methods("GET").Name(Observations)
 	m.Path("/observations").Methods("POST").Name(CreateObservation)
 	m.Path("/observations/{Id:.+}").Methods("GET").Name(Observation)
 

router/routes.go

@@ -31,4 +31,5 @@ const (
 
 	Observation       = "observation:get"
 	CreateObservation = "observation:create"
+	Observations      = "observation:list"
 )