treshenkov/clearing
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix logs

Browse source
This commit is contained in:
akulikov 2023-05-27 20:30:07 +03:00
parent de3a2a6759
commit 694a029554
12 changed files with 130 additions and 77 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

77
clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/GatewayController.java
View file

@ -5,14 +5,22 @@ import io.swagger.annotations.ApiResponse;
import io.swagger.annotations.ApiResponses;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.http.MediaType;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.ResponseBody;
import ru.spcex.clearing.gatewayapi.logic.ProcessResult;
import ru.spcex.clearing.gatewayapi.logic.Processor;
import ru.spcex.clearing.gatewayapi.logic.companies.CompaniesRequestParam;
import ru.spcex.clearing.gatewayapi.logic.listings_fond.FondListingsRequestParam;
import ru.spcex.clearing.gatewayapi.logic.listings_mm.MMListingsRequestParam;
import ru.spcex.clearing.gatewayapi.request.BaseRequest;
import ru.spcex.clearing.gatewayapi.request.CompaniesRequest;
import ru.spcex.clearing.gatewayapi.request.FondListingsRequest;
import ru.spcex.clearing.gatewayapi.request.MMListingsRequest;
import ru.spcex.clearing.gatewayapi.response.CommonResponse;
@Controller
@ -20,7 +28,26 @@ import ru.spcex.clearing.gatewayapi.response.CommonResponse;
public class GatewayController {
private final Logger log = LoggerFactory.getLogger(getClass());
@ApiOperation(value = "Put listings")
private final Processor<FondListingsRequestParam> fondListingsRequestProcessor;
private final Processor<MMListingsRequestParam> mmListingsRequestProcessor;
private final Processor<CompaniesRequestParam> companiesRequestProcessor;
public GatewayController(
@Qualifier("fondListingsRequestProcessor")
Processor<FondListingsRequestParam> fondListingsRequestProcessor,
@Qualifier("mmListingsRequestProcessor")
Processor<MMListingsRequestParam> mmListingsRequestProcessor,
@Qualifier("companiesRequestProcessor")
Processor<CompaniesRequestParam> companiesRequestProcessor
) {
this.fondListingsRequestProcessor = fondListingsRequestProcessor;
this.mmListingsRequestProcessor = mmListingsRequestProcessor;
this.companiesRequestProcessor = companiesRequestProcessor;
}
@ApiOperation(value = "Экспорт ценных бумаг в Клиринговую систему")
@ApiResponses(value = {
@ApiResponse(code = 200, message = "OK", response = CommonResponse.class),
@ApiResponse(code = 400, message = "Ошибка валидации", response = CommonResponse.class)
@ -32,18 +59,37 @@ public class GatewayController {
produces = MediaType.APPLICATION_JSON_VALUE
)
@ResponseBody
public CommonResponse listings(@RequestBody FondListingsRequest request) {
// todo pack it to abstract class
CommonResponse commonResponse = new CommonResponse();
commonResponse.setId(request.getId());
commonResponse.setType(request.getType());
commonResponse.setDatetime(request.getDatetime());
commonResponse.setSection(request.getSection());
commonResponse.setCode(200); // todo set result code
public CommonResponse listingsFond(@RequestBody FondListingsRequest request) {
CommonResponse commonResponse = createResponse(request);
FondListingsRequestParam requestParam = new FondListingsRequestParam(request);
ProcessResult processResult = fondListingsRequestProcessor.process(requestParam);
return commonResponse;
}
@ApiOperation(value = "Put companies")
@ApiOperation(value = "Экспорт спецификаций биржевых инструментов в Клиринговую систему")
@ApiResponses(value = {
@ApiResponse(code = 200, message = "OK", response = CommonResponse.class),
@ApiResponse(code = 400, message = "Ошибка валидации", response = CommonResponse.class)
})
@RequestMapping(
path = "/listing_mm",
method = RequestMethod.POST,
consumes = MediaType.APPLICATION_JSON_VALUE,
produces = MediaType.APPLICATION_JSON_VALUE
)
@ResponseBody
public CommonResponse listingsMM(@RequestBody MMListingsRequest request) {
CommonResponse commonResponse = createResponse(request);
MMListingsRequestParam requestParam = new MMListingsRequestParam(request);
ProcessResult processResult = mmListingsRequestProcessor.process(requestParam);
return commonResponse;
}
@ApiOperation(value = "Экспорт участников в клиринговую систему")
@ApiResponses(value = {
@ApiResponse(code = 200, message = "OK", response = CommonResponse.class),
@ApiResponse(code = 400, message = "Ошибка валидации", response = CommonResponse.class)
@ -56,13 +102,20 @@ public class GatewayController {
)
@ResponseBody
public CommonResponse companies(@RequestBody CompaniesRequest request) {
// todo pack it to abstract class
CommonResponse commonResponse = createResponse(request);
CompaniesRequestParam requestParam = new CompaniesRequestParam(request);
ProcessResult processResult = companiesRequestProcessor.process(requestParam);
return commonResponse;
}
private CommonResponse createResponse(BaseRequest request) {
CommonResponse commonResponse = new CommonResponse();
commonResponse.setId(request.getId());
commonResponse.setType(request.getType());
commonResponse.setDatetime(request.getDatetime());
commonResponse.setSection(request.getSection());
commonResponse.setCode(200); // todo set result code
return commonResponse;
}

2
clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/TestController.java
View file

@ -18,7 +18,7 @@ public class TestController {
@ApiOperation(value = "Test gateway-api availability.")
@ApiResponses(value = {@ApiResponse(code = 200, message = "OK", response = String.class)})
@RequestMapping(method = RequestMethod.GET, path = "/system/ping", produces = MediaType.TEXT_PLAIN_VALUE)
@RequestMapping(method = RequestMethod.GET, path = "/ping", produces = MediaType.TEXT_PLAIN_VALUE)
@ResponseBody
public String processGet() {
log.info("Call test method for gateway-api controller");

12
clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/logic/companies/CheckMemberCompanyExist.java
View file

@ -65,7 +65,7 @@ public class CheckMemberCompanyExist extends Stage<CompaniesRequestParam> {
if (!companySymbolsFromImdg.isEmpty()) {
CompanySymbols companySymbolFromImdg = companySymbolsFromImdg.iterator().next();
if (companySymbolsFromImdg.size() > 1) {
log.warn("For UUID found > 1 company_symbols, update first (id = {})", companySymbolFromImdg.getId());
log.warn("For UUID = {} > 1 company_symbols, update first (id = {})", company.getId(), companySymbolFromImdg.getId());
}
companyFound = true;
company.setAlreadyExist(true);
@ -190,7 +190,7 @@ public class CheckMemberCompanyExist extends Stage<CompaniesRequestParam> {
} else {
Contact contactFromImdg = contactsFromImdg.iterator().next();
if (contactsFromImdg.size() > 1) {
log.warn("Found contact > 1 for contactType {}, update first (id = {})",
log.warn("Found contact > 1 for contact_type {}, update first (id = {})",
contactFromImdg.getContactType(),
contactFromImdg.getId());
}
@ -214,7 +214,7 @@ public class CheckMemberCompanyExist extends Stage<CompaniesRequestParam> {
} else {
ProfileDocument profileDocument = profileDocumentsFromImdg.iterator().next();
if (profileDocumentsFromImdg.size() > 1) {
log.warn("Found profileDocument > 1 for documentType {} (companyId {}), update first (id = {})",
log.warn("Found profile_document > 1 for document_type {} (company.id {}), update first (id = {})",
memberProfileDocument.getDocumentType(),
company.getMapId(),
profileDocument.getId());
@ -239,7 +239,7 @@ public class CheckMemberCompanyExist extends Stage<CompaniesRequestParam> {
} else {
ClientCode clientCode = clientCodesFromImdg.iterator().next();
if (clientCodesFromImdg.size() > 1) {
log.warn("Found clientCode > 1 for code {} (companyId {}), update first (id = {})",
log.warn("Found client_code > 1 for code {} (company.id {}), update first (id = {})",
clientCode.getCode(),
company.getMapId(),
clientCode.getId());
@ -274,7 +274,7 @@ public class CheckMemberCompanyExist extends Stage<CompaniesRequestParam> {
if (!accountFromImdg.isEmpty()) {
Account account = accountFromImdg.iterator().next();
if (accountFromImdg.size() > 1) {
log.warn("for client (company.UUID {}) for money_account {} found accounts > 1, use first (id = {})",
log.warn("for client (company.id {}) for money_account {} found accounts > 1, use first (id = {})",
company.getId(),
moneyAccount,
account.getId());
@ -305,7 +305,7 @@ public class CheckMemberCompanyExist extends Stage<CompaniesRequestParam> {
Account account = accountFromImdg.iterator().next();
if (!accountFromImdg.isEmpty()) {
if (accountFromImdg.size() > 1) {
log.warn("for client (company.UUID {}) for depo_account {} found accounts > 1, use first (id = {})",
log.warn("for client (company.id {}) for depo_account {} found accounts > 1, use first (id = {})",
company.getId(),
depoAccountValue,
account.getId());

12
clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/logic/companies/PrepareMemberCompanies.java
View file

@ -24,7 +24,7 @@ public class PrepareMemberCompanies extends Stage<CompaniesRequestParam> {
Map<UUID, MemberCompany> companyForUUID = new HashMap<>();
for (MemberCompany memberCompany : companyList) {
if (companyForUUID.containsKey(memberCompany.getId())) {
log.warn("For company.UUID {} found > 1 element from request, use first", memberCompany.getId());
log.warn("For company.id {} found > 1 element from request, use first", memberCompany.getId());
memberCompany.setInvalidData(true);
continue;
}
@ -36,7 +36,7 @@ public class PrepareMemberCompanies extends Stage<CompaniesRequestParam> {
UUID companyInfoUUID = companyInfo.getCompanyId();
MemberCompany company = companyForUUID.get(companyInfoUUID);
if (company == null) {
log.warn("For companyInfo.UUID {} not found company, companyInfo skipped", companyInfoUUID);
log.warn("For company_info.company_id {} not found company, company_info skipped", companyInfoUUID);
continue;
}
company.setCompanyInfo(companyInfo);
@ -47,7 +47,7 @@ public class PrepareMemberCompanies extends Stage<CompaniesRequestParam> {
UUID memberCompanySymbolsUUID = memberCompanySymbols.getCompanyId();
MemberCompany memberCompany = companyForUUID.get(memberCompanySymbolsUUID);
if (memberCompany == null) {
log.warn("For companySymbols ({} = {}) not found company, companySymbols skipped",
log.warn("For company_symbols ({} = {}) not found company, company_symbols skipped",
memberCompanySymbols.getCompanySymbol(),
memberCompanySymbols.getCompanySymbolValue());
memberCompanySymbols.setInvalidData(true);
@ -75,7 +75,7 @@ public class PrepareMemberCompanies extends Stage<CompaniesRequestParam> {
UUID companyClearingCategoryUUID = companyClearingCategory.getCompanyId();
MemberCompany memberCompany = companyForUUID.get(companyClearingCategoryUUID);
if (memberCompany == null) {
log.warn("For companyClearingCategory ({}) not found company, skipped", companyClearingCategory.getCategory());
log.warn("For company_clearing_category ({}) not found company, skipped", companyClearingCategory.getCategory());
companyClearingCategory.setInvalidData(true);
continue;
}
@ -87,7 +87,7 @@ public class PrepareMemberCompanies extends Stage<CompaniesRequestParam> {
UUID profileDocumentUUID = memberProfileDocument.getCompanyId();
MemberCompany memberCompany = companyForUUID.get(profileDocumentUUID);
if (memberCompany == null) {
log.warn("For profileDocument (documentType {}) not found company, skipped", memberProfileDocument.getDocumentType());
log.warn("For profile_document (document_type {}) not found company, skipped", memberProfileDocument.getDocumentType());
memberProfileDocument.setInvalidData(true);
continue;
}
@ -99,7 +99,7 @@ public class PrepareMemberCompanies extends Stage<CompaniesRequestParam> {
UUID clientUUID = memberClient.getCompanyId();
MemberCompany memberCompany = companyForUUID.get(clientUUID);
if (memberCompany == null) {
log.warn("For client (clientCode {}) not found company, skipped", memberClient.getClientCode());
log.warn("For client (client_code {}) not found company, skipped", memberClient.getClientCode());
memberClient.setInvalidData(true);
continue;
}

28
clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/logic/companies/ValidateMemberCompanies.java
View file

@ -72,7 +72,7 @@ public class ValidateMemberCompanies extends Stage<CompaniesRequestParam> {
if (company.isInvalidData()) continue;
if (StringUtils.isEmpty(company.getShortName())) {
log.warn("Empty or null shortName for company (UUID = {}), skipped", company.getId());
log.warn("Empty or null short_name for company (id = {}), skipped", company.getId());
company.setInvalidData(true);
continue;
}
@ -81,14 +81,14 @@ public class ValidateMemberCompanies extends Stage<CompaniesRequestParam> {
String workflowStatusStr = companyClearingCategory.getWorkflowStatus();
ServiceStatus workflowStatus = IEnumKey.getEnumByKey(ServiceStatus.class, workflowStatusStr);
if (!validWorkflowStatus.contains(workflowStatus)) {
log.warn("Invalid workflow_status {} for company_clearing_category for company.UUID {}, skipped", workflowStatus, company.getId());
log.warn("Invalid workflow_status {} for company_clearing_category for company.id {}, skipped", workflowStatus, company.getId());
companyClearingCategory.setInvalidData(true);
}
String clearingCategoryStr = companyClearingCategory.getCategory();
ClearingCategory clearingCategory = IEnumKey.getEnumByKey(ClearingCategory.class, clearingCategoryStr);
if (!validClearingCategory.contains(clearingCategory)) {
log.warn("Invalid category {} for company_clearing_category for company.UUID {}, skipped", workflowStatus, company.getId());
log.warn("Invalid category {} for company_clearing_category for company.id {}, skipped", workflowStatus, company.getId());
companyClearingCategory.setInvalidData(true);
}
}
@ -97,12 +97,12 @@ public class ValidateMemberCompanies extends Stage<CompaniesRequestParam> {
String companySymbolStr = companySymbols.getCompanySymbol();
CompanySymbol companySymbol = IEnumKey.getEnumByKey(CompanySymbol.class, companySymbolStr);
if (!validCompanySymbols.contains(companySymbol)) {
log.warn("Invalid companySymbol {} for company.UUID {}, skipped", companySymbolStr, company.getId());
log.warn("Invalid company_symbol {} for company.id {}, skipped", companySymbolStr, company.getId());
companySymbols.setInvalidData(true);
}
if (StringUtils.isEmpty(companySymbols.getCompanySymbolValue())) {
log.warn("Empty or null companySymbolValue for company.UUID {}, skipped", companySymbols.getCompanySymbolValue());
log.warn("Empty or null company_symbol_value for company.id {}, skipped", companySymbols.getCompanySymbolValue());
companySymbols.setInvalidData(true);
}
}
@ -112,12 +112,12 @@ public class ValidateMemberCompanies extends Stage<CompaniesRequestParam> {
String contactTypeStr = contact.getContactType();
ContactTypes contactType = IEnumKey.getEnumByKey(ContactTypes.class, contactTypeStr);
if (!validContactTypes.contains(contactType)) {
log.warn("Invalid contact_type {} for company.UUID {}, skipped", contactTypeStr, company.getId());
log.warn("Invalid contact_type {} for company.id {}, skipped", contactTypeStr, company.getId());
contact.setInvalidData(true);
}
if (StringUtils.isEmpty(contact.getContactValue())) {
log.warn("Empty or null contact_value for contact {}, company.UUID {}", contactTypeStr, company.getId());
log.warn("Empty or null contact_value for contact {}, company.id {}", contactTypeStr, company.getId());
contact.setInvalidData(true);
}
@ -127,39 +127,39 @@ public class ValidateMemberCompanies extends Stage<CompaniesRequestParam> {
String documentTypeStr = memberProfileDocument.getDocumentType();
DocumentTypes documentType = IEnumKey.getEnumByKey(DocumentTypes.class, documentTypeStr);
if (!validDocumentTypes.contains(documentType)) {
log.warn("Invalid document_type {} for profile_document for company.UUID {}, skipped", documentTypeStr, company.getId());
log.warn("Invalid document_type {} for profile_document for company.id {}, skipped", documentTypeStr, company.getId());
memberProfileDocument.setInvalidData(true);
}
if (memberProfileDocument.getIssueDate() == null) {
log.warn("issue_date is null for profile_document, company.UUID {}", company.getId());
log.warn("issue_date is null for profile_document, company.id {}", company.getId());
memberProfileDocument.setInvalidData(true);
}
if (StringUtils.isEmpty(memberProfileDocument.getIssuer())) {
log.warn("issuer is null or empty for profile_document, company.UUID {}", company.getId());
log.warn("issuer is null or empty for profile_document, company.id {}", company.getId());
memberProfileDocument.setInvalidData(true);
}
if (StringUtils.isEmpty(memberProfileDocument.getNumber())) {
log.warn("number is null or empty for profile_document, company.UUID {}", company.getId());
log.warn("number is null or empty for profile_document, company.id {}", company.getId());
memberProfileDocument.setInvalidData(true);
}
if (memberProfileDocument.getValidToDate() == null) {
log.warn("valid_to_date is null for profile_document, company.UUID {}", company.getId());
log.warn("valid_to_date is null for profile_document, company.id {}", company.getId());
memberProfileDocument.setInvalidData(true);
}
}
for (MemberClient memberClient : company.getClientList()) {
if (StringUtils.isEmpty(memberClient.getClientCode())) {
log.warn("client_code is null or empty for client, company.UUID {}", company.getId());
log.warn("client_code is null or empty for client, company.id {}", company.getId());
memberClient.setInvalidData(true);
}
if (StringUtils.isEmpty(memberClient.getMoneyAccount()) && StringUtils.isEmpty(memberClient.getDepoAccount())) {
log.warn("money_account and depo_account is null or empty for client, company.UUID {}", company.getId());
log.warn("money_account and depo_account is null or empty for client, company.id {}", company.getId());
memberClient.setInvalidData(true);
}
}

6
clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/logic/listings_fond/CheckFondSecurityExist.java
View file

@ -128,7 +128,7 @@ public class CheckFondSecurityExist extends Stage<FondListingsRequestParam> {
} else {
CouponPeriod couponPeriod = couponPeriodListFromImdg.iterator().next();
if (couponPeriodListFromImdg.size() > 1) {
log.warn("For securityId {}, periodStartDate {}, periodEndDate {} found > 1 couponPeriod, " +
log.warn("For securityId {}, period_start_date {}, period_end_date {} found > 1 coupon_period, " +
"update first (id = {})",
fondSecurity.getMapId(),
couponSchedules.getPeriodStartDate(),
@ -155,7 +155,7 @@ public class CheckFondSecurityExist extends Stage<FondListingsRequestParam> {
} else {
FixedIncomeCashFlow fixedIncomeCashFlow = fixedIncomeCashFlowListFromImdg.iterator().next();
if (fixedIncomeCashFlowListFromImdg.size() > 1) {
log.warn("For securityId {}, valueDate {} found > 1 fixedIncomeCashFlow, update first (id = {})",
log.warn("For security_id {}, value_date {} found > 1 fixed_income_cash_flow, update first (id = {})",
fondSecurity.getMapId(),
nominal.getDate(),
fixedIncomeCashFlow.getId());
@ -175,7 +175,7 @@ public class CheckFondSecurityExist extends Stage<FondListingsRequestParam> {
nominal.setCouponNumber(couponSchedule.getCouponNumber());
}
if (nominal.getAccruedCoupon() == null || nominal.getCouponNumber() == null) {
log.warn("Can't find accrued_coupon OR coupon_number for nominal, security.UUID {}", fondSecurity.getId());
log.warn("Can't find accrued_coupon OR coupon_number for nominal, security.id {}", fondSecurity.getId());
nominal.setInvalidData(true);
}
}

4
clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/logic/listings_fond/CheckIssuerCompanyExist.java
View file

@ -104,7 +104,7 @@ public class CheckIssuerCompanyExist extends Stage<FondListingsRequestParam> {
// Случай, когда по переданным реквизитам найдено несколько компании
if (!Objects.equals(company.getMapId(), companyFromImdg.getId())) {
log.warn("For company_symbols (company.UUID = {}, {} = {}) found > 1 company (company.id = {}), " +
log.warn("For company_symbols (company.id = {}, {} = {}) found > 1 company (company.id = {}), " +
"company_symbols skipped",
company.getId(),
companySymbols.getCompanySymbol(),
@ -177,7 +177,7 @@ public class CheckIssuerCompanyExist extends Stage<FondListingsRequestParam> {
} else {
Contact contactFromImdg = contactsFromImdg.iterator().next();
if (contactsFromImdg.size() > 1) {
log.warn("Found contact > 1 for contactType {}, update first (id = {})",
log.warn("Found contact > 1 for contact_type {}, update first (id = {})",
contactFromImdg.getContactType(),
contactFromImdg.getId());
}

10
clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/logic/listings_fond/PrepareIssuerCompanies.java
View file

@ -22,7 +22,7 @@ public class PrepareIssuerCompanies extends Stage<FondListingsRequestParam> {
Map<UUID, IssuerCompany> issuerCompanyMap = new HashMap<>();
for (IssuerCompany issuerCompany : issuerCompanyList) {
if (issuerCompanyMap.containsKey(issuerCompany.getId())) {
log.warn("For company.UUID {} found > 1 element from request, use first", issuerCompany.getId());
log.warn("For company.id {} found > 1 element from request, use first", issuerCompany.getId());
issuerCompany.setInvalidData(true);
continue;
}
@ -42,7 +42,7 @@ public class PrepareIssuerCompanies extends Stage<FondListingsRequestParam> {
}
}
if (!securityFoundForCompany) {
log.warn("For company.UUID {} not found security", issuerCompanyId);
log.warn("For company.id {} not found security", issuerCompanyId);
}
}
@ -51,11 +51,11 @@ public class PrepareIssuerCompanies extends Stage<FondListingsRequestParam> {
UUID issuerCompanyInfoUUID = issuerCompanyInfo.getCompanyId();
IssuerCompany issuerCompany = issuerCompanyMap.get(issuerCompanyInfoUUID);
if (issuerCompany == null) {
log.warn("For companyInfo.UUID {} not found company, companyInfo skipped", issuerCompanyInfoUUID);
log.warn("For company_info.company_id {} not found company, company_info skipped", issuerCompanyInfoUUID);
continue;
}
if (issuerCompany.getIssuerCompanyInfo() != null) {
log.warn("For company.UUID {} found > 1 companyInfo, use first", issuerCompanyInfoUUID);
log.warn("For company.id {} found > 1 company_info, use first", issuerCompanyInfoUUID);
continue;
}
issuerCompany.setIssuerCompanyInfo(issuerCompanyInfo);
@ -66,7 +66,7 @@ public class PrepareIssuerCompanies extends Stage<FondListingsRequestParam> {
UUID issuerCompanySymbolsUUID = issuerCompanySymbols.getCompanyId();
IssuerCompany issuerCompany = issuerCompanyMap.get(issuerCompanySymbolsUUID);
if (issuerCompany == null) {
log.warn("For companySymbols ({} = {}) not found company, companySymbols skipped",
log.warn("For company_symbols ({} = {}) not found company, company_symbols skipped",
issuerCompanySymbols.getCompanySymbol(),
issuerCompanySymbols.getCompanySymbolValue());
issuerCompanySymbols.setInvalidData(true);

8
clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/logic/listings_fond/PrepareSecurities.java
View file

@ -22,7 +22,7 @@ public class PrepareSecurities extends Stage<FondListingsRequestParam> {
Map<UUID, FondSecurity> securityMap = new HashMap<>();
for (FondSecurity fondSecurity : securities) {
if (securityMap.containsKey(fondSecurity.getId())) {
log.warn("For security.UUID {} found > 1 element from request, use first", fondSecurity.getId());
log.warn("For security.id {} found > 1 element from request, use first", fondSecurity.getId());
fondSecurity.setInvalidData(true);
continue;
}
@ -34,7 +34,7 @@ public class PrepareSecurities extends Stage<FondListingsRequestParam> {
UUID couponScheduleUUID = couponSchedule.getSecurityId();
FondSecurity fondSecurity = securityMap.get(couponScheduleUUID);
if (fondSecurity == null) {
log.warn("For couponSchedule.securityId {} not found security, skipped", couponScheduleUUID);
log.warn("For coupon_schedule.security_id {} not found security, skipped", couponScheduleUUID);
continue;
}
fondSecurity.getCouponScheduleList().add(couponSchedule);
@ -51,7 +51,7 @@ public class PrepareSecurities extends Stage<FondListingsRequestParam> {
UUID listingUUID = listing.getSecurityId();
FondSecurity fondSecurity = securityMap.get(listingUUID);
if (fondSecurity == null) {
log.warn("For listing.securityId {} not found security, skipped", listingUUID);
log.warn("For listing.security_id {} not found security, skipped", listingUUID);
continue;
}
fondSecurity.getListingList().add(listing);
@ -62,7 +62,7 @@ public class PrepareSecurities extends Stage<FondListingsRequestParam> {
UUID nominalUUID = nominal.getSecurityId();
FondSecurity fondSecurity = securityMap.get(nominalUUID);
if (fondSecurity == null) {
log.warn("For nominal.securityId {} not found security, skipped", nominalUUID);
log.warn("For nominal.security_id {} not found security, skipped", nominalUUID);
continue;
}
fondSecurity.getNominalList().add(nominal);

2
clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/logic/listings_fond/SendMessageToCompanyServiceWithIssuerCompanies.java
View file

@ -60,7 +60,7 @@ public class SendMessageToCompanyServiceWithIssuerCompanies extends Stage<FondLi
)
);
if (companyFromImdg == null) {
log.warn("Can't insert company (UUID {}), skipped", company.getId());
log.warn("Can't insert company (id {}), skipped", company.getId());
company.setInvalidData(true);
continue;
}

34
clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/logic/listings_fond/ValidateIncomeSecurities.java
View file

@ -29,7 +29,7 @@ public class ValidateIncomeSecurities extends Stage<FondListingsRequestParam> {
if (fondSecurity.isInvalidData()) continue;
if (fondSecurity.getIssuerCompany() == null) {
log.warn("For security.UUID {} not found company, skipped", fondSecurity.getId());
log.warn("For security.id {} not found company, skipped", fondSecurity.getId());
fondSecurity.setInvalidData(true);
continue;
}
@ -37,7 +37,7 @@ public class ValidateIncomeSecurities extends Stage<FondListingsRequestParam> {
String instrumentTypeStr = fondSecurity.getInstrumentType();
InstrumentType instrumentType = IEnumKey.getEnumByKey(InstrumentType.class, instrumentTypeStr);
if (instrumentType != InstrumentType.BOND && instrumentType != InstrumentType.EQTY) {
log.warn("Invalid instrumentType {} for security.UUID {}, skipped", instrumentTypeStr, fondSecurity.getId());
log.warn("Invalid instrument_type {} for security.id {}, skipped", instrumentTypeStr, fondSecurity.getId());
fondSecurity.setInvalidData(true);
continue;
}
@ -45,7 +45,7 @@ public class ValidateIncomeSecurities extends Stage<FondListingsRequestParam> {
String workflowStatusStr = fondSecurity.getWorkflowStatus();
WorkflowStatus workflowStatus = IEnumKey.getEnumByKey(WorkflowStatus.class, workflowStatusStr);
if (workflowStatus == null) {
log.warn("Invalid workflowStatus {} for security.UUID {}, skipped", workflowStatusStr, fondSecurity.getId());
log.warn("Invalid workflow_status {} for security.id {}, skipped", workflowStatusStr, fondSecurity.getId());
fondSecurity.setInvalidData(true);
continue;
}
@ -53,7 +53,7 @@ public class ValidateIncomeSecurities extends Stage<FondListingsRequestParam> {
String shareTypeStr = fondSecurity.getShareType();
ShareType shareType = IEnumKey.getEnumByKey(ShareType.class, shareTypeStr);
if (instrumentType == InstrumentType.EQTY && shareType == null) {
log.warn("Invalid shareType {} for security.UUID {}, skipped", shareTypeStr, fondSecurity.getId());
log.warn("Invalid share_type {} for security.id {}, skipped", shareTypeStr, fondSecurity.getId());
fondSecurity.setInvalidData(true);
continue;
}
@ -61,19 +61,19 @@ public class ValidateIncomeSecurities extends Stage<FondListingsRequestParam> {
String bondTypeStr = fondSecurity.getBondType();
BondType bondType = IEnumKey.getEnumByKey(BondType.class, bondTypeStr);
if (bondType == null) {
log.warn("Invalid bondType {} for security.UUID {}, skipped", bondTypeStr, fondSecurity.getId());
log.warn("Invalid bondType {} for security.id {}, skipped", bondTypeStr, fondSecurity.getId());
fondSecurity.setInvalidData(true);
continue;
}
if (StringUtils.isEmpty(fondSecurity.getSecuritySymbol())) {
log.warn("Empty or null securitySymbol for security.UUID {}, skipped", fondSecurity.getId());
log.warn("Empty or null security_symbol for security.id {}, skipped", fondSecurity.getId());
fondSecurity.setInvalidData(true);
continue;
}
if (StringUtils.isEmpty(fondSecurity.getShortName())) {
log.warn("Empty or null shortName for security.UUID {}, skipped", fondSecurity.getShortName());
log.warn("Empty or null short_name for security.id {}, skipped", fondSecurity.getShortName());
fondSecurity.setInvalidData(true);
continue;
}
@ -83,24 +83,24 @@ public class ValidateIncomeSecurities extends Stage<FondListingsRequestParam> {
for (IncomeListing listing : listingList) {
if (StringUtils.isEmpty(listing.getCode())) {
log.warn("Empty or null code (market) for listing from security.UUID {}", fondSecurity.getId());
log.warn("Empty or null code for listing from security.id {}", fondSecurity.getId());
listing.setInvalidData(true);
}
if (listing.getLotSize() == null) {
log.warn("lotSize is null for listing from security.UUID {}", fondSecurity.getId());
log.warn("lot_size is null for listing from security.id {}", fondSecurity.getId());
listing.setInvalidData(true);
}
if (StringUtils.isEmpty(listing.getTradingCurrency())) {
log.warn("Empty or null tradingCurrency for listing from security.UUID {}", fondSecurity.getId());
log.warn("Empty or null trading_currency for listing from security.id {}", fondSecurity.getId());
listing.setInvalidData(true);
}
workflowStatusStr = listing.getWorkflowStatus();
workflowStatus = IEnumKey.getEnumByKey(WorkflowStatus.class, workflowStatusStr);
if (workflowStatus == null) {
log.warn("Invalid workflowStatus {} for listing from security.UUID {}", workflowStatusStr, fondSecurity.getId());
log.warn("Invalid workflow_status {} for listing from security.id {}", workflowStatusStr, fondSecurity.getId());
listing.setInvalidData(true);
}
@ -119,7 +119,7 @@ public class ValidateIncomeSecurities extends Stage<FondListingsRequestParam> {
couponSchedule.getPeriodEndDate() == null ||
couponSchedule.getPeriodEndDate().isBefore(couponSchedule.getPeriodStartDate())
) {
log.warn("Invalid periodStartDate {} or periodEndDate {} for couponSchedule, security.UUID {}, skipped",
log.warn("Invalid period_start_date {} or period_end_date {} for coupon_schedule, security.id {}, skipped",
couponSchedule.getPeriodStartDate(),
couponSchedule.getPeriodEndDate(),
fondSecurity.getId());
@ -127,29 +127,29 @@ public class ValidateIncomeSecurities extends Stage<FondListingsRequestParam> {
}
if (couponSchedule.getCouponNumber() == null) {
log.warn("couponNumber is null for couponSchedule, security.UUID {}, skipped", fondSecurity.getId());
log.warn("coupon_number is null for coupon_schedule, security.id {}, skipped", fondSecurity.getId());
couponSchedule.setInvalidData(true);
}
if (couponSchedule.getCouponRate() == null) {
log.warn("couponRate is null for couponSchedule, security.UUID {}, skipped", fondSecurity.getId());
log.warn("coupon_rate is null for coupon_schedule, security.id {}, skipped", fondSecurity.getId());
couponSchedule.setInvalidData(true);
}
if (couponSchedule.getAccruedCoupon() == null) {
log.warn("accruedCoupon is null for couponSchedule, security.UUID {}, skipped", fondSecurity.getId());
log.warn("accrued_coupon is null for coupon_schedule, security.id {}, skipped", fondSecurity.getId());
couponSchedule.setInvalidData(true);
}
}
for (Nominal nominal : fondSecurity.getNominalList()) {
if (nominal.getNominal() == null) {
log.warn("nominal (value) is null for nominal, security.UUID {}, skipped", fondSecurity.getId());
log.warn("nominal (value) is null for nominal, security.id {}, skipped", fondSecurity.getId());
nominal.setInvalidData(true);
}
if (nominal.getDate() == null) {
log.warn("date is null for nominal, security.UUID {}, skipped", fondSecurity.getId());
log.warn("date is null for nominal, security.id {}, skipped", fondSecurity.getId());
nominal.setInvalidData(true);
}
}

12
clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/logic/listings_fond/ValidateIssuerCompanies.java
View file

@ -47,7 +47,7 @@ public class ValidateIssuerCompanies extends Stage<FondListingsRequestParam> {
if (issuerCompany.isInvalidData()) continue;
if (StringUtils.isEmpty(issuerCompany.getShortName())) {
log.warn("Empty or null shortName for company (UUID = {}), skipped", issuerCompany.getId());
log.warn("Empty or null short_name for company (id = {}), skipped", issuerCompany.getId());
issuerCompany.setInvalidData(true);
continue;
}
@ -55,7 +55,7 @@ public class ValidateIssuerCompanies extends Stage<FondListingsRequestParam> {
String workflowStatusStr = issuerCompany.getWorkflowStatus();
WorkflowStatus workflowStatus = IEnumKey.getEnumByKey(WorkflowStatus.class, workflowStatusStr);
if (workflowStatus == null) {
log.warn("Invalid workflowStatus {} for company (UUID = {}), skipped", workflowStatusStr, issuerCompany.getId());
log.warn("Invalid workflow_status {} for company (id = {}), skipped", workflowStatusStr, issuerCompany.getId());
issuerCompany.setInvalidData(true);
continue;
}
@ -66,12 +66,12 @@ public class ValidateIssuerCompanies extends Stage<FondListingsRequestParam> {
String companySymbolStr = companySymbols.getCompanySymbol();
CompanySymbol companySymbol = IEnumKey.getEnumByKey(CompanySymbol.class, companySymbolStr);
if (!validCompanySymbols.contains(companySymbol)) {
log.warn("Invalid companySymbol {} for company.UUID {}, skipped", companySymbolStr, issuerCompany.getId());
log.warn("Invalid company_symbol {} for company.id {}, skipped", companySymbolStr, issuerCompany.getId());
companySymbols.setInvalidData(true);
}
if (StringUtils.isEmpty(companySymbols.getCompanySymbolValue())) {
log.warn("Empty or null companySymbolValue for company.UUID {}, skipped", companySymbols.getCompanySymbolValue());
log.warn("Empty or null company_symbol_value for company.id {}, skipped", companySymbols.getCompanySymbolValue());
companySymbols.setInvalidData(true);
}
@ -83,12 +83,12 @@ public class ValidateIssuerCompanies extends Stage<FondListingsRequestParam> {
String contactTypeStr = contact.getContactType();
ContactTypes contactType = IEnumKey.getEnumByKey(ContactTypes.class, contactTypeStr);
if (!validContactTypes.contains(contactType)) {
log.warn("Invalid contactType {} for company.UUID {}, skipped", contactTypeStr, issuerCompany.getId());
log.warn("Invalid contact_type {} for company.id {}, skipped", contactTypeStr, issuerCompany.getId());
contact.setInvalidData(true);
}
if (StringUtils.isEmpty(contact.getContactValue())) {
log.warn("Empty or null contactValue for contact {}, company.UUID {}", contactTypeStr, issuerCompany.getId());
log.warn("Empty or null contact_value for contact {}, company.id {}", contactTypeStr, issuerCompany.getId());
contact.setInvalidData(true);
}