エラー見れるように修正

rabee-inc · Nov 1, 2021 · ec70a72 · ec70a72
1 parent 35483a4
commit ec70a72
Showing 1 changed file with 34 additions and 22 deletions.
diff --git a/httpclient/client.go b/httpclient/client.go
@@ -124,13 +124,17 @@ func PostJSON(ctx context.Context, url string, param interface{}, res interface{
 
 	status, body, err := send(ctx, req, opt)
 	if body != nil && len(body) > 0 {
-		errRes := map[string]interface{}{}
-		err = json.Unmarshal(body, &errRes)
-		if err != nil {
-			log.Warningm(ctx, "json.Unmarshal", err)
-			return status, err
+		if status == http.StatusOK {
+			perr := json.Unmarshal(body, res)
+			if perr != nil {
+				log.Warningm(ctx, "json.Unmarshal", perr)
+				err = perr
+			}
+		} else {
+			errRes := map[string]interface{}{}
+			err = json.Unmarshal(body, &errRes)
+			log.Warningf(ctx, "%v", errRes)
 		}
-		log.Warningf(ctx, "%v", errRes)
 	}
 	return status, err
 }
@@ -176,14 +180,18 @@ func PutJSON(ctx context.Context, url string, param interface{}, res interface{}
 	}
 
 	status, body, err := send(ctx, req, opt)
-	if status != http.StatusOK {
-		return status, err
-	}
-
-	err = json.Unmarshal(body, res)
-	if err != nil {
-		log.Warningm(ctx, "json.Unmarshal", err)
-		return status, err
+	if body != nil && len(body) > 0 {
+		if status == http.StatusOK {
+			perr := json.Unmarshal(body, res)
+			if perr != nil {
+				log.Warningm(ctx, "json.Unmarshal", perr)
+				err = perr
+			}
+		} else {
+			errRes := map[string]interface{}{}
+			err = json.Unmarshal(body, &errRes)
+			log.Warningf(ctx, "%v", errRes)
+		}
 	}
 	return status, err
 }
@@ -283,14 +291,18 @@ func DeleteJSON(ctx context.Context, url string, param interface{}, res interfac
 	}
 
 	status, body, err := send(ctx, req, opt)
-	if status != http.StatusOK {
-		return status, err
-	}
-
-	err = json.Unmarshal(body, res)
-	if err != nil {
-		log.Warningm(ctx, "json.Unmarshal", err)
-		return status, err
+	if body != nil && len(body) > 0 {
+		if status == http.StatusOK {
+			perr := json.Unmarshal(body, res)
+			if perr != nil {
+				log.Warningm(ctx, "json.Unmarshal", perr)
+				err = perr
+			}
+		} else {
+			errRes := map[string]interface{}{}
+			err = json.Unmarshal(body, &errRes)
+			log.Warningf(ctx, "%v", errRes)
+		}
 	}
 	return status, err
 }