create parsing exception from client

Board-of-Directors · Oct 23, 2023 · 280fb05 · 280fb05
1 parent 40af59d
commit 280fb05
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/src/main/java/ru/nsu/fit/directors/userservice/api/OrderApi.java b/src/main/java/ru/nsu/fit/directors/userservice/api/OrderApi.java
@@ -8,6 +8,7 @@
 import org.springframework.stereotype.Component;
 import org.springframework.web.reactive.function.client.WebClient;
 import org.springframework.web.util.UriBuilder;
+import ru.nsu.fit.directors.userservice.dto.response.BaseResponse;
 import ru.nsu.fit.directors.userservice.exception.ClientException;
 import ru.nsu.fit.directors.userservice.exception.ServerNotAvailableException;
 
@@ -43,8 +44,14 @@ public <T> List<T> syncListGetWithParams(Function<UriBuilder, URI> uriBuilder, C
                 .uri(uriBuilder)
                 .accept(MediaType.APPLICATION_JSON)
                 .retrieve()
-                .onStatus(HttpStatusCode::is4xxClientError, response -> response.bodyToMono(String.class).map(ClientException::new))
-                .onStatus(HttpStatusCode::is5xxServerError, response -> response.bodyToMono(String.class).map(ServerNotAvailableException::new))
+                .onStatus(
+                    HttpStatusCode::is4xxClientError,
+                    response -> response.bodyToMono(BaseResponse.class).map(resp -> new ClientException(resp.getException().getMessage()))
+                )
+                .onStatus(
+                    HttpStatusCode::is5xxServerError,
+                    response -> response.bodyToMono(String.class).map(ServerNotAvailableException::new)
+                )
                 .toEntityList(type)
                 .block())
             .map(ResponseEntity::getBody)

diff --git a/src/main/java/ru/nsu/fit/directors/userservice/dto/response/BaseResponse.java b/src/main/java/ru/nsu/fit/directors/userservice/dto/response/BaseResponse.java
@@ -1,6 +1,7 @@
 package ru.nsu.fit.directors.userservice.dto.response;
 
 import lombok.Getter;
+import lombok.NoArgsConstructor;
 import lombok.Setter;
 
 /**
@@ -14,6 +15,7 @@
  */
 @Getter
 @Setter
+@NoArgsConstructor
 public class BaseResponse<T> {
     private T result;
     private ResponseException exception;

diff --git a/src/main/java/ru/nsu/fit/directors/userservice/dto/response/ResponseException.java b/src/main/java/ru/nsu/fit/directors/userservice/dto/response/ResponseException.java
@@ -1,6 +1,7 @@
 package ru.nsu.fit.directors.userservice.dto.response;
 
 import lombok.Getter;
+import lombok.NoArgsConstructor;
 import lombok.Setter;
 
 /**
@@ -9,6 +10,7 @@
  */
 @Getter
 @Setter
+@NoArgsConstructor
 public class ResponseException {
     private String message;
     private String type;