Delete a text measurement type
This commit is contained in:
parent
49621ca27b
commit
431ba7ed91
9 changed files with 142 additions and 1 deletions
|
@ -57,6 +57,7 @@ func Handler() *mux.Router {
|
|||
m.Get(router.CreateTextMeasurementType).Handler(handler(serveCreateTextMeasurementType))
|
||||
m.Get(router.TextMeasurementTypes).Handler(handler(serveTextMeasurementTypeList))
|
||||
m.Get(router.UpdateTextMeasurementType).Handler(handler(serveUpdateTextMeasurementType))
|
||||
m.Get(router.DeleteTextMeasurementType).Handler(handler(serveDeleteTextMeasurementType))
|
||||
|
||||
return m
|
||||
}
|
||||
|
|
|
@ -76,3 +76,17 @@ func serveUpdateTextMeasurementType(w http.ResponseWriter, r *http.Request) erro
|
|||
|
||||
return writeJSON(w, text_measurement_type)
|
||||
}
|
||||
|
||||
func serveDeleteTextMeasurementType(w http.ResponseWriter, r *http.Request) error {
|
||||
id, _ := strconv.ParseInt(mux.Vars(r)["Id"], 10, 0)
|
||||
|
||||
deleted, err := store.TextMeasurementTypes.Delete(id)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if deleted {
|
||||
w.WriteHeader(http.StatusOK)
|
||||
}
|
||||
|
||||
return writeJSON(w, &models.TextMeasurementType{})
|
||||
}
|
||||
|
|
|
@ -124,3 +124,30 @@ func TestTextMeasurementType_Update(t *testing.T) {
|
|||
t.Error("!success")
|
||||
}
|
||||
}
|
||||
|
||||
func TestTextMeasurementType_Delete(t *testing.T) {
|
||||
setup()
|
||||
|
||||
want := newTextMeasurementType()
|
||||
|
||||
calledDelete := false
|
||||
store.TextMeasurementTypes.(*models.MockTextMeasurementTypesService).Delete_ = func(id int64) (bool, error) {
|
||||
if id != want.Id {
|
||||
t.Errorf("wanted request for text_measurement_type %d but got %d", want.Id, id)
|
||||
}
|
||||
calledDelete = true
|
||||
return true, nil
|
||||
}
|
||||
|
||||
success, err := apiClient.TextMeasurementTypes.Delete(want.Id)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
if !calledDelete {
|
||||
t.Error("!calledDelete")
|
||||
}
|
||||
if !success {
|
||||
t.Error("!success")
|
||||
}
|
||||
}
|
||||
|
|
Reference in a new issue