diff --git a/pom.xml b/pom.xml
index 4487067..38b5337 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
8023
${server.port} ${management.port}
${env.REGISTRY}
- 1.117-7e0ac25
+ 1.119-7d5622c
1.108-0800fde
0.12.6
1.681-7a97267
diff --git a/src/main/java/dev/vality/fraudbusters/api/converter/UserInspectRequestToInspectUserContextConverter.java b/src/main/java/dev/vality/fraudbusters/api/converter/UserInspectRequestToInspectUserContextConverter.java
index 96b87d1..0645658 100644
--- a/src/main/java/dev/vality/fraudbusters/api/converter/UserInspectRequestToInspectUserContextConverter.java
+++ b/src/main/java/dev/vality/fraudbusters/api/converter/UserInspectRequestToInspectUserContextConverter.java
@@ -24,7 +24,7 @@ public class UserInspectRequestToInspectUserContextConverter
@Override
public InspectUserContext convert(UserInspectRequest request) {
- ContactInfo userInfo = buildUserInfo(request.getUser());
+ ContactInfo userInfo = buildContactInfo(request.getCustomer());
List shopContexts = Optional.ofNullable(request.getMerchants())
.orElse(Collections.emptyList())
.stream()
@@ -35,8 +35,8 @@ public InspectUserContext convert(UserInspectRequest request) {
.setShopList(shopContexts);
}
- private ContactInfo buildUserInfo(Customer user) {
- Contact contact = Optional.ofNullable(user)
+ private ContactInfo buildContactInfo(Customer customer) {
+ Contact contact = Optional.ofNullable(customer)
.map(Customer::getContact)
.orElseGet(Contact::new);
return new ContactInfo()
diff --git a/src/main/java/dev/vality/fraudbusters/api/resource/UserInspectorResource.java b/src/main/java/dev/vality/fraudbusters/api/resource/UserInspectorResource.java
index 3232477..eae5907 100644
--- a/src/main/java/dev/vality/fraudbusters/api/resource/UserInspectorResource.java
+++ b/src/main/java/dev/vality/fraudbusters/api/resource/UserInspectorResource.java
@@ -5,6 +5,7 @@
import dev.vality.swag.fraudbusters.api.InspectUserApi;
import dev.vality.swag.fraudbusters.model.UserInspectRequest;
import dev.vality.swag.fraudbusters.model.UserInspectResult;
+import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.core.convert.converter.Converter;
@@ -14,6 +15,7 @@
@Slf4j
@RestController
+@Validated
@RequiredArgsConstructor
public class UserInspectorResource implements InspectUserApi {
@@ -21,7 +23,7 @@ public class UserInspectorResource implements InspectUserApi {
private final Converter userInspectRequestToInspectUserContextConverter;
@Override
- public ResponseEntity inspectUser(UserInspectRequest userInspectRequest) {
+ public ResponseEntity inspectUser(@Valid UserInspectRequest userInspectRequest) {
log.debug("-> inspectUser request: {}", userInspectRequest);
InspectUserContext context = userInspectRequestToInspectUserContextConverter.convert(userInspectRequest);
UserInspectResult result = fraudbustersInspectorService.inspectUser(context);
diff --git a/src/test/java/dev/vality/fraudbusters/api/resource/ResourceTest.java b/src/test/java/dev/vality/fraudbusters/api/resource/ResourceTest.java
index 25cc411..6f361ef 100644
--- a/src/test/java/dev/vality/fraudbusters/api/resource/ResourceTest.java
+++ b/src/test/java/dev/vality/fraudbusters/api/resource/ResourceTest.java
@@ -166,10 +166,11 @@ void inspectUserTest() {
when(fraudbustersInspectorService.inspectUser(any())).thenReturn(new UserInspectResult());
UserInspectRequest request = new UserInspectRequest();
+ request.setMerchants(null);
assertThrows(HttpClientErrorException.BadRequest.class, () ->
restTemplate.postForEntity(initUrl(INSPECT_USER), request, UserInspectResult.class));
- request.user(ApiBeanGenerator.initCustomer());
+ request.customer(ApiBeanGenerator.initCustomer());
request.merchants(List.of(ApiBeanGenerator.initMerchant()));
restTemplate.postForEntity(initUrl(INSPECT_USER), request, UserInspectResult.class);
verify(fraudbustersInspectorService, times(1)).inspectUser(any());