chore: separate error and success responses as per the specification, for mobile api (#324)

This commit is contained in:
Daniel Sanchez 2022-09-30 18:04:22 +02:00 committed by GitHub
parent 0da70116b0
commit 2881d0cd5e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 11 deletions

View File

@ -2,8 +2,11 @@ package gowaku
import "encoding/json"
type jsonResponse struct {
Error *string `json:"error,omitempty"`
type jsonResponseError struct {
Error *string `json:"error"`
}
type jsonResponseSuccess struct {
Result interface{} `json:"result"`
}
@ -11,14 +14,14 @@ func prepareJSONResponse(result interface{}, err error) string {
if err != nil {
errStr := err.Error()
errResponse := jsonResponse{
errResponse := jsonResponseError{
Error: &errStr,
}
response, _ := json.Marshal(&errResponse)
return string(response)
}
data, err := json.Marshal(jsonResponse{Result: result})
data, err := json.Marshal(jsonResponseSuccess{Result: result})
if err != nil {
return prepareJSONResponse(nil, err)
}
@ -26,17 +29,14 @@ func prepareJSONResponse(result interface{}, err error) string {
}
func makeJSONResponse(err error) string {
var errString *string = nil
result := true
if err != nil {
errStr := err.Error()
errString = &errStr
result = false
outBytes, _ := json.Marshal(jsonResponseError{Error: &errStr})
return string(outBytes)
}
out := jsonResponse{
Error: errString,
Result: result,
out := jsonResponseSuccess{
Result: true,
}
outBytes, _ := json.Marshal(out)