From c66df265d963227f7a559becc01304c7db880e91 Mon Sep 17 00:00:00 2001
From: AKurakin <akurakin@mfd.ru>
Date: Thu, 28 Sep 2023 15:54:00 +0300
Subject: [PATCH] =?UTF-8?q?company-service=20http://jira.mfd.msk:8088/brow?=
 =?UTF-8?q?se/CLS-347=20bug=20fix,=20=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B8?=
 =?UTF-8?q?=20=D0=BF=D0=BE=D0=B8=D1=81=D0=BA=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../company/service/MultiCompanyService.java  | 35 +++----------------
 .../service/processor/CompanyProcessor.java   |  2 ++
 2 files changed, 6 insertions(+), 31 deletions(-)

diff --git a/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/MultiCompanyService.java b/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/MultiCompanyService.java
index f0cb6e513..22dc30751 100644
--- a/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/MultiCompanyService.java
+++ b/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/MultiCompanyService.java
@@ -131,10 +131,6 @@ public class MultiCompanyService
                 );
                 companyId = getCompanyIdForCompanySymbols(req.getUuid(), req.getCompany(), req.getCompanySymbols());
                 log.debug("For request {} (uuid {}) company {}.", baseRequest.getId(), req.getUuid(), companyId == null ? "not found" : ("found, id=" + companyId));
-                if (companyId == null) {
-                    log.debug("For request {} (uuid {}) company not found. Try find by other symbols.", baseRequest.getId(), req.getUuid());
-                    companyId = getCompanyIdForCompanySymbols(req.getCompanySymbols());
-                }
 
                 if (companyId == null) {
                     companyId = companyService.create(req.getCompany());
@@ -353,9 +349,11 @@ public class MultiCompanyService
             }
         }
         if (companySymbol == null && StringUtils.isNotEmpty(cnr.getCompanySymbolValue())
-                && IEnumKey.contains(cnr.getCompanySymbol(), CompanySymbol.INN, CompanySymbol.CIO)) { // вероятно там будет только UUID
+                && IEnumKey.contains(cnr.getCompanySymbol(), CompanySymbol.UUID, CompanySymbol.INN, CompanySymbol.CIO)) { // вероятно там будет только UUID
             {
                 String companySymbolType = cnr.getCompanySymbol();
+                log.debug("Company not found by UUID=\"{}\", try find by {}={}",
+                        uuid, companySymbolType, cnr.getCompanySymbolValue());
                 log.trace("Search company by companySymbol {}={}", companySymbolType, cnr.getCompanySymbolValue());
                 Collection<CompanySymbols> companySymbolsFromImdg = companySymbolsImdg.getCollectionObjectsByFieldValues(
                         Map.of(
@@ -375,6 +373,7 @@ public class MultiCompanyService
             for (CompanySymbolNewRequest cSymbolReq : companySymbols) {
                 if (IEnumKey.contains(cSymbolReq.getCompanySymbol(), CompanySymbol.INN, CompanySymbol.CIO)) {
                     String companySymbolType = cSymbolReq.getCompanySymbol();
+                    log.debug("Company not found by UUID=\"{}\", try find by {}", uuid, companySymbolType);
                     log.trace("Search company by companySymbol {}={}", companySymbolType, cSymbolReq.getCompanySymbolValue());
                     Collection<CompanySymbols> companySymbolsFromImdg = companySymbolsImdg.getCollectionObjectsByFieldValues(
                             Map.of(
@@ -399,32 +398,6 @@ public class MultiCompanyService
             return null;
     }
 
-    Long getCompanyIdForCompanySymbols(List<CompanySymbolNewRequest> otherRequests) {
-        CompanySymbols companySymbol = null;
-        for (CompanySymbolNewRequest req : otherRequests) {
-            if (req.getCompanySymbol() == null) continue;
-            log.trace("Search company by companySymbol {}={}", req.getCompanySymbol(), req.getCompanySymbolValue());
-            Collection<CompanySymbols> companySymbolsFromImdg = companySymbolsImdg.getCollectionObjectsByFieldValues(
-                    Map.of(
-                            "companySymbol", req.getCompanySymbol(),
-                            "companySymbolValue", req.getCompanySymbolValue()
-                    )
-            );
-            if (!companySymbolsFromImdg.isEmpty()) {
-                companySymbol = companySymbolsFromImdg.iterator().next();
-                if (companySymbolsFromImdg.size() > 1) {
-                    log.warn("For {} found > 1 company_symbols, use first (id = {})", req.getCompanySymbol(), req.getCompanySymbolValue());
-                }
-                log.debug("Found by company symbol {} {}", req.getCompanySymbol(), req.getCompanySymbolValue());
-                break;
-            }
-        }
-        if (companySymbol != null)
-            return companySymbol.getCompanyId();
-        else
-            return null;
-    }
-
     private <T> BaseRequest<T> wrapRequest(BaseRequest<?> template, T payload, ActionType action) {
         BaseRequest<T> r = new BaseRequest<>();
         r.setId(template.getId());
diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/processor/CompanyProcessor.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/processor/CompanyProcessor.java
index 2635f1704..c23c4aebd 100644
--- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/processor/CompanyProcessor.java
+++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/processor/CompanyProcessor.java
@@ -53,6 +53,8 @@ public class CompanyProcessor {
                         map(companyRequestAdapter::toCategoryRequest).toList();
 
                 CompanyGatewayRequest companyGatewayRequest = new CompanyGatewayRequest();
+                if (companyId != null)
+                    companyGatewayRequest.setUuid(companyId.toString());
                 companyGatewayRequest.setCompany(companyRequestAdapter.toCompanyRequest(memberCompany));
                 request.getCompanyInfoList()
                         .stream()