Update a measurement

api/handler.go

@@ -68,6 +68,7 @@ func Handler() *mux.Router {
 	m.Get(router.Measurement).Handler(handler(serveMeasurement))
 	m.Get(router.CreateMeasurement).Handler(handler(serveCreateMeasurement))
 	m.Get(router.Measurements).Handler(handler(serveMeasurementList))
+	m.Get(router.UpdateMeasurement).Handler(handler(serveUpdateMeasurement))
 
 	return m
 }

api/measurements.go

@@ -57,3 +57,22 @@ func serveMeasurementList(w http.ResponseWriter, r *http.Request) error {
 
 	return writeJSON(w, measurements)
 }
+
+func serveUpdateMeasurement(w http.ResponseWriter, r *http.Request) error {
+	id, _ := strconv.ParseInt(mux.Vars(r)["Id"], 10, 0)
+	var measurement models.Measurement
+	err := json.NewDecoder(r.Body).Decode(&measurement)
+	if err != nil {
+		return err
+	}
+
+	updated, err := store.Measurements.Update(id, &measurement)
+	if err != nil {
+		return err
+	}
+	if updated {
+		w.WriteHeader(http.StatusOK)
+	}
+
+	return writeJSON(w, measurement)
+}

api/measurements_test.go

@@ -94,3 +94,33 @@ func TestMeasurement_List(t *testing.T) {
 		t.Errorf("got measurements %+v but wanted measurements %+v", measurements, want)
 	}
 }
+
+func TestMeasurement_Update(t *testing.T) {
+	setup()
+
+	want := newMeasurement()
+
+	calledPut := false
+	store.Measurements.(*models.MockMeasurementsService).Update_ = func(id int64, measurement *models.Measurement) (bool, error) {
+		if id != want.Id {
+			t.Errorf("wanted request for measurement %d but got %d", want.Id, id)
+		}
+		if !normalizeDeepEqual(want, measurement) {
+			t.Errorf("wanted request for measurement %d but got %d", want, measurement)
+		}
+		calledPut = true
+		return true, nil
+	}
+
+	success, err := apiClient.Measurements.Update(want.Id, want)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if !calledPut {
+		t.Error("!calledPut")
+	}
+	if !success {
+		t.Error("!success")
+	}
+}

datastore/measurements.go

@@ -46,3 +46,26 @@ func (s *measurementsStore) List(opt *models.MeasurementListOptions) ([]*models.
 	}
 	return measurements, nil
 }
+
+func (s *measurementsStore) Update(id int64, measurement *models.Measurement) (bool, error) {
+	_, err := s.Get(id)
+	if err != nil {
+		return false, err
+	}
+
+	if id != measurement.Id {
+		return false, models.ErrMeasurementNotFound
+	}
+
+	measurement.UpdatedAt = time.Now()
+	changed, err := s.dbh.Update(measurement)
+	if err != nil {
+		return false, err
+	}
+
+	if changed == 0 {
+		return false, ErrNoRowsUpdated
+	}
+
+	return true, nil
+}

datastore/measurements_test.go

@@ -98,3 +98,23 @@ func TestMeasurementsStore_List_db(t *testing.T) {
 		t.Errorf("got measurements %+v, want %+v", measurements, want)
 	}
 }
+
+func TestMeasurementsStore_Update_db(t *testing.T) {
+	tx, _ := DB.Begin()
+	defer tx.Rollback()
+
+	measurement := insertMeasurement(t, tx)
+
+	d := NewDatastore(tx)
+
+	// Tweak it
+	measurement.MeasurementValue = sql.NullFloat64{Float64: 4.56, Valid: true}
+	updated, err := d.Measurements.Update(measurement.Id, measurement)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if !updated {
+		t.Error("!updated")
+	}
+}

models/measurements.go

@@ -43,6 +43,9 @@ type MeasurementsService interface {
 
 	// Create a measurement
 	Create(measurement *Measurement) (bool, error)
+
+	// Update an existing measurement
+	Update(id int64, MeasurementType *Measurement) (bool, error)
 }
 
 var (
@@ -118,10 +121,32 @@ func (s *measurementsService) List(opt *MeasurementListOptions) ([]*Measurement,
 	return measurements, nil
 }
 
+func (s *measurementsService) Update(id int64, measurement *Measurement) (bool, error) {
+	strId := strconv.FormatInt(id, 10)
+
+	url, err := s.client.url(router.UpdateMeasurement, map[string]string{"Id": strId}, nil)
+	if err != nil {
+		return false, err
+	}
+
+	req, err := s.client.NewRequest("PUT", url.String(), measurement)
+	if err != nil {
+		return false, err
+	}
+
+	resp, err := s.client.Do(req, &measurement)
+	if err != nil {
+		return false, err
+	}
+
+	return resp.StatusCode == http.StatusOK, nil
+}
+
 type MockMeasurementsService struct {
 	Get_    func(id int64) (*Measurement, error)
 	List_   func(opt *MeasurementListOptions) ([]*Measurement, error)
 	Create_ func(measurement *Measurement) (bool, error)
+	Update_ func(id int64, measurement *Measurement) (bool, error)
 }
 
 var _ MeasurementsService = &MockMeasurementsService{}
@@ -146,3 +171,10 @@ func (s *MockMeasurementsService) List(opt *MeasurementListOptions) ([]*Measurem
 	}
 	return s.List_(opt)
 }
+
+func (s *MockMeasurementsService) Update(id int64, measurement *Measurement) (bool, error) {
+	if s.Update_ == nil {
+		return false, nil
+	}
+	return s.Update_(id, measurement)
+}

models/measurements_test.go

@@ -116,3 +116,34 @@ func TestMeasurementService_List(t *testing.T) {
 		t.Errorf("Measurements.List return %+v, want %+v", measurements, want)
 	}
 }
+
+func TestMeasurementService_Update(t *testing.T) {
+	setup()
+	defer teardown()
+
+	want := newMeasurement()
+
+	var called bool
+	mux.HandleFunc(urlPath(t, router.UpdateMeasurement, map[string]string{"Id": "1"}), func(w http.ResponseWriter, r *http.Request) {
+		called = true
+		testMethod(t, r, "PUT")
+		testBody(t, r, `{"id":1,"strainId":1,"observationId":1,"textMeasurementTypeId":{"Int64":0,"Valid":false},"measurementValue":{"Float64":4.56,"Valid":true},"confidenceInterval":{"Float64":0,"Valid":false},"unitTypeId":{"Int64":1,"Valid":true},"createdAt":"0001-01-01T00:00:00Z","updatedAt":"0001-01-01T00:00:00Z","deletedAt":{"Time":"0001-01-01T00:00:00Z","Valid":false}}`+"\n")
+		w.WriteHeader(http.StatusOK)
+		writeJSON(w, want)
+	})
+
+	measurement := newMeasurement()
+	measurement.MeasurementValue = sql.NullFloat64{Float64: 4.56, Valid: true}
+	updated, err := client.Measurements.Update(measurement.Id, measurement)
+	if err != nil {
+		t.Errorf("Measurements.Update returned error: %v", err)
+	}
+
+	if !updated {
+		t.Error("!updated")
+	}
+
+	if !called {
+		t.Fatal("!called")
+	}
+}

router/api.go

@@ -63,6 +63,7 @@ func API() *mux.Router {
 	m.Path("/measurements/").Methods("GET").Name(Measurements)
 	m.Path("/measurements/").Methods("POST").Name(CreateMeasurement)
 	m.Path("/measurements/{Id:.+}").Methods("GET").Name(Measurement)
+	m.Path("/measurements/{Id:.+}").Methods("PUT").Name(UpdateMeasurement)
 
 	return m
 }

router/routes.go

@@ -50,4 +50,5 @@ const (
 	Measurement       = "measurements:get"
 	CreateMeasurement = "measurements:create"
 	Measurements      = "measurements:list"
+	UpdateMeasurement = "measurements:update"
 )