From dd41ada2563b2a665dfced1d35af2c61982e6b71 Mon Sep 17 00:00:00 2001
From: AKurakin <akurakin@mfd.ru>
Date: Tue, 18 Apr 2023 16:02:37 +0300
Subject: [PATCH] backend-api . CLS-264 CLS-257

---
 .../request/cud/account/AccountUpdateAction.java          | 1 -
 .../controller/queue/account/AccountControllerTest.java   | 2 +-
 .../queue/account/BankAccountControllerTest.java          | 6 +++---
 .../queue/company/EditCompanyInfoControllerTest.java      | 2 +-
 .../queue/journal/InDocumentJournalControllerTest.java    | 2 +-
 .../queue/utilities/CudKeyRateControllerTest.java         | 2 +-
 .../clearing/company/service/CompanyInfoService.java      | 2 --
 .../clearing/company/service/CompanyInfoServiceTest.java  | 8 ++------
 8 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/account/AccountUpdateAction.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/account/AccountUpdateAction.java
index fada9b182..9bbabc425 100644
--- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/account/AccountUpdateAction.java
+++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/account/AccountUpdateAction.java
@@ -6,7 +6,6 @@ import org.springframework.util.StringUtils;
 import ru.spcex.clearing.backendapi.domain.actions.IAction;
 import ru.spcex.clearing.backendapi.errors.BackEndError;
 import ru.spcex.clearing.platform.messaging.domain.ActionType;
-import ru.spcex.clearing.platform.messaging.domain.cud.account.AccountNewRequest;
 import ru.spcex.clearing.platform.messaging.domain.cud.account.AccountUpdateRequest;
 import ru.spcex.platform.utils.enumeration.EnumMessage;
 
diff --git a/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/account/AccountControllerTest.java b/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/account/AccountControllerTest.java
index e6d6d122a..b00ffc9a0 100644
--- a/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/account/AccountControllerTest.java
+++ b/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/account/AccountControllerTest.java
@@ -15,7 +15,7 @@ class AccountControllerTest extends AbstractControllerTest {
     /**
      * {@link AccountController#getAll()} <br>
      * Тест проверяет получение запроса по REST API и отправку всех записей из таблицы hazelcast Map_BankAccount.<br>
-     * Входной запрос /securities/bank-accounts/ <br>
+     * Входной запрос /accounting/accounts/ <br>
      * Ответ CommonGetAllResponse <br>
      */
     @Test
diff --git a/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/account/BankAccountControllerTest.java b/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/account/BankAccountControllerTest.java
index 9780d5957..6c60d38e8 100644
--- a/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/account/BankAccountControllerTest.java
+++ b/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/account/BankAccountControllerTest.java
@@ -124,7 +124,7 @@ class BankAccountControllerTest extends AbstractControllerTest {
     /**
      * {@link BankAccountController#delete(Long)} <br>
      * Тест проверяет получение id сущности {@link Long} по REST API и отправку в Apache Kafka.<br>
-     * Входной запрос /securities/bank-accounts/{@link Long}: - 0L<br>
+     * Входной запрос /accounting/bank-accounts/{@link Long}: - 0L<br>
      */
     @Test
     void delete() throws Exception {
@@ -140,7 +140,7 @@ class BankAccountControllerTest extends AbstractControllerTest {
     /**
      * {@link BankAccountController#getById(Long)} <br>
      * Тест проверяет получение запроса по REST API и отправку всех записей из таблицы hazelcast Map_BankAccount.<br>
-     * Входной запрос /securities/bank-accounts/{@link Long}: - 0L <br>
+     * Входной запрос /accounting/bank-accounts/{@link Long}: - 0L <br>
      * Ответ BankAccountBackendGetById <br>
      */
     @Test
@@ -185,7 +185,7 @@ class BankAccountControllerTest extends AbstractControllerTest {
     /**
      * {@link BankAccountController#getAll()} <br>
      * Тест проверяет получение запроса по REST API и отправку всех записей из таблицы hazelcast Map_BankAccount.<br>
-     * Входной запрос /securities/bank-accounts/ <br>
+     * Входной запрос /accounting/bank-accounts/ <br>
      * Ответ CommonGetAllResponse <br>
      */
     @Test
diff --git a/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/company/EditCompanyInfoControllerTest.java b/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/company/EditCompanyInfoControllerTest.java
index b58c31c0e..3e9622306 100644
--- a/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/company/EditCompanyInfoControllerTest.java
+++ b/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/company/EditCompanyInfoControllerTest.java
@@ -97,7 +97,7 @@ class EditCompanyInfoControllerTest extends AbstractControllerTest {
     /**
      * {@link EditCompanyInfoController#getAll()} <br>
      * Тест проверяет получение запроса по REST API и отправку всех записей из таблицы hazelcast Map_Company.<br>
-     * Входной запрос /securities/bank-accounts/ <br>
+     * Входной запрос /company-infos/ <br>
      * Ответ CommonGetAllResponse <br>
      */
     @Test
diff --git a/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/journal/InDocumentJournalControllerTest.java b/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/journal/InDocumentJournalControllerTest.java
index b2753da02..e87550cdb 100644
--- a/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/journal/InDocumentJournalControllerTest.java
+++ b/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/journal/InDocumentJournalControllerTest.java
@@ -15,7 +15,7 @@ class InDocumentJournalControllerTest extends AbstractControllerTest {
     /**
      * {@link InDocumentJournalController#getAll()} <br>
      * Тест проверяет получение запроса по REST API.<br>
-     * Входной запрос /securities/bank-accounts/ <br>
+     * Входной запрос /in-document-journals/ <br>
      * Ответ CommonGetAllResponse <br>
      */
     @Test
diff --git a/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/utilities/CudKeyRateControllerTest.java b/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/utilities/CudKeyRateControllerTest.java
index 2d402727e..384198de5 100644
--- a/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/utilities/CudKeyRateControllerTest.java
+++ b/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/utilities/CudKeyRateControllerTest.java
@@ -59,7 +59,7 @@ class CudKeyRateControllerTest extends AbstractControllerTest {
     /**
      * {@link CudKeyRateController#delete(Long)}  <br>
      * Тест проверяет получение id сущности {@link Long} по REST API и отправку в Apache Kafka.<br>
-     * Входной запрос /securities/bank-accounts/{@link Long}: - 0L<br>
+     * Входной запрос /utilities/key-rates/{@link Long}: - 0L<br>
      */
     @Test
     void delete() throws Exception {
diff --git a/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/CompanyInfoService.java b/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/CompanyInfoService.java
index 6fad333bf..7dd8ba584 100644
--- a/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/CompanyInfoService.java
+++ b/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/CompanyInfoService.java
@@ -92,8 +92,6 @@ public class CompanyInfoService extends QueueConsumer implements InitializingBea
             companyInfo.setResidence(req.getResidence());
             companyInfo.setShortNameEng(req.getShortNameEng());
             companyInfo.setFullNameEng(req.getFullNameEng());
-            companyInfo.setShortName(req.getShortName());
-            companyInfo.setFullName(req.getFullName());
 
             company.setUpdated(Instant.now());
             companyMap.update(company);
diff --git a/clearing-parent/company-service/src/test/java/ru/spcex/clearing/company/service/CompanyInfoServiceTest.java b/clearing-parent/company-service/src/test/java/ru/spcex/clearing/company/service/CompanyInfoServiceTest.java
index f6c22a2e2..4245f0729 100644
--- a/clearing-parent/company-service/src/test/java/ru/spcex/clearing/company/service/CompanyInfoServiceTest.java
+++ b/clearing-parent/company-service/src/test/java/ru/spcex/clearing/company/service/CompanyInfoServiceTest.java
@@ -112,8 +112,6 @@ class CompanyInfoServiceTest {
      * {@link CompanyInfoUpdateRequest#residence} - RUS<br>
      * {@link CompanyInfoUpdateRequest#shortNameEng} - updated shortNameEng<br>
      * {@link CompanyInfoUpdateRequest#fullNameEng} - updated fullNameEng<br>
-     * {@link CompanyInfoUpdateRequest#shortName} - updated shortName<br>
-     * {@link CompanyInfoUpdateRequest#fullName} - updated fullName<br>
      */
     @Test
     void companyInfoUpdate() throws InterruptedException {
@@ -130,12 +128,12 @@ class CompanyInfoServiceTest {
         existsCompanyInfo.setResidence("0000");
         existsCompanyInfo.setShortNameEng("exists shortNameEng");
         existsCompanyInfo.setFullNameEng("exists fullNameEng");
-        existsCompanyInfo.setShortName("exists shortName");
-        existsCompanyInfo.setFullName("exists fullName");
         Company existsCompany = new Company();
         existsCompany.setId(ID);
         existsCompany.setWorkflowStatus(WorkflowStatus.Active.getKey());
         existsCompany.setProfile(existsCompanyInfo);
+        existsCompany.setShortName("exists shortName");
+        existsCompany.setFullName("exists fullName");
         companyImdg.insert(existsCompany);
 
         CompanyInfoUpdateRequest companyInfoUpdateRequest = new CompanyInfoUpdateRequest();
@@ -164,8 +162,6 @@ class CompanyInfoServiceTest {
         predictableCompanyInfo.setResidence("RUS");
         predictableCompanyInfo.setShortNameEng("updated shortNameEng");
         predictableCompanyInfo.setFullNameEng("updated fullNameEng");
-        predictableCompanyInfo.setShortName("updated shortName");
-        predictableCompanyInfo.setFullName("updated fullName");
 
         //ACT
         String jsonString = getJsonStringForUPDATE(companyInfoUpdateRequest, ID);