Added checkErrorV5 to submissions services

Author: luizrrodrigues

src/services/submissions.js

@@ -5,8 +5,32 @@
  */
 import _ from 'lodash';
 import qs from 'qs';
+import { setErrorIcon, ERROR_ICON_TYPES } from '../utils/errors';
 import { getApi } from './api';
 
+/**
+ * Helper method that checks for HTTP error response v5 and throws Error in this case.
+ * @param {Object} res HTTP response object
+ * @return {Object} API JSON response object
+ * @private
+ */
+async function checkErrorV5(res) {
+  if (!res.ok) {
+    if (res.status >= 500) {
+      setErrorIcon(ERROR_ICON_TYPES.API, '/challenges', res.statusText);
+    }
+    throw new Error(res.statusText);
+  }
+  const jsonRes = (await res.json());
+  if (jsonRes.message) {
+    throw new Error(res.message);
+  }
+  return {
+    result: jsonRes,
+    headers: res.headers,
+  };
+}
+
 /**
  * Submission service.
  */
@@ -36,8 +60,8 @@ class SubmissionsService {
 
     const url = `/submissions?${qs.stringify(query, { encode: false })}`;
     return this.private.apiV5.get(url)
-      .then(res => (res.ok ? res.json() : new Error(res.statusText)))
-      .then(res => res);
+      .then(checkErrorV5)
+      .then(res => res.result);
   }
 
   /**
@@ -47,14 +71,14 @@ class SubmissionsService {
   async getScanReviewIds() {
     const reviews = await Promise.all([
       this.private.apiV5.get('/reviewTypes?name=AV Scan')
-        .then(res => (res.ok ? res.json() : new Error(res.statusText)))
-        .then(res => res),
+        .then(checkErrorV5)
+        .then(res => res.result),
       this.private.apiV5.get('/reviewTypes?name=SonarQube Review')
-        .then(res => (res.ok ? res.json() : new Error(res.statusText)))
-        .then(res => res),
+        .then(checkErrorV5)
+        .then(res => res.result),
       this.private.apiV5.get('/reviewTypes?name=Virus Scan')
-        .then(res => (res.ok ? res.json() : new Error(res.statusText)))
-        .then(res => res),
+        .then(checkErrorV5)
+        .then(res => res.result),
     ]).then(([av, sonar, virus]) => (_.concat(av, sonar, virus)));
 
     return reviews.map(r => r.id);