backend-api http://jira.mfd.msk:8088/browse/CLS-282 добавил юнит тест, поправил мету под регистры

This commit is contained in:
AKurakin 2023-05-16 14:17:08 +03:00
parent c002f39111
commit f4573b3dc5
13 changed files with 2579 additions and 2709 deletions

View file

@ -19,7 +19,7 @@ import java.util.Collection;
import java.util.Map;
@Controller
@RequestMapping("/depo-payment-instruction-register")
@RequestMapping("/depo-payment-instruction-registers")
public class DepoPaymentInstructionRegisterController extends AbstractQueueController {
private final IStateLoader stateLoader;

View file

@ -19,7 +19,7 @@ import java.util.Collection;
import java.util.Map;
@Controller
@RequestMapping("/exclude-liabilities-register")
@RequestMapping("/exclude-liabilities-registers")
public class ExcludeLiabilitiesRegisterController extends AbstractQueueController {
private final IStateLoader stateLoader;

View file

@ -1300,7 +1300,7 @@
<sessionId type="1" dbname="Идентификатор клиринговой сессии" name="Клиринговая сессия" shortname="Сессия" visible="true" searchable="true" sortable="true" link="session"/>
</executionFond>
<depoBalanceRegister name="Реестр остатков ценных бумаг" destination="depo-balance-registers" class="ru.clearing.classes.statics.data.misc.DepoBalanceRegister" table="balance_depo_register">
<depoBalanceRegister name="Реестр остатков ценных бумаг" destination="depo-balance-registers" class="ru.clearing.classes.statics.data.register.DepoBalanceRegister" table="balance_depo_register">
<id type="1" name="Идентификатор записи" shortname="ID" searchable="true" sortable="true"/>
<createdAt field="created" type="4" webtype="5" dbname="Дата-время создания записи" name="Время создания записи" shortname="Создано" searchable="true" sortable="true" ignore="true"/>
<updatedAt field="updated" type="4" webtype="5" dbname="Дата-время изменения записи" name="Время изменения записи" shortname="Изменено" searchable="true" sortable="true" ignore="true"/>
@ -1310,7 +1310,7 @@
<quantity type="11" name="Количество" shortname="Количество" searchable="true" sortable="true"/>
<securitySymbol type="2" length="255" name="Код ценной бумаги" shortname="Ценная бумага" searchable="true" sortable="true"/>
</depoBalanceRegister>
<moneyBalanceRegister name="Реестр остатков денежных средств" destination="money-balance-registers" class="ru.clearing.classes.statics.data.misc.MoneyBalanceRegister" table="money_balance_register">
<moneyBalanceRegister name="Реестр остатков денежных средств" destination="money-balance-registers" class="ru.clearing.classes.statics.data.register.MoneyBalanceRegister" table="money_balance_register">
<setHouseName type="2" length="255" name="Наименование РО" shortname="Наименование РО" searchable="true" sortable="true" visible="true"/>
<account type="2" length="50" name="Номер торгового/клирингового счета" shortname="Номер торгового/клирингового счета" searchable="true" sortable="true" visible="true"/>
<infoAccount type="2" length="50" name="Номер счета внутреннего учета СПВБ" shortname="Номер счета внутреннего учета СПВБ" searchable="true" sortable="true" visible="true"/>
@ -1377,7 +1377,7 @@
<direction type="1" name="Направление" shortname="Направление" searchable="true" sortable="true" link="inOutDirection" ignore="true"/>
<sessionId type="1" dbname="Идентификатор клиринговой сессии" name="Клиринговая сессия" shortname="Сессия" visible="true" searchable="true" sortable="true" link="session"/>
</depoPaymentInstructionRegister>
<excludeLiabilitiesRegister name="Реестр обязательств, исключенных из клирингового пула" destination="exclude-liabilities-registers" class="ru.clearing.classes.statics.data.journal.ExcludeLiabilitiesRegister" table="exclude_liabilities_register">
<excludeLiabilitiesRegister name="Реестр обязательств, исключенных из клирингового пула" destination="exclude-liabilities-registers" class="ru.clearing.classes.statics.data.register.ExcludeLiabilitiesRegister" table="exclude_liabilities_register">
<id type="1" name="Идентификатор записи" shortname="ID" searchable="true" sortable="true"/>
<createdAt field="created" type="4" webtype="5" dbname="Дата-время создания записи" name="Время создания записи" shortname="Создано" searchable="true" sortable="true" ignore="true"/>
<updatedAt field="updated" type="4" webtype="5" dbname="Дата-время изменения записи" name="Время изменения записи" shortname="Изменено" searchable="true" sortable="true" ignore="true"/>
@ -1395,7 +1395,7 @@
<sumLiabilities type="10" name="Сумма обязательств" shortname="Обязательства" searchable="true" sortable="true" visible="true"/>
<settlementDate type="6" name="Дата расчета" shortname="Расчет" searchable="true" sortable="true"/>
</excludeLiabilitiesRegister>
<liabilitiesRegister name="Реестр учета обязательств" destination="liabilities-registers" class="ru.clearing.classes.statics.data.journal.LiabilitiesRegister" table="liabilities_register">
<liabilitiesRegister name="Реестр учета обязательств" destination="liabilities-registers" class="ru.clearing.classes.statics.data.register.LiabilitiesRegister" table="liabilities_register">
<id type="1" name="Идентификатор записи" shortname="ID" searchable="true" sortable="true"/>
<createdAt field="created" type="4" webtype="5" dbname="Дата-время создания записи" name="Время создания записи" shortname="Создано" searchable="true" sortable="true" ignore="true"/>
<updatedAt field="updated" type="4" webtype="5" dbname="Дата-время изменения записи" name="Время изменения записи" shortname="Изменено" searchable="true" sortable="true" ignore="true"/>

View file

@ -115,6 +115,14 @@ import static ru.spcex.clearing.test.json.MatcherFactoryWithJson.usingIgnoringFi
//payment
PaymentInstructionController.class,
//register
AdmittedLiabilitiesRegisterController.class,
CoveredLiabilitiesRegisterController.class,
DepoBalanceRegisterController.class,
DepoPaymentInstructionRegisterController.class,
ExcludeLiabilitiesRegisterController.class,
ExecutionRegisterController.class,
LiabilitiesRegisterController.class,
MoneyBalanceRegisterController.class,
ContractRegisterController.class,
ReportRegisterController.class,
//registry

View file

@ -0,0 +1,38 @@
package ru.spcex.clearing.backendapi.controller.queue.register;
import org.junit.jupiter.api.Test;
import ru.clearing.classes.statics.data.register.AdmittedLiabilitiesRegister;
import ru.spcex.clearing.backendapi.controller.queue.AbstractControllerTest;
import ru.spcex.clearing.imdg.IMDGDistributedNames;
import java.math.BigDecimal;
import java.time.LocalDate;
class AdmittedLiabilitiesRegisterControllerTest extends AbstractControllerTest {
private static final String REST_URL = "/admitted-liabilities-registers/";
/**
* {@link AdmittedLiabilitiesRegisterController#getAll()} <br>
* Тест проверяет получение запроса по REST API.<br>
* Входной запрос /admitted-liabilities-registers/ <br>
* Ответ CommonGetAllResponse <br>
*/
@Test
void getAll() throws Exception {
//ARRANGE
AdmittedLiabilitiesRegister admittedLiabilitiesRegister = new AdmittedLiabilitiesRegister();
admittedLiabilitiesRegister.setId(currentId.get());
admittedLiabilitiesRegister.setCompanyFullName("fuill nme");
admittedLiabilitiesRegister.setSessionId(111L);
admittedLiabilitiesRegister.setSecuritySymbol("RUB");
admittedLiabilitiesRegister.setSecurityFullName("SEC NAME");
admittedLiabilitiesRegister.setCompanyId(222L);
admittedLiabilitiesRegister.setClearingCode("CCDE");
admittedLiabilitiesRegister.setAccount("ACC1");
admittedLiabilitiesRegister.setAmount(BigDecimal.valueOf(12.15));
admittedLiabilitiesRegister.setClearingDate(LocalDate.now());
//ACT and ASSERT
checkGettingAllFromRestApi(IMDGDistributedNames.Map_AdmittedLiabilitiesRegister, admittedLiabilitiesRegister, REST_URL);
}
}

View file

@ -0,0 +1,38 @@
package ru.spcex.clearing.backendapi.controller.queue.register;
import org.junit.jupiter.api.Test;
import ru.clearing.classes.statics.data.register.CoveredLiabilitiesRegister;
import ru.spcex.clearing.backendapi.controller.queue.AbstractControllerTest;
import ru.spcex.clearing.imdg.IMDGDistributedNames;
import java.math.BigDecimal;
import java.time.LocalDate;
class CoveredLiabilitiesRegisterControllerTest extends AbstractControllerTest {
private static final String REST_URL = "/covered-liabilities-registers/";
/**
* {@link CoveredLiabilitiesRegisterController#getAll()} <br>
* Тест проверяет получение запроса по REST API.<br>
* Входной запрос /covered-liabilities-registers/ <br>
* Ответ CommonGetAllResponse <br>
*/
@Test
void getAll() throws Exception {
//ARRANGE
CoveredLiabilitiesRegister coveredLiabilitiesRegister = new CoveredLiabilitiesRegister();
coveredLiabilitiesRegister.setId(currentId.get());
coveredLiabilitiesRegister.setCompanyFullName("fuill nme");
coveredLiabilitiesRegister.setSessionId(111L);
coveredLiabilitiesRegister.setSecuritySymbol("RUB");
coveredLiabilitiesRegister.setSecurityFullName("SEC NAME");
coveredLiabilitiesRegister.setCompanyId(222L);
coveredLiabilitiesRegister.setClearingCode("CCDE");
coveredLiabilitiesRegister.setAccount("ACC1");
coveredLiabilitiesRegister.setAmount(BigDecimal.valueOf(12.15));
coveredLiabilitiesRegister.setClearingDate(LocalDate.now());
//ACT and ASSERT
checkGettingAllFromRestApi(IMDGDistributedNames.Map_CoveredLiabilitiesRegister, coveredLiabilitiesRegister, REST_URL);
}
}

View file

@ -0,0 +1,30 @@
package ru.spcex.clearing.backendapi.controller.queue.register;
import org.junit.jupiter.api.Test;
import ru.clearing.classes.statics.data.register.DepoBalanceRegister;
import ru.spcex.clearing.backendapi.controller.queue.AbstractControllerTest;
import ru.spcex.clearing.imdg.IMDGDistributedNames;
class DepoBalanceRegisterControllerTest extends AbstractControllerTest {
private static final String REST_URL = "/depo-balance-registers/";
/**
* {@link DepoBalanceRegisterController#getAll()} <br>
* Тест проверяет получение запроса по REST API.<br>
* Входной запрос /depo-balance-registers/ <br>
* Ответ CommonGetAllResponse <br>
*/
@Test
void getAll() throws Exception {
//ARRANGE
DepoBalanceRegister depoBalanceRegister = new DepoBalanceRegister();
depoBalanceRegister.setId(currentId.get());
depoBalanceRegister.setSessionId(111L);
depoBalanceRegister.setSecuritySymbol("RUB");
depoBalanceRegister.setCompanyId(222L);
depoBalanceRegister.setDepoCode("DCDE");
//ACT and ASSERT
checkGettingAllFromRestApi(IMDGDistributedNames.Map_DepoBalanceRegister, depoBalanceRegister, REST_URL);
}
}

View file

@ -0,0 +1,35 @@
package ru.spcex.clearing.backendapi.controller.queue.register;
import org.junit.jupiter.api.Test;
import ru.clearing.classes.statics.data.register.DepoPaymentInstructionRegister;
import ru.spcex.clearing.backendapi.controller.queue.AbstractControllerTest;
import ru.spcex.clearing.imdg.IMDGDistributedNames;
import java.math.BigDecimal;
class DepoPaymentInstructionRegisterControllerTest extends AbstractControllerTest {
private static final String REST_URL = "/depo-payment-instruction-registers/";
/**
* {@link DepoPaymentInstructionRegisterController#getAll()} <br>
* Тест проверяет получение запроса по REST API.<br>
* Входной запрос /depo-payment-instruction-registers/ <br>
* Ответ CommonGetAllResponse <br>
*/
@Test
void getAll() throws Exception {
//ARRANGE
DepoPaymentInstructionRegister depoPaymentInstructionRegister = new DepoPaymentInstructionRegister();
depoPaymentInstructionRegister.setId(currentId.get());
depoPaymentInstructionRegister.setCompanyId(currentId.get());
depoPaymentInstructionRegister.setTradingClearingRegistryType("TR");
depoPaymentInstructionRegister.setTradingClearingRegistry("REG");
depoPaymentInstructionRegister.setCbCode("CBCD");
depoPaymentInstructionRegister.setQuantity(BigDecimal.valueOf(12.15));
depoPaymentInstructionRegister.setDirection(currentId.get());
depoPaymentInstructionRegister.setSessionId(currentId.get());
//ACT and ASSERT
checkGettingAllFromRestApi(IMDGDistributedNames.Map_DepoPaymentInstructionRegister, depoPaymentInstructionRegister, REST_URL);
}
}

View file

@ -0,0 +1,42 @@
package ru.spcex.clearing.backendapi.controller.queue.register;
import org.junit.jupiter.api.Test;
import ru.clearing.classes.statics.data.register.ExcludeLiabilitiesRegister;
import ru.spcex.clearing.backendapi.controller.queue.AbstractControllerTest;
import ru.spcex.clearing.imdg.IMDGDistributedNames;
import java.math.BigDecimal;
import java.time.LocalDate;
class ExcludeLiabilitiesRegisterControllerTest extends AbstractControllerTest {
private static final String REST_URL = "/exclude-liabilities-registers/";
/**
* {@link ExcludeLiabilitiesRegisterController#getAll()} <br>
* Тест проверяет получение запроса по REST API.<br>
* Входной запрос /exclude-liabilities-registers/ <br>
* Ответ CommonGetAllResponse <br>
*/
@Test
void getAll() throws Exception {
//ARRANGE
ExcludeLiabilitiesRegister excludeLiabilitiesRegister = new ExcludeLiabilitiesRegister();
excludeLiabilitiesRegister.setId(currentId.get());
excludeLiabilitiesRegister.setSessionId(222L);
excludeLiabilitiesRegister.setValidFromDate(LocalDate.now());
excludeLiabilitiesRegister.setValidToDate(LocalDate.now());
excludeLiabilitiesRegister.setCompanyId(333L);
excludeLiabilitiesRegister.setCompanyFullName("CompanyFullName");
excludeLiabilitiesRegister.setInn("Inn");
excludeLiabilitiesRegister.setSegment("Segment");
excludeLiabilitiesRegister.setRegistryCode("RegistryCode");
excludeLiabilitiesRegister.setAccount("Account");
excludeLiabilitiesRegister.setRegistryStatus("RegistryStatus");
excludeLiabilitiesRegister.setCurrency("Currency");
excludeLiabilitiesRegister.setSumLiabilities(BigDecimal.valueOf(12.15));
excludeLiabilitiesRegister.setSettlementDate(LocalDate.now());
//ACT and ASSERT
checkGettingAllFromRestApi(IMDGDistributedNames.Map_ExcludeLiabilitiesRegister, excludeLiabilitiesRegister, REST_URL);
}
}

View file

@ -0,0 +1,48 @@
package ru.spcex.clearing.backendapi.controller.queue.register;
import org.junit.jupiter.api.Test;
import ru.clearing.classes.statics.data.register.ExecutionRegister;
import ru.spcex.clearing.backendapi.controller.queue.AbstractControllerTest;
import ru.spcex.clearing.imdg.IMDGDistributedNames;
import java.math.BigDecimal;
import java.time.Instant;
import java.time.LocalDate;
class ExecutionRegisterControllerTest extends AbstractControllerTest {
private static final String REST_URL = "/execution-registers/";
/**
* {@link ExecutionRegisterController#getAll()} <br>
* Тест проверяет получение запроса по REST API.<br>
* Входной запрос /execution-registers/ <br>
* Ответ CommonGetAllResponse <br>
*/
@Test
void getAll() throws Exception {
//ARRANGE
ExecutionRegister executionRegister = new ExecutionRegister();
executionRegister.setId(currentId.get());
executionRegister.setTradingDate(LocalDate.now());
executionRegister.setExchangeExecutionId(123L);
executionRegister.setExchangeExecutionTime(Instant.now());
executionRegister.setSecurityId(123L);
executionRegister.setSellerId(123L);
executionRegister.setSellerClearingCode("CCDE");
executionRegister.setSellerTradingClearingRegister("TCR");
executionRegister.setSellerMoneyAccount("MACC-1");
executionRegister.setSellerDepoAccount("DACC-1");
executionRegister.setBuyerId(123L);
executionRegister.setBuyerClearingCode("BCCD");
executionRegister.setBuyerTradingClearingRegister("REG2");
executionRegister.setBuyerMoneyAccount("BMCCC-12");
executionRegister.setBuyerDepoAccount("BCCC-12");
executionRegister.setAmount(BigDecimal.valueOf(14.55));
executionRegister.setQuantity(BigDecimal.valueOf(0.1));
executionRegister.setClearingDate(LocalDate.now());
//ACT and ASSERT
checkGettingAllFromRestApi(IMDGDistributedNames.Map_ExecutionRegister, executionRegister, REST_URL);
}
}

View file

@ -0,0 +1,43 @@
package ru.spcex.clearing.backendapi.controller.queue.register;
import org.junit.jupiter.api.Test;
import ru.clearing.classes.statics.data.register.LiabilitiesRegister;
import ru.spcex.clearing.backendapi.controller.queue.AbstractControllerTest;
import ru.spcex.clearing.imdg.IMDGDistributedNames;
import java.math.BigDecimal;
import java.time.LocalDate;
class LiabilitiesRegisterControllerTest extends AbstractControllerTest {
private static final String REST_URL = "/liabilities-registers/";
/**
* {@link LiabilitiesRegisterController#getAll()} <br>
* Тест проверяет получение запроса по REST API.<br>
* Входной запрос /liabilities-registers/ <br>
* Ответ CommonGetAllResponse <br>
*/
@Test
void getAll() throws Exception {
//ARRANGE
LiabilitiesRegister liabilitiesRegister = new LiabilitiesRegister();
liabilitiesRegister.setId(currentId.get());
liabilitiesRegister.setSessionId(111L);
liabilitiesRegister.setValidFromDate(LocalDate.now());
liabilitiesRegister.setValidToDate(LocalDate.now());
liabilitiesRegister.setCompanyId(111L);
liabilitiesRegister.setCompanyFullName("Name ");
liabilitiesRegister.setInn("INN");
liabilitiesRegister.setSegment("SIGSGM-nt");
liabilitiesRegister.setRegistryCode("REG");
liabilitiesRegister.setAccount("ACC");
liabilitiesRegister.setRegistryStatus("ACTV");
liabilitiesRegister.setCurrency("RUB");
liabilitiesRegister.setSumLiabilities(BigDecimal.TEN);
liabilitiesRegister.setSettlementDate(LocalDate.now());
//ACT and ASSERT
checkGettingAllFromRestApi(IMDGDistributedNames.Map_LiabilitiesRegister, liabilitiesRegister, REST_URL);
}
}

View file

@ -0,0 +1,39 @@
package ru.spcex.clearing.backendapi.controller.queue.register;
import org.junit.jupiter.api.Test;
import ru.clearing.classes.statics.data.register.MoneyBalanceRegister;
import ru.spcex.clearing.backendapi.controller.queue.AbstractControllerTest;
import ru.spcex.clearing.imdg.IMDGDistributedNames;
import java.math.BigDecimal;
class MoneyBalanceRegisterControllerTest extends AbstractControllerTest {
private static final String REST_URL = "/money-balance-registers/";
/**
* {@link MoneyBalanceRegisterController#getAll()} <br>
* Тест проверяет получение запроса по REST API.<br>
* Входной запрос /money-balance-registers/ <br>
* Ответ CommonGetAllResponse <br>
*/
@Test
void getAll() throws Exception {
//ARRANGE
MoneyBalanceRegister moneyBalanceRegister = new MoneyBalanceRegister();
moneyBalanceRegister.setId(currentId.get());
moneyBalanceRegister.setSetHouseName("setHouseName");
moneyBalanceRegister.setAccount("account");
moneyBalanceRegister.setInfoAccount("infoAccount");
moneyBalanceRegister.setRemainderSum(BigDecimal.valueOf(11.22));
moneyBalanceRegister.setBlockedSum(BigDecimal.valueOf(11.22));
moneyBalanceRegister.setUnblockedSum(BigDecimal.valueOf(11.22));
moneyBalanceRegister.setInn("inn");
moneyBalanceRegister.setSessionId(456L);
moneyBalanceRegister.setCompanyFullName("companyFullName");
moneyBalanceRegister.setCompanyId(currentId.get());
//ACT and ASSERT
checkGettingAllFromRestApi(IMDGDistributedNames.Map_MoneyBalanceRegister, moneyBalanceRegister, REST_URL);
}
}

File diff suppressed because it is too large Load diff