[Bug]added error handling for api calls

Signed-off-by: sumukhswamy <[email protected]>
opensearch-project · Oct 21, 2024 · d002719 · d002719
1 parent 8190b1f
commit d002719
Show file tree

Hide file tree

Showing 2 changed files with 116 additions and 33 deletions.
diff --git a/server/routes/query.ts b/server/routes/query.ts
@@ -37,9 +37,17 @@ export function registerQueryRoute(server: IRouter, service: QueryService) {
       response
     ): Promise<IOpenSearchDashboardsResponse<any | ResponseError>> => {
       const retVal = await service.describeSQLQuery(context, request);
-      return response.ok({
-        body: retVal,
-      });
+      if(retVal.data.ok){
+        return response.ok({
+          body: retVal,
+        });
+      }
+      else{
+        return response.custom({
+          body: retVal.data.body,
+          statusCode: retVal.data.statusCode
+        });
+      }
     }
   );
 
@@ -81,9 +89,17 @@ export function registerQueryRoute(server: IRouter, service: QueryService) {
       response
     ): Promise<IOpenSearchDashboardsResponse<any | ResponseError>> => {
       const retVal = await service.describeSQLCsv(context, request);
-      return response.ok({
-        body: retVal,
-      });
+      if(retVal.data.ok){
+        return response.ok({
+          body: retVal,
+        });
+      }
+      else{
+        return response.custom({
+          body: retVal.data.body,
+          statusCode: retVal.data.statusCode
+        });
+      }
     }
   );
 
@@ -103,9 +119,17 @@ export function registerQueryRoute(server: IRouter, service: QueryService) {
       response
     ): Promise<IOpenSearchDashboardsResponse<any | ResponseError>> => {
       const retVal = await service.describePPLCsv(context, request);
-      return response.ok({
-        body: retVal,
-      });
+      if(retVal.data.ok){
+        return response.ok({
+          body: retVal,
+        });
+      }
+      else{
+        return response.custom({
+          body: retVal.data.body,
+          statusCode: retVal.data.statusCode
+        });
+      }
     }
   );
 
@@ -125,9 +149,17 @@ export function registerQueryRoute(server: IRouter, service: QueryService) {
       response
     ): Promise<IOpenSearchDashboardsResponse<any | ResponseError>> => {
       const retVal = await service.describeSQLJson(context, request);
-      return response.ok({
-        body: retVal,
-      });
+      if(retVal.data.ok){
+        return response.ok({
+          body: retVal,
+        });
+      }
+      else{
+        return response.custom({
+          body: retVal.data.body,
+          statusCode: retVal.data.statusCode
+        });
+      }
     }
   );
 
@@ -147,9 +179,17 @@ export function registerQueryRoute(server: IRouter, service: QueryService) {
       response
     ): Promise<IOpenSearchDashboardsResponse<any | ResponseError>> => {
       const retVal = await service.describePPLJson(context, request);
-      return response.ok({
-        body: retVal,
-      });
+      if(retVal.data.ok){
+        return response.ok({
+          body: retVal,
+        });
+      }
+      else{
+        return response.custom({
+          body: retVal.data.body,
+          statusCode: retVal.data.statusCode
+        });
+      }
     }
   );
 
@@ -169,9 +209,17 @@ export function registerQueryRoute(server: IRouter, service: QueryService) {
       response
     ): Promise<IOpenSearchDashboardsResponse<any | ResponseError>> => {
       const retVal = await service.describeSQLText(context, request);
-      return response.ok({
-        body: retVal,
-      });
+      if(retVal.data.ok){
+        return response.ok({
+          body: retVal,
+        });
+      }
+      else{
+        return response.custom({
+          body: retVal.data.body,
+          statusCode: retVal.data.statusCode
+        });
+      }
     }
   );
 
@@ -191,9 +239,17 @@ export function registerQueryRoute(server: IRouter, service: QueryService) {
       response
     ): Promise<IOpenSearchDashboardsResponse<any | ResponseError>> => {
       const retVal = await service.describePPLText(context, request);
-      return response.ok({
-        body: retVal,
-      });
+      if(retVal.data.ok){
+        return response.ok({
+          body: retVal,
+        });
+      }
+      else{
+        return response.custom({
+          body: retVal.data.body,
+          statusCode: retVal.data.statusCode
+        });
+      }
     }
   );
 
@@ -213,9 +269,17 @@ export function registerQueryRoute(server: IRouter, service: QueryService) {
       response
     ): Promise<IOpenSearchDashboardsResponse<any | ResponseError>> => {
       const retVal = await service.describeSQLAsyncQuery(context, request);
-      return response.ok({
-        body: retVal,
-      });
+      if(retVal.data.ok){
+        return response.ok({
+          body: retVal,
+        });
+      }
+      else{
+        return response.custom({
+          body: retVal.data.body,
+          statusCode: retVal.data.statusCode
+        });
+      }
     }
   );
 
@@ -240,9 +304,17 @@ export function registerQueryRoute(server: IRouter, service: QueryService) {
         request.params.id,
         request.params.dataSourceMDSId
       );
-      return response.ok({
-        body: retVal,
-      });
+      if(retVal.data.ok){
+        return response.ok({
+          body: retVal,
+        });
+      }
+      else{
+        return response.custom({
+          body: retVal.data.body,
+          statusCode: retVal.data.statusCode
+        });
+      }
     }
   );
 
@@ -288,9 +360,17 @@ export function registerQueryRoute(server: IRouter, service: QueryService) {
       response
     ): Promise<IOpenSearchDashboardsResponse<any | ResponseError>> => {
       const retVal = await service.describeSyncQueryDataSources(context, request);
-      return response.ok({
-        body: retVal,
-      });
+      if(retVal.data.ok){
+        return response.ok({
+          body: retVal,
+        });
+      }
+      else{
+        return response.custom({
+          body: retVal.data.body,
+          statusCode: retVal.data.statusCode
+        });
+      }
     }
   );
 }
diff --git a/server/services/QueryService.ts b/server/services/QueryService.ts
@@ -52,7 +52,8 @@ export default class QueryService {
         data: {
           ok: false,
           resp: err.message,
-          body: err.body
+          body: err.body,
+          statusCode: err.statusCode || 400
         },
       };
     }
@@ -88,7 +89,8 @@ export default class QueryService {
         data: {
           ok: false,
           resp: err.message,
-          body: err.body
+          body: err.body,
+          statusCode: err.statusCode || 400
         },
       };
     }
@@ -121,7 +123,8 @@ export default class QueryService {
         data: {
           ok: false,
           resp: err.message,
-          body: err.body
+          body: err.body,
+          statusCode: err.statusCode || 400
         },
       };
     }