[Hexlet#276]. update js script, update tests, add override handleMeth…

…odArgumentNotValid method
kitdim · Jun 23, 2024 · d813da8 · d813da8
1 parent 4c25a7c
commit d813da8
Show file tree

Hide file tree

Showing 4 changed files with 89 additions and 10 deletions.
diff --git a/src/main/java/io/hexlet/typoreporter/handler/GlobalExceptionHandler.java b/src/main/java/io/hexlet/typoreporter/handler/GlobalExceptionHandler.java
@@ -1,18 +1,27 @@
 package io.hexlet.typoreporter.handler;
 
+import io.hexlet.typoreporter.handler.domain.ApiError;
 import io.hexlet.typoreporter.handler.exception.AccountAlreadyExistException;
 import io.hexlet.typoreporter.handler.exception.AccountNotFoundException;
 import io.hexlet.typoreporter.handler.exception.NewPasswordTheSameException;
 import io.hexlet.typoreporter.handler.exception.OldPasswordWrongException;
 import io.hexlet.typoreporter.handler.exception.WorkspaceAlreadyExistException;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
+import org.springframework.http.HttpStatusCode;
 import org.springframework.http.ResponseEntity;
+import org.springframework.validation.FieldError;
+import org.springframework.validation.ObjectError;
+import org.springframework.web.bind.MethodArgumentNotValidException;
 import org.springframework.web.bind.annotation.ControllerAdvice;
 import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.context.request.WebRequest;
 import org.springframework.web.servlet.mvc.method.annotation.ResponseEntityExceptionHandler;
 
 import javax.security.auth.login.AccountExpiredException;
+import java.util.ArrayList;
+import java.util.List;
 
 @Slf4j
 @ControllerAdvice
@@ -52,4 +61,22 @@ public ResponseEntity<String> handleTypoNotFoundException(TypeNotPresentExceptio
     public ResponseEntity<String> handleWorkSpaceAlreadyExistException(WorkspaceAlreadyExistException ex) {
         return ResponseEntity.status(HttpStatus.CONFLICT).body(ex.getMessage());
     }
+
+    @Override
+    protected ResponseEntity<Object> handleMethodArgumentNotValid(MethodArgumentNotValidException ex,
+                                                                  HttpHeaders headers,
+                                                                  HttpStatusCode status,
+                                                                  WebRequest request) {
+
+        List<String> errors = new ArrayList<>();
+        for (FieldError error : ex.getBindingResult().getFieldErrors()) {
+            errors.add(error.getField() + ": " + error.getDefaultMessage());
+        }
+        for (ObjectError error : ex.getBindingResult().getGlobalErrors()) {
+            errors.add(error.getObjectName() + ": " + error.getDefaultMessage());
+        }
+
+        ApiError apiError = new ApiError(HttpStatus.BAD_REQUEST, ex.getLocalizedMessage(), errors);
+        return handleExceptionInternal(ex, apiError, headers, apiError.getStatus(), request);
+    }
 }
diff --git a/src/main/java/io/hexlet/typoreporter/handler/domain/ApiError.java b/src/main/java/io/hexlet/typoreporter/handler/domain/ApiError.java
@@ -0,0 +1,29 @@
+package io.hexlet.typoreporter.handler.domain;
+
+import lombok.Getter;
+import org.springframework.http.HttpStatus;
+
+import java.util.Collections;
+import java.util.List;
+
+@Getter
+public class ApiError {
+
+    private final HttpStatus status;
+    private final String message;
+    private final List<String> errors;
+
+    public ApiError(HttpStatus status, String message, List<String> errors) {
+        super();
+        this.status = status;
+        this.message = message;
+        this.errors = errors;
+    }
+
+    public ApiError(HttpStatus status, String message, String error) {
+        super();
+        this.status = status;
+        this.message = message;
+        errors = Collections.singletonList(error);
+    }
+}
diff --git a/src/test/java/io/hexlet/typoreporter/web/WorkspaceApiIT.java b/src/test/java/io/hexlet/typoreporter/web/WorkspaceApiIT.java
@@ -35,7 +35,6 @@
 import static io.hexlet.typoreporter.test.factory.EntitiesFactory.WORKSPACE_101_TOKEN;
 import static java.time.Instant.now;
 import static org.springframework.http.MediaType.APPLICATION_JSON;
-import static org.springframework.http.MediaType.APPLICATION_PROBLEM_JSON;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.header;
@@ -114,8 +113,8 @@ void addTypoReportWithPageUrlBlank() throws Exception {
                 .header("Referer", ALLOWED_URL_101_URL)
                 .contentType(APPLICATION_JSON))
             .andExpect(status().isBadRequest())
-            .andExpect(content().contentType(APPLICATION_PROBLEM_JSON))
-            .andExpect(jsonPath("$.title").value("Bad Request"));
+            .andExpect(content().contentType(APPLICATION_JSON))
+            .andExpect(jsonPath("$.status").value("BAD_REQUEST"));
     }
 
     @Test
@@ -135,8 +134,8 @@ void addTypoReportWithPageUrlNull() throws Exception {
                 .header("Referer", ALLOWED_URL_101_URL)
                 .contentType(APPLICATION_JSON))
             .andExpect(status().isBadRequest())
-            .andExpect(content().contentType(APPLICATION_PROBLEM_JSON))
-            .andExpect(jsonPath("$.title").value("Bad Request"));
+            .andExpect(content().contentType(APPLICATION_JSON))
+            .andExpect(jsonPath("$.status").value("BAD_REQUEST"));
     }
 
     @Test
@@ -157,8 +156,8 @@ void addTypoReportWithPageUrlNotValid() throws Exception {
                 .header("Referer", ALLOWED_URL_101_URL)
                 .contentType(APPLICATION_JSON))
             .andExpect(status().isBadRequest())
-            .andExpect(content().contentType(APPLICATION_PROBLEM_JSON))
-            .andExpect(jsonPath("$.title").value("Bad Request"));
+            .andExpect(content().contentType(APPLICATION_JSON))
+            .andExpect(jsonPath("$.status").value("BAD_REQUEST"));
     }
 
     @ParameterizedTest

diff --git a/src/widget/index.js b/src/widget/index.js
@@ -222,17 +222,28 @@ const sendData = (elements, state) => async (event) => {
   state.data.reporterName = value === '' ? 'Anonymous' : value;
   state.data.reporterComment = elements.commentEl.value;
   try {
-    await fetch(`${state.options.workSpaceUrl}/api/workspaces/${state.options.workSpaceId}/typos`, {
+    let response = await fetch(`${state.options.workSpaceUrl}/api/workspaces/${state.options.workSpaceId}/typos`, {
       method: 'POST',
       headers: {
         'Content-Type': 'application/json',
         'Authorization': `Basic ${state.options.authorizationToken}`,
       },
       body: JSON.stringify(state.data),
     });
-    resetModalState(state);
+    let data = await response.json();
+    if (isSuccessPost(response)) {
+      resetModalState(state);
+    } else {
+      const errors = getErrors(data);
+      alert(errors);
+    }
   } catch (error) {
-    throw new Error('Произошла ошибка:', error);
+        let errorText =
+            'Error in plugin integration.\n' +
+            'Check the settings (https://fixit.hexlet.io/workspace/{workspaceID}/integration).';
+        alert(errorText)
+        resetModalState(state);
+        throw new Error('Произошла ошибка:', error);
   }
 };
 
@@ -267,6 +278,19 @@ const isSelectionLeftToRight = (selection) => {
   return range.collapsed;
 }
 
+const isSuccessPost = (response) => {
+  return response.status === 201;
+}
+
+const getErrors = (data) => {
+  let text = 'There are the following errors in the submission form:\n';
+  Object.keys(data.errors).forEach(key => {
+    let message = data.errors[key];
+    text += `${message} \n`;
+  });
+  return text;
+}
+
 const handleTypoReporter = (options) => {
   if (!options || !options.authorizationToken && !options.workSpaceId) {
     throw new Error('Для работы модуля требуется указать workSpaceId и authorizationToken');