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

account-service http://jira.mfd.msk:8088/browse/CLS-361 TCR sequence

Browse source
This commit is contained in:
AKurakin 2023-06-29 13:01:36 +03:00
parent fa2cb814c8
commit 5aa1de8b18
2 changed files with 49 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/TradingClearingRegistryService.java
View file

@ -250,10 +250,9 @@ public class TradingClearingRegistryService extends QueueConsumer implements Ini
tradingClearingRegistry.setTradingClearingRegistryPurpose(registryPurpose.getKey()); tradingClearingRegistry.setTradingClearingRegistryPurpose(registryPurpose.getKey());
Company company = companyImdg.getSingleObjectByID(req.getCompanyId()); Company company = companyImdg.getSingleObjectByID(req.getCompanyId());
String code = "%4s".formatted(company.getClearingCode()).replace(' ', '0'); Long seqId = companySequenceNextId(req.getCompanyId());
code += registryPurpose.getKey(); String code = makeCode(company.getClearingCode(), registryPurpose, tradingRegistryType, seqId);
if (registryPurpose == TradingClearingRegistryPurpose.C) code += tradingRegistryType + id; log.debug("For new TCR.id={} of companyId={} next sequence={}; code={}", id, req.getCompanyId(), seqId, code);
else code += "AT" + id;
tradingClearingRegistry.setCode(code); tradingClearingRegistry.setCode(code);
Instant now = Instant.now(); Instant now = Instant.now();
@ -323,7 +322,9 @@ public class TradingClearingRegistryService extends QueueConsumer implements Ini
tradingClearingRegistry.setTradingClearingRegistryPurpose(registryPurpose.getKey()); tradingClearingRegistry.setTradingClearingRegistryPurpose(registryPurpose.getKey());
Company company = companyImdg.getSingleObjectByID(req.getCompanyId()); Company company = companyImdg.getSingleObjectByID(req.getCompanyId());
String code = makeCode(company.getClearingCode(), registryPurpose, tradingRegistryType, id); Long seqId = companySequenceNextId(req.getCompanyId());
String code = makeCode(company.getClearingCode(), registryPurpose, tradingRegistryType, seqId);
log.debug("For new TCR.id={} of companyId={} next sequence={}; code={}", id, req.getCompanyId(), seqId, code);
tradingClearingRegistry.setCode(code); tradingClearingRegistry.setCode(code);
Instant now = Instant.now(); Instant now = Instant.now();
@ -341,6 +342,40 @@ public class TradingClearingRegistryService extends QueueConsumer implements Ini
return null; return null;
} }
protected Long companySequenceNextId(Long companyId) {
Collection<TradingClearingRegistry> existTCR = tradingClearingRegistryImdg.getCollectionObjectsByFieldValues(Map.of(
"companyId", companyId
));
if (existTCR.isEmpty()) {
log.trace("For company id={} not found exist TCR.", companyId);
return 1L;
}
log.trace("For company id={} found {} exist TCR.", companyId, existTCR.size());
long maxN = 0;
for (TradingClearingRegistry tcr : existTCR) {
Long codeN = parseCodeSeqId(tcr.getCode());
if (codeN != null) {
if (maxN < codeN)
maxN = codeN;
}
}
return maxN + 1;
}
protected Long parseCodeSeqId(String code) {
if (code == null || code.isBlank())
return null;
try {
String toParse = code.trim();
if (toParse.length() > 5)
toParse = toParse.substring(toParse.length() - 5);
return Long.parseLong(toParse);
} catch (NumberFormatException nan) {
log.warn("Can not parse number from TCR code \"{}\": {}", code, nan.getMessage());
}
return null;
}
protected String makeCode(String companyClearingCode, TradingClearingRegistryPurpose registryPurpose, String tradingRegistryType, Long id) { protected String makeCode(String companyClearingCode, TradingClearingRegistryPurpose registryPurpose, String tradingRegistryType, Long id) {
String code; String code;
code = companyClearingCode; code = companyClearingCode;

9
clearing-parent/account-service/src/test/java/ru/spcex/clearing/account/service/TradingClearingRegistryServiceTest.java
View file

@ -337,4 +337,13 @@ class TradingClearingRegistryServiceTest {
"000000105", TradingClearingRegistryPurpose.M, "ER", 100012L "000000105", TradingClearingRegistryPurpose.M, "ER", 100012L
)); ));
} }
@Test
void parseCodeSeqId() {
Assertions.assertEquals(Long.valueOf(1L), tradingClearingRegistryService.parseCodeSeqId("0005CAT00001"));
Assertions.assertEquals(Long.valueOf(5001), tradingClearingRegistryService.parseCodeSeqId("0005CAT05001"));
Assertions.assertEquals(null, tradingClearingRegistryService.parseCodeSeqId("0005CAT"));
Assertions.assertEquals(null, tradingClearingRegistryService.parseCodeSeqId(""));
Assertions.assertEquals(null, tradingClearingRegistryService.parseCodeSeqId(null));
}
} }