From 8b35c7d6c5da74bbda6441ff120bbc338ffd46c3 Mon Sep 17 00:00:00 2001
From: AKurakin <akurakin@mfd.ru>
Date: Thu, 14 Sep 2023 13:18:18 +0300
Subject: [PATCH] =?UTF-8?q?company-service=20http://jira.mfd.msk:8088/brow?=
 =?UTF-8?q?se/CLS-509=20=D1=80=D0=B5=D0=B4=D0=B0=D0=BA=D1=82=D0=B8=D1=80?=
 =?UTF-8?q?=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20CompanySymbol?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../config/validation/CompanySymbolValidationConfig.java | 8 ++------
 .../ru/spcex/clearing/company/error/CompanyErrors.java   | 1 +
 .../clearing/company/service/CompanySymbolService.java   | 9 ++++++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/config/validation/CompanySymbolValidationConfig.java b/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/config/validation/CompanySymbolValidationConfig.java
index c06df951a..0585c211f 100644
--- a/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/config/validation/CompanySymbolValidationConfig.java
+++ b/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/config/validation/CompanySymbolValidationConfig.java
@@ -73,12 +73,8 @@ public class CompanySymbolValidationConfig {
                             IMDGDistributedNames.Map_CompanySymbols,
                             CompanySymbols.class,
                             CompanyErrors.RequiredFieldEmpty,
-                            CompanyErrors.CompanyInfoNotFound,
-                            (CompanySymbols existSymbol) -> {
-                                assert existSymbol.getId().equals(context.getValidatedObject().getId());
-                                return existSymbol.getCompanySymbol().equals(context.getValidatedObject().getCompanySymbol())
-                                        ? null : CompanyErrors.EditCompanySymbols;
-                            }),
+                            CompanyErrors.CompanyInfoNotFound
+                    ),
 
                     FieldRequiredRule.instance("companyId", CompanySymbolUpdateRequest::getCompanyId, CompanyErrors.RequiredFieldEmpty),
                     IdPresentRule.instance("companyId",
diff --git a/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/error/CompanyErrors.java b/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/error/CompanyErrors.java
index 824f55545..feaa34f50 100644
--- a/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/error/CompanyErrors.java
+++ b/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/error/CompanyErrors.java
@@ -21,6 +21,7 @@ public enum CompanyErrors implements IErrorEnumId {
     CategoryAlreadySet(3017L),  // Компании %s уже присвоена категория %s.
     CompanyAlreadyHasLiabilities(3018L),  // У компании %s присутствуют обязательства.
     CompanyWithCompanySymbolAlreadyExist(3019L), // Компания с %s = %s уже создана" (где первый %s - companySymbol, второй %s - companySymbolValue)
+    @Deprecated
     EditCompanySymbols(3020L),  // Тип реквизита компании %s не может быть изменен.
     EditContactType(3021L),  // Тип контакта компании %s не может быть изменен.
     TradingClearingRegistryNotFound(3022L), // ТКР с %s не найден
diff --git a/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/CompanySymbolService.java b/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/CompanySymbolService.java
index 3297b9b03..ac69dc9fc 100644
--- a/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/CompanySymbolService.java
+++ b/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/CompanySymbolService.java
@@ -176,9 +176,12 @@ public class CompanySymbolService extends QueueConsumer implements InitializingB
             if (companySymbols == null) {
                 throw new ClearingBaseException(new EnumMessage(CompanyErrors.CompanyInfoNotFound, req.getId()));
             }
-//            if (!companySymbols.getCompanySymbol().equalsIgnoreCase(req.getCompanySymbolValue())) {
-//                throw new ClearingBaseException(new EnumMessage(CompanyErrors.EditCompanySymbols, req.getId()));
-//            }
+            if (!companySymbols.getCompanySymbol().equalsIgnoreCase(req.getCompanySymbol())) {
+                log.debug("Change CompanySymbol[{}].CompanySymbol from \"{}\" to \"{}\"",
+                        companySymbols.getId(), companySymbols.getCompanySymbol(), req.getCompanySymbol());
+                companyService.updateCompanyBySymbol(transaction, companySymbols, true);
+                companySymbols.setCompanySymbol(req.getCompanySymbol());
+            }
             companySymbols.setCompanySymbolValue(req.getCompanySymbolValue());
             companySymbolsTMap.update(companySymbols);
             companyService.updateCompanyBySymbol(transaction, companySymbols, false);