updated request response, created better response structure

Author: mikebionic

app.go

@@ -36,8 +36,8 @@ func (a *App) Run(addr string) {
 
 func (a *App) initializeRoutes() {
 	api := a.Router.PathPrefix("/api/v1").Subrouter()
-	api.HandleFunc("", a.getRequest).Methods(http.MethodGet)
-	api.HandleFunc("", a.apiMakeDbRequest).Methods(http.MethodPost)
-	api.HandleFunc("", a.notFound)
+	api.HandleFunc("/", a.getRequest).Methods(http.MethodGet)
+	api.HandleFunc("/make-db-request", a.apiMakeDbRequest).Methods(http.MethodPost)
+	api.HandleFunc("/", a.notFound)
 	api.HandleFunc("/user/{userID}/comment/{commentID}", a.withParams).Methods(http.MethodGet)
 }

common.go

@@ -0,0 +1,16 @@
+package main
+
+import (
+	"reflect"
+)
+
+func isNil(i interface{}) bool {
+	if i == nil {
+		return true
+	}
+	switch reflect.TypeOf(i).Kind() {
+	case reflect.Ptr, reflect.Map, reflect.Array, reflect.Chan, reflect.Slice:
+		return reflect.ValueOf(i).IsNil()
+	}
+	return false
+}

responseHandlers.go

@@ -5,14 +5,44 @@ import (
 	"net/http"
 )
 
-func respondWithJSON(w http.ResponseWriter, code int, payload interface{}) {
-	response, _ := json.Marshal(payload)
+type BasicApiResponse struct {
+	Data    interface{} `json:"data"`
+	Status  int         `json:"status"`
+	Total   int         `json:"total"`
+	Message string      `json:"message"`
+}
+
+func respondWithJSON(w http.ResponseWriter, code int, payload map[string]interface{}) {
+
+	var apiResponse BasicApiResponse
+
+	apiResponse.Data = payload["data"]
+	if !isNil(apiResponse.Data) {
+		apiResponse.Status = 1
+	}
+
+	if !isNil(payload["status"]) {
+		apiResponse.Status = payload["status"].(int)
+	}
+
+	if !isNil(payload["total"]) {
+		apiResponse.Total = payload["total"].(int)
+	}
+
+	if !isNil(payload["message"].(string)) {
+		apiResponse.Message = payload["message"].(string)
+	}
+
+	if isNil(apiResponse.Total) {
+		apiResponse.Total = apiResponse.Status
+	}
 
+	response, _ := json.Marshal(apiResponse)
 	w.Header().Set("Content-Type", "application/json")
 	w.WriteHeader(code)
 	w.Write(response)
 }
 
 func respondWithError(w http.ResponseWriter, code int, message string) {
-	respondWithJSON(w, code, map[string]string{"error": message})
+	respondWithJSON(w, code, map[string]interface{}{"message": message})
 }

routeFunctions.go

@@ -34,25 +34,34 @@ func (a *App) apiMakeDbRequest(w http.ResponseWriter, r *http.Request) {
 
 	var queryrequest QueryRequest
 	json.Unmarshal(reqBody, &queryrequest)
-	fmt.Println(queryrequest)
+	// fmt.Println(queryrequest)
+
+	var response []query_response
 
-	var response interface{}
 	switch executeOnly_state {
 	case 0:
 		response, err = do_db_select_query(a.DB, queryrequest.QueryString)
-
 	default:
 		err = do_db_query_exec(a.DB, queryrequest.QueryString)
-		response = map[string]interface{}{"status": 1}
-
 	}
 
 	if err != nil {
 		respondWithError(w, http.StatusInternalServerError, err.Error())
 		return
 	}
-	respondWithJSON(w, http.StatusOK, response)
 
+	res := make(map[string]interface{})
+	res["message"] = "db query result"
+	res["data"] = response
+
+	if executeOnly_state == 0 {
+		res["total"] = len(response)
+	} else {
+		res["total"] = 1
+		res["status"] = 1
+	}
+
+	respondWithJSON(w, http.StatusOK, res)
 }
 
 func (a *App) getRequest(w http.ResponseWriter, r *http.Request) {