Delete an observation type
This commit is contained in:
parent
73f7b580c1
commit
68b98f6d6b
9 changed files with 141 additions and 0 deletions
|
@ -45,6 +45,7 @@ func Handler() *mux.Router {
|
|||
m.Get(router.CreateObservationType).Handler(handler(serveCreateObservationType))
|
||||
m.Get(router.ObservationTypes).Handler(handler(serveObservationTypeList))
|
||||
m.Get(router.UpdateObservationType).Handler(handler(serveUpdateObservationType))
|
||||
m.Get(router.DeleteObservationType).Handler(handler(serveDeleteObservationType))
|
||||
|
||||
return m
|
||||
}
|
||||
|
|
|
@ -76,3 +76,17 @@ func serveUpdateObservationType(w http.ResponseWriter, r *http.Request) error {
|
|||
|
||||
return writeJSON(w, observation_type)
|
||||
}
|
||||
|
||||
func serveDeleteObservationType(w http.ResponseWriter, r *http.Request) error {
|
||||
id, _ := strconv.ParseInt(mux.Vars(r)["Id"], 10, 0)
|
||||
|
||||
deleted, err := store.ObservationTypes.Delete(id)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if deleted {
|
||||
w.WriteHeader(http.StatusOK)
|
||||
}
|
||||
|
||||
return writeJSON(w, &models.ObservationType{})
|
||||
}
|
||||
|
|
|
@ -124,3 +124,30 @@ func TestObservationType_Update(t *testing.T) {
|
|||
t.Error("!success")
|
||||
}
|
||||
}
|
||||
|
||||
func TestObservationType_Delete(t *testing.T) {
|
||||
setup()
|
||||
|
||||
want := newObservationType()
|
||||
|
||||
calledDelete := false
|
||||
store.ObservationTypes.(*models.MockObservationTypesService).Delete_ = func(id int64) (bool, error) {
|
||||
if id != want.Id {
|
||||
t.Errorf("wanted request for observation_type %d but got %d", want.Id, id)
|
||||
}
|
||||
calledDelete = true
|
||||
return true, nil
|
||||
}
|
||||
|
||||
success, err := apiClient.ObservationTypes.Delete(want.Id)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
if !calledDelete {
|
||||
t.Error("!calledDelete")
|
||||
}
|
||||
if !success {
|
||||
t.Error("!success")
|
||||
}
|
||||
}
|
||||
|
|
Reference in a new issue