diff --git a/clearing-parent/backend-api/src/main/resources/meta/data.xml b/clearing-parent/backend-api/src/main/resources/meta/data.xml
index bea743845..66cecd1dd 100644
--- a/clearing-parent/backend-api/src/main/resources/meta/data.xml
+++ b/clearing-parent/backend-api/src/main/resources/meta/data.xml
@@ -1,570 +1,570 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/clearing-parent/backend-api/src/main/resources/meta/meta.json b/clearing-parent/backend-api/src/main/resources/meta/meta.json
index 56a0696e4..afebb94c7 100644
--- a/clearing-parent/backend-api/src/main/resources/meta/meta.json
+++ b/clearing-parent/backend-api/src/main/resources/meta/meta.json
@@ -2079,7 +2079,7 @@
"fields": [
{"code": "companyId",
- "type": 1,"name": "Наименование компании","shortname": "Компании","link": "company","linkCode": "shortName","required": true,"enabled": false
+ "type": 1,"name": "Наименование компании","shortname": "Компания","link": "company","linkCode": "shortName","required": true,"enabled": false
}
,
{"code": "documentType",
diff --git a/clearing-parent/backend-api/src/main/resources/meta/meta.xml b/clearing-parent/backend-api/src/main/resources/meta/meta.xml
index 0cf8db772..81fc3a0ad 100644
--- a/clearing-parent/backend-api/src/main/resources/meta/meta.xml
+++ b/clearing-parent/backend-api/src/main/resources/meta/meta.xml
@@ -1,2111 +1,2111 @@
-
-
-
-
-
-
-
-
-
+ * хранят деньги разных участников
+ * в сделке:
+ * регистр CMAT кому переводить (registry.account)
+ * регистр LMAT кто переводит деньги (registry.account)
+ * в итоге создается 2 PaymentInstruction: LMAT -> TRAN счет -> CMAT счет
+ */
+ private StageResult formingPaymentInstructions(Long sessionId) {
+ Collection registries = selectRegistries();
+ log.debug("found registries.size() = {}", registries.size());
+ Account tranAcc = accountImdg.getSingleObjectBySQL("accountType = '%s' and status = '%s' and processingSign = '%s'"
+ .formatted(AccountType.Tran.getKey(), AccountStatus.ACTIVE.getKey(), Allowed.ALLOWED.getKey()));
+ if (tranAcc == null) {
+ return new StageResult<>(
+ new EnumMessage(ClearingError.AccountNotPresent, "accountType = " + AccountType.Tran.getKey()),
+ false);
+ }
+ log.debug("found tranAcc.id = {}", tranAcc.getId());
+ Map> groups = registries
+ .stream()
+ .collect(Collectors.groupingBy(Registry::getGroupId));
+ log.debug("groups.size = {}", groups.size());
+ List allPaymentInstructions = new ArrayList<>();
+ for (Map.Entry> group : groups.entrySet()) {
+ Long groupId = group.getKey();
+ Function findByCode = rgsCode -> group.getValue()
+ .stream()
+ .filter(rgs -> equalsByRegistry(rgsCode, rgs))
+ .findFirst()
+ .orElse(null);
+ Registry rgsCmt = findByCode.apply(CM_T);
+ Registry rgsLmt = findByCode.apply(LM_T);
+ if (rgsCmt == null || rgsLmt == null) {
+ log.error("groupId {} cmt_t {} lm_t {} - both must be present", groupId, rgsCmt, rgsLmt);
+ continue;
+ }
+ log.debug("generating payment instruction for groupId {} cmt_t {} lm_t {}",
+ groupId,
+ rgsCmt.getId(),
+ rgsLmt.getId());
+ Pair pmtInstrs = PaymentInstructionBuilderFinalMkr
+ .builder(imdgProvider)
+ .cm_t(rgsCmt)
+ .lm_t(rgsLmt)
+ .tranAcc(tranAcc)
+ .sessionId(sessionId)
+ .build();
+ Pair.forEach(pmtInstrs, pmtInstr -> {
+ paymentInstructionImdg.insert(pmtInstr);
+ allPaymentInstructions.add(pmtInstr);
+ });
+ log.debug("generated PaymentInstructions for groupId {}: pmtInstr1.id={} pmtInstr2.id={}",
+ groupId,
+ pmtInstrs.getFirst().getId(),
+ pmtInstrs.getSecond().getId());
+ }
+ sendSdfs(allPaymentInstructions);
+ StageResult> stageResult = new StageResult<>(null, true);
+ stageResult.setStageResult(allPaymentInstructions);
+ return stageResult;
+ }
+
+ private void sendSdfs(List formedPaymentInstructions) {
+ List sDf03Created = new ArrayList<>();
+ List sDf12Created = new ArrayList<>();
+ for (PaymentInstruction paymentInstruction : formedPaymentInstructions) {
+ Security security = securityImdg.getSingleObjectByID(paymentInstruction.getCreditLeg_securityId());
+ Account account = accountImdg.getSingleObjectByID(paymentInstruction.getCreditLeg_accountId());
+ if (InstrumentType.CRNC.equalsByKey(security.getInstrumentType()) &&
+ List.of(AccountType.Corr, AccountType.Clrn).contains(IEnumKey.getEnumByKey(AccountType.class, account.getAccountType()))) {
+ sDf03Created.add(newSDf03(paymentInstruction));
+ } else if (!InstrumentType.CRNC.equalsByKey(security.getInstrumentType()) &&
+ AccountType.Depo.equalsByKey(account.getAccountType())) {
+ sDf12Created.add(newSDf12(paymentInstruction));
+ }
+ }
+
+ Long sdf03GroupId = !sDf03Created.isEmpty() ? imdgProvider.getImdgIdGenerator().nextId() : null;
+ for (SDf03 sDf03 : sDf03Created) {
+ sDf03.setGenerationId(sdf03GroupId);
+ sDf03Imdg.insert(sDf03);
+ }
+
+ if (sdf03GroupId != null) {
+ ExportToFileRequest exportToFileRequest = new ExportToFileRequest();
+ exportToFileRequest.setNameOfTable("DF-03");
+ exportToFileRequest.setSdfGroupId(sdf03GroupId);
+ kafkaSender.sendRequestToQueue(Consts.EXPORT_PROCESS, exportToFileRequest);
+ }
+
+ Long sdf12GroupId = null;
+ Long maxTxNumber = 1L;
+ if (!sDf12Created.isEmpty()) {
+ sdf12GroupId = imdgProvider.getImdgIdGenerator().nextId();
+ ImdgPredicateBuilder predicateBuilder = sDf12Imdg.predicateBuilder();
+ ImdgPredicate notEmptyTransactionNum = predicateBuilder.not(predicateBuilder.equals("transaction_number", ""));
+ Long maxId = sDf12Imdg.aggregateLongMax("id", notEmptyTransactionNum);
+ if (maxId != null) {
+ SDf12 sDf12 = sDf12Imdg.getSingleObjectByID(maxId);
+ maxTxNumber = Long.parseLong(sDf12.getTransactionNumber()) + 1;
+ }
+ }
+ for (SDf12 sDf12 : sDf12Created) {
+ sDf12.setGenerationId(sdf03GroupId);
+ sDf12.setTransactionNumber(maxTxNumber.toString());
+ sDf12.setTransactionQuantity(String.valueOf(sDf12Created.size()));
+ sDf12Imdg.insert(sDf12);
+ }
+
+ if (sdf12GroupId != null) {
+ SwtExporterRequest swtExporterRequest = new SwtExporterRequest();
+ swtExporterRequest.setType("SDF_12");
+ kafkaSender.sendRequestToQueue(Consts.SWT_EXPORTER, swtExporterRequest);
+ }
+ }
+
+ private SDf03 newSDf03(PaymentInstruction paymentInstruction) {
+ log.debug("creating sdf03");
+ SDf03 sDf03 = new SDf03();
+ sDf03.setId(idGenerator.nextId());
+ sDf03.setSeg_type("S");
+ sDf03.setDoc_type("002");
+ String strId = paymentInstruction.getId().toString();
+ String strIdCut = strId.length() > 16 ? strId.substring(strId.length() - 16) : strId;
+ sDf03.setDocnm_ref(strIdCut);
+ sDf03.setC_acc_deb(paymentInstruction.getCreditLeg_account());
+
+ String senderSbankName = "";
+ if (paymentInstruction.getSenderId().equals(1L)) {
+ senderSbankName = paymentInstruction.getPayeeBankName();
+ } else {
+ Company company = companyImdg.getSingleObjectByID(paymentInstruction.getSenderId());
+ if (company != null) {
+ senderSbankName = company.getShortName();
+ }
+ }
+ sDf03.setSbanknam1(senderSbankName);
+ sDf03.setSbanknam2(senderSbankName);
+ sDf03.setSbanknam3(senderSbankName);
+ sDf03.setSbanknam4(senderSbankName);
+ sDf03.setSbanknam5(senderSbankName);
+
+ sDf03.setC_acc_cred(paymentInstruction.getDebitLeg_account());
+
+ String addresseeSbankName = "";
+ if (paymentInstruction.getAddresseeId().equals(1L)) {
+ addresseeSbankName = paymentInstruction.getAddresseeBankName();
+ } else {
+ Company company = companyImdg.getSingleObjectByID(paymentInstruction.getAddresseeId());
+ if (company != null) {
+ addresseeSbankName = company.getShortName();
+ }
+ }
+ sDf03.setRbanknam1(addresseeSbankName);
+ sDf03.setRbanknam2(addresseeSbankName);
+ sDf03.setRbanknam3(addresseeSbankName);
+ sDf03.setRbanknam4(addresseeSbankName);
+ sDf03.setRbanknam5(addresseeSbankName);
+
+ sDf03.setPay_date(payDateFormatter.format(TimeUtil.toLocalDate(paymentInstruction.getPaymentDate())));
+ sDf03.setPay_val("RUR");
+ sDf03.setSum_deb(paymentInstruction.getDebitLeg_amount() != null ? paymentInstruction.getDebitLeg_amount().toString() : "");
+ sDf03.setSpecif_1(paymentInstruction.getPaymentPurpose());
+ sDf03.setGenerationTime(Instant.now());
+ sDf03.setPaymentInstructionId(paymentInstruction.getId());
+ log.debug("successfully processed, new id {}", sDf03.getId());
+ return sDf03;
+ }
+
+ private SDf12 newSDf12(PaymentInstruction paymentInstruction) {
+ log.debug("creating sdf12");
+ SDf12 sDf12 = new SDf12();
+ sDf12.setId(idGenerator.nextId());
+ sDf12.setOutDocument(sDf12.getId().toString());
+ sDf12.setDirection("DELFREE");
+ sDf12.setQuantity(paymentInstruction.getCreditLeg_amount().toString());
+ sDf12.setSecurityCode(paymentInstruction.getCreditLeg_securityId().toString());
+ sDf12.setDepoCodeSender(paymentInstruction.getCreditLeg_account());
+ sDf12.setDepoCodeAdressee(paymentInstruction.getDebitLeg_account());
+// sDf12.setTransactionNumber();
+ sDf12.setGenerationTime(Instant.now());
+ return sDf12;
+ }
+
+ DateTimeFormatter payDateFormatter = DateTimeFormatter.ofPattern("dd.MM.yy");
+
+ private static boolean equalsByRegistry(RegistryTradingParams code, Registry rgs) {
+ return code.equalByRegistry(
+ IEnumKey.getEnumByKey(RegistryDesignation.class, rgs.getRegistryDesignation()),
+ IEnumKey.getEnumByKey(RegistryInstrumentType.class, rgs.getRegistryInstrumentType()),
+ IEnumKey.getEnumByKey(RegistryCapacity.class, rgs.getRegistryCapacity()),
+ IEnumKey.getEnumByKey(RegistryUnit.class, rgs.getRegistryUnit())
+ );
+
+ }
+}
diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/InspectionObligations.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/InspectionObligations.java
index 02914f8f3..8bef42c94 100644
--- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/InspectionObligations.java
+++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/InspectionObligations.java
@@ -13,13 +13,16 @@ import ru.spcex.clearing.session.stage.Task;
import ru.spcex.platform.enumeration.*;
import ru.spcex.platform.imdg.api.Imdg;
import ru.spcex.platform.imdg.api.ImdgProvider;
+import ru.spcex.platform.imdg.api.predicate.ImdgPredicateBuilder;
import ru.spcex.platform.imdg.api.predicate.specific.RegistryCodeSqlBuilder;
+import ru.spcex.platform.utils.collection.Pair;
import ru.spcex.platform.utils.enumeration.EnumMessage;
import ru.spcex.platform.utils.enumeration.IEnumKey;
import ru.spcex.platform.utils.enumeration.IMessageResolver;
import ru.spcex.platform.utils.enumeration.SimpleMessageResolver;
import java.time.Instant;
+import java.time.LocalDate;
import java.util.*;
import java.util.stream.Collectors;
@@ -30,6 +33,7 @@ public class InspectionObligations implements ISessionStage {
private ImdgProvider imdgProvider;
private Imdg registryImdg;
private final IMessageResolver msgResolver = new SimpleMessageResolver();
+ private SessionType sessionType;
private final static RegistryTradingParams OS_T;
private final static RegistryTradingParams OM_T;
@@ -65,6 +69,10 @@ public class InspectionObligations implements ISessionStage {
this.registryImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_Registry, Registry.class);
}
+ public void setSessionType(SessionType sessionType) {
+ this.sessionType = sessionType;
+ }
+
@Override
public StageResult submit(Task task) {
switch (task.getTaskType()) {
@@ -95,6 +103,10 @@ public class InspectionObligations implements ISessionStage {
boolean isUncovered = false;
List checkResults = new ArrayList<>();
for (Registry obligation : obligationsInGroup) {
+ if (SessionType.FINL.equals(sessionType) && RegistryInstrumentType.S.equalsByKey(obligation.getRegistryInstrumentType())) {
+ checkResults.add(new CheckResult(obligation, false));
+ continue;
+ }
String sqlAssetRegistryCondition = searchAssetsByObligationSql(obligation);
log.debug("search asset by registry.id={} sql {}", sqlAssetRegistryCondition, obligation.getId());
Registry asset = registryImdg.getSingleObjectBySQL(sqlAssetRegistryCondition);
@@ -154,6 +166,24 @@ public class InspectionObligations implements ISessionStage {
tRegistryWithSameCompany.ifPresent(registry -> updateRegistryStatus(registry, RegistryStatus.FAIL));
}
}
+ //проверяем есть ли второй день для сделки (он не входит в пул, поэтому ищем отдельно)
+ if (registries.stream().anyMatch(rgs -> rgs.getRefundDate() != null)) {
+ Optional> groupIdAndSettleDate = registries.stream()
+ .map(rgs -> new Pair<>(rgs.getGroupId(), rgs.getSettlementDate()))
+ .filter(pair -> pair.getFirst() != null)
+ .filter(pair -> pair.getSecond() != null)
+ .findFirst();
+ if (groupIdAndSettleDate.isEmpty())
+ return;
+ ImdgPredicateBuilder pb = registryImdg.predicateBuilder();
+ Collection refundRgs = registryImdg.getCollectionObjectsByPredicate(
+ pb.and(
+ pb.equals("groupId", groupIdAndSettleDate.get().getFirst()),
+ pb.not(pb.equals("settlementDate", groupIdAndSettleDate.get().getSecond()))
+ )
+ );
+ refundRgs.forEach(rgs -> updateRegistryStatus(rgs, RegistryStatus.FAIL));
+ }
} else {
registries.forEach(registry -> updateRegistryStatus(registry, RegistryStatus.OK));
}
diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/RegistryDepoBuilder.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/RegistryDepoBuilder.java
index 0435e7905..fbd8dc2ce 100644
--- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/RegistryDepoBuilder.java
+++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/RegistryDepoBuilder.java
@@ -98,7 +98,7 @@ public class RegistryDepoBuilder implements IRegistryBuilder {
boolean isTSelling = regDsgn.equals(RegistryDesignation.T) && side.isSell();
boolean isTBuying = regDsgn.equals(RegistryDesignation.T) && side.isBuy();
- if ((isOBuying || isTSelling) && !secondLeg || (isOSelling || isTBuying) && secondLeg) {
+ if ((isOSelling || isTBuying) && !secondLeg || (isOBuying || isTSelling) && secondLeg) {
reg.setRegistryInstrumentType(RegistryInstrumentType.M.getKey());
reg.setBalanceDimension(BalanceDimension.MONY.getKey());
Currency currency = currencyImdg.getSingleObjectByFieldValues(Map.of("currencyCode", exec.getSettlementCurrency()));
@@ -133,11 +133,11 @@ public class RegistryDepoBuilder implements IRegistryBuilder {
reg.setSettledDebit((execDep).getFirstLegAmount());
}
if (secondLeg) {
- reg.setSettlementDate(execDep.getFirstLegSettlementDate());
- reg.setSettlementCode(execDep.getFirstLegSettlementCode());
- } else {
reg.setSettlementDate(execDep.getSecondLegSettlementDate());
reg.setSettlementCode(execDep.getSecondLegSettlementCode());
+ } else {
+ reg.setSettlementDate(execDep.getFirstLegSettlementDate());
+ reg.setSettlementCode(execDep.getFirstLegSettlementCode());
}
reg.setRefundDate(execDep.getSecondLegSettlementDate());
reg.setValueDate(execDep.getFirstLegSettlementDate());
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 75638873b..9d38ebe63 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
@@ -42,8 +42,8 @@ public class ProfileDocumentValidationConfig {
IMDGDistributedNames.Map_Company,
Company.class,
CompanyErrors.RequiredFieldEmpty,
- CompanyErrors.CompanyNotFound,
- company -> WorkflowStatus.Active.equalsByKey(company.getWorkflowStatus()) ? null : CompanyErrors.CompanyDisabled),
+ CompanyErrors.CompanyNotFound
+ ),
DictionaryPresentRule.instance("documentType",
ProfileDocumentNewRequest::getDocumentType,
IMDGDistributedNames.Map_DocumentTypeDictionary,
diff --git a/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/AccountNotificationHelper.java b/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/AccountNotificationHelper.java
index cde306470..c220cf6dd 100644
--- a/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/AccountNotificationHelper.java
+++ b/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/AccountNotificationHelper.java
@@ -9,19 +9,15 @@ import ru.clearing.classes.statics.data.liabilities.LiabilitiesClaimsAssets;
import ru.spcex.clearing.company.error.CompanyErrors;
import ru.spcex.clearing.imdg.IMDGDistributedNames;
import ru.spcex.clearing.platform.messaging.domain.Consts;
-import ru.spcex.clearing.platform.messaging.domain.cud.account.AccountNewRequest;
+import ru.spcex.clearing.platform.messaging.domain.cud.account.ClientCodeNewRequest;
import ru.spcex.clearing.platform.messaging.domain.cud.account.InformationAccountNewRequest;
import ru.spcex.clearing.platform.messaging.domain.cud.account.sdf01.AccountTerminationRequest;
import ru.spcex.clearing.platform.messaging.service.sender.KafkaSender;
-import ru.spcex.platform.enumeration.AccountType;
-import ru.spcex.platform.enumeration.WorkflowStatus;
import ru.spcex.platform.imdg.api.Imdg;
import ru.spcex.platform.imdg.api.ImdgProvider;
import java.math.BigDecimal;
-import java.util.ArrayList;
import java.util.Collection;
-import java.util.List;
@Service
public class AccountNotificationHelper {
@@ -96,4 +92,11 @@ public class AccountNotificationHelper {
Long reqId = kafkaSender.sendRequestToQueue(Consts.INFORMATION_ACCOUNT_SYSTEM_NEW, r);
log.debug("Send request id={}", reqId);
}
+
+ public void clientCodeNew(ClientCodeNewRequest clientCodeNewRequest) {
+ log.debug("Sending messages to account-service {} for company {}",
+ Consts.DESTINATION_CLIENT_CODE_NEW_UM_COMPANY, clientCodeNewRequest.getCompanyId());
+ Long reqId = kafkaSender.sendRequestToQueue(Consts.DESTINATION_CLIENT_CODE_NEW_UM_COMPANY, clientCodeNewRequest);
+ log.debug("Send request id={}", reqId);
+ }
}
\ No newline at end of file
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 ddaccb5fd..8bd977c78 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
@@ -175,9 +175,9 @@ public class ClearingMemberCategoryService extends QueueConsumer implements Init
transaction.beginTransaction();
boolean txOk = false;
try {
- companyService.relationService.cancelRelation(transaction, clearingMemberCategory.getCompanyId(), clearingMemberCategory);
Imdg txClearingMemberCategoryMap = transaction.getImdg(IMDGDistributedNames.Map_ClearingMemberCategory, ClearingMemberCategory.class);
- txClearingMemberCategoryMap.delete(clearingMemberCategory);
+ txClearingMemberCategoryMap.delete(clearingMemberCategory); // далить до cancelRelation внутри транзакции
+ companyService.relationService.cancelRelation(transaction, clearingMemberCategory.getCompanyId(), clearingMemberCategory);
txOk = true;
} finally {
if (txOk)
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 3cf059bc6..9840b6db3 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
@@ -379,6 +379,104 @@ public class CompanyService extends QueueConsumer implements InitializingBean {
}
+ public synchronized Company createOrUpdateCompany(BaseRequest companyNewRequestBaseRequest, Long existCompanyId) throws ValidationException {
+ CompanyNewRequest req = companyNewRequestBaseRequest.getRequestPayload();
+ log.debug("company new or update, request {}, existCOmpanyId={}", companyNewRequestBaseRequest.getId(), existCompanyId);
+ { // Валидация
+ RequestInfoUpdate requestInfoUpdate = userRoleVerification.validateRoleAndGetResult(companyNewRequestBaseRequest);
+ if (requestInfoUpdate != null)
+ throw new ValidationException(CompanyErrors.GeneralError, requestInfoUpdate.getMessage());
+// requestInfoUpdate = validationHelper.validateTillFirstError(companyNewRequestBaseRequest, companyNewRequestValidator);
+// if (requestInfoUpdate != null) throw new ValidationException(CompanyErrors.GeneralError, requestInfoUpdate.getMessage());
+ }
+
+ Company company = null;
+ if (existCompanyId != null) {
+ company = companyIMap.getSingleObjectByID(existCompanyId);
+ if (company == null) {
+ throw new ValidationException(CompanyErrors.CompanyNotFound, String.valueOf(existCompanyId));
+ }
+ }
+
+ if (company == null) {
+ // #createCompany
+ company = new Company();
+ company.setId(idSequence.nextId());
+ Instant now = Instant.now();
+ company.setCreated(now);
+ company.setUpdated(now);
+ log.debug("Create new company {}", company.getId());
+
+ company.setShortName(req.getShortName());
+ company.setFullName(req.getFullName());
+
+ ImdgTransaction transaction = imdgProvider.newTransaction();
+ transaction.beginTransaction();
+ boolean txOk = false;
+ try {
+ if (req.getCompanySymbol() != null) {
+ CompanySymbols newSymbol = companySymbolService.createCompanySymbol(transaction, company.getId(), req.getCompanySymbol(), req.getCompanySymbolValue());
+ updateCompanyBySymbol(company, newSymbol, false);
+ }
+
+ company.setWorkflowStatus(req.getWorkflowStatus());
+ fillNewCompanyInfo(company, req);
+
+ Imdg companyMap = transaction.getImdg(IMDGDistributedNames.Map_Company, Company.class);
+ companyMap.insert(company);
+ log.debug("company-new request processed, BaseRequest.id = {}, company.id={}",
+ companyNewRequestBaseRequest.getId(), company.getId());
+ txOk = true;
+ } finally {
+ if (txOk)
+ transaction.commitTransaction();
+ else
+ transaction.rollbackTransaction();
+ }
+ accountNotification.makeInfoAccount(company.getId());
+ } else {
+ log.debug("Update exist company {}", company.getId());
+ company.setUpdated(Instant.now());
+ // #updateCompany
+
+ company.setUpdated(Instant.now());
+ company.setShortName(req.getShortName());
+ company.setFullName(req.getFullName());
+
+ if (req.getCompanySymbol() != null || req.getCompanySymbolValue() != null) {
+ log.trace("Request field CompanySymbol, CompanySymbolValue ignore for update company request.");
+ }
+// CompanySymbols не обновляем
+ ImdgTransaction transaction = imdgProvider.newTransaction();
+ transaction.beginTransaction();
+ boolean txOk = false;
+ try {
+ String prevStatus = company.getWorkflowStatus();
+ if (req.getWorkflowStatus() != null) {
+ company.setWorkflowStatus(req.getWorkflowStatus());
+ if (!Objects.equals(prevStatus, company.getWorkflowStatus())) {
+ relationService.onChangeWorkflowStatus(transaction, company, prevStatus, company.getWorkflowStatus());
+ } else {
+ log.trace("Status was not changed");
+ }
+ } else {
+ log.trace("Null new WorkflowStatus");
+ }
+ Imdg companyMap = transaction.getImdg(IMDGDistributedNames.Map_Company, Company.class);
+ companyMap.update(company);
+ txOk = true;
+ } finally {
+ if (txOk)
+ transaction.commitTransaction();
+ else
+ transaction.rollbackTransaction();
+ }
+ }
+
+ return company;
+ }
+
+
/**
* Блокировка компании после блокировки счетов
*
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 41addee87..221da629a 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
@@ -154,9 +154,9 @@ 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.getCompanySymbolValue())) {
+// throw new ClearingBaseException(new EnumMessage(CompanyErrors.EditCompanySymbols, req.getId()));
+// }
companySymbols.setCompanySymbolValue(req.getCompanySymbolValue());
companySymbolsTMap.update(companySymbols);
companyService.updateCompanyBySymbol(transaction, companySymbols, false);
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
new file mode 100644
index 000000000..360fa37f4
--- /dev/null
+++ b/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/MultiCompanyService.java
@@ -0,0 +1,223 @@
+package ru.spcex.clearing.company.service;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.kafka.clients.consumer.Consumer;
+import org.apache.kafka.clients.producer.Producer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import ru.clearing.classes.statics.data.company.Company;
+import ru.clearing.classes.statics.data.company.CompanySymbols;
+import ru.spcex.clearing.imdg.IMDGDistributedNames;
+import ru.spcex.clearing.platform.messaging.domain.BaseRequest;
+import ru.spcex.clearing.platform.messaging.domain.Consts;
+import ru.spcex.clearing.platform.messaging.domain.cud.account.ClientCodeNewRequest;
+import ru.spcex.clearing.platform.messaging.domain.cud.company.*;
+import ru.spcex.clearing.platform.messaging.service.QueueConsumer;
+import ru.spcex.clearing.platform.messaging.service.RequestInfoUpdate;
+import ru.spcex.clearing.util.security.UserRoleVerification;
+import ru.spcex.clearing.util.services.RequestHelper;
+import ru.spcex.clearing.validation.common.ValidationHelper;
+import ru.spcex.platform.enumeration.CompanySymbol;
+import ru.spcex.platform.enumeration.UserRole;
+import ru.spcex.platform.imdg.api.Imdg;
+import ru.spcex.platform.imdg.api.ImdgProvider;
+import ru.spcex.platform.utils.error.ValidationException;
+import ru.spcex.platform.utils.log.ExceptionUtils;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Map;
+
+/**
+ * Обрабатывает MultiCompanyRequest и распределяет сложный объект по...
+ */
+@Service
+public class MultiCompanyService
+ extends QueueConsumer implements InitializingBean {
+
+ private final Logger log = LoggerFactory.getLogger(getClass());
+ private final RequestHelper requestHelper;
+
+ protected UserRoleVerification userRoleVerification;
+// private final ValidationHelper validationHelper;
+
+ final CompanyService companyService;
+ final CompanyInfoService companyInfoService;
+ final ProfileDocumentService profileDocumentService;
+ final CompanySymbolService companySymbolService;
+ final ContactService contactService;
+ final AccountNotificationHelper accountNotification;
+ final RelationService relationService;
+
+ final ImdgProvider imdgProvider;
+ final Imdg companyIMap;
+ final Imdg companySymbolsImdg;
+
+ @Autowired
+ public MultiCompanyService(Consumer kafkaQueue, Producer kafkaProducer,
+ ImdgProvider imdgProvider,
+ RequestHelper requestHelper,
+
+ CompanyService companyService,
+ CompanyInfoService companyInfoService,
+ ProfileDocumentService profileDocumentService,
+ CompanySymbolService companySymbolService,
+ ContactService contactService,
+ AccountNotificationHelper accountNotification,
+ RelationService relationService,
+ ValidationHelper validationHelper
+ ) {
+ super(kafkaQueue, kafkaProducer);
+ this.imdgProvider = imdgProvider;
+ this.requestHelper = requestHelper.setLogger(log);
+
+// this.idSequence = imdgProvider.getImdgIdGenerator();
+// this.userRoleVerification = userRoleVerification;
+// userRoleVerification.setRoleForVerification(UserRole.Admin);
+// this.validationHelper = validationHelper;
+ this.companyService = companyService;
+ this.companyInfoService = companyInfoService;
+ this.profileDocumentService = profileDocumentService;
+ this.companySymbolService = companySymbolService;
+ this.contactService = contactService;
+ this.accountNotification = accountNotification;
+ this.relationService = relationService;
+
+ companyIMap = imdgProvider.getImdg(IMDGDistributedNames.Map_Company, Company.class);
+ companySymbolsImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_CompanySymbols, CompanySymbols.class);
+ }
+
+ @Override
+ public void afterPropertiesSet() {
+ callback(MultiCompanyRequest.class)
+ .setFunction(request -> requestHelper.requestFunction(this::processMultiRequest, request))
+ .forDestination(Consts.DESTINATION_COMPANY_MULTIREQUEST, callbacks::put);
+ init();
+ }
+
+ private synchronized RequestInfoUpdate processMultiRequest(BaseRequest baseRequest) {
+ MultiCompanyRequest req = baseRequest.getRequestPayload();
+ log.debug("company-batch-new request received, BaseRequest.id = {}", baseRequest.getId());
+ { // Валидация
+ RequestInfoUpdate requestInfoUpdate = userRoleVerification.validateRoleAndGetResult(baseRequest);
+ if (requestInfoUpdate != null) return requestInfoUpdate;
+
+ }
+ /*
+ todo:
+ 1) добавить апдейт кейсы
+ 2) сделать транзакции.
+
+ */
+ Long companyId = null;
+ boolean txOk = false;
+ synchronized (companyService) {
+ try {
+ companyId = getCompanyIdForCompanySymbols(req.getUuid(), req.getCompany());
+ log.debug("For request {} (uuid {}) company {}.", baseRequest.getId(), req.getUuid(), companyId == null ? "not found" : ("found, id=" + companyId));
+
+ RequestInfoUpdate replyI;
+ Company company = companyService.createOrUpdateCompany(wrapRequest(baseRequest, req.getCompany()), companyId);
+ companyId = company.getId();
+ log.debug("The companyId={}", companyId);
+ fillCompanyId(req, companyId);
+
+ //todo update case:
+ replyI = companyInfoService.companyInfoUpdate(wrapRequest(baseRequest, req.getCompanyInfo()));
+ for (ProfileDocumentNewRequest partRequest : req.getProfileDocuments()) {
+ replyI = profileDocumentService.profileDocumentNew(wrapRequest(baseRequest, partRequest));
+ }
+ for (CompanySymbolNewRequest partRequest : req.getCompanySymbols()) {
+ replyI = companySymbolService.companySymbolNew(wrapRequest(baseRequest, partRequest));
+ }
+ for (ContactNewRequest partRequest : req.getContacts()) {
+ replyI = contactService.contactNew(wrapRequest(baseRequest, partRequest));
+ }
+ txOk = true;
+ } catch (ValidationException vex) {
+ log.error("For companyId={} error: {}", companyId, ExceptionUtils.getStackTrace(vex));
+ }
+ }
+ if (txOk) {
+ log.debug("Create or update sendNewClientCode for company {}", companyId);
+ for (ClientCodeNewRequest partRequest : req.getClientCodes()) {
+ accountNotification.clientCodeNew(partRequest); // Consts.DESTINATION_CLIENT_CODE_NEW Consts.DESTINATION_CLIENT_CODE_UPDATE
+ }
+ }
+
+ return null;
+ }
+
+
+ Long getCompanyIdForCompanySymbols(String uuid, CompanyNewRequest cnr) {
+ CompanySymbols companySymbol = null;
+ if (StringUtils.isNotEmpty(uuid)) {
+ log.trace("Search company by companySymbol uuid={}", uuid);
+ Collection companySymbolsFromImdg = companySymbolsImdg.getCollectionObjectsByFieldValues(
+ Map.of(
+ "companySymbol", CompanySymbol.UUID.getKey(),
+ "companySymbolValue", uuid
+ )
+ );
+ if (!companySymbolsFromImdg.isEmpty()) {
+ companySymbol = companySymbolsFromImdg.iterator().next();
+ if (companySymbolsFromImdg.size() > 1) {
+ log.warn("For UUID found > 1 company_symbols, use first (id = {})", companySymbol.getId());
+ }
+ }
+ }
+ if (companySymbol == null && StringUtils.isNotEmpty(cnr.getCompanySymbol())) {
+ log.trace("Search company by companySymbol {}={}", cnr.getCompanySymbol(), cnr.getCompanySymbolValue());
+ Collection companySymbolsFromImdg = companySymbolsImdg.getCollectionObjectsByFieldValues(
+ Map.of(
+ "companySymbol", cnr.getCompanySymbol(),
+ "companySymbolValue", cnr.getCompanySymbolValue()
+ )
+ );
+ if (!companySymbolsFromImdg.isEmpty()) {
+ companySymbol = companySymbolsFromImdg.iterator().next();
+ if (companySymbolsFromImdg.size() > 1) {
+ log.warn("For {} found > 1 company_symbols, use first (id = {})", cnr.getCompanySymbol(), cnr.getCompanySymbolValue());
+ }
+ }
+ }
+ if (companySymbol != null)
+ return companySymbol.getCompanyId();
+ else
+ return null;
+ }
+
+ private BaseRequest wrapRequest(BaseRequest template, T payload) {
+ BaseRequest r = new BaseRequest<>();
+ r.setId(template.getId());
+ r.setActionType(template.getActionType()); // todo?
+ r.setUserId(template.getUserId());
+ r.setCorrelationId(template.getCorrelationId());
+ r.setRequestPayload(payload);
+ return r;
+ }
+
+ void fillCompanyId(MultiCompanyRequest req, Long companyId) {
+ req.getCompany().setId(companyId);
+ req.getCompanyInfo().setId(companyId);
+ if (req.getCompanySymbols() == null) req.setCompanySymbols(new ArrayList<>());
+ if (req.getClientCodes() == null) req.setClientCodes(new ArrayList<>());
+ if (req.getProfileDocuments() == null) req.setProfileDocuments(new ArrayList<>());
+ if (req.getContacts() == null) req.setContacts(new ArrayList<>());
+ for (CompanySymbolNewRequest cs : req.getCompanySymbols()) {
+ cs.setCompanyId(companyId);
+ }
+ for (ClientCodeNewRequest cc : req.getClientCodes()) {
+ cc.setCompanyId(companyId);
+ }
+ for (ProfileDocumentNewRequest pd : req.getProfileDocuments()) {
+ pd.setCompanyId(companyId);
+ }
+ for (ContactNewRequest c : req.getContacts()) {
+ c.setCompanyId(companyId);
+ }
+ }
+}
diff --git a/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/ProfileDocumentService.java b/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/ProfileDocumentService.java
index b23e3ff7f..af4c24586 100644
--- a/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/ProfileDocumentService.java
+++ b/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/ProfileDocumentService.java
@@ -94,7 +94,7 @@ public class ProfileDocumentService extends QueueConsumer implements Initializin
}
@NonNull
- private RequestInfoUpdate profileDocumentNew(BaseRequest profileDocumentNewRequestBaseRequest) {
+ protected RequestInfoUpdate profileDocumentNew(BaseRequest profileDocumentNewRequestBaseRequest) {
log.trace("Start processing ProfileDocumentNewRequest!");
RequestInfoUpdate requestInfoUpdate = userRoleVerification.validateRoleAndGetResult(profileDocumentNewRequestBaseRequest);
@@ -146,10 +146,6 @@ public class ProfileDocumentService extends QueueConsumer implements Initializin
log.warn("Company {} not found by profileDocument {}", profileDocument.getCompanyId(), profileDocument.getId());
return requestHelper.makeErrorResponse(deleteRequest, CompanyErrors.CompanyNotFound, profileDocument.getCompanyId());
}
- if (!WorkflowStatus.Active.equalsByKey(existCompany.getWorkflowStatus())) {
- log.debug("Company {} not active", profileDocument.getCompanyId());
- return requestHelper.makeErrorResponse(deleteRequest, CompanyErrors.CompanyNotFound, profileDocument.getCompanyId());
- }
ImdgTransaction transaction = imdgProvider.newTransaction();
transaction.beginTransaction();
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 8ceb3bd34..07b01d7bd 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
@@ -272,8 +272,9 @@ public class RelationService extends QueueConsumer implements InitializingBean {
return existRelation;
}
- Collection selectCompanyClearingMemberCategory(Long companyId) {
- Collection companyCategory = clearingMemberCategoryImdg.getCollectionObjectsByFieldValues(
+ Collection selectCompanyClearingMemberCategory(ImdgTransaction tx, Long companyId) {
+ Imdg cmcMap = tx == null ? clearingMemberCategoryImdg : tx.getImdg(IMDGDistributedNames.Map_ClearingMemberCategory, ClearingMemberCategory.class);
+ Collection companyCategory = cmcMap.getCollectionObjectsByFieldValues(
Map.of("companyId", companyId)
);
return companyCategory.stream()
@@ -325,7 +326,7 @@ public class RelationService extends QueueConsumer implements InitializingBean {
Relation relation = relationMap.getSingleObjectByID(req.getId());
final Long companyId = relation.getConsumerId();
- Collection companyCMC = selectCompanyClearingMemberCategory(companyId);
+ Collection companyCMC = selectCompanyClearingMemberCategory(null, companyId);
boolean companyCMCisBIV = companyCMC.contains(ClearingCategory.B.getKey()) || companyCMC.contains(ClearingCategory.I.getKey())
|| companyCMC.contains(ClearingCategory.V.getKey());
boolean companyCMCisCF = companyCMC.contains(ClearingCategory.C.getKey()) || companyCMC.contains(ClearingCategory.F.getKey());
@@ -335,7 +336,7 @@ public class RelationService extends QueueConsumer implements InitializingBean {
boolean txOk = false;
try {
tx.beginTransaction();
- relationUpdate0(tx, req, relation); // первоначальное ТЗ.
+ //relationUpdate0(tx, req, relation); // первоначальное ТЗ.
boolean needAddNewRelation = false; // call relationNew0(req, companyId, firstCMC);
if (ru.spcex.platform.enumeration.Service.MKR.equalsByKey(relation.getService())) { // relation B or I or V
@@ -467,6 +468,9 @@ public class RelationService extends QueueConsumer implements InitializingBean {
log.debug("Relation {} already reopened(resumed)", relation.getId());
return relation;
}
+ if (req.getComment() != null) {
+ relation.setComment(req.getComment());
+ }
relation.setServiceStatus(ServiceStatus.Reopened.getKey());
relation.setUpdated(Instant.now());
@@ -505,18 +509,19 @@ public class RelationService extends QueueConsumer implements InitializingBean {
Relation relation = relationMap.getSingleObjectByID(req.getId());
Long companyId = relation.getConsumerId();
- Collection companyCMC = selectCompanyClearingMemberCategory(companyId);
+ Collection companyCMC = selectCompanyClearingMemberCategory(null, companyId);
boolean companyCMCisBIV = companyCMC.contains(ClearingCategory.B.getKey()) || companyCMC.contains(ClearingCategory.I.getKey())
|| companyCMC.contains(ClearingCategory.V.getKey());
boolean companyCMCisCF = companyCMC.contains(ClearingCategory.C.getKey()) || companyCMC.contains(ClearingCategory.F.getKey());
- String firstCMC = companyCMC.isEmpty() ? null : companyCMC.iterator().next();
- if (companyCMCisBIV) {
+ if (companyCMCisBIV && MKR.equalsByKey(relation.getService())) {
// relation не изменяем
- } else if (companyCMCisCF) {
+ } else if (companyCMCisCF && FOND.equalsByKey(relation.getService())) {
// relation не изменяем
+ } else {
+ // удалить.
}
- // else ? todo bad logic! Проверить ТЗ.
+ // else
{
ImdgTransaction tx = imdgProvider.newTransaction();
boolean txOk = false;
@@ -588,28 +593,50 @@ public class RelationService extends QueueConsumer implements InitializingBean {
relationMap.insert(relation);
}
+ /**
+ * Приходит от ClearingMemberCategory
+ */
protected void cancelRelation(ImdgTransaction transaction, Long companyId, ClearingMemberCategory clearingMemberCategory) {
+ log.debug("Cancelling relations for companyId={} and clearingMemberCategory {}", companyId, clearingMemberCategory == null ? null : clearingMemberCategory.getClearingMemberCategory());
Objects.requireNonNull(companyId, "companyId");
Imdg relationMap = transaction.getImdg(IMDGDistributedNames.Map_Relation, Relation.class);
- String serviceStatus = null;
- if (clearingMemberCategory == null) {
- log.warn("clearingMemberCategory not set for companyId={}", companyId);
- } else {
- ClearingCategory clearingCategory = getEnumByKey(ClearingCategory.class, clearingMemberCategory.getClearingMemberCategory());
- serviceStatus = serviceForCMC(clearingCategory).getKey();
+// String serviceStatus = null;
+// if (clearingMemberCategory == null) {
+// log.warn("clearingMemberCategory not set for companyId={}", companyId);
+// } else {
+// ClearingCategory clearingCategory = getEnumByKey(ClearingCategory.class, clearingMemberCategory.getClearingMemberCategory());
+// serviceStatus = serviceForCMC(clearingCategory).getKey();
+// }
+
+ Collection companyCMC = selectCompanyClearingMemberCategory(null, companyId);
+ if (companyCMC.contains(clearingMemberCategory.getClearingMemberCategory())) {
+ // never
+ log.warn("ClearingMemberCategory \"{}\" already exist in set for company {}.", clearingMemberCategory.getClearingMemberCategory(), companyId);
}
+ boolean companyCMCisBIV = companyCMC.contains(ClearingCategory.B.getKey()) || companyCMC.contains(ClearingCategory.I.getKey())
+ || companyCMC.contains(ClearingCategory.V.getKey());
+ boolean companyCMCisCF = companyCMC.contains(ClearingCategory.C.getKey()) || companyCMC.contains(ClearingCategory.F.getKey());
+
Relation relation = searchRelation(transaction, clearingMemberCategory.getClearingMemberCategory(), companyId);
if (relation == null) {
log.debug("Relation for clearingMemberCategory.id={} {} not found", clearingMemberCategory.getId(), clearingMemberCategory.getClearingMemberCategory());
- return;
} else {
- relation.setUpdated(Instant.now());
- log.debug("Update exist relation.id={}", relation.getId());
+ if (companyCMCisBIV && MKR.equalsByKey(relation.getService())) {
+ // relation не изменяем
+ log.debug("Relation {} {} lost for ClearingMemberCategory \"{}\".", relation.getId(), relation.getService(), clearingMemberCategory.getClearingMemberCategory());
+ } else if (companyCMCisCF && FOND.equalsByKey(relation.getService())) {
+ // relation не изменяем
+ log.debug("Relation {} {} lost for ClearingMemberCategory \"{}\".", relation.getId(), relation.getService(), clearingMemberCategory.getClearingMemberCategory());
+ } else {
+ // удалить.
+ log.debug("Block exist relation.id={}", relation.getId());
+ relation.setUpdated(Instant.now());
+ relation.setServiceStatus(Closed.getKey());
+ relationMap.update(relation);
+ log.debug("Relation[{}] updated (closed) by clearingMemberCategory[{}].", relation.getId(), clearingMemberCategory.getId());
+ }
}
- relation.setServiceStatus(Closed.getKey());
- log.debug("Relation[{}] updated (closed) by clearingMemberCategory[{}].", relation.getId(), clearingMemberCategory.getId());
- relationMap.insert(relation);
}
protected void cancelAllRelationForCompany(ImdgTransaction transaction, Long companyId) {
diff --git a/clearing-parent/db-scripts/src/main/resources/db/DATA.sql b/clearing-parent/db-scripts/src/main/resources/db/DATA.sql
index 7eb6bc2b8..dbd3d8af8 100644
--- a/clearing-parent/db-scripts/src/main/resources/db/DATA.sql
+++ b/clearing-parent/db-scripts/src/main/resources/db/DATA.sql
@@ -1,4 +1,4 @@
--- DB version: 3.5.0.28
+-- DB version: 3.5.0.31
-- DATA version: 3.5.0.8
/* Dictionaries */
@@ -652,11 +652,11 @@ INSERT INTO ERROR_CODE_DICTIONARY(ID, CODE, NAME) values (1019, 'SECR', 'Инс
INSERT INTO ERROR_CODE_DICTIONARY(ID, CODE, NAME) values (1020, 'SECR', 'Режим %s не найден.') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
-INSERT INTO ERROR_CODE_DICTIONARY(ID, CODE, NAME) values (1021, 'SECR', 'Информиция об инструментах Денежного рынка на режимах добавляется автоматически.') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
+INSERT INTO ERROR_CODE_DICTIONARY(ID, CODE, NAME) values (1021, 'SECR', 'Информация об инструментах Денежного рынка на режимах добавляется автоматически.') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
-INSERT INTO ERROR_CODE_DICTIONARY(ID, CODE, NAME) values (1022, 'SECR', 'Информиция об инструментах Денежного рынка на режимах изменяется автоматически.') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
+INSERT INTO ERROR_CODE_DICTIONARY(ID, CODE, NAME) values (1022, 'SECR', 'Информация об инструментах Денежного рынка на режимах изменяется автоматически.') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
-INSERT INTO ERROR_CODE_DICTIONARY(ID, CODE, NAME) values (1023, 'SECR', 'Информиция об инструментах Денежного рынка на режимах блокируется автоматически.') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
+INSERT INTO ERROR_CODE_DICTIONARY(ID, CODE, NAME) values (1023, 'SECR', 'Информация об инструментах Денежного рынка на режимах блокируется автоматически.') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
INSERT INTO ERROR_CODE_DICTIONARY(ID, CODE, NAME) values (2000, 'UTIL', 'Общая ошибка модуля utility-service.') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
@@ -864,7 +864,7 @@ INSERT INTO ERROR_CODE_DICTIONARY(ID, CODE, NAME) values (7010, 'SCHD', 'Нев
INSERT INTO ERROR_CODE_DICTIONARY(ID, CODE, NAME) values (7011, 'SCHD', 'Невозможно добавить задачу на прошедшее время.') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
-INSERT INTO ERROR_CODE_DICTIONARY(ID, CODE, NAME) values (7012, 'SCHD', 'Указанный в задаче нструмент не найден.') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
+INSERT INTO ERROR_CODE_DICTIONARY(ID, CODE, NAME) values (7012, 'SCHD', 'Указанный в задаче инструмент не найден.') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
INSERT INTO ERROR_CODE_DICTIONARY(ID, CODE, NAME) values (7013, 'SCHD', 'Указанный инструмент неактивен.') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/config/LoggingInterceptor.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/config/LoggingInterceptor.java
new file mode 100644
index 000000000..9c473f9a6
--- /dev/null
+++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/config/LoggingInterceptor.java
@@ -0,0 +1,35 @@
+package ru.spcex.clearing.gatewayapi.config;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.http.HttpRequest;
+import org.springframework.http.client.ClientHttpRequestExecution;
+import org.springframework.http.client.ClientHttpRequestInterceptor;
+import org.springframework.http.client.ClientHttpResponse;
+import org.springframework.util.StreamUtils;
+
+import java.io.IOException;
+import java.nio.charset.Charset;
+
+public class LoggingInterceptor implements ClientHttpRequestInterceptor {
+
+ private final Logger log = LoggerFactory.getLogger(getClass());
+
+ @Override
+ public ClientHttpResponse intercept(HttpRequest request,
+ byte[] body,
+ ClientHttpRequestExecution execution) throws IOException {
+
+ log.info("Request URI: " + request.getURI());
+ log.info("Request method: " + request.getMethod());
+ log.info("Request headers: " + request.getHeaders());
+ log.info("Request body: " + new String(body, "UTF-8"));
+
+ ClientHttpResponse response = execution.execute(request, body);
+
+ log.info("Response status code: " + response.getStatusCode());
+ log.info("Response body: " + StreamUtils.copyToString(response.getBody(), Charset.defaultCharset()));
+
+ return response;
+ }
+}
\ No newline at end of file
diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/config/ProcessorConfiguration.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/config/ProcessorConfiguration.java
index 006799c35..e994af56a 100644
--- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/config/ProcessorConfiguration.java
+++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/config/ProcessorConfiguration.java
@@ -55,7 +55,7 @@ public class ProcessorConfiguration {
pipeline.add(new PrepareMemberCompanies());
pipeline.add(new ValidateMemberCompanies());
pipeline.add(new CheckMemberCompanyExist(imdgProvider));
- pipeline.add(new SendMessageToCompanyServiceWithMemberCompanies(kafkaSender, imdgProvider));
+ pipeline.add(new CompaniesKafkaMessenger(kafkaSender, imdgProvider));
processor.setPipeline(pipeline);
return processor;
}
diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/config/RestTemplateConfig.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/config/RestTemplateConfig.java
index 08d62366d..f92c5ab3f 100644
--- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/config/RestTemplateConfig.java
+++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/config/RestTemplateConfig.java
@@ -7,6 +7,7 @@ import org.springframework.context.annotation.Configuration;
import org.springframework.web.client.RestTemplate;
import java.time.Duration;
+import java.util.Collections;
@Configuration
public class RestTemplateConfig {
@@ -19,9 +20,11 @@ public class RestTemplateConfig {
@Bean("rest-template")
public RestTemplate restTemplate() {
- return builder
+ RestTemplate restTemplate = builder
.setConnectTimeout(Duration.ofMillis(10000))
.setReadTimeout(Duration.ofMillis(40000))
.build();
+ restTemplate.setInterceptors(Collections.singletonList(new LoggingInterceptor()));
+ return restTemplate;
}
}
\ No newline at end of file
diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/config/WebConfig.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/config/WebConfig.java
index 1b8ea243c..cca5eab8f 100644
--- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/config/WebConfig.java
+++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/config/WebConfig.java
@@ -1,8 +1,6 @@
package ru.spcex.clearing.gatewayapi.config;
-import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
-import org.springframework.web.filter.CommonsRequestLoggingFilter;
import org.springframework.web.servlet.config.annotation.EnableWebMvc;
import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
@@ -12,16 +10,6 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
@EnableWebMvc
public class WebConfig implements WebMvcConfigurer {
- @Bean
- public CommonsRequestLoggingFilter loggingFilter() {
- CommonsRequestLoggingFilter filter = new CommonsRequestLoggingFilter();
- filter.setIncludePayload(true);
- filter.setIncludeQueryString(true);
- filter.setMaxPayloadLength(1000000000);
- filter.setAfterMessagePrefix("Income request data: ");
- return filter;
- }
-
@Override
public void addResourceHandlers(ResourceHandlerRegistry registry) {
registry.addResourceHandler("swagger-ui.html")
diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/config/deserializers/InstantDeserializer.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/config/deserializers/InstantDeserializer.java
index 2e03347b6..2e832d4bb 100644
--- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/config/deserializers/InstantDeserializer.java
+++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/config/deserializers/InstantDeserializer.java
@@ -10,7 +10,7 @@ import java.time.Instant;
import java.time.format.DateTimeFormatter;
public class InstantDeserializer extends JsonDeserializer {
- private static final DateTimeFormatter formatter = DateTimeFormatter.ofPattern("dd.MM.yyyy HH:mm:ss:SSS");
+ private static final DateTimeFormatter formatter = DateTimeFormatter.ofPattern("dd.MM.yyyy HH:mm:ss");
@Override
public Instant deserialize(JsonParser p, DeserializationContext ctxt) throws IOException {
diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/config/filters/CachedHttpServletRequest.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/config/filters/CachedHttpServletRequest.java
new file mode 100644
index 000000000..212139df4
--- /dev/null
+++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/config/filters/CachedHttpServletRequest.java
@@ -0,0 +1,30 @@
+package ru.spcex.clearing.gatewayapi.config.filters;
+
+import org.springframework.util.StreamUtils;
+
+import javax.servlet.ServletInputStream;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletRequestWrapper;
+import java.io.*;
+
+public class CachedHttpServletRequest extends HttpServletRequestWrapper {
+
+ private byte[] cachedPayload;
+
+ public CachedHttpServletRequest(HttpServletRequest request) throws IOException {
+ super(request);
+ InputStream requestInputStream = request.getInputStream();
+ this.cachedPayload = StreamUtils.copyToByteArray(requestInputStream);
+ }
+
+ @Override
+ public ServletInputStream getInputStream() {
+ return new CachedServletInputStream(this.cachedPayload);
+ }
+
+ @Override
+ public BufferedReader getReader() {
+ ByteArrayInputStream byteArrayInputStream = new ByteArrayInputStream(this.cachedPayload);
+ return new BufferedReader(new InputStreamReader(byteArrayInputStream));
+ }
+}
diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/config/filters/CachedServletInputStream.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/config/filters/CachedServletInputStream.java
new file mode 100644
index 000000000..19fe57efe
--- /dev/null
+++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/config/filters/CachedServletInputStream.java
@@ -0,0 +1,44 @@
+package ru.spcex.clearing.gatewayapi.config.filters;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.servlet.ReadListener;
+import javax.servlet.ServletInputStream;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+public class CachedServletInputStream extends ServletInputStream {
+ private final Logger log = LoggerFactory.getLogger(getClass());
+ private InputStream cachedInputStream;
+
+ public CachedServletInputStream(byte[] cachedBody) {
+ this.cachedInputStream = new ByteArrayInputStream(cachedBody);
+ }
+
+ @Override
+ public boolean isFinished() {
+ try {
+ return cachedInputStream.available() == 0;
+ } catch (IOException exp) {
+ log.error(exp.getMessage());
+ }
+ return false;
+ }
+
+ @Override
+ public boolean isReady() {
+ return true;
+ }
+
+ @Override
+ public void setReadListener(ReadListener readListener) {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public int read() throws IOException {
+ return cachedInputStream.read();
+ }
+}
diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/config/filters/RequestCachingFilter.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/config/filters/RequestCachingFilter.java
new file mode 100644
index 000000000..7898f6a13
--- /dev/null
+++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/config/filters/RequestCachingFilter.java
@@ -0,0 +1,34 @@
+package ru.spcex.clearing.gatewayapi.config.filters;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.core.Ordered;
+import org.springframework.core.annotation.Order;
+import org.springframework.stereotype.Component;
+import org.springframework.util.StreamUtils;
+import org.springframework.web.filter.OncePerRequestFilter;
+
+import javax.servlet.FilterChain;
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebFilter;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+
+@Order(value = Ordered.HIGHEST_PRECEDENCE)
+@Component
+@WebFilter(filterName = "RequestCachingFilter", urlPatterns = "/*")
+public class RequestCachingFilter extends OncePerRequestFilter {
+
+ private final Logger log = LoggerFactory.getLogger(getClass());
+
+ @Override
+ protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response,
+ FilterChain filterChain) throws ServletException, IOException {
+ CachedHttpServletRequest cachedHttpServletRequest = new CachedHttpServletRequest(request);
+ log.info("REQUEST QUERY: " + request.getQueryString());
+ log.info("REQUEST DATA: " + StreamUtils.copyToString(cachedHttpServletRequest.getInputStream(), StandardCharsets.UTF_8));
+ filterChain.doFilter(cachedHttpServletRequest, response);
+ }
+}
diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/config/serializers/InstantSerializer.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/config/serializers/InstantSerializer.java
index d6ea47601..4459af257 100644
--- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/config/serializers/InstantSerializer.java
+++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/config/serializers/InstantSerializer.java
@@ -10,7 +10,7 @@ import java.time.Instant;
import java.time.format.DateTimeFormatter;
public class InstantSerializer extends JsonSerializer {
- private static final DateTimeFormatter formatter = DateTimeFormatter.ofPattern("dd.MM.yyyy HH:mm:ss:SSS");
+ private static final DateTimeFormatter formatter = DateTimeFormatter.ofPattern("dd.MM.yyyy HH:mm:ss");
@Override
public void serialize(Instant value, JsonGenerator gen, SerializerProvider serializers) throws IOException {
diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/GatewayController.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/GatewayController.java
index ff0513561..ad37874bf 100644
--- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/GatewayController.java
+++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/GatewayController.java
@@ -70,7 +70,7 @@ public class GatewayController {
)
@ResponseBody
public CommonResponse listingsFond(@RequestBody FondListingsRequest request) {
- request.validate(validTypes, List.of(Section.FOND));
+// request.validate(validTypes, List.of(Section.FOND));
FondListingsRequestParam requestParam = new FondListingsRequestParam(request);
ProcessResult processResult = fondListingsRequestProcessor.process(requestParam);
if (processResult.getError() != null) throw new GatewayException(request, processResult.getError());
@@ -91,7 +91,7 @@ public class GatewayController {
)
@ResponseBody
public CommonResponse listingsMM(@RequestBody MMListingsRequest request) {
- request.validate(validTypes, List.of(Section.MKR));
+// request.validate(validTypes, List.of(Section.MKR));
MMListingsRequestParam requestParam = new MMListingsRequestParam(request);
ProcessResult processResult = mmListingsRequestProcessor.process(requestParam);
if (processResult.getError() != null) throw new GatewayException(request, processResult.getError());
@@ -112,7 +112,7 @@ public class GatewayController {
)
@ResponseBody
public CommonResponse companies(@RequestBody CompaniesRequest request) {
- request.validate(validTypes, Collections.emptyList());
+// request.validate(validTypes, Collections.emptyList());
CompaniesRequestParam requestParam = new CompaniesRequestParam(request);
ProcessResult processResult = companiesRequestProcessor.process(requestParam);
if (processResult.getError() != null) throw new GatewayException(request, processResult.getError());
diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/logic/companies/CompaniesKafkaMessenger.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/logic/companies/CompaniesKafkaMessenger.java
new file mode 100644
index 000000000..f00b3266b
--- /dev/null
+++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/logic/companies/CompaniesKafkaMessenger.java
@@ -0,0 +1,104 @@
+package ru.spcex.clearing.gatewayapi.logic.companies;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import ru.clearing.classes.statics.data.company.Company;
+import ru.spcex.clearing.gatewayapi.logic.ProcessResult;
+import ru.spcex.clearing.gatewayapi.logic.Stage;
+import ru.spcex.clearing.gatewayapi.request.objects.*;
+import ru.spcex.clearing.imdg.IMDGDistributedNames;
+import ru.spcex.clearing.platform.messaging.domain.Consts;
+import ru.spcex.clearing.platform.messaging.domain.cud.account.ClientCodeNewRequest;
+import ru.spcex.clearing.platform.messaging.domain.cud.company.*;
+import ru.spcex.clearing.platform.messaging.service.sender.KafkaSender;
+import ru.spcex.platform.enumeration.CompanySymbol;
+import ru.spcex.platform.imdg.api.Imdg;
+import ru.spcex.platform.imdg.api.ImdgProvider;
+
+import java.util.List;
+
+/**
+ * Отправка сообщения к company-service на создание/обновление company
+ * todo Пока убрал совсем не рабочую логику с sendToQueueWaitForAnswer
+ */
+public class CompaniesKafkaMessenger extends Stage {
+ private final Logger log = LoggerFactory.getLogger(getClass());
+
+ private final KafkaSender kafkaSender;
+ private final Imdg companyImdg;
+
+ public CompaniesKafkaMessenger(KafkaSender kafkaSender, ImdgProvider imdgProvider) {
+ this.kafkaSender = kafkaSender;
+ this.companyImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_Company, Company.class);
+ }
+
+ @Override
+ public ProcessResult process(CompaniesRequestParam param) {
+ List companyList = param.getMemberCompanyList();
+ for (MemberCompany company : companyList) {
+ if (company.isInvalidData()) continue;
+
+ MultiCompanyRequest multiCompanyRequest = new MultiCompanyRequest();
+
+ CompanyNewRequest companyNewRequest = new CompanyNewRequest();
+ companyNewRequest.setShortName(company.getShortName());
+ companyNewRequest.setFullName(company.getFullName());
+ companyNewRequest.setCompanySymbol(CompanySymbol.UUID.getKey());
+ companyNewRequest.setCompanySymbolValue(company.getId().toString());
+ multiCompanyRequest.setCompany(companyNewRequest);
+
+ MemberCompanyInfo companyInfo = company.getCompanyInfo();
+ CompanyInfoUpdateRequest companyInfoUpdateRequest = new CompanyInfoUpdateRequest();
+ companyInfoUpdateRequest.setCountryCode("RUS"); // todo в текущей версии ТЗ присылается в цифровом обозначении
+ companyInfoUpdateRequest.setProfessionalSign(companyInfo.getProfessionalSign());
+ companyInfoUpdateRequest.setLegalKind(companyInfo.getLegalKind());
+ companyInfoUpdateRequest.setOrganizationType(companyInfo.getOrganizationType());
+ companyInfoUpdateRequest.setResidence(companyInfo.getResidence());
+ multiCompanyRequest.setCompanyInfo(companyInfoUpdateRequest);
+
+ for (MemberCompanySymbols companySymbols : company.getMemberCompanySymbolsList()) {
+ if (companySymbols.isInvalidData()) continue;
+ CompanySymbolNewRequest companySymbolNewRequest = new CompanySymbolNewRequest();
+ companySymbolNewRequest.setCompanySymbol(companySymbols.getCompanySymbol());
+ companySymbolNewRequest.setCompanySymbolValue(companySymbols.getCompanySymbolValue());
+ multiCompanyRequest.getCompanySymbols().add(companySymbolNewRequest);
+ }
+
+ for (MemberContact contact : company.getContactList()) {
+ if (contact.isInvalidData()) continue;
+ ContactNewRequest contactNewRequest = new ContactNewRequest();
+ contactNewRequest.setContactType(contact.getContactType());
+ contactNewRequest.setContactValue(contact.getContactValue());
+ multiCompanyRequest.getContacts().add(contactNewRequest);
+ }
+
+ for (MemberProfileDocument profileDocument : company.getProfileDocumentList()) {
+ if (profileDocument.isInvalidData()) continue;
+ ProfileDocumentNewRequest profileDocumentNewRequest = new ProfileDocumentNewRequest();
+ profileDocumentNewRequest.setDocumentType(profileDocument.getDocumentType());
+ profileDocumentNewRequest.setIssueDate(profileDocument.getIssueDate());
+ profileDocumentNewRequest.setIssuer(profileDocument.getIssuer());
+ profileDocumentNewRequest.setNumber(profileDocument.getNumber());
+ profileDocumentNewRequest.setValidToDate(profileDocument.getValidToDate());
+ profileDocumentNewRequest.setLink(profileDocument.getLink());
+ multiCompanyRequest.getProfileDocuments().add(profileDocumentNewRequest);
+ }
+
+ for (MemberClient client : company.getClientList()) {
+ if (client.isInvalidData()) continue;
+
+ if (!company.isAlreadyExist() || !client.isAlreadyExist()) {
+ ClientCodeNewRequest clientCodeNewRequest = new ClientCodeNewRequest();
+ clientCodeNewRequest.setCode(client.getClientCode());
+ clientCodeNewRequest.setMoneyAccountId(client.getMoneyAccountId());
+ clientCodeNewRequest.setDepoAccountId(client.getDepoAccountId());
+ multiCompanyRequest.getClientCodes().add(clientCodeNewRequest);
+ }
+ }
+
+ kafkaSender.sendRequestToQueue(Consts.DESTINATION_COMPANY_MULTIREQUEST, multiCompanyRequest);
+ }
+
+ return null;
+ }
+}
diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/logic/companies/SendMessageToCompanyServiceWithMemberCompanies.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/logic/companies/SendMessageToCompanyServiceWithMemberCompanies.java
deleted file mode 100644
index f095ea803..000000000
--- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/logic/companies/SendMessageToCompanyServiceWithMemberCompanies.java
+++ /dev/null
@@ -1,179 +0,0 @@
-package ru.spcex.clearing.gatewayapi.logic.companies;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import ru.clearing.classes.statics.data.company.Company;
-import ru.spcex.clearing.gatewayapi.logic.ProcessResult;
-import ru.spcex.clearing.gatewayapi.logic.Stage;
-import ru.spcex.clearing.gatewayapi.request.objects.*;
-import ru.spcex.clearing.imdg.IMDGDistributedNames;
-import ru.spcex.clearing.platform.messaging.domain.Consts;
-import ru.spcex.clearing.platform.messaging.domain.cud.account.ClientCodeNewRequest;
-import ru.spcex.clearing.platform.messaging.domain.cud.account.ClientCodeUpdateRequest;
-import ru.spcex.clearing.platform.messaging.domain.cud.company.*;
-import ru.spcex.clearing.platform.messaging.service.sender.KafkaSender;
-import ru.spcex.platform.enumeration.CompanySymbol;
-import ru.spcex.platform.enumeration.ServiceStatus;
-import ru.spcex.platform.enumeration.WorkflowStatus;
-import ru.spcex.platform.imdg.api.Imdg;
-import ru.spcex.platform.imdg.api.ImdgProvider;
-import ru.spcex.platform.utils.enumeration.IEnumKey;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * Отправка сообщения к company-service на создание/обновление company
- * todo Пока убрал совсем не рабочую логику с sendToQueueWaitForAnswer
- */
-public class SendMessageToCompanyServiceWithMemberCompanies extends Stage {
- private final Logger log = LoggerFactory.getLogger(getClass());
-
- private final KafkaSender kafkaSender;
- private final Imdg companyImdg;
-
- public SendMessageToCompanyServiceWithMemberCompanies(KafkaSender kafkaSender, ImdgProvider imdgProvider) {
- this.kafkaSender = kafkaSender;
- this.companyImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_Company, Company.class);
- }
- @Override
- public ProcessResult process(CompaniesRequestParam param) {
- List companyList = param.getMemberCompanyList();
- for (MemberCompany company : companyList) {
- if (company.isInvalidData()) continue;
-
- String companyWorkflowStatus = WorkflowStatus.Active.getKey();
- if (!company.getCompanyClearingCategoryList().isEmpty()) {
- MemberCompanyClearingCategory clearingCategory = company.getCompanyClearingCategoryList().get(0);
- ServiceStatus categoryStatus = IEnumKey.getEnumByKey(ServiceStatus.class, clearingCategory.getWorkflowStatus());
- if (categoryStatus == ServiceStatus.Active || categoryStatus == ServiceStatus.Appl || categoryStatus == ServiceStatus.Reopened) {
- companyWorkflowStatus = WorkflowStatus.Active.getKey();
- } else {
- companyWorkflowStatus = WorkflowStatus.Blocked.getKey();
- }
- }
-
- CompanyNewRequest companyNewRequest = new CompanyNewRequest();
- if (company.isAlreadyExist()) companyNewRequest.setId(company.getMapId());
- companyNewRequest.setShortName(company.getShortName());
- companyNewRequest.setFullName(company.getFullName());
- companyNewRequest.setCompanySymbol(CompanySymbol.UUID.getKey());
- companyNewRequest.setCompanySymbolValue(company.getId().toString());
-
- MemberCompanyInfo companyInfo = company.getCompanyInfo();
-
- if (company.isAlreadyExist()) {
- kafkaSender.sendRequestToQueue(Consts.DESTINATION_COMPANY_UPDATE, companyNewRequest);
- } else {
- kafkaSender.sendRequestToQueue(Consts.DESTINATION_COMPANY_NEW, companyNewRequest);
- Company companyFromImdg = companyImdg.getSingleObjectByFieldValues(
- Map.of(
- "shortName", company.getShortName(),
- "fullName", company.getFullName(),
- "workflowStatus", companyWorkflowStatus
- )
- );
- if (companyFromImdg == null) {
- log.warn("Can't insert company (UUID {}), skipped", company.getId());
- company.setInvalidData(true);
- continue;
- }
- company.setAlreadyExist(true);
- company.setMapId(companyFromImdg.getId());
- }
- Long companyId = company.getMapId();
-
- CompanyInfoUpdateRequest companyInfoUpdateRequest = new CompanyInfoUpdateRequest();
- companyInfoUpdateRequest.setId(companyId);
- companyInfoUpdateRequest.setCountryCode("RUS"); // todo в текущей версии ТЗ присылается в цифровом обозначении
- companyInfoUpdateRequest.setProfessionalSign(companyInfo.getProfessionalSign());
- companyInfoUpdateRequest.setLegalKind(companyInfo.getLegalKind());
- companyInfoUpdateRequest.setOrganizationType(companyInfo.getOrganizationType());
- companyInfoUpdateRequest.setResidence(companyInfo.getResidence());
- kafkaSender.sendRequestToQueue(Consts.DESTINATION_COMPANY_UPDATE, companyInfoUpdateRequest);
-
- for (MemberCompanySymbols companySymbols : company.getMemberCompanySymbolsList()) {
- if (companySymbols.isInvalidData()) continue;
- if (!company.isAlreadyExist() || !companySymbols.isAlreadyExist()) {
- CompanySymbolNewRequest companySymbolNewRequest = new CompanySymbolNewRequest();
- companySymbolNewRequest.setCompanyId(companyId);
- companySymbolNewRequest.setCompanySymbol(companySymbols.getCompanySymbol());
- companySymbolNewRequest.setCompanySymbolValue(companySymbols.getCompanySymbolValue());
- kafkaSender.sendRequestToQueue(Consts.DESTINATION_COMPANY_SYMBOL_NEW, companySymbolNewRequest);
- } else {
- CompanySymbolUpdateRequest companySymbolUpdateRequest = new CompanySymbolUpdateRequest();
- companySymbolUpdateRequest.setId(companySymbols.getMapId());
- companySymbolUpdateRequest.setCompanyId(companyId);
- companySymbolUpdateRequest.setCompanySymbolValue(companySymbols.getCompanySymbolValue());
- kafkaSender.sendRequestToQueue(Consts.DESTINATION_COMPANY_SYMBOL_UPDATE, companySymbolUpdateRequest);
- }
- }
-
- for (MemberContact contact : company.getContactList()) {
- if (contact.isInvalidData()) continue;
- if (!company.isAlreadyExist() || !contact.isAlreadyExist()) {
- ContactNewRequest contactNewRequest = new ContactNewRequest();
- contactNewRequest.setCompanyId(companyId);
- contactNewRequest.setContactType(contact.getContactType());
- contactNewRequest.setContactValue(contact.getContactValue());
- kafkaSender.sendRequestToQueue(Consts.DESTINATION_CONTACT_NEW, contactNewRequest);
- } else {
- ContactUpdateRequest contactUpdateRequest = new ContactUpdateRequest();
- contactUpdateRequest.setId(contact.getMapId());
- contactUpdateRequest.setContactType(contact.getContactType());
- contactUpdateRequest.setContactValue(contact.getContactValue());
- kafkaSender.sendRequestToQueue(Consts.DESTINATION_CONTACT_UPDATE, contactUpdateRequest);
- }
- }
-
- for (MemberProfileDocument profileDocument : company.getProfileDocumentList()) {
- if (profileDocument.isInvalidData()) continue;
- if (!company.isAlreadyExist() || !profileDocument.isAlreadyExist()) {
- ProfileDocumentNewRequest profileDocumentNewRequest = new ProfileDocumentNewRequest();
- profileDocumentNewRequest.setCompanyId(companyId);
- profileDocumentNewRequest.setDocumentType(profileDocument.getDocumentType());
- profileDocumentNewRequest.setIssueDate(profileDocument.getIssueDate());
- profileDocumentNewRequest.setIssuer(profileDocument.getIssuer());
- profileDocumentNewRequest.setNumber(profileDocument.getNumber());
- profileDocumentNewRequest.setValidToDate(profileDocument.getValidToDate());
- profileDocumentNewRequest.setLink(profileDocument.getLink());
- kafkaSender.sendRequestToQueue(Consts.DESTINATION_PROFILE_DOCUMENT_NEW, profileDocumentNewRequest);
- } else {
- ProfileDocumentUpdateRequest profileDocumentUpdateRequest = new ProfileDocumentUpdateRequest();
- profileDocumentUpdateRequest.setId(profileDocument.getMapId());
- profileDocumentUpdateRequest.setCompanyId(companyId);
- profileDocumentUpdateRequest.setDocumentType(profileDocument.getDocumentType());
- profileDocumentUpdateRequest.setIssueDate(profileDocument.getIssueDate());
- profileDocumentUpdateRequest.setIssuer(profileDocument.getIssuer());
- profileDocumentUpdateRequest.setNumber(profileDocument.getNumber());
- profileDocumentUpdateRequest.setValidToDate(profileDocument.getValidToDate());
- profileDocumentUpdateRequest.setLink(profileDocument.getLink());
- kafkaSender.sendRequestToQueue(Consts.DESTINATION_PROFILE_DOCUMENT_NEW, profileDocumentUpdateRequest);
- }
- }
-
- for (MemberClient client : company.getClientList()) {
- if (client.isInvalidData()) continue;
-
- if (!company.isAlreadyExist() || !client.isAlreadyExist()) {
- ClientCodeNewRequest clientCodeNewRequest = new ClientCodeNewRequest();
- clientCodeNewRequest.setCompanyId(companyId);
- clientCodeNewRequest.setCode(client.getClientCode());
- clientCodeNewRequest.setMoneyAccountId(client.getMoneyAccountId());
- clientCodeNewRequest.setDepoAccountId(client.getDepoAccountId());
- kafkaSender.sendRequestToQueue(Consts.DESTINATION_CLIENT_CODE_NEW, clientCodeNewRequest);
- } else {
- ClientCodeUpdateRequest clientCodeUpdateRequest = new ClientCodeUpdateRequest();
- clientCodeUpdateRequest.setId(client.getMapId());
- clientCodeUpdateRequest.setCompanyId(companyId);
- clientCodeUpdateRequest.setCode(client.getClientCode());
- clientCodeUpdateRequest.setMoneyAccountId(client.getMoneyAccountId());
- clientCodeUpdateRequest.setDepoAccountId(client.getDepoAccountId());
- kafkaSender.sendRequestToQueue(Consts.DESTINATION_CLIENT_CODE_NEW, clientCodeUpdateRequest);
- }
- }
- }
-
- return null;
- }
-}
diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/logic/listings_fond/SendMessageToSecurityServiceWithFondSecurities.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/logic/listings_fond/SendMessageToSecurityServiceWithFondSecurities.java
index a0399155b..ad772bc4c 100644
--- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/logic/listings_fond/SendMessageToSecurityServiceWithFondSecurities.java
+++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/logic/listings_fond/SendMessageToSecurityServiceWithFondSecurities.java
@@ -94,7 +94,7 @@ public class SendMessageToSecurityServiceWithFondSecurities extends Stage request = new HttpEntity<>(inboundRequest, httpHeaders);
diff --git a/clearing-parent/gateway-api/src/main/resources/application.properties b/clearing-parent/gateway-api/src/main/resources/application.properties
index a67693f48..0b44aca31 100644
--- a/clearing-parent/gateway-api/src/main/resources/application.properties
+++ b/clearing-parent/gateway-api/src/main/resources/application.properties
@@ -25,8 +25,8 @@ gateway-api.kafka-consumer.auto-offset-reset=latest
gateway-api.kafka-consumer.linger-ms=1
gateway-api.kafka-consumer.buffer-memory=33554432
-gateway-api.inbound-server.enable-ssl=true
+gateway-api.inbound-server.enable-ssl=false
gateway-api.inbound-server.host=localhost
-gateway-api.inbound-server.port=9999
-gateway-api.inbound-server.pathLOCM=/inbound_request
-gateway-api.inbound-server.pathLOSC=/inbound_request
\ No newline at end of file
+gateway-api.inbound-server.port=8080
+gateway-api.inbound-server.pathLOCM=test_tomcat9/p1
+gateway-api.inbound-server.pathLOSC=test_tomcat9/p2
\ No newline at end of file
diff --git a/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/errors/SecuritiesError.java b/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/errors/SecuritiesError.java
index 836333d1b..8a4b572d2 100644
--- a/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/errors/SecuritiesError.java
+++ b/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/errors/SecuritiesError.java
@@ -15,9 +15,11 @@ public enum SecuritiesError implements IErrorEnumId {
CurrencyAlreadyExists(1015L),
CurrencyNotFound(1016L),
ListingAlreadyExist(1017L), // Инструмент на режиме %s уже существует
- ListingNotFound(1017L), // Инструмент на режиме %s не найден
+ ListingNotFound(1018L), // Инструмент на режиме %s не найден
MarketNotFound(1020L), // Режим %s не найден
- ListingOnMMSCreatedBySystem(1021L), // Информиция об инструментах Денежного рынка на режимах добавляется автоматически
+ ListingOnMMSCreatedBySystem(1021L), // Информиция об инструментах Денежного рынка на режимах добавляется автоматически.
+ ListingOnMMSUpdatedBySystem(1022L), // Информиция об инструментах Денежного рынка на режимах изменяется автоматически.
+ ListingOnMMSDeletedBySystem(1023L), // Информиция об инструментах Денежного рынка на режимах блокируется автоматически.
;
private final Long id;
diff --git a/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/service/cud/EquitySecurityService.java b/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/service/cud/EquitySecurityService.java
index 4b874f3f8..b55bbc06a 100644
--- a/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/service/cud/EquitySecurityService.java
+++ b/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/service/cud/EquitySecurityService.java
@@ -101,6 +101,7 @@ public class EquitySecurityService extends QueueConsumer implements Initializing
equity.setInstrumentType(req.getInstrumentType());
equity.setSecurityId(equity.getId());
equity.setCreated(Instant.now());
+ equity.setUpdated(equity.getCreated());
try {
transaction.beginTransaction();
Imdg equityImdg = transaction.getImdg(IMDGDistributedNames.Map_EquitySecurity, EquitySecurity.class);
diff --git a/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/service/cud/FixedIncomeSecurityService.java b/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/service/cud/FixedIncomeSecurityService.java
index 1753206d9..beee6b1e4 100644
--- a/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/service/cud/FixedIncomeSecurityService.java
+++ b/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/service/cud/FixedIncomeSecurityService.java
@@ -105,6 +105,7 @@ public class FixedIncomeSecurityService extends QueueConsumer implements Initial
fixedIncome.setInstrumentType(req.getInstrumentType());
fixedIncome.setSecurityId(fixedIncome.getId());
fixedIncome.setCreated(Instant.now());
+ fixedIncome.setUpdated(fixedIncome.getCreated());
try {
transaction.beginTransaction();
Imdg fixedIncomeImdg = transaction.getImdg(IMDGDistributedNames.Map_FixedIncomeSecurity, FixedIncomeSecurity.class);
diff --git a/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/service/cud/MoneyMarketSecurityService.java b/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/service/cud/MoneyMarketSecurityService.java
index 5fbf1afc2..3a2e38883 100644
--- a/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/service/cud/MoneyMarketSecurityService.java
+++ b/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/service/cud/MoneyMarketSecurityService.java
@@ -135,7 +135,9 @@ public class MoneyMarketSecurityService extends QueueConsumer implements Initial
mms.setIssuerId(req.getIssuerId());
mms.setSecurityId(mms.getId());
mms.setDescription(req.getDescription());
+ mms.setConvention(req.getConvention());
mms.setCreated(Instant.now());
+ mms.setUpdated(mms.getCreated());
if (req.getWorkflowStatus() == null) {
mms.setWorkflowStatus(WorkflowStatus.Active.getKey());
} else {
@@ -206,6 +208,7 @@ public class MoneyMarketSecurityService extends QueueConsumer implements Initial
mms.setIssuerId(req.getIssuerId());
mms.setSecurityId(mms.getId());
mms.setDescription(req.getDescription());
+ mms.setConvention(req.getConvention());
if (req.getWorkflowStatus() != null) {
mms.setWorkflowStatus(req.getWorkflowStatus());
}
diff --git a/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/validation/ListingValidationProvider.java b/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/validation/ListingValidationProvider.java
index 84158be33..8a30eedbf 100644
--- a/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/validation/ListingValidationProvider.java
+++ b/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/validation/ListingValidationProvider.java
@@ -2,14 +2,15 @@ package ru.spcex.clearing.securities.validation;
import org.springframework.stereotype.Component;
import ru.clearing.classes.statics.data.misc.Listing;
-import ru.clearing.classes.statics.data.scheduler.PlannerTemplate;
import ru.clearing.classes.statics.data.security.Security;
+import ru.clearing.platform.dictionary.CurrencyCodeDictionary;
+import ru.clearing.platform.dictionary.WorkflowStatusDictionary;
import ru.spcex.clearing.imdg.IMDGDistributedNames;
import ru.spcex.clearing.platform.messaging.domain.cud.common.CommonDeleteRequest;
-import ru.spcex.clearing.platform.messaging.domain.cud.schedule.PlannerTemplateUpdateRequest;
import ru.spcex.clearing.platform.messaging.domain.cud.securitites.*;
import ru.spcex.clearing.util.security.SecuritySelector;
import ru.spcex.clearing.securities.errors.SecuritiesError;
+import ru.spcex.clearing.validation.common.rules.DictionaryPresentRule;
import ru.spcex.clearing.validation.common.rules.IdPresentRule;
import ru.spcex.clearing.validation.common.rules.SpecialIdPresentRule;
import ru.spcex.platform.classes.base.SpcexObjectBase;
@@ -31,6 +32,7 @@ import java.util.function.Function;
@Component
public class ListingValidationProvider {
final Imdg workflowStatusDictionaryImdg;
+ final Imdg currencyCodeDictionaryImdg;
final Imdg listingImdg;
final Imdg marketImdg;
final SecuritySelector securitySelector;
@@ -39,6 +41,7 @@ public class ListingValidationProvider {
public ListingValidationProvider(ImdgProvider imdgProvider, SecuritySelector securitySelector) {
this.securitySelector = securitySelector;
this.workflowStatusDictionaryImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_WorkflowStatusDictionary, SpcexObjectBase.class);
+ this.currencyCodeDictionaryImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_CurrencyCodeDictionary, SpcexObjectBase.class);
this.listingImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_Listing, Listing.class);
this.marketImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_Market, ru.clearing.classes.statics.data.misc.Market.class);
}
@@ -49,6 +52,7 @@ public class ListingValidationProvider {
ImdgValidationContext context = new ImdgValidationContext<>();
context.setValidatedObject(listingRequest);
context.addImdg(IMDGDistributedNames.Map_WorkflowStatusDictionary, workflowStatusDictionaryImdg);
+ context.addImdg(IMDGDistributedNames.Map_CurrencyCodeDictionary, currencyCodeDictionaryImdg);
context.addImdg(IMDGDistributedNames.Map_Market, marketImdg);
context.addImdg(IMDGDistributedNames.Map_Listing, listingImdg);
return new ValidatorImpl>(context,
@@ -62,6 +66,16 @@ public class ListingValidationProvider {
SecuritiesError.RequiredFieldIsEmpty, SecuritiesError.MarketNotFound,
true
),
+ DictionaryPresentRule.instance("tradingCurrency", ListingNewRequest::getTradingCurrency,
+ IMDGDistributedNames.Map_CurrencyCodeDictionary, CurrencyCodeDictionary.class,
+ SecuritiesError.RequiredFieldIsEmpty, SecuritiesError.WrongFieldValue,
+ false
+ ),
+ DictionaryPresentRule.instance("workflowStatus", ListingNewRequest::getWorkflowStatus,
+ IMDGDistributedNames.Map_WorkflowStatusDictionary, WorkflowStatusDictionary.class,
+ SecuritiesError.RequiredFieldIsEmpty, SecuritiesError.WrongFieldValue,
+ false
+ ),
new NotSameActiveListing<>(ListingNewRequest::getSecurityId, ListingNewRequest::getMarket)
);
};
@@ -72,12 +86,23 @@ public class ListingValidationProvider {
ImdgValidationContext context = new ImdgValidationContext<>();
context.setValidatedObject(mmsRequest);
context.addImdg(IMDGDistributedNames.Map_WorkflowStatusDictionary, workflowStatusDictionaryImdg);
+ context.addImdg(IMDGDistributedNames.Map_CurrencyCodeDictionary, currencyCodeDictionaryImdg);
context.addImdg(IMDGDistributedNames.Map_Listing, listingImdg);
return new ValidatorImpl<>(context,
new PresentById(IMDGDistributedNames.Map_Listing, SecuritiesError.ListingNotFound, true),
new SecurityIdPresentRule("securityId", ListingUpdateRequest::getSecurityId,
(Security security) ->
- InstrumentType.RATE.equalsByKey(security.getInstrumentType()) ? SecuritiesError.ListingOnMMSCreatedBySystem : null
+ InstrumentType.RATE.equalsByKey(security.getInstrumentType()) ? SecuritiesError.ListingOnMMSUpdatedBySystem : null
+ ),
+ DictionaryPresentRule.instance("tradingCurrency", ListingUpdateRequest::getTradingCurrency,
+ IMDGDistributedNames.Map_CurrencyCodeDictionary, CurrencyCodeDictionary.class,
+ SecuritiesError.RequiredFieldIsEmpty, SecuritiesError.WrongFieldValue,
+ false
+ ),
+ DictionaryPresentRule.instance("workflowStatus", ListingUpdateRequest::getWorkflowStatus,
+ IMDGDistributedNames.Map_WorkflowStatusDictionary, WorkflowStatusDictionary.class,
+ SecuritiesError.RequiredFieldIsEmpty, SecuritiesError.WrongFieldValue,
+ false
)
);
};
@@ -102,7 +127,7 @@ public class ListingValidationProvider {
Security security = securitySelector.selectSecurityById(listing.getSecurityId());
if (security != null) {
if (InstrumentType.RATE.equalsByKey(security.getInstrumentType()))
- return SecuritiesError.ListingOnMMSCreatedBySystem;
+ return SecuritiesError.ListingOnMMSDeletedBySystem;
}
return null;
}
diff --git a/clearing-parent/securities-service/src/test/java/ru/spcex/clearing/securities/service/AbstractServiceTest.java b/clearing-parent/securities-service/src/test/java/ru/spcex/clearing/securities/service/AbstractServiceTest.java
index 85df3f211..75a4070f8 100644
--- a/clearing-parent/securities-service/src/test/java/ru/spcex/clearing/securities/service/AbstractServiceTest.java
+++ b/clearing-parent/securities-service/src/test/java/ru/spcex/clearing/securities/service/AbstractServiceTest.java
@@ -18,10 +18,12 @@ import ru.spcex.clearing.imdg.IMDGDistributedNames;
import ru.spcex.clearing.securities.config.ErrorResolverConfig;
import ru.spcex.clearing.securities.config.ValidationConfig;
import ru.spcex.clearing.securities.service.cud.*;
+import ru.spcex.clearing.securities.validation.ListingValidationProvider;
import ru.spcex.clearing.securities.validation.ValidationProvider;
import ru.spcex.clearing.test.MatcherFactory;
import ru.spcex.clearing.test.config.ImdgTestConfig;
import ru.spcex.clearing.test.config.KafkaTestConfig;
+import ru.spcex.clearing.util.security.SecuritySelector;
import ru.spcex.platform.imdg.api.Imdg;
import ru.spcex.platform.imdg.api.ImdgProvider;
@@ -37,7 +39,8 @@ import static ru.spcex.clearing.test.config.ImdgTestConfig.waitAvailableImdgProv
EquitySecurityService.class,
FixedIncomeSecurityService.class,
MoneyMarketSecurityService.class,
- ListingService.class,
+ ListingService.class, ListingValidationProvider.class,
+ SecuritySelector.class,
ImdgTestConfig.class,
KafkaTestConfig.class,
ValidationProvider.class,
diff --git a/clearing-parent/securities-service/src/test/java/ru/spcex/clearing/securities/service/MoneyMarketSecurityFactory.java b/clearing-parent/securities-service/src/test/java/ru/spcex/clearing/securities/service/MoneyMarketSecurityFactory.java
index 780630784..3e78596d8 100644
--- a/clearing-parent/securities-service/src/test/java/ru/spcex/clearing/securities/service/MoneyMarketSecurityFactory.java
+++ b/clearing-parent/securities-service/src/test/java/ru/spcex/clearing/securities/service/MoneyMarketSecurityFactory.java
@@ -24,6 +24,7 @@ class MoneyMarketSecurityFactory {
private String fullName = "estat";
private String shortName = "esasdftat";
private String securitySymbol = "sdfafd";
+ private String convention = "convention";
private String istin = "istin";
private String termType = AbstractServiceTest.termType;
@@ -106,6 +107,7 @@ class MoneyMarketSecurityFactory {
moneyMarketSecurity.setDescription(description);
moneyMarketSecurity.setLotSize(lotSize);
moneyMarketSecurity.setSecuritySymbol(securitySymbol);
+ moneyMarketSecurity.setConvention(convention);
moneyMarketSecurity.setWorkflowStatus(ru.spcex.platform.enumeration.Status.Active.getKey());
return moneyMarketSecurity;
@@ -131,6 +133,7 @@ class MoneyMarketSecurityFactory {
moneyMarketSecurityUpdateRequest.setIssuerId(issuerId);
moneyMarketSecurityUpdateRequest.setDescription(description);
moneyMarketSecurityUpdateRequest.setSecuritySymbol(securitySymbol);
+ moneyMarketSecurityUpdateRequest.setConvention(convention);
moneyMarketSecurityUpdateRequest.setWorkflowStatus(ru.spcex.platform.enumeration.Status.Active.getKey());
return moneyMarketSecurityUpdateRequest;
@@ -160,6 +163,7 @@ class MoneyMarketSecurityFactory {
keyRequest.setIsin(istin);
keyRequest.setDescription(description);
keyRequest.setSecuritySymbol(securitySymbol);
+ keyRequest.setConvention(convention);
keyRequest.setWorkflowStatus(ru.spcex.platform.enumeration.Status.Active.getKey());
diff --git a/clearing-parent/utility-service/src/main/java/ru/spcex/clearing/utility/config/KafkaConfig.java b/clearing-parent/utility-service/src/main/java/ru/spcex/clearing/utility/config/KafkaConfig.java
index 2dde7ea72..d12d1aaa7 100644
--- a/clearing-parent/utility-service/src/main/java/ru/spcex/clearing/utility/config/KafkaConfig.java
+++ b/clearing-parent/utility-service/src/main/java/ru/spcex/clearing/utility/config/KafkaConfig.java
@@ -3,13 +3,23 @@ package ru.spcex.clearing.utility.config;
import org.apache.kafka.clients.consumer.Consumer;
import org.apache.kafka.clients.producer.Producer;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.beans.factory.config.ConfigurableBeanFactory;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Scope;
+import org.springframework.kafka.core.KafkaTemplate;
+import org.springframework.kafka.core.ProducerFactory;
+import ru.spcex.clearing.imdg.IMDGDistributedNames;
import ru.spcex.clearing.platform.messaging.config.KafkaConsumerFactory;
import ru.spcex.clearing.platform.messaging.config.KafkaProducerFactory;
+import ru.spcex.clearing.platform.messaging.config.element.KafkaProducerSettings;
+import ru.spcex.clearing.platform.messaging.service.RequestInfo;
+import ru.spcex.clearing.platform.messaging.service.sender.KafkaSender;
import ru.spcex.clearing.utility.config.settings.UtilityServiceSettings;
+import ru.spcex.platform.imdg.api.Imdg;
+import ru.spcex.platform.imdg.api.ImdgId;
+import ru.spcex.platform.imdg.api.ImdgProvider;
@Configuration
public class KafkaConfig {
@@ -26,4 +36,30 @@ public class KafkaConfig {
return KafkaProducerFactory.producer(settings.getKafkaProducer());
}
+ @Bean
+ public ProducerFactory pf(UtilityServiceSettings settings) {
+ KafkaProducerSettings kafkaSettings = settings.getKafkaProducer();
+ return KafkaProducerFactory.producerFactory(kafkaSettings);
+ }
+
+ @Bean("kafkaTemplate")
+ public KafkaTemplate kafkaTemplate(ProducerFactory pf) {
+ return new KafkaTemplate<>(pf);
+ }
+
+ @Autowired
+ @Bean
+ public KafkaSender kafkaSender(@Qualifier("kafkaTemplate") KafkaTemplate kafkaTemplate,
+ ImdgProvider imdgProvider) {
+ ImdgId imdgIdGenerator = imdgProvider.getImdgIdGenerator();
+ return KafkaSender
+ .setup()
+ .setKafkaTemplate(kafkaTemplate)
+ .idGenerator(imdgIdGenerator::nextId)
+ .imdgProvider(s -> {
+ Imdg imdg = imdgProvider.getImdg(IMDGDistributedNames.Map_RequestInfo, RequestInfo.class);
+ return imdg::insert;
+ })
+ .build();
+ }
}
diff --git a/clearing-parent/utility-service/src/main/java/ru/spcex/clearing/utility/service/NotificationService.java b/clearing-parent/utility-service/src/main/java/ru/spcex/clearing/utility/service/NotificationService.java
new file mode 100644
index 000000000..cc50660cb
--- /dev/null
+++ b/clearing-parent/utility-service/src/main/java/ru/spcex/clearing/utility/service/NotificationService.java
@@ -0,0 +1,102 @@
+package ru.spcex.clearing.utility.service;
+
+import org.apache.kafka.clients.consumer.Consumer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import ru.clearing.classes.statics.data.misc.Notification;
+import ru.spcex.clearing.imdg.IMDGDistributedNames;
+import ru.spcex.clearing.platform.messaging.domain.BaseRequest;
+import ru.spcex.clearing.platform.messaging.domain.cud.utilities.NotificationFeedbackRequest;
+import ru.spcex.clearing.platform.messaging.domain.cud.utilities.NotificationNewRequest;
+import ru.spcex.clearing.platform.messaging.domain.cud.utilities.NotificationUpdateRequest;
+import ru.spcex.clearing.platform.messaging.service.QueueConsumer;
+import ru.spcex.clearing.platform.messaging.service.sender.KafkaSender;
+import ru.spcex.platform.imdg.api.Imdg;
+import ru.spcex.platform.imdg.api.ImdgProvider;
+
+import java.time.Instant;
+import java.time.LocalDate;
+
+import static ru.spcex.clearing.platform.messaging.domain.Consts.*;
+import static ru.spcex.platform.enumeration.NotificationStatus.PEND;
+import static ru.spcex.platform.enumeration.ObjectType.statement;
+
+@Service
+public class NotificationService extends QueueConsumer implements InitializingBean {
+ private final Logger log = LoggerFactory.getLogger(getClass());
+ private final Imdg notificationMap;
+ private final KafkaSender kafkaSender;
+
+ @Autowired
+ public NotificationService(Consumer kafkaQueue,
+ ImdgProvider imdgProvider,
+ KafkaSender kafkaSender) {
+ super(kafkaQueue);
+ this.notificationMap = imdgProvider.getImdg(IMDGDistributedNames.Map_Notification, Notification.class);
+ this.kafkaSender = kafkaSender;
+ }
+
+ @Override
+ public void afterPropertiesSet() {
+ callback(NotificationNewRequest.class)
+ .setConsumer(this::notificationNewRequest)
+ .forDestination(NOTIFICATION_NEW, callbacks::put);
+ callback(NotificationUpdateRequest.class)
+ .setConsumer(this::notificationUpdateRequest)
+ .forDestination(NOTIFICATION_UPDATE, callbacks::put);
+ init();
+ }
+
+ private void notificationNewRequest(BaseRequest notificationNewRequestBaseRequest) {
+ log.info("Starting notificationNewRequest processing...");
+ NotificationNewRequest request = notificationNewRequestBaseRequest.getRequestPayload();
+ Notification notification = notificationBuilderFromNotificationNewRequest(request);
+ notificationMap.insert(notification);
+ log.info("NotificationNewRequest successfully processed! Generated id:\t{}", notification.getId());
+ }
+
+ private void notificationUpdateRequest(BaseRequest notificationUpdateRequestBaseRequest) {
+ NotificationUpdateRequest request = notificationUpdateRequestBaseRequest.getRequestPayload();
+ Long id = request.getId();
+ log.info("Starting notificationUpdateRequest processing by id: {} ...", id);
+ Notification notification = notificationMap.getSingleObjectByID(id);
+ if (notification == null) {
+ throw new NullPointerException("Notification by id:{" + id + "} is null!");
+ }
+ notification.setNotificationStatus(request.getNotificationStatus());
+ notification.setUpdated(Instant.now());
+ notificationMap.update(notification);
+ sendFeedbackString(notification.getObjectType(), notification.getNotificationStatus());
+ log.info("NotificationUpdateRequest successfully processed!");
+ }
+
+ private Notification notificationBuilderFromNotificationNewRequest(NotificationNewRequest request) {
+ Notification notification = new Notification();
+ notification.setClearingDate(LocalDate.now());
+ notification.setSenderId(request.getSenderId());
+ notification.setAddresseeId(request.getAddresseeId());
+ notification.setObjectType(request.getObjectType());
+ notification.setObjectId(request.getObjectId());
+ notification.setNotificationStatus(PEND.getKey());
+ notification.setCreated(Instant.now());
+ notification.setUpdated(Instant.now());
+ return notification;
+ }
+
+ private void sendFeedbackString(String objectType, String status) {
+ if (objectType.equalsIgnoreCase(statement.getKey())) {
+ kafkaSender.sendRequestToQueue(CLEARING_NOTIFICATION_FEEDBACK, buildFeedbackRequest(status));
+ } else {
+ log.warn("Unsupported notification type {}", objectType);
+ }
+ }
+
+ private NotificationFeedbackRequest buildFeedbackRequest(String status) {
+ NotificationFeedbackRequest request = new NotificationFeedbackRequest();
+ request.setNotificationStatus(status);
+ return request;
+ }
+}
diff --git a/platform-parent/platform-enum/src/main/java/ru/spcex/platform/enumeration/NotificationStatus.java b/platform-parent/platform-enum/src/main/java/ru/spcex/platform/enumeration/NotificationStatus.java
new file mode 100644
index 000000000..553981867
--- /dev/null
+++ b/platform-parent/platform-enum/src/main/java/ru/spcex/platform/enumeration/NotificationStatus.java
@@ -0,0 +1,21 @@
+package ru.spcex.platform.enumeration;
+
+import ru.spcex.platform.utils.enumeration.IEnumKey;
+
+public enum NotificationStatus implements IEnumKey {
+ PEND("PEND"),
+ CNCL("CNCL"),
+ ACPT("ACPT"),
+ READ("READ");
+
+ private final String key;
+
+ NotificationStatus(String key) {
+ this.key = key;
+ }
+
+ @Override
+ public String getKey() {
+ return key;
+ }
+}
diff --git a/platform-parent/platform-enum/src/main/java/ru/spcex/platform/enumeration/RegistryTradingParams.java b/platform-parent/platform-enum/src/main/java/ru/spcex/platform/enumeration/RegistryTradingParams.java
index 8be105014..a9594b124 100644
--- a/platform-parent/platform-enum/src/main/java/ru/spcex/platform/enumeration/RegistryTradingParams.java
+++ b/platform-parent/platform-enum/src/main/java/ru/spcex/platform/enumeration/RegistryTradingParams.java
@@ -14,4 +14,94 @@ public record RegistryTradingParams(RegistryDesignation registryDesignation,
return isEqualDesignation && isEqualInstrumentType && isEqualCapacity && isEqualUnit;
}
+ public final static RegistryTradingParams OS_T;
+ public final static RegistryTradingParams OM_T;
+ public final static RegistryTradingParams TS_T;
+ public final static RegistryTradingParams TM_T;
+ public final static RegistryTradingParams DM_X;
+ public final static RegistryTradingParams DM_T;
+ public final static RegistryTradingParams AM_F;
+ public final static RegistryTradingParams AM_T;
+ public final static RegistryTradingParams AM_B;
+ public final static RegistryTradingParams AS_T;
+ public final static RegistryTradingParams AS_B;
+ public final static RegistryTradingParams AS_F;
+ public final static RegistryTradingParams CM_T;
+ public final static RegistryTradingParams LM_T;
+ public final static RegistryTradingParams CS_T;
+ public final static RegistryTradingParams LS_T;
+ public final static RegistryTradingParams L__T;
+
+ static {
+ OS_T = new RegistryTradingParams(RegistryDesignation.O,
+ RegistryInstrumentType.S,
+ null,
+ RegistryUnit.T);
+ OM_T = new RegistryTradingParams(RegistryDesignation.O,
+ RegistryInstrumentType.M,
+ null,
+ RegistryUnit.T);
+ TS_T = new RegistryTradingParams(RegistryDesignation.T,
+ RegistryInstrumentType.S,
+ null,
+ RegistryUnit.T);
+
+ TM_T = new RegistryTradingParams(RegistryDesignation.T,
+ RegistryInstrumentType.M,
+ null,
+ RegistryUnit.T);
+ DM_X = new RegistryTradingParams(RegistryDesignation.D,
+ RegistryInstrumentType.M,
+ null,
+ RegistryUnit.X);
+ DM_T = new RegistryTradingParams(RegistryDesignation.D,
+ RegistryInstrumentType.M,
+ null,
+ RegistryUnit.T);
+ AM_F = new RegistryTradingParams(RegistryDesignation.A,
+ RegistryInstrumentType.M,
+ null,
+ RegistryUnit.F);
+ AM_T = new RegistryTradingParams(RegistryDesignation.A,
+ RegistryInstrumentType.M,
+ null,
+ RegistryUnit.T);
+ AM_B = new RegistryTradingParams(RegistryDesignation.A,
+ RegistryInstrumentType.M,
+ null,
+ RegistryUnit.B);
+ AS_T = new RegistryTradingParams(RegistryDesignation.A,
+ RegistryInstrumentType.S,
+ null,
+ RegistryUnit.T);
+ AS_B = new RegistryTradingParams(RegistryDesignation.A,
+ RegistryInstrumentType.S,
+ null,
+ RegistryUnit.B);
+ AS_F = new RegistryTradingParams(RegistryDesignation.A,
+ RegistryInstrumentType.S,
+ null,
+ RegistryUnit.F);
+ CM_T = new RegistryTradingParams(RegistryDesignation.C,
+ RegistryInstrumentType.M,
+ null,
+ RegistryUnit.T);
+ LM_T = new RegistryTradingParams(RegistryDesignation.L,
+ RegistryInstrumentType.M,
+ null,
+ RegistryUnit.T);
+ CS_T = new RegistryTradingParams(RegistryDesignation.C,
+ RegistryInstrumentType.S,
+ null,
+ RegistryUnit.T);
+ LS_T = new RegistryTradingParams(RegistryDesignation.L,
+ RegistryInstrumentType.S,
+ null,
+ RegistryUnit.T);
+ L__T = new RegistryTradingParams(RegistryDesignation.L,
+ null,
+ null,
+ RegistryUnit.T);
+ }
+
}
diff --git a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/Consts.java b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/Consts.java
index 7c9901cfa..b71bf93c3 100644
--- a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/Consts.java
+++ b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/Consts.java
@@ -41,6 +41,7 @@ public interface Consts {
String DESTINATION_PLANNER_UPDATE = "planner-update";
String DESTINATION_PLANNER_DELETE = "planner-delete";
+ String DESTINATION_COMPANY_MULTIREQUEST = "company-multirequest-new";
String DESTINATION_COMPANY_NEW = "company-new";
String DESTINATION_COMPANY_DELETE = "company-delete";
String DESTINATION_COMPANY_UPDATE = "company-update";
@@ -104,6 +105,11 @@ public interface Consts {
String DESTINATION_TRADING_CLEARING_REGISTRY_UPDATE = "trading-clearing-registry-update";
String DESTINATION_TRADING_CLEARING_REGISTRY_BLOCK = "trading-clearing-registry-block";
+ String CLEARING_NOTIFICATION_FEEDBACK = "clearing-notification-feedback";
+ String NOTIFICATION_NEW = "notification-new";
+ String NOTIFICATION_UPDATE = "notification-update";
+
+
String DESTINATION_SDF08_NEW = "s-df-08-new";
String DESTINATION_SDF02_NEW = "s-df-02-new";
@@ -139,7 +145,7 @@ public interface Consts {
String BALANCE_ACCOUNT_UPDATE = "balance-account-update";
String CONTINUE_CLEARING = "continue-clearing";
String LAUNCHER_NEW = "launcher-new";
- String NOTIFICATION_NEW = "notification-new";
+
String REQUEST_INFO_UPDATE = "request-info-update";
diff --git a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/company/MultiCompanyRequest.java b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/company/MultiCompanyRequest.java
new file mode 100644
index 000000000..067712ec9
--- /dev/null
+++ b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/company/MultiCompanyRequest.java
@@ -0,0 +1,81 @@
+package ru.spcex.clearing.platform.messaging.domain.cud.company;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import ru.spcex.clearing.platform.messaging.domain.cud.account.ClientCodeNewRequest;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class MultiCompanyRequest {
+ @JsonProperty
+ String uuid; // для лога
+
+ @JsonProperty
+ CompanyNewRequest company;
+ @JsonProperty
+ CompanyInfoUpdateRequest companyInfo;
+ @JsonProperty
+ List profileDocuments = new ArrayList<>();
+ @JsonProperty
+ List companySymbols = new ArrayList<>();
+ @JsonProperty
+ List contacts = new ArrayList<>();
+ @JsonProperty
+ List clientCodes = new ArrayList<>();
+
+ public String getUuid() {
+ return uuid;
+ }
+
+ public void setUuid(String uuid) {
+ this.uuid = uuid;
+ }
+
+ public CompanyNewRequest getCompany() {
+ return company;
+ }
+
+ public void setCompany(CompanyNewRequest company) {
+ this.company = company;
+ }
+
+ public CompanyInfoUpdateRequest getCompanyInfo() {
+ return companyInfo;
+ }
+
+ public void setCompanyInfo(CompanyInfoUpdateRequest companyInfo) {
+ this.companyInfo = companyInfo;
+ }
+
+ public List getProfileDocuments() {
+ return profileDocuments;
+ }
+
+ public void setProfileDocuments(List profileDocuments) {
+ this.profileDocuments = profileDocuments;
+ }
+
+ public List getCompanySymbols() {
+ return companySymbols;
+ }
+
+ public void setCompanySymbols(List companySymbols) {
+ this.companySymbols = companySymbols;
+ }
+
+ public List getContacts() {
+ return contacts;
+ }
+
+ public void setContacts(List contacts) {
+ this.contacts = contacts;
+ }
+
+ public List getClientCodes() {
+ return clientCodes;
+ }
+
+ public void setClientCodes(List clientCodes) {
+ this.clientCodes = clientCodes;
+ }
+}
diff --git a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/utilities/NotificationFeedbackRequest.java b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/utilities/NotificationFeedbackRequest.java
new file mode 100644
index 000000000..f58461bfc
--- /dev/null
+++ b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/utilities/NotificationFeedbackRequest.java
@@ -0,0 +1,17 @@
+package ru.spcex.clearing.platform.messaging.domain.cud.utilities;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+
+public class NotificationFeedbackRequest {
+ @JsonProperty
+ public String notificationStatus;
+
+ public String getNotificationStatus() {
+ return notificationStatus;
+ }
+
+ public void setNotificationStatus(String notificationStatus) {
+ this.notificationStatus = notificationStatus;
+ }
+}
diff --git a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/utilities/NotificationUpdateRequest.java b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/utilities/NotificationUpdateRequest.java
new file mode 100644
index 000000000..3a14578d3
--- /dev/null
+++ b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/utilities/NotificationUpdateRequest.java
@@ -0,0 +1,27 @@
+package ru.spcex.clearing.platform.messaging.domain.cud.utilities;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+public class NotificationUpdateRequest {
+ @JsonProperty
+ public Long id;
+
+ @JsonProperty
+ public String notificationStatus;
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ public String getNotificationStatus() {
+ return notificationStatus;
+ }
+
+ public void setNotificationStatus(String notificationStatus) {
+ this.notificationStatus = notificationStatus;
+ }
+}