From 94da51654e79e2380da0760af9af72eb35f38b1b Mon Sep 17 00:00:00 2001 From: kostyastruga Date: Fri, 23 Jan 2026 18:40:29 +0700 Subject: [PATCH 1/3] Change proto --- pom.xml | 2 +- .../UserInspectRequestToInspectUserContextConverter.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) 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() From baababb99c85c3e4c4f017440904197d1822f9c8 Mon Sep 17 00:00:00 2001 From: kostyastruga Date: Fri, 23 Jan 2026 18:44:41 +0700 Subject: [PATCH 2/3] Change proto --- .../java/dev/vality/fraudbusters/api/resource/ResourceTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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..845e474 100644 --- a/src/test/java/dev/vality/fraudbusters/api/resource/ResourceTest.java +++ b/src/test/java/dev/vality/fraudbusters/api/resource/ResourceTest.java @@ -169,7 +169,7 @@ void inspectUserTest() { 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()); From 496abfcfd0adea4483e2dcb7a50cc54acee8b41b Mon Sep 17 00:00:00 2001 From: kostyastruga Date: Fri, 23 Jan 2026 20:10:52 +0700 Subject: [PATCH 3/3] Fix test --- .../fraudbusters/api/resource/UserInspectorResource.java | 4 +++- .../dev/vality/fraudbusters/api/resource/ResourceTest.java | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) 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 845e474..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,6 +166,7 @@ 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));