Merge pull request #127 from numary/feature/num-288-remove-response-w…

…rapper-n-ledger-api Remove 'ok' property on json responses.
formancehq · Jan 19, 2022 · 01de87f · 01de87f
2 parents 9c03790 + f600702
commit 01de87f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 11 deletions.
diff --git a/pkg/api/controllers/base_controller.go b/pkg/api/controllers/base_controller.go
@@ -10,22 +10,18 @@ import (
 // Controllers struct
 type BaseController struct{}
 
-type BaseResponse struct {
-	Ok bool `json:"ok"`
-}
+type BaseResponse struct {}
 
 func (ctl *BaseController) response(c *gin.Context, status int, data interface{}) {
 	if data == nil {
 		c.Status(status)
 	}
 	if reflect.TypeOf(data) == reflect.TypeOf(query.Cursor{}) {
 		c.JSON(status, gin.H{
-			"ok":     true,
 			"cursor": data,
 		})
 	} else {
 		c.JSON(status, gin.H{
-			"ok":   true,
 			"data": data,
 		})
 	}
@@ -34,7 +30,6 @@ func (ctl *BaseController) response(c *gin.Context, status int, data interface{}
 func (ctl *BaseController) responseError(c *gin.Context, status int, err error) {
 	c.Abort()
 	c.AbortWithStatusJSON(status, gin.H{
-		"ok":            false,
 		"error":         true,
 		"error_code":    status,
 		"error_message": err.Error(),

diff --git a/pkg/api/controllers/script_controller.go b/pkg/api/controllers/script_controller.go
@@ -40,9 +40,7 @@ func (ctl *ScriptController) PostScript(c *gin.Context) {
 
 	err := l.(*ledger.Ledger).Execute(c.Request.Context(), script)
 
-	res := gin.H{
-		"ok": err == nil,
-	}
+	res := gin.H{}
 
 	if err != nil {
 		errStr := err.Error()

diff --git a/pkg/api/middlewares/ledger_middleware.go b/pkg/api/middlewares/ledger_middleware.go
@@ -32,8 +32,9 @@ func (m *LedgerMiddleware) LedgerMiddleware() gin.HandlerFunc {
 		l, err := m.resolver.GetLedger(c.Request.Context(), name)
 		if err != nil {
 			c.JSON(400, gin.H{
-				"ok":  false,
-				"err": err.Error(),
+				"error":         true,
+				"error_code":    400,
+				"error_message": err.Error(),
 			})
 		}
 		defer func() {