alex/restaurant-search
1
Fork 0
Code Releases Activity

Refactoring

Browse Source
This commit is contained in:
Alex Yatskov 2015-03-24 22:34:06 +09:00
parent 499d6b0024
commit bf5537668e
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
server.go
View File

@ -152,23 +152,23 @@ func getCategories(rw http.ResponseWriter, req *http.Request) {
} }
func addCategory(rw http.ResponseWriter, req *http.Request) { func addCategory(rw http.ResponseWriter, req *http.Request) {
type jsonRequest struct { type jsonAddCategoryRequest struct {
Description string `json:"description"` Description string `json:"description"`
} }
type jsonResponse struct { type jsonAddCategoryResponse struct {
Description string `json:"description"` Description string `json:"description"`
Id int `json:"id"` Id int `json:"id"`
Success bool `json:"success"` Success bool `json:"success"`
} }
var request jsonRequest var request jsonAddCategoryRequest
if err := json.NewDecoder(req.Body).Decode(&request); err != nil { if err := json.NewDecoder(req.Body).Decode(&request); err != nil {
http.Error(rw, err.Error(), http.StatusInternalServerError) http.Error(rw, err.Error(), http.StatusInternalServerError)
return return
} }
response := jsonResponse{Description: strings.TrimSpace(request.Description)} response := jsonAddCategoryResponse{Description: strings.TrimSpace(request.Description)}
if len(request.Description) > 0 { if len(request.Description) > 0 {
result, err := db.Exec("INSERT INTO categories(description) VALUES(?)", request.Description) result, err := db.Exec("INSERT INTO categories(description) VALUES(?)", request.Description)
@ -200,15 +200,15 @@ func addCategory(rw http.ResponseWriter, req *http.Request) {
} }
func removeCategory(rw http.ResponseWriter, req *http.Request) { func removeCategory(rw http.ResponseWriter, req *http.Request) {
type jsonRequest struct { type jsonRemoveCategoryRequest struct {
Id int `json:"id"` Id int `json:"id"`
} }
type jsonResponse struct { type jsonRemoveCategoryResponse struct {
Success bool `json:"success"` Success bool `json:"success"`
} }
var request jsonRequest var request jsonRemoveCategoryRequest
if err := json.NewDecoder(req.Body).Decode(&request); err != nil { if err := json.NewDecoder(req.Body).Decode(&request); err != nil {
http.Error(rw, err.Error(), http.StatusInternalServerError) http.Error(rw, err.Error(), http.StatusInternalServerError)
return return
@ -224,7 +224,7 @@ func removeCategory(rw http.ResponseWriter, req *http.Request) {
log.Fatal(err) log.Fatal(err)
} }
js, err := json.Marshal(jsonResponse{affectedRows > 0}) js, err := json.Marshal(jsonRemoveCategoryResponse{affectedRows > 0})
if err != nil { if err != nil {
log.Fatal(err) log.Fatal(err)
} }

4
types.go
View File

@ -35,8 +35,6 @@ type queryProjection struct {
stats recordStats stats recordStats
} }
type featureMap map[interface{}]float64
type recordStats struct { type recordStats struct {
compatibility float64 compatibility float64
count int count int
@ -78,3 +76,5 @@ func (slice records) Less(i, j int) bool {
func (slice records) Swap(i, j int) { func (slice records) Swap(i, j int) {
slice[i], slice[j] = slice[j], slice[i] slice[i], slice[j] = slice[j], slice[i]
} }
type featureMap map[interface{}]float64