Change user to customer field

pom.xml

@@ -23,7 +23,7 @@
         <management.port>8023</management.port>
         <exposed.ports>${server.port} ${management.port}</exposed.ports>
         <dockerfile.registry>${env.REGISTRY}</dockerfile.registry>
-        <swag-fraudbusters.version>1.117-7e0ac25</swag-fraudbusters.version>
+        <swag-fraudbusters.version>1.119-7d5622c</swag-fraudbusters.version>
         <fraudbusters-proto.version>1.108-0800fde</fraudbusters-proto.version>
         <jjwt-version>0.12.6</jjwt-version>
         <damsel.version>1.681-7a97267</damsel.version>

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<ShopContext> 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()

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,14 +15,15 @@
 
 @Slf4j
 @RestController
+@Validated
 @RequiredArgsConstructor
 public class UserInspectorResource implements InspectUserApi {
 
     private final FraudbustersInspectorService fraudbustersInspectorService;
     private final Converter<UserInspectRequest, InspectUserContext> userInspectRequestToInspectUserContextConverter;
 
     @Override
-    public ResponseEntity<UserInspectResult> inspectUser(UserInspectRequest userInspectRequest) {
+    public ResponseEntity<UserInspectResult> inspectUser(@Valid UserInspectRequest userInspectRequest) {
         log.debug("-> inspectUser request: {}", userInspectRequest);
         InspectUserContext context = userInspectRequestToInspectUserContextConverter.convert(userInspectRequest);
         UserInspectResult result = fraudbustersInspectorService.inspectUser(context);

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());