refactor(controller.client): simplify with body.Merge

adhocore · Oct 3, 2020 · 4735648 · 4735648
1 parent a025a1d
commit 4735648
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/controller/client.go b/controller/client.go
@@ -11,17 +11,18 @@ import (
 func CreateShortUrl(res http.ResponseWriter, req *http.Request) {
     shortCode, err := url.CreateUrlShortCodeFromRequest(req)
     shortUrl := fmt.Sprintf("%s%s%s", "http://", req.Host, "/" + shortCode)
+    body := response.Body{"short_code": shortCode, "short_url": shortUrl}
 
     if err == nil {
-        response.JSON(res, http.StatusOK, response.Body{"short_code": shortCode, "short_url": shortUrl})
+        response.JSON(res, http.StatusOK, body)
         return
     }
 
-    status, body := http.StatusUnprocessableEntity, response.Body{"message": err.Error()}
+    status, errBody := http.StatusUnprocessableEntity, response.Body{"message": err.Error()}
     if shortCode != "" {
         status = http.StatusConflict
-        body["short_code"] = shortCode
+        errBody.Merge(body)
     }
 
-    response.JSON(res, status, body)
+    response.JSON(res, status, errBody)
 }