thermokarst/bactdb
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Ember data: characteristics

Browse source
This commit is contained in:
Matthew Dillon 2015-02-03 12:32:24 -09:00
parent a37a5a9400
commit 41ee2857ee
7 changed files with 56 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

14
api/characteristics.go
View file

@ -20,17 +20,17 @@ func serveCharacteristic(w http.ResponseWriter, r *http.Request) error {
return err
}
return writeJSON(w, characteristic)
return writeJSON(w, models.CharacteristicJSON{Characteristic: characteristic})
}
func serveCreateCharacteristic(w http.ResponseWriter, r *http.Request) error {
var characteristic models.Characteristic
var characteristic models.CharacteristicJSON
err := json.NewDecoder(r.Body).Decode(&characteristic)
if err != nil {
return err
}
created, err := store.Characteristics.Create(&characteristic)
created, err := store.Characteristics.Create(characteristic.Characteristic)
if err != nil {
return err
}
@ -55,18 +55,18 @@ func serveCharacteristicList(w http.ResponseWriter, r *http.Request) error {
characteristics = []*models.Characteristic{}
}
return writeJSON(w, characteristics)
return writeJSON(w, models.CharacteristicsJSON{Characteristics: characteristics})
}
func serveUpdateCharacteristic(w http.ResponseWriter, r *http.Request) error {
id, _ := strconv.ParseInt(mux.Vars(r)["Id"], 10, 0)
var characteristic models.Characteristic
var characteristic models.CharacteristicJSON
err := json.NewDecoder(r.Body).Decode(&characteristic)
if err != nil {
return err
}
updated, err := store.Characteristics.Update(id, &characteristic)
updated, err := store.Characteristics.Update(id, characteristic.Characteristic)
if err != nil {
return err
}
@ -88,5 +88,5 @@ func serveDeleteCharacteristic(w http.ResponseWriter, r *http.Request) error {
w.WriteHeader(http.StatusOK)
}
return writeJSON(w, &models.Characteristic{})
return writeJSON(w, nil)
}