From e3cbd738072429e04b22020da49f2a56bd23a892 Mon Sep 17 00:00:00 2001
From: AKurakin <akurakin@mfd.ru>
Date: Wed, 21 Jun 2023 13:38:51 +0300
Subject: [PATCH] =?UTF-8?q?company-service=20=D0=BF=D0=BE=D0=BF=D1=80?=
 =?UTF-8?q?=D0=B0=D0=B2=D0=B8=D0=BB=20=D1=82=D0=B5=D0=BA=D1=81=D1=82=20?=
 =?UTF-8?q?=D0=BE=D1=88=D0=B8=D0=B1=D0=BE=D0=BA=20=D0=B4=D0=BB=D1=8F=20com?=
 =?UTF-8?q?pany-new/update?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../company/service/CompanyService.java       | 36 ++++++++-----------
 1 file changed, 15 insertions(+), 21 deletions(-)

diff --git a/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/CompanyService.java b/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/CompanyService.java
index 333e2bc34..50d275afa 100644
--- a/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/CompanyService.java
+++ b/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/CompanyService.java
@@ -66,11 +66,11 @@ public class CompanyService extends QueueConsumer implements InitializingBean {
                           ValidationHelper validationHelper,
                           UserRoleVerification userRoleVerification,
                           @Qualifier("companyNewRequestValidator")
-                          Function<CompanyNewRequest, IValidator> companyNewRequestValidator,
+                                  Function<CompanyNewRequest, IValidator> companyNewRequestValidator,
                           @Qualifier("companyUpdateRequestValidator")
-                          Function<CompanyNewRequest, IValidator> companyUpdateRequestValidator,
+                                  Function<CompanyNewRequest, IValidator> companyUpdateRequestValidator,
                           @Qualifier("CompanyDeleteRequestValidator")
-                          Function<CommonDeleteRequest, IValidator> companyDeleteRequestValidator,
+                                  Function<CommonDeleteRequest, IValidator> companyDeleteRequestValidator,
                           CompanySymbolService companySymbolService,
                           AccountNotificationHelper accountNotification,
                           RelationService relationService) {
@@ -112,28 +112,22 @@ public class CompanyService extends QueueConsumer implements InitializingBean {
         init();
     }
 
-    private RequestInfoUpdate processBaseRequest(BaseRequest<?> request) {
-        RequestInfoUpdate requestInfoUpdate = null;
+    private RequestInfoUpdate processBaseRequest(BaseRequest<?> request) throws ValidationException {
         // Валидация
-        requestInfoUpdate = userRoleVerification.validateRoleAndGetResult(request);
+        RequestInfoUpdate requestInfoUpdate = userRoleVerification.validateRoleAndGetResult(request);
         if (requestInfoUpdate != null) return requestInfoUpdate;
-
-        try {
-            ActionType actionType = request.getActionType();
-            switch (actionType) {
-                case NEW -> {
-                    CompanyNewRequest companyNewRequest = (CompanyNewRequest) request.getRequestPayload();
-                    IValidator validator = companyNewRequestValidator.apply(companyNewRequest);
-                    Optional<EnumMessage> error = validator.tillFirstError();
-                    if (error.isPresent()){
-                        return new RequestInfoUpdate(request.getId(), Status.Error, error.get().toString());
-                    }
-                    create(companyNewRequest);
+        ActionType actionType = request.getActionType();
+        switch (actionType) {
+            case NEW -> {
+                CompanyNewRequest companyNewRequest = (CompanyNewRequest) request.getRequestPayload();
+                IValidator validator = companyNewRequestValidator.apply(companyNewRequest);
+                Optional<EnumMessage> error = validator.tillFirstError();
+                if (error.isPresent()) {
+                    throw new ValidationException(error.get());
                 }
-                case UPDATE -> update((CompanyNewRequest) request.getRequestPayload());
+                create(companyNewRequest);
             }
-        } catch (ValidationException e) {
-            requestInfoUpdate = new RequestInfoUpdate(request.getId(), Status.Error, e.getMessage());
+            case UPDATE -> update((CompanyNewRequest) request.getRequestPayload());
         }
         return requestInfoUpdate;
     }