Delete a measurement
This commit is contained in:
parent
bc3c724a1d
commit
4eecb36e34
9 changed files with 141 additions and 0 deletions
|
@ -69,6 +69,7 @@ func Handler() *mux.Router {
|
|||
m.Get(router.CreateMeasurement).Handler(handler(serveCreateMeasurement))
|
||||
m.Get(router.Measurements).Handler(handler(serveMeasurementList))
|
||||
m.Get(router.UpdateMeasurement).Handler(handler(serveUpdateMeasurement))
|
||||
m.Get(router.DeleteMeasurement).Handler(handler(serveDeleteMeasurement))
|
||||
|
||||
return m
|
||||
}
|
||||
|
|
|
@ -76,3 +76,17 @@ func serveUpdateMeasurement(w http.ResponseWriter, r *http.Request) error {
|
|||
|
||||
return writeJSON(w, measurement)
|
||||
}
|
||||
|
||||
func serveDeleteMeasurement(w http.ResponseWriter, r *http.Request) error {
|
||||
id, _ := strconv.ParseInt(mux.Vars(r)["Id"], 10, 0)
|
||||
|
||||
deleted, err := store.Measurements.Delete(id)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if deleted {
|
||||
w.WriteHeader(http.StatusOK)
|
||||
}
|
||||
|
||||
return writeJSON(w, &models.Measurement{})
|
||||
}
|
||||
|
|
|
@ -124,3 +124,30 @@ func TestMeasurement_Update(t *testing.T) {
|
|||
t.Error("!success")
|
||||
}
|
||||
}
|
||||
|
||||
func TestMeasurement_Delete(t *testing.T) {
|
||||
setup()
|
||||
|
||||
want := newMeasurement()
|
||||
|
||||
calledDelete := false
|
||||
store.Measurements.(*models.MockMeasurementsService).Delete_ = func(id int64) (bool, error) {
|
||||
if id != want.Id {
|
||||
t.Errorf("wanted request for measurement %d but got %d", want.Id, id)
|
||||
}
|
||||
calledDelete = true
|
||||
return true, nil
|
||||
}
|
||||
|
||||
success, err := apiClient.Measurements.Delete(want.Id)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
if !calledDelete {
|
||||
t.Error("!calledDelete")
|
||||
}
|
||||
if !success {
|
||||
t.Error("!success")
|
||||
}
|
||||
}
|
||||
|
|
Reference in a new issue