This commit is contained in:
akulikov
parent
f5e2886ad6
commit
654943ec36
2 changed files with 176 additions and 12 deletions
|
|
@ -12,6 +12,9 @@ public enum AccountError implements IErrorEnumId {
|
|||
CompanyNotFound(5013L),
|
||||
CompanyNotActive(5014L),
|
||||
InfoAccountAlreadyExist(5015L),
|
||||
TradingClearingRegistryAlreadyExist(5016L),
|
||||
DepoAccountNotFound(5017L),
|
||||
MoneyAccountNotFound(5018L),
|
||||
ClearingCategoryNotFound(5019L),
|
||||
TradingClearingRegistryNotFound(5022L),
|
||||
;
|
||||
|
|
|
|||
|
|
@ -12,6 +12,7 @@ import ru.clearing.classes.statics.data.account.ClearingAccount;
|
|||
import ru.clearing.classes.statics.data.account.DepoAccount;
|
||||
import ru.clearing.classes.statics.data.account.InformationAccount;
|
||||
import ru.clearing.classes.statics.data.company.Company;
|
||||
import ru.clearing.classes.statics.data.company.relation.Relation;
|
||||
import ru.clearing.classes.statics.data.registry.TradingClearingRegistry;
|
||||
import ru.spcex.clearing.account.errors.AccountError;
|
||||
import ru.spcex.clearing.imdg.IMDGDistributedNames;
|
||||
|
|
@ -25,18 +26,23 @@ import ru.spcex.clearing.platform.messaging.service.RequestInfoUpdate;
|
|||
import ru.spcex.clearing.platform.messaging.service.Status;
|
||||
import ru.spcex.clearing.util.security.UserRoleVerification;
|
||||
import ru.spcex.clearing.validation.common.ValidationHelper;
|
||||
import ru.spcex.platform.enumeration.AccountType;
|
||||
import ru.spcex.platform.enumeration.ServiceStatus;
|
||||
import ru.spcex.platform.enumeration.TradingClearingRegistryPurpose;
|
||||
import ru.spcex.platform.enumeration.TradingClearingRegistryType;
|
||||
import ru.spcex.platform.imdg.api.Imdg;
|
||||
import ru.spcex.platform.imdg.api.ImdgProvider;
|
||||
import ru.spcex.platform.imdg.api.predicate.ImdgPredicate;
|
||||
import ru.spcex.platform.imdg.api.predicate.ImdgPredicateBuilder;
|
||||
import ru.spcex.platform.utils.enumeration.EnumMessage;
|
||||
import ru.spcex.platform.utils.enumeration.IMessageResolver;
|
||||
import ru.spcex.platform.utils.validation.IValidator;
|
||||
|
||||
import java.time.Instant;
|
||||
import java.util.Arrays;
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.function.Function;
|
||||
|
||||
@Service
|
||||
|
|
@ -52,6 +58,7 @@ public class TradingClearingRegistryService extends QueueConsumer implements Ini
|
|||
private final Imdg<InformationAccount> informationAccountImdg;
|
||||
private final Imdg<Account> accountImdg;
|
||||
private final Imdg<Company> companyImdg;
|
||||
private final Imdg<Relation> relationImdg;
|
||||
|
||||
private final Function<TradingClearingRegistryUpdateRequest, IValidator> tradingClearingRegistryUpdateRequestValidator;
|
||||
private final Function<TradingClearingRegistryNewRequest, IValidator> tradingClearingRegistryNewRequestValidator;
|
||||
|
|
@ -83,6 +90,7 @@ public class TradingClearingRegistryService extends QueueConsumer implements Ini
|
|||
this.informationAccountImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_InformationAccount, InformationAccount.class);
|
||||
this.companyImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_Company, Company.class);
|
||||
this.accountImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_Account, Account.class);
|
||||
this.relationImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_Relation, Relation.class);
|
||||
this.tradingClearingRegistryUpdateRequestValidator = tradingClearingRegistryUpdateRequestValidator;
|
||||
this.tradingClearingRegistryBlockRequestValidator = tradingClearingRegistryBlockRequestValidator;
|
||||
this.messageResolver = messageResolver;
|
||||
|
|
@ -102,7 +110,7 @@ public class TradingClearingRegistryService extends QueueConsumer implements Ini
|
|||
.forDestination(Consts.DESTINATION_TRADING_CLEARING_REGISTRY_BLOCK, callbacks::put);
|
||||
}
|
||||
|
||||
public RequestInfoUpdate tradingClearingRegistryNew(BaseRequest<TradingClearingRegistryNewRequest> userRequest) {
|
||||
public RequestInfoUpdate tradingClearingRegistryAutoNew(BaseRequest<TradingClearingRegistryNewRequest> userRequest) {
|
||||
log.debug("TradingClearingRegistryNewRequest received");
|
||||
RequestInfoUpdate requestInfoUpdate = userRoleVerification.validateRoleAndGetResult(userRequest);
|
||||
if (requestInfoUpdate != null) return requestInfoUpdate;
|
||||
|
|
@ -125,28 +133,128 @@ public class TradingClearingRegistryService extends QueueConsumer implements Ini
|
|||
InformationAccount infoAccount = null;
|
||||
ClearingAccount clearingAccount = clearingAccountImdg.getSingleObjectByID(req.getMoneyAccountId());
|
||||
if (clearingAccount == null) infoAccount = informationAccountImdg.getSingleObjectByID(req.getMoneyAccountId());
|
||||
Long clearingAccountId = clearingAccount != null ? clearingAccount.getAccountId() : infoAccount.getAccountId();
|
||||
Account clearingAccountMain = accountImdg.getSingleObjectByID(clearingAccountId);
|
||||
Long accountId = clearingAccount != null ? clearingAccount.getAccountId() : infoAccount.getAccountId();
|
||||
Account accountMain = accountImdg.getSingleObjectByID(accountId);
|
||||
|
||||
|
||||
// TODO: WELCOME TO HELL
|
||||
// Проверка выглядит очень сложно и запутанно, потому что репортеры сами не до конца понимают, какая она должна быть.
|
||||
// Пока что она соответствует ТЗ, но возможно будет правиться, поэтому расписана без выноса кода в методы и
|
||||
// прочих методов сокращения кода
|
||||
Relation relation = relationImdg.getSingleObjectByFieldValues(Map.of("consumerId", req.getCompanyId()));
|
||||
if (ru.spcex.platform.enumeration.Service.MKR.equalsByKey(relation.getService())) {
|
||||
TradingClearingRegistry registry = tradingClearingRegistryImdg.getSingleObjectByFieldValues(Map.of("companyId", req.getCompanyId()));
|
||||
if (registry != null) {
|
||||
String errMsg = messageResolver.resolve(
|
||||
new EnumMessage(AccountError.TradingClearingRegistryAlreadyExist,
|
||||
req.getCompanyId(),
|
||||
registry.getId())
|
||||
);
|
||||
return new RequestInfoUpdate()
|
||||
.setMessage(errMsg)
|
||||
.setStatus(Status.Error)
|
||||
.setId(userRequest.getId());
|
||||
}
|
||||
DepoAccount depoAccountForCheck = depoAccountImdg.getSingleObjectByFieldValues(Map.of("companyId", req.getCompanyId()));
|
||||
if (depoAccountForCheck == null) {
|
||||
String errMsg = messageResolver.resolve(new EnumMessage(AccountError.DepoAccountNotFound, req.getCompanyId()));
|
||||
return new RequestInfoUpdate()
|
||||
.setMessage(errMsg)
|
||||
.setStatus(Status.Error)
|
||||
.setId(userRequest.getId());
|
||||
}
|
||||
} else if (ru.spcex.platform.enumeration.Service.FOND.equalsByKey(relation.getService())) {
|
||||
if (AccountType.Info.equalsByKey(accountMain.getStatus())) {
|
||||
TradingClearingRegistry registry = tradingClearingRegistryImdg.getSingleObjectByFieldValues(Map.of(
|
||||
"companyId", req.getCompanyId(),
|
||||
"tradingClearingRegistryType", TradingClearingRegistryPurpose.M.getKey()
|
||||
));
|
||||
if (registry != null) {
|
||||
String errMsg = messageResolver.resolve(
|
||||
new EnumMessage(AccountError.TradingClearingRegistryAlreadyExist,
|
||||
req.getCompanyId(),
|
||||
registry.getId())
|
||||
);
|
||||
return new RequestInfoUpdate()
|
||||
.setMessage(errMsg)
|
||||
.setStatus(Status.Error)
|
||||
.setId(userRequest.getId());
|
||||
}
|
||||
DepoAccount depoAccountForCheck = depoAccountImdg.getSingleObjectByFieldValues(Map.of("companyId", req.getCompanyId()));
|
||||
if (depoAccountForCheck == null) {
|
||||
String errMsg = messageResolver.resolve(new EnumMessage(AccountError.DepoAccountNotFound, req.getCompanyId()));
|
||||
return new RequestInfoUpdate()
|
||||
.setMessage(errMsg)
|
||||
.setStatus(Status.Error)
|
||||
.setId(userRequest.getId());
|
||||
}
|
||||
} else if (AccountType.Clrn.equalsByKey(accountMain.getStatus())) {
|
||||
ImdgPredicateBuilder imdgPredicateBuilder = tradingClearingRegistryImdg.predicateBuilder();
|
||||
ImdgPredicate predicate = imdgPredicateBuilder.and(
|
||||
imdgPredicateBuilder.equals("companyId", req.getCompanyId()),
|
||||
imdgPredicateBuilder.or(
|
||||
imdgPredicateBuilder.equals("tradingClearingRegistryPurpose", TradingClearingRegistryPurpose.M.getKey()),
|
||||
imdgPredicateBuilder.equals("tradingClearingRegistryPurpose", TradingClearingRegistryPurpose.C.getKey())
|
||||
)
|
||||
);
|
||||
Collection<TradingClearingRegistry> registry = tradingClearingRegistryImdg.getCollectionObjectsByPredicate(predicate);
|
||||
if (!registry.isEmpty()) {
|
||||
String errMsg = messageResolver.resolve(
|
||||
new EnumMessage(AccountError.TradingClearingRegistryAlreadyExist,
|
||||
req.getCompanyId(),
|
||||
registry.iterator().next().getId())
|
||||
);
|
||||
return new RequestInfoUpdate()
|
||||
.setMessage(errMsg)
|
||||
.setStatus(Status.Error)
|
||||
.setId(userRequest.getId());
|
||||
}
|
||||
DepoAccount depoAccountForCheck = depoAccountImdg.getSingleObjectByFieldValues(Map.of("companyId", req.getCompanyId()));
|
||||
if (depoAccountForCheck == null) {
|
||||
String errMsg = messageResolver.resolve(new EnumMessage(AccountError.DepoAccountNotFound, req.getCompanyId()));
|
||||
return new RequestInfoUpdate()
|
||||
.setMessage(errMsg)
|
||||
.setStatus(Status.Error)
|
||||
.setId(userRequest.getId());
|
||||
}
|
||||
} else if (AccountType.Depo.equalsByKey(accountMain.getStatus())) {
|
||||
InformationAccount infoAccountForCheck = informationAccountImdg.getSingleObjectByFieldValues(
|
||||
Map.of("companyId", req.getCompanyId())
|
||||
);
|
||||
ClearingAccount clearingAccountForCheck = clearingAccountImdg.getSingleObjectByFieldValues(
|
||||
Map.of("companyId", req.getCompanyId())
|
||||
);
|
||||
if (infoAccountForCheck == null && clearingAccountForCheck == null) {
|
||||
String errMsg = messageResolver.resolve(
|
||||
new EnumMessage(AccountError.MoneyAccountNotFound, req.getCompanyId())
|
||||
);
|
||||
return new RequestInfoUpdate()
|
||||
.setMessage(errMsg)
|
||||
.setStatus(Status.Error)
|
||||
.setId(userRequest.getId());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
List<String> activeStatuses = Arrays.asList(ServiceStatus.Active.getKey(), ServiceStatus.Reopened.getKey());
|
||||
String status = null;
|
||||
if (depoAccountMain != null && depoAccountMain.getStatus() != null) {
|
||||
if (activeStatuses.contains(depoAccountMain.getStatus()) && activeStatuses.contains(clearingAccountMain.getStatus()))
|
||||
if (activeStatuses.contains(depoAccountMain.getStatus()) && activeStatuses.contains(accountMain.getStatus()))
|
||||
status = ServiceStatus.Active.getKey();
|
||||
if (depoAccountMain.getStatus().equals(ServiceStatus.Blocked.getKey()) || clearingAccountMain.getStatus().equals(ServiceStatus.Blocked.getKey()))
|
||||
if (depoAccountMain.getStatus().equals(ServiceStatus.Blocked.getKey()) || accountMain.getStatus().equals(ServiceStatus.Blocked.getKey()))
|
||||
status = ServiceStatus.Blocked.getKey();
|
||||
if (depoAccountMain.getStatus().equals(ServiceStatus.Suspended.getKey()) || clearingAccountMain.getStatus().equals(ServiceStatus.Suspended.getKey()))
|
||||
if (depoAccountMain.getStatus().equals(ServiceStatus.Suspended.getKey()) || accountMain.getStatus().equals(ServiceStatus.Suspended.getKey()))
|
||||
status = ServiceStatus.Suspended.getKey();
|
||||
if (depoAccountMain.getStatus().equals(ServiceStatus.Closed.getKey()) || clearingAccountMain.getStatus().equals(ServiceStatus.Closed.getKey()))
|
||||
if (depoAccountMain.getStatus().equals(ServiceStatus.Closed.getKey()) || accountMain.getStatus().equals(ServiceStatus.Closed.getKey()))
|
||||
status = ServiceStatus.Closed.getKey();
|
||||
} else if (clearingAccountMain.getStatus() != null) {
|
||||
if (activeStatuses.contains(clearingAccountMain.getStatus()))
|
||||
} else if (accountMain.getStatus() != null) {
|
||||
if (activeStatuses.contains(accountMain.getStatus()))
|
||||
status = ServiceStatus.Active.getKey();
|
||||
if (clearingAccountMain.getStatus().equals(ServiceStatus.Blocked.getKey()))
|
||||
if (accountMain.getStatus().equals(ServiceStatus.Blocked.getKey()))
|
||||
status = ServiceStatus.Blocked.getKey();
|
||||
if (clearingAccountMain.getStatus().equals(ServiceStatus.Suspended.getKey()))
|
||||
if (accountMain.getStatus().equals(ServiceStatus.Suspended.getKey()))
|
||||
status = ServiceStatus.Suspended.getKey();
|
||||
if (clearingAccountMain.getStatus().equals(ServiceStatus.Closed.getKey()))
|
||||
if (accountMain.getStatus().equals(ServiceStatus.Closed.getKey()))
|
||||
status = ServiceStatus.Closed.getKey();
|
||||
}
|
||||
if (status == null) {
|
||||
|
|
@ -189,6 +297,59 @@ public class TradingClearingRegistryService extends QueueConsumer implements Ini
|
|||
return null;
|
||||
}
|
||||
|
||||
public RequestInfoUpdate tradingClearingRegistryNew(BaseRequest<TradingClearingRegistryNewRequest> userRequest) {
|
||||
log.debug("TradingClearingRegistryNewRequest received");
|
||||
RequestInfoUpdate requestInfoUpdate = userRoleVerification.validateRoleAndGetResult(userRequest);
|
||||
if (requestInfoUpdate != null) return requestInfoUpdate;
|
||||
|
||||
requestInfoUpdate = validationHelper.validateTillFirstError(userRequest, tradingClearingRegistryNewRequestValidator);
|
||||
if (requestInfoUpdate != null) return requestInfoUpdate;
|
||||
|
||||
TradingClearingRegistryNewRequest req = userRequest.getRequestPayload();
|
||||
|
||||
Long id = tradingClearingRegistryImdg.nextIDSequenceFor();
|
||||
TradingClearingRegistry tradingClearingRegistry = new TradingClearingRegistry();
|
||||
tradingClearingRegistry.setId(id);
|
||||
tradingClearingRegistry.setCompanyId(req.getCompanyId());
|
||||
tradingClearingRegistry.setMoneyAccountId(req.getMoneyAccountId());
|
||||
tradingClearingRegistry.setDepoAaccountId(req.getDepoAccountId());
|
||||
|
||||
DepoAccount depoAccount = req.getDepoAccountId() != null ? depoAccountImdg.getSingleObjectByID(req.getDepoAccountId()) : null;
|
||||
ClearingAccount clearingAccount = clearingAccountImdg.getSingleObjectByID(req.getMoneyAccountId());
|
||||
|
||||
tradingClearingRegistry.setStatus(ServiceStatus.Active.getKey());
|
||||
|
||||
String tradingRegistryType;
|
||||
if (depoAccount != null) {
|
||||
tradingRegistryType = depoAccount.getDepoAccountType();
|
||||
} else {
|
||||
if (clearingAccount != null) tradingRegistryType = clearingAccount.getClearingAccountType();
|
||||
else tradingRegistryType = TradingClearingRegistryType.Owner_A.getKey();
|
||||
}
|
||||
tradingClearingRegistry.setTradingClearingRegistryType(tradingRegistryType);
|
||||
|
||||
TradingClearingRegistryPurpose registryPurpose;
|
||||
if (req.getDepoAccountId() != null) registryPurpose = TradingClearingRegistryPurpose.C;
|
||||
else registryPurpose = TradingClearingRegistryPurpose.M;
|
||||
tradingClearingRegistry.setTradingClearingRegistryPurpose(registryPurpose.getKey());
|
||||
|
||||
Company company = companyImdg.getSingleObjectByID(req.getCompanyId());
|
||||
String code = "%4s".formatted(company.getClearingCode()).replace(' ', '0');
|
||||
code += registryPurpose.getKey();
|
||||
if (registryPurpose == TradingClearingRegistryPurpose.C) code += tradingRegistryType + id;
|
||||
else code += "AT" + id;
|
||||
tradingClearingRegistry.setCode(code);
|
||||
|
||||
Instant now = Instant.now();
|
||||
tradingClearingRegistry.setCreated(now);
|
||||
tradingClearingRegistry.setUpdated(now);
|
||||
|
||||
tradingClearingRegistryImdg.insert(tradingClearingRegistry);
|
||||
|
||||
log.debug("successfully processed, id {}", id);
|
||||
return null;
|
||||
}
|
||||
|
||||
public RequestInfoUpdate tradingClearingRegistryUpdate(BaseRequest<TradingClearingRegistryUpdateRequest> userRequest) {
|
||||
log.debug("TradingClearingRegistryUpdateRequest received");
|
||||
RequestInfoUpdate requestInfoUpdate = userRoleVerification.validateRoleAndGetResult(userRequest);
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue