From eccfb27efee47e4ea112d2bdc82d02d0a9f68102 Mon Sep 17 00:00:00 2001
From: AKurakin <akurakin@mfd.ru>
Date: Thu, 14 Sep 2023 12:52:24 +0300
Subject: [PATCH] =?UTF-8?q?account-service=20CLS-533=20=D1=80=D0=B0=D0=B7?=
 =?UTF-8?q?=D1=80=D0=B5=D1=88=D0=B5=D0=BD=D0=B8=D0=B5=20=D1=80=D0=B5=D0=B4?=
 =?UTF-8?q?=D0=B0=D0=BA=D1=82=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D1=82=D1=8C=20?=
 =?UTF-8?q?=D0=B2=D1=81=D0=B5=20=D1=81=D1=87=D0=B5=D1=82=D0=B0=20(=D0=BF?=
 =?UTF-8?q?=D0=BE=D1=82=D0=BE=D0=BC=D1=83=20=D1=87=D1=82=D0=BE=20=D1=82?=
 =?UTF-8?q?=D0=BE=D0=BB=D1=8C=D0=BA=D0=BE=20=D1=81=D1=82=D0=B0=D1=82=D1=83?=
 =?UTF-8?q?=D1=81=20=D0=BC=D0=B5=D0=BD=D1=8F=D0=B5=D1=82=D1=81=D1=8F)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../config/validation/AccountValidationConfig.java     | 10 ++++++----
 .../spcex/clearing/account/service/AccountService.java |  4 ++++
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/config/validation/AccountValidationConfig.java b/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/config/validation/AccountValidationConfig.java
index 2d927427d..2d874f69a 100644
--- a/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/config/validation/AccountValidationConfig.java
+++ b/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/config/validation/AccountValidationConfig.java
@@ -141,10 +141,12 @@ public class AccountValidationConfig {
                             AccountTypeDictionary.class,
                             AccountError.RequiredFieldEmpty,
                             AccountError.WrongFieldValue,
-                            accountType -> {
-                                if (AccountType.Corr.equalsByKey(accountType.getCode())) return null;
-                                return AccountError.WrongFieldValue;
-                            })
+                            false
+//                            accountType -> {
+//                                if (AccountType.Corr.equalsByKey(accountType.getCode())) return null;
+//                                return AccountError.WrongFieldValue;
+//                            }
+                            )
             );
         };
     }
diff --git a/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/AccountService.java b/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/AccountService.java
index 786fc475e..758557528 100644
--- a/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/AccountService.java
+++ b/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/AccountService.java
@@ -163,6 +163,10 @@ public class AccountService extends QueueConsumer implements InitializingBean {
         CorrespondentAccountUpdateRequest request = userRequest.getRequestPayload();
 
         Account account = accountMap.getSingleObjectByID(request.getId());
+        if (request.getAccountType() != null && !request.getAccountType().equals(account.getAccountType())) {
+            requestInfoUpdate = makeError(userRequest.getId(), AccountError.WrongFieldValue, "accountType");
+            return requestInfoUpdate;
+        }
 
         if (request.getStatus() != null) account.setStatus(request.getStatus());