feat(core): Response error code for invalid result

DLTcollab · Mar 15, 2019 · cb3d926 · cb3d926
1 parent fb6c29c
commit cb3d926
Showing 1 changed file with 52 additions and 10 deletions.
diff --git a/accelerator/server.cc b/accelerator/server.cc
@@ -14,6 +14,27 @@ void set_options_method_header(served::response& res) {
   res.set_header("Access-Control-Max-Age", "86400");
 }
 
+status_t set_response_content(status_t ret, char** json_result) {
+  status_t http_ret;
+  if (ret == SC_OK) {
+    return SC_HTTP_OK;
+  }
+
+  cJSON* json_obj = cJSON_CreateObject();
+  if (ret == SC_CCLIENT_NOT_FOUND) {
+    http_ret = SC_NOT_FOUND;
+    cJSON_AddStringToObject(json_obj, "message", "Request not found");
+  } else if (ret == SC_SERIALIZER_JSON_PARSE) {
+    http_ret = SC_BAD_REQUEST;
+    cJSON_AddStringToObject(json_obj, "message", "Invalid request header");
+  } else {
+    http_ret = SC_INTERNAL_SERVICE_ERROR;
+    cJSON_AddStringToObject(json_obj, "message", "Internal service error");
+  }
+  *json_result = cJSON_PrintUnformatted(json_obj);
+  return http_ret;
+}
+
 int main(int, char const**) {
   served::multiplexer mux;
   mux.use_after(served::plugin::access_log);
@@ -62,12 +83,15 @@ int main(int, char const**) {
                 set_options_method_header(res);
               })
       .get([&](served::response& res, const served::request& req) {
+        status_t ret = SC_OK;
         char* json_result;
 
-        api_find_transactions_by_tag(&service, req.params["tag"].c_str(),
-                                     &json_result);
+        ret = api_find_transactions_by_tag(&service, req.params["tag"].c_str(),
+                                           &json_result);
+        ret = set_response_content(ret, &json_result);
         res.set_header("Content-Type", "application/json");
         res.set_header("Access-Control-Allow-Origin", "*");
+        res.set_status(ret);
         res << json_result;
       });
 
@@ -84,12 +108,15 @@ int main(int, char const**) {
                 set_options_method_header(res);
               })
       .get([&](served::response& res, const served::request& req) {
+        status_t ret = SC_OK;
         char* json_result;
 
-        api_get_transaction_object(&service, req.params["tx"].c_str(),
-                                   &json_result);
+        ret = api_get_transaction_object(&service, req.params["tx"].c_str(),
+                                         &json_result);
+        ret = set_response_content(ret, &json_result);
         res.set_header("Content-Type", "application/json");
         res.set_header("Access-Control-Allow-Origin", "*");
+        res.set_status(ret);
         res << json_result;
       });
 
@@ -106,12 +133,15 @@ int main(int, char const**) {
                 set_options_method_header(res);
               })
       .get([&](served::response& res, const served::request& req) {
+        status_t ret = SC_OK;
         char* json_result;
 
-        api_find_transactions_obj_by_tag(&service, req.params["tag"].c_str(),
-                                         &json_result);
+        ret = api_find_transactions_obj_by_tag(
+            &service, req.params["tag"].c_str(), &json_result);
+        ret = set_response_content(ret, &json_result);
         res.set_header("Content-Type", "application/json");
         res.set_header("Access-Control-Allow-Origin", "*");
+        res.set_status(ret);
         res << json_result;
       });
 
@@ -126,11 +156,14 @@ int main(int, char const**) {
                 set_options_method_header(res);
               })
       .get([&](served::response& res, const served::request& req) {
+        status_t ret = SC_OK;
         char* json_result;
 
-        api_get_tips_pair(&service, &json_result);
+        ret = api_get_tips_pair(&service, &json_result);
+        ret = set_response_content(ret, &json_result);
         res.set_header("Content-Type", "application/json");
         res.set_header("Access-Control-Allow-Origin", "*");
+        res.set_status(ret);
         res << json_result;
       });
 
@@ -145,11 +178,14 @@ int main(int, char const**) {
                 set_options_method_header(res);
               })
       .get([&](served::response& res, const served::request& req) {
+        status_t ret = SC_OK;
         char* json_result;
 
-        api_get_tips(&service, &json_result);
+        ret = api_get_tips(&service, &json_result);
+        ret = set_response_content(ret, &json_result);
         res.set_header("Content-Type", "application/json");
         res.set_header("Access-Control-Allow-Origin", "*");
+        res.set_status(ret);
         res << json_result;
       });
 
@@ -164,11 +200,14 @@ int main(int, char const**) {
                 set_options_method_header(res);
               })
       .get([&](served::response& res, const served::request& req) {
+        status_t ret = SC_OK;
         char* json_result;
 
-        api_generate_address(&service, &json_result);
+        ret = api_generate_address(&service, &json_result);
+        ret = set_response_content(ret, &json_result);
         res.set_header("Content-Type", "application/json");
         res.set_header("Access-Control-Allow-Origin", "*");
+        res.set_status(ret);
         res << json_result;
       });
 
@@ -183,6 +222,7 @@ int main(int, char const**) {
                 set_options_method_header(res);
               })
       .post([&](served::response& res, const served::request& req) {
+        status_t ret = SC_OK;
         char* json_result;
 
         if (req.header("content-type").find("application/json") ==
@@ -195,7 +235,9 @@ int main(int, char const**) {
           res.set_status(SC_BAD_REQUEST);
           cJSON_Delete(json_obj);
         } else {
-          api_send_transfer(&service, req.body().c_str(), &json_result);
+          ret = api_send_transfer(&service, req.body().c_str(), &json_result);
+          ret = set_response_content(ret, &json_result);
+          res.set_status(ret);
         }
 
         res.set_header("Content-Type", "application/json");