From 58dcfe6061251c855ec595be86a6339745cf1ea5 Mon Sep 17 00:00:00 2001 From: AKurakin Date: Sat, 27 May 2023 17:18:29 +0300 Subject: [PATCH] =?UTF-8?q?company-service=20http://jira.mfd.msk:8088/brow?= =?UTF-8?q?se/CLS-333=20=D1=87=D0=B0=D1=81=D1=82=D1=8C=202.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../config/validation/ProfileDocumentValidationConfig.java | 3 --- .../company/service/ClearingMemberCategoryService.java | 7 +++++-- .../ru/spcex/clearing/company/service/CompanyService.java | 6 ------ .../ru/spcex/clearing/company/service/RelationService.java | 5 ++--- 4 files changed, 7 insertions(+), 14 deletions(-) diff --git a/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/config/validation/ProfileDocumentValidationConfig.java b/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/config/validation/ProfileDocumentValidationConfig.java index ffc0ca3f2..d08613612 100644 --- a/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/config/validation/ProfileDocumentValidationConfig.java +++ b/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/config/validation/ProfileDocumentValidationConfig.java @@ -57,9 +57,6 @@ public class ProfileDocumentValidationConfig { FieldRequiredRule.instance("issuer", ProfileDocumentNewRequest::getIssuer, CompanyErrors.RequiredFieldEmpty), - FieldRequiredRule.instance("issuerCode", - ProfileDocumentNewRequest::getIssuerCode, - CompanyErrors.RequiredFieldEmpty), FieldRequiredRule.instance("name", ProfileDocumentNewRequest::getName, CompanyErrors.RequiredFieldEmpty), diff --git a/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/ClearingMemberCategoryService.java b/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/ClearingMemberCategoryService.java index 33bdb7ed2..dd4b8f2b4 100644 --- a/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/ClearingMemberCategoryService.java +++ b/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/ClearingMemberCategoryService.java @@ -21,11 +21,11 @@ import ru.spcex.clearing.platform.messaging.service.RequestInfoUpdate; import ru.spcex.clearing.util.security.UserRoleVerification; import ru.spcex.clearing.validation.common.ValidationHelper; import ru.spcex.platform.imdg.api.Imdg; +import ru.spcex.platform.imdg.api.ImdgId; import ru.spcex.platform.imdg.api.ImdgProvider; import ru.spcex.platform.imdg.api.ImdgTransaction; import ru.spcex.platform.utils.validation.IValidator; -import java.util.Map; import java.util.function.Function; @Service @@ -34,6 +34,7 @@ public class ClearingMemberCategoryService extends QueueConsumer implements Init private final Imdg clearingMemberCategoryMap; private final Imdg companyMap; private final ImdgProvider imdgProvider; + private final ImdgId idSequence; private final Function clearingMemberCategoryNewRequestValidator; private final Function clearingMemberCategoryUpdateRequestValidator; @@ -56,6 +57,7 @@ public class ClearingMemberCategoryService extends QueueConsumer implements Init this.clearingMemberCategoryMap = imdgProvider.getImdg(IMDGDistributedNames.Map_ClearingMemberCategory, ClearingMemberCategory.class); this.companyMap = imdgProvider.getImdg(IMDGDistributedNames.Map_Company, Company.class); this.imdgProvider = imdgProvider; + this.idSequence = imdgProvider.getImdgIdGenerator(); this.clearingMemberCategoryNewRequestValidator = clearingMemberCategoryNewRequestValidator; this.clearingMemberCategoryUpdateRequestValidator = clearingMemberCategoryUpdateRequestValidator; this.clearingMemberCategoryDeleteRequestValidator = clearingMemberCategoryDeleteRequestValidator; @@ -88,6 +90,7 @@ public class ClearingMemberCategoryService extends QueueConsumer implements Init if (requestInfoUpdate != null) return requestInfoUpdate; ClearingMemberCategoryNewRequest req = userRequest.getRequestPayload(); ClearingMemberCategory newCategory = new ClearingMemberCategory(); + newCategory.setId(idSequence.nextId()); newCategory.setCompanyId(req.getCompanyId()); newCategory.setClearingMemberCategory(req.getClearingMemberCategory()); @@ -96,7 +99,7 @@ public class ClearingMemberCategoryService extends QueueConsumer implements Init transaction.beginTransaction(); boolean txOk = false; try { - companyService.relationService.createNewRelation(transaction, req.getCompanyId()); + companyService.relationService.createNewRelation(transaction, req.getCompanyId(), newCategory); Imdg txClearingMemberCategoryMap = transaction.getImdg(IMDGDistributedNames.Map_ClearingMemberCategory, ClearingMemberCategory.class); txClearingMemberCategoryMap.insert(newCategory); txOk = true; 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 148c94093..0460cb621 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 @@ -141,11 +141,6 @@ public class CompanyService extends QueueConsumer implements InitializingBean { companyMap.insert(company); log.debug("company-new request processed, BaseRequest.id = {}, company.id={}", companyNewRequestBaseRequest.getId(), company.getId()); - //todo see this CLS-333.2 - relationService.createNewRelation(transaction, company.getId()); - if (!(WorkflowStatus.Active.equalsByKey(company.getWorkflowStatus()))) { // Block - relationService.onChangeWorkflowStatus(transaction, company, null, company.getWorkflowStatus()); - } txOk = true; } finally { if (txOk) @@ -197,7 +192,6 @@ public class CompanyService extends QueueConsumer implements InitializingBean { if (updateRequest.getWorkflowStatus() != null) { company.setWorkflowStatus(updateRequest.getWorkflowStatus()); if (!Objects.equals(prevStatus, company.getWorkflowStatus())) { - //todo see this CLS-333.2 relationService.onChangeWorkflowStatus(transaction, company, prevStatus, company.getWorkflowStatus()); } else { log.trace("Status was not changed"); diff --git a/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/RelationService.java b/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/RelationService.java index 491107d32..7632612c6 100644 --- a/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/RelationService.java +++ b/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/RelationService.java @@ -280,16 +280,15 @@ public class RelationService extends QueueConsumer implements InitializingBean { // --- internal API --- - protected void createNewRelation(ImdgTransaction transaction, Long companyId) { + protected void createNewRelation(ImdgTransaction transaction, Long companyId, ClearingMemberCategory clearingMemberCategory) { Imdg relationMap = transaction.getImdg(IMDGDistributedNames.Map_Relation, Relation.class); Relation relation = new Relation(); Company company = transaction.getImdg(IMDGDistributedNames.Map_Company, Company.class).getSingleObjectByFieldValues(Map.of("id", companyId)); - ClearingMemberCategory clearingMemberCategory = transaction.getImdg(IMDGDistributedNames.Map_ClearingMemberCategory, ClearingMemberCategory.class).getSingleObjectByFieldValues(Map.of("companyId", companyId)); WorkflowStatus workflowStatus = getEnumByKey(WorkflowStatus.class, company.getWorkflowStatus()); String serviceStatus = null; if (clearingMemberCategory == null) { - log.debug("clearingMemberCategory not found for companyId={}", companyId); + log.warn("clearingMemberCategory not set for companyId={}", companyId); } else { ClearingCategory clearingCategory = getEnumByKey(ClearingCategory.class, clearingMemberCategory.getClearingMemberCategory()); switch (Objects.requireNonNull(clearingCategory)) {