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

Merge remote-tracking branch 'origin/dev' into CLS-276

Browse source
This commit is contained in:
psemenkov 2023-05-03 12:27:50 +03:00
commit 8beb210e32
29 changed files with 148 additions and 116 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/AbstractQueueController.java
View file

@ -4,6 +4,7 @@ import ru.spcex.clearing.backendapi.controller.response.cud.CudResponse;
import ru.spcex.clearing.backendapi.domain.actions.IAction;
import ru.spcex.clearing.backendapi.service.IOperator;
import java.util.Objects;
import java.util.concurrent.ExecutionException;
public class AbstractQueueController {

2
clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/account/ClientCodeController.java
View file

@ -26,7 +26,7 @@ import java.util.Map;
import java.util.concurrent.ExecutionException;
@Controller
@RequestMapping("/accounting/client-codes")
@RequestMapping("/client-codes")
public class ClientCodeController extends AbstractQueueController {
private final IStateLoader stateLoader;

4
clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/securities/InformationAccountController.java → clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/account/InformationAccountController.java
View file

@ -1,4 +1,4 @@
package ru.spcex.clearing.backendapi.controller.queue.securities;
package ru.spcex.clearing.backendapi.controller.queue.account;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiResponse;
@ -17,7 +17,7 @@ import java.util.Collection;
import java.util.Map;
@Controller
@RequestMapping("/securities/information-accounts")
@RequestMapping("/accounting/information-account")
public class InformationAccountController {
private final IStateLoader stateLoader;

4
clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/company/EditClearingMemberCategoryController.java → clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/company/ClearingMemberCategoryController.java
View file

@ -27,11 +27,11 @@ import java.util.concurrent.ExecutionException;
@Controller
@RequestMapping("/clearing-member-categories")
public class EditClearingMemberCategoryController extends AbstractQueueController {
public class ClearingMemberCategoryController extends AbstractQueueController {
private final IStateLoader stateLoader;
@Autowired
public EditClearingMemberCategoryController(IOperator operator, IStateLoader stateLoader) {
public ClearingMemberCategoryController(IOperator operator, IStateLoader stateLoader) {
super(operator);
this.stateLoader = stateLoader;
}

7
clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/company/EditCompanyInfoController.java → clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/company/CompanyInfoController.java
View file

@ -16,7 +16,6 @@ import ru.spcex.clearing.backendapi.controller.response.cud.CudResponse;
import ru.spcex.clearing.backendapi.controller.response.entity.CommonGetAllResponse;
import ru.spcex.clearing.backendapi.meta.GetResponseFactory;
import ru.spcex.clearing.backendapi.service.IOperator;
import ru.spcex.clearing.backendapi.service.IStateLoader;
import ru.spcex.clearing.imdg.IMDGDistributedNames;
import ru.spcex.clearing.platform.messaging.domain.Consts;
import ru.spcex.platform.imdg.api.Imdg;
@ -29,15 +28,13 @@ import java.util.concurrent.ExecutionException;
@Controller
@RequestMapping("/company-infos")
public class EditCompanyInfoController extends AbstractQueueController {
private final IStateLoader stateLoader;
public class CompanyInfoController extends AbstractQueueController {
private final Imdg<Company> companyImdg;
private final GetResponseFactory responseFactory;
@Autowired
public EditCompanyInfoController(IOperator operator, IStateLoader stateLoader, ImdgProvider imdgProvider, GetResponseFactory responseFactory) {
public CompanyInfoController(IOperator operator, ImdgProvider imdgProvider, GetResponseFactory responseFactory) {
super(operator);
this.stateLoader = stateLoader;
this.companyImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_Company, Company.class);
this.responseFactory = responseFactory;
}

4
clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/company/EditCompanySymbolController.java → clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/company/CompanySymbolController.java
View file

@ -25,12 +25,12 @@ import java.util.concurrent.ExecutionException;
@Controller
@RequestMapping("/company-symbols")
public class EditCompanySymbolController extends AbstractQueueController {
public class CompanySymbolController extends AbstractQueueController {
private final IStateLoader stateLoader;
@Autowired
public EditCompanySymbolController(IOperator operator, IStateLoader stateLoader) {
public CompanySymbolController(IOperator operator, IStateLoader stateLoader) {
super(operator);
this.stateLoader = stateLoader;
}

4
clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/company/EditContactController.java → clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/company/ContactController.java
View file

@ -25,11 +25,11 @@ import java.util.concurrent.ExecutionException;
@Controller
@RequestMapping("/contacts")
public class EditContactController extends AbstractQueueController {
public class ContactController extends AbstractQueueController {
private final IStateLoader stateLoader;
@Autowired
public EditContactController(IOperator operator, IStateLoader stateLoader) {
public ContactController(IOperator operator, IStateLoader stateLoader) {
super(operator);
this.stateLoader = stateLoader;
}

2
clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/registry/TradingClearingRegistryController.java
View file

@ -28,7 +28,7 @@ import java.util.Optional;
import java.util.concurrent.ExecutionException;
@Controller
@RequestMapping("/registry/trading-clearing-registry")
@RequestMapping("/trading-clearing-registries")
public class TradingClearingRegistryController extends AbstractQueueController {
private final IStateLoader stateLoader;

6
clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/securities/CudCouponPeriodController.java → clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/securities/CouponPeriodController.java
View file

@ -19,12 +19,12 @@ import java.util.Collection;
import java.util.Map;
@Controller
@RequestMapping("/securities/coupon-period-securities")
public class CudCouponPeriodController extends AbstractQueueController {
@RequestMapping("/securities/coupon-periods")
public class CouponPeriodController extends AbstractQueueController {
private final IStateLoader stateLoader;
@Autowired
public CudCouponPeriodController(IOperator operator, IStateLoader stateLoader) {
public CouponPeriodController(IOperator operator, IStateLoader stateLoader) {
super(operator);
this.stateLoader = stateLoader;
}

4
clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/securities/CudEquitySecurityController.java → clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/securities/EquitySecurityController.java
View file

@ -28,11 +28,11 @@ import java.util.concurrent.ExecutionException;
@Controller
@RequestMapping("/securities/equity-securities")
public class CudEquitySecurityController extends AbstractQueueController {
public class EquitySecurityController extends AbstractQueueController {
private final IStateLoader stateLoader;
@Autowired
public CudEquitySecurityController(IOperator operator, IStateLoader stateLoader) {
public EquitySecurityController(IOperator operator, IStateLoader stateLoader) {
super(operator);
this.stateLoader = stateLoader;
}

6
clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/securities/CudFixedIncomeCashFlowController.java → clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/securities/FixedIncomeCashFlowController.java
View file

@ -19,12 +19,12 @@ import java.util.Collection;
import java.util.Map;
@Controller
@RequestMapping("/securities/fixed-income-cash-flow-securities")
public class CudFixedIncomeCashFlowController extends AbstractQueueController {
@RequestMapping("/securities/fixed-income-cash-flows")
public class FixedIncomeCashFlowController extends AbstractQueueController {
private final IStateLoader stateLoader;
@Autowired
public CudFixedIncomeCashFlowController(IOperator operator, IStateLoader stateLoader) {
public FixedIncomeCashFlowController(IOperator operator, IStateLoader stateLoader) {
super(operator);
this.stateLoader = stateLoader;
}

4
clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/securities/CudFixedIncomeSecurityController.java → clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/securities/FixedIncomeSecurityController.java
View file

@ -28,11 +28,11 @@ import java.util.concurrent.ExecutionException;
@Controller
@RequestMapping("/securities/fixed-income-securities")
public class CudFixedIncomeSecurityController extends AbstractQueueController {
public class FixedIncomeSecurityController extends AbstractQueueController {
private final IStateLoader stateLoader;
@Autowired
public CudFixedIncomeSecurityController(IOperator operator, IStateLoader stateLoader) {
public FixedIncomeSecurityController(IOperator operator, IStateLoader stateLoader) {
super(operator);
this.stateLoader = stateLoader;
}

4
clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/securities/CudMoneyMarketSecurityController.java → clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/securities/MoneyMarketSecurityController.java
View file

@ -28,11 +28,11 @@ import java.util.concurrent.ExecutionException;
@Controller
@RequestMapping("/securities/money-securities")
public class CudMoneyMarketSecurityController extends AbstractQueueController {
public class MoneyMarketSecurityController extends AbstractQueueController {
private final IStateLoader stateLoader;
@Autowired
public CudMoneyMarketSecurityController(IOperator operator, IStateLoader stateLoader) {
public MoneyMarketSecurityController(IOperator operator, IStateLoader stateLoader) {
super(operator);
this.stateLoader = stateLoader;
}

26
clearing-parent/backend-api/src/main/resources/meta/data.xml
View file

@ -208,19 +208,19 @@
<task id="35" code="SCLR" name="Запуск клиринговой сессии"/>
<task id="36" code="SPRC" name="Запуск преклиринга"/>
<task id="37" code="SPOC" name="Запуск постклиринга"/>
<task id="38" code="LIMM" name="Выгрузка в торговую систему остатков секции МКР"/>
<task id="38" code="LIMF" name="Выгрузка в торговую систему остатков Фондовой секции"/>
<task id="39" code="LIQU" name="Ликвидационная сессия по обязательтсвам участника"/>
<task id="40" code="STRM" name="Начало торговой сессии секции МКР"/>
<task id="41" code="ETRM" name="Завершение торговой сессии секции МКР"/>
<task id="42" code="SIPO" name="Начало торговой сессии по первичным торгам"/>
<task id="43" code="EIPO" name="Завершение торговой сессии по первичным торгам"/>
<task id="44" code="STRF" name="Начало торговой сессии по вторичным торгам"/>
<task id="45" code="ETRF" name="Завершение торговой сессии по вторичным торгам"/>
<task id="46" code="RCHK" name="Запрос на сверку активов"/>
<task id="47" code="GRYT" name="Сформировать регистр на текущий день"/>
<task id="48" code="GRRT" name="Сформировать реестр на текущий день"/>
<task id="49" code="GORD" name="Формирование реестра распоряжений, направленных расчетному депозитарию"/>
<task id="38" code="LIMM" name="Выгрузка в торговую систему остатков по деньгам"/>
<task id="39" code="LIMS" name="Выгрузка в торговую систему остатков по бумагам"/>
<task id="40" code="LIQU" name="Ликвидационная сессия по обязательтсвам участника"/>
<task id="41" code="STRM" name="Начало торговой сессии секции МКР"/>
<task id="42" code="ETRM" name="Завершение торговой сессии секции МКР"/>
<task id="43" code="SIPO" name="Начало торговой сессии по первичным торгам"/>
<task id="44" code="EIPO" name="Завершение торговой сессии по первичным торгам"/>
<task id="45" code="STRF" name="Начало торговой сессии по вторичным торгам"/>
<task id="46" code="ETRF" name="Завершение торговой сессии по вторичным торгам"/>
<task id="47" code="RCHK" name="Запрос на сверку активов"/>
<task id="48" code="GRYT" name="Сформировать регистр на текущий день"/>
<task id="49" code="GRRT" name="Сформировать реестр на текущий день"/>
<task id="50" code="GORD" name="Формирование реестра распоряжений, направленных расчетному депозитарию"/>
<taskStatus id="1" code="ACTV" name="Активна"/>
<taskStatus id="2" code="BLKD" name="Не активна"/>
<taskStatus id="3" code="CNCL" name="Отмена расписания"/>

20
clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/AbstractControllerTest.java
View file

@ -95,10 +95,10 @@ import static ru.spcex.clearing.test.json.MatcherFactoryWithJson.usingIgnoringFi
//company
CompanyRoleSetController.class,
CompanyController.class,
EditClearingMemberCategoryController.class,
EditCompanyInfoController.class,
EditCompanySymbolController.class,
EditContactController.class,
ClearingMemberCategoryController.class,
CompanyInfoController.class,
CompanySymbolController.class,
ContactController.class,
ProfileDocumentController.class,
RelationController.class,
//execution
@ -139,11 +139,11 @@ import static ru.spcex.clearing.test.json.MatcherFactoryWithJson.usingIgnoringFi
PlannerController.class,
PlannerTemplateController.class,
//securities
CudMoneyMarketSecurityController.class,
CudCouponPeriodController.class,
CudEquitySecurityController.class,
CudFixedIncomeCashFlowController.class,
CudFixedIncomeSecurityController.class,
MoneyMarketSecurityController.class,
CouponPeriodController.class,
EquitySecurityController.class,
FixedIncomeCashFlowController.class,
FixedIncomeSecurityController.class,
InformationAccountController.class,
SecurityController.class,
//user
@ -162,7 +162,7 @@ import static ru.spcex.clearing.test.json.MatcherFactoryWithJson.usingIgnoringFi
MessagesTestConfig.class,
Jackson2HttpConverterTestConfig.class})
@ExtendWith(SpringExtension.class)
@WebMvcTest//(controllers = DeleteCompanyController.class)
@WebMvcTest
//@TestPropertySource(properties = "spring.config.location=D:/repo/mfd/clearing/clearing-parent/backend-api/src/main/resources/")
public abstract class AbstractControllerTest {
protected static final MatcherFactoryWithJson.Matcher<BaseRequest> BASE_REQUEST_MATCHER = usingIgnoringFieldsComparatorForClass(BaseRequest.class,"userId");

6
clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/account/ClientCodeControllerTest.java
View file

@ -20,7 +20,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
import static ru.spcex.clearing.test.json.JsonUtil.writeValue;
class ClientCodeControllerTest extends AbstractControllerTest {
private static final String REST_URL = "/accounting/client-codes/";
private static final String REST_URL = "/client-codes/";
/**
* {@link ClientCodeController#add(ClientCodeNewAction)}<br>
@ -98,7 +98,7 @@ class ClientCodeControllerTest extends AbstractControllerTest {
/**
* {@link ClientCodeController#delete(Long)} <br>
* Тест проверяет получение id сущности {@link Long} по REST API и отправку в Apache Kafka.<br>
* Входной запрос /accounting/client-codes/{@link Long}: - 0L<br>
* Входной запрос /client-codes/{@link Long}: - 0L<br>
*/
@Test
void delete() throws Exception {
@ -114,7 +114,7 @@ class ClientCodeControllerTest extends AbstractControllerTest {
/**
* {@link ClientCodeController#getAll()} <br>
* Тест проверяет получение запроса по REST API и отправку всех записей из таблицы hazelcast Map_ClientCode.<br>
* Входной запрос /accounting/client-codes/ <br>
* Входной запрос /client-codes/ <br>
* Ответ CommonGetAllResponse <br>
*/
@Test

7
clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/securities/InformationAccountControllerTest.java → clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/account/InformationAccountControllerTest.java
View file

@ -1,17 +1,18 @@
package ru.spcex.clearing.backendapi.controller.queue.securities;
package ru.spcex.clearing.backendapi.controller.queue.account;
import org.junit.jupiter.api.Test;
import ru.clearing.classes.statics.data.account.InformationAccount;
import ru.spcex.clearing.backendapi.controller.queue.AbstractControllerTest;
import ru.spcex.clearing.backendapi.controller.queue.account.InformationAccountController;
import ru.spcex.clearing.imdg.IMDGDistributedNames;
class InformationAccountControllerTest extends AbstractControllerTest {
public static final String REST_URL = "/securities/information-accounts/";
public static final String REST_URL = "/accounting/information-account/";
/**
* {@link InformationAccountController#getAll()} <br>
* Тест проверяет получение запроса по REST API.<br>
* Входной запрос /securities/information-accounts/ <br>
* Входной запрос /accounting/information-account/ <br>
* Ответ CommonGetAllResponse <br>
*/
@Test

12
clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/company/EditClearingMemberCategoryControllerTest.java → clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/company/ClearingMemberCategoryControllerTest.java
View file

@ -17,11 +17,11 @@ import ru.spcex.clearing.platform.messaging.domain.Consts;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static ru.spcex.clearing.test.json.JsonUtil.writeValue;
class EditClearingMemberCategoryControllerTest extends AbstractControllerTest {
class ClearingMemberCategoryControllerTest extends AbstractControllerTest {
private static final String REST_URL = "/clearing-member-categories/";
/**
* {@link EditClearingMemberCategoryController#add(ClearingMemberCategoryNewAction)}<br>
* {@link ClearingMemberCategoryController#add(ClearingMemberCategoryNewAction)}<br>
* Тест проверяет получение сущности {@link ClearingMemberCategoryNewAction} по REST API и отправку в Apache Kafka.<br>
* Входной запрос {@link ClearingMemberCategoryNewAction}:<br>
* {@link ClearingMemberCategoryNewAction#clearingMemberCategory} - "Category"<br>
@ -40,7 +40,7 @@ class EditClearingMemberCategoryControllerTest extends AbstractControllerTest {
}
/**
* {@link EditClearingMemberCategoryController#add(ClearingMemberCategoryNewAction)}<br>
* {@link ClearingMemberCategoryController#add(ClearingMemberCategoryNewAction)}<br>
* Тест проверяет получение сущности {@link ClearingMemberCategoryNewAction} по REST API и отправку в Apache Kafka.<br>
* Входной запрос {@link ClearingMemberCategoryNewAction}:<br>
* {@link ClearingMemberCategoryNewAction#clearingMemberCategory} - "Category"<br>
@ -53,7 +53,7 @@ class EditClearingMemberCategoryControllerTest extends AbstractControllerTest {
}
/**
* {@link EditClearingMemberCategoryController#update(Long, ClearingMemberCategoryUpdateAction)}<br>
* {@link ClearingMemberCategoryController#update(Long, ClearingMemberCategoryUpdateAction)}<br>
* Тест проверяет получение сущности {@link ClearingMemberCategoryUpdateAction} по REST API и отправку в Apache Kafka.<br>
* Входной запрос {@link ClearingMemberCategoryUpdateAction}:<br>
* {@link ClearingMemberCategoryUpdateAction#clearingMemberCategory} - Category<br>
@ -72,7 +72,7 @@ class EditClearingMemberCategoryControllerTest extends AbstractControllerTest {
}
/**
* {@link EditClearingMemberCategoryController#delete(Long)} <br>
* {@link ClearingMemberCategoryController#delete(Long)} <br>
* Тест проверяет получение id сущности {@link Long} по REST API и отправку в Apache Kafka.<br>
* Входной запрос /clearing-member-categories/{@link Long}: - currentId<br>
*/
@ -88,7 +88,7 @@ class EditClearingMemberCategoryControllerTest extends AbstractControllerTest {
}
/**
* {@link EditClearingMemberCategoryController#getAll()} <br>
* {@link ClearingMemberCategoryController#getAll()} <br>
* Тест проверяет получение запроса по REST API и отправку всех записей из таблицы hazelcast Map_ClearingMemberCategory.<br>
* Входной запрос /clearing-member-categories/ <br>
* Ответ CommonGetAllResponse <br>

39
clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/company/DeleteCompanyControllerTest.java → clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/company/CompanyControllerTest.java
View file

@ -3,15 +3,19 @@ package ru.spcex.clearing.backendapi.controller.queue.company;
import org.junit.jupiter.api.Test;
import ru.clearing.classes.statics.data.company.Company;
import ru.spcex.clearing.backendapi.controller.queue.AbstractControllerTest;
import ru.spcex.clearing.backendapi.controller.queue.registry.TradingClearingRegistryController;
import ru.spcex.clearing.backendapi.controller.request.cud.common.CommonDeleteAction;
import ru.spcex.clearing.backendapi.controller.request.cud.company.CompanyNewAction;
import ru.spcex.clearing.backendapi.controller.request.cud.registry.TradingClearingRegistryNewAction;
import ru.spcex.clearing.imdg.IMDGDistributedNames;
import ru.spcex.clearing.platform.messaging.domain.Consts;
import ru.spcex.clearing.platform.messaging.domain.cud.registry.TradingClearingRegistryNewRequest;
class DeleteCompanyControllerTest extends AbstractControllerTest {
class CompanyControllerTest extends AbstractControllerTest {
private static final String REST_URL = "/companies/";
/**
* {@link DeleteCompanyController#delete(Long)} <br>
* {@link CompanyController#delete(Long)} <br>
* Тест проверяет получение id сущности {@link Long} по REST API и отправку в Apache Kafka.<br>
* Входной запрос /companies/{@link Long}: - 0L<br>
*/
@ -27,7 +31,7 @@ class DeleteCompanyControllerTest extends AbstractControllerTest {
}
/**
* {@link DeleteCompanyController#getAll()} <br>
* {@link CompanyController#getAll()} <br>
* Тест проверяет получение запроса по REST API и отправку всех записей из таблицы hazelcast Map_Company.<br>
* Входной запрос /companies <br>
*/
@ -45,4 +49,33 @@ class DeleteCompanyControllerTest extends AbstractControllerTest {
//ACT and ASSERT
checkGettingAllFromRestApi(IMDGDistributedNames.Map_Company, existCompany, REST_URL);
}
/**
* {@link CompanyController#add(CompanyNewAction)}<br>
* Тест проверяет создание сущности {@link CompanyNewAction} по REST API и отправку в Apache Kafka.<br>
* Входной запрос {@link CompanyNewAction}:<br>
* {@link CompanyNewAction#fullName "Full name"<br>
* {@link CompanyNewAction#companySymbol "CLRC"<br>
* {@link CompanyNewAction#companySymbolValue "NAME1"<br>
* {@link CompanyNewAction#workflowStatus "ACTV"<br>
*/
@Test
void add() throws Exception {
//ARRANGE
CompanyNewAction newAction = getCompanyNewAction();
//ACT and ASSERT
checkAddingByRestApi(REST_URL, newAction);
checkSendedMessegeFromKafka(Consts.DESTINATION_COMPANY_NEW, newAction);
}
CompanyNewAction getCompanyNewAction() {
CompanyNewAction newAction = new CompanyNewAction();
newAction.setFullName("Full name");
newAction.setCompanySymbol("CLRC");
newAction.setCompanySymbolValue("NAME1");
newAction.setWorkflowStatus("ACTV");
return newAction;
}
}

8
clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/company/EditCompanyInfoControllerTest.java → clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/company/CompanyInfoControllerTest.java
View file

@ -26,11 +26,11 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
import static ru.spcex.clearing.test.json.JsonUtil.writeValue;
class EditCompanyInfoControllerTest extends AbstractControllerTest {
class CompanyInfoControllerTest extends AbstractControllerTest {
private static final String REST_URL = "/company-infos/";
/**
* {@link EditCompanyInfoController#update(Long, CompanyInfoUpdateAction)}<br>
* {@link CompanyInfoController#update(Long, CompanyInfoUpdateAction)}<br>
* Тест проверяет получение сущности {@link CompanyInfoUpdateAction} по REST API и отправку в Apache Kafka.<br>
* Входной запрос {@link CompanyInfoUpdateAction}:<br>
* {@link CompanyInfoUpdateAction#workflowStatus} - ACTV<br>
@ -54,7 +54,7 @@ class EditCompanyInfoControllerTest extends AbstractControllerTest {
}
/**
* {@link EditCompanyInfoController#update(Long, CompanyInfoUpdateAction)}<br>
* {@link CompanyInfoController#update(Long, CompanyInfoUpdateAction)}<br>
* Тест проверяет получение сущности {@link CompanyInfoUpdateAction} по REST API и отправку в Apache Kafka.<br>
* Входной запрос {@link CompanyInfoUpdateAction}:<br>
* {@link CompanyInfoUpdateAction#workflowStatus} - ACTV<br>
@ -95,7 +95,7 @@ class EditCompanyInfoControllerTest extends AbstractControllerTest {
}
/**
* {@link EditCompanyInfoController#getAll()} <br>
* {@link CompanyInfoController#getAll()} <br>
* Тест проверяет получение запроса по REST API и отправку всех записей из таблицы hazelcast Map_Company.<br>
* Входной запрос /company-infos/ <br>
* Ответ CommonGetAllResponse <br>

8
clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/company/EditCompanySymbolControllerTest.java → clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/company/CompanySymbolControllerTest.java
View file

@ -16,11 +16,11 @@ import ru.spcex.clearing.platform.messaging.domain.Consts;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static ru.spcex.clearing.test.json.JsonUtil.writeValue;
class EditCompanySymbolControllerTest extends AbstractControllerTest {
class CompanySymbolControllerTest extends AbstractControllerTest {
private static final String REST_URL = "/company-symbols/";
/**
* {@link EditCompanySymbolController#update(Long, CompanySymbolUpdateAction)}<br>
* {@link CompanySymbolController#update(Long, CompanySymbolUpdateAction)}<br>
* Тест проверяет получение сущности {@link CompanySymbolUpdateAction} по REST API и отправку в Apache Kafka.<br>
* Входной запрос {@link CompanySymbolUpdateAction}:<br>
* {@link CompanySymbolUpdateAction#companyId} - 1000L<br>
@ -35,7 +35,7 @@ class EditCompanySymbolControllerTest extends AbstractControllerTest {
}
/**
* {@link EditCompanySymbolController#update(Long, CompanySymbolUpdateAction)}<br>
* {@link CompanySymbolController#update(Long, CompanySymbolUpdateAction)}<br>
* Тест проверяет получение сущности {@link CompanySymbolUpdateAction} по REST API и отправку в Apache Kafka.<br>
* Входной запрос {@link CompanySymbolUpdateAction}:<br>
* {@link CompanySymbolUpdateAction#companyId} - 1000L<br>
@ -58,7 +58,7 @@ class EditCompanySymbolControllerTest extends AbstractControllerTest {
}
/**
* {@link EditCompanySymbolController#getAll()} <br>
* {@link CompanySymbolController#getAll()} <br>
* Тест проверяет получение запроса по REST API и отправку всех записей из таблицы hazelcast Map_CompanySymbols.<br>
* Входной запрос /clearing-member-categories/ <br>
* Ответ CommonGetAllResponse <br>

8
clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/company/EditContactControllerTest.java → clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/company/ContactControllerTest.java
View file

@ -17,11 +17,11 @@ import ru.spcex.clearing.platform.messaging.domain.Consts;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static ru.spcex.clearing.test.json.JsonUtil.writeValue;
class EditContactControllerTest extends AbstractControllerTest {
class ContactControllerTest extends AbstractControllerTest {
private static final String REST_URL = "/contacts/";
/**
* {@link EditCompanySymbolController#update(Long, CompanySymbolUpdateAction)}<br>
* {@link CompanySymbolController#update(Long, CompanySymbolUpdateAction)}<br>
* Тест проверяет получение сущности {@link CompanySymbolUpdateAction} по REST API и отправку в Apache Kafka.<br>
* Входной запрос {@link CompanySymbolUpdateAction}:<br>
* {@link CompanySymbolUpdateAction#companyId} - 1000L<br>
@ -36,7 +36,7 @@ class EditContactControllerTest extends AbstractControllerTest {
}
/**
* {@link EditContactController#update(Long, ContactUpdateAction)}<br>
* {@link ContactController#update(Long, ContactUpdateAction)}<br>
* Тест проверяет получение сущности {@link ContactUpdateAction} по REST API и отправку в Apache Kafka.<br>
* Входной запрос {@link ContactUpdateAction}:<br>
* {@link ContactUpdateAction#contactType} - ContactType<br>
@ -57,7 +57,7 @@ class EditContactControllerTest extends AbstractControllerTest {
}
/**
* {@link EditContactController#getAll()} <br>
* {@link ContactController#getAll()} <br>
* Тест проверяет получение запроса по REST API и отправку всех записей из таблицы hazelcast Map_Contact.<br>
* Входной запрос /contacts/ <br>
* Ответ CommonGetAllResponse <br>

8
clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/registry/TradingClearingRegistryControllerTest.java
View file

@ -25,7 +25,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
import static ru.spcex.clearing.test.json.JsonUtil.writeValue;
class TradingClearingRegistryControllerTest extends AbstractControllerTest {
private static final String REST_URL = "/registry/trading-clearing-registry/";
private static final String REST_URL = "/trading-clearing-registries/";
/**
* {@link TradingClearingRegistryController#add(TradingClearingRegistryNewAction)}<br>
@ -87,7 +87,7 @@ class TradingClearingRegistryControllerTest extends AbstractControllerTest {
/**
* {@link TradingClearingRegistryController#delete(Long)} <br>
* Тест проверяет получение id сущности {@link Long} по REST API и отправку в Apache Kafka.<br>
* Входной запрос /registry/trading-clearing-registry/{@link Long}: - 0L<br>
* Входной запрос /trading-clearing-registries/{@link Long}: - 0L<br>
*/
@Test
void delete() throws Exception {
@ -103,7 +103,7 @@ class TradingClearingRegistryControllerTest extends AbstractControllerTest {
/**
* {@link TradingClearingRegistryController#getById(Long)} <br>
* Тест проверяет получение запроса по REST API и отправку всех записей из таблицы hazelcast Map_TradingClearingRegistry.<br>
* Входной запрос /registry/trading-clearing-registry/{@link Long}: - 0L <br>
* Входной запрос /trading-clearing-registries/{@link Long}: - 0L <br>
* Ответ BankAccountBackendGetById <br>
*/
@Test
@ -150,7 +150,7 @@ class TradingClearingRegistryControllerTest extends AbstractControllerTest {
/**
* {@link TradingClearingRegistryController#getAll()} <br>
* Тест проверяет получение запроса по REST API и отправку всех записей из таблицы hazelcast Map_BankAccount.<br>
* Входной запрос /registry/trading-clearing-registry/ <br>
* Входной запрос /trading-clearing-registries/ <br>
* Ответ CommonGetAllResponse <br>
*/
@Test

8
clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/securities/CudCouponPeriodControllerTest.java → clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/securities/CouponPeriodControllerTest.java
View file

@ -8,13 +8,13 @@ import ru.spcex.clearing.imdg.IMDGDistributedNames;
import java.math.BigDecimal;
import java.time.LocalDate;
class CudCouponPeriodControllerTest extends AbstractControllerTest {
public static final String REST_URL = "/securities/coupon-period-securities/";
class CouponPeriodControllerTest extends AbstractControllerTest {
public static final String REST_URL = "/securities/coupon-periods/";
/**
* {@link CudCouponPeriodController#getAll()} <br>
* {@link CouponPeriodController#getAll()} <br>
* Тест проверяет получение запроса по REST API.<br>
* Входной запрос /securities/coupon-period-securities/ <br>
* Входной запрос /securities/coupon-periods/ <br>
* Ответ CommonGetAllResponse <br>
*/
@Test

10
clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/securities/CudEquitySecurityControllerTest.java → clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/securities/EquitySecurityControllerTest.java
View file

@ -12,11 +12,11 @@ import ru.spcex.platform.enumeration.Status;
import java.math.BigDecimal;
class CudEquitySecurityControllerTest extends AbstractControllerTest {
class EquitySecurityControllerTest extends AbstractControllerTest {
public static final String REST_URL = "/securities/equity-securities/";
/**
* {@link CudEquitySecurityController#add(EquitySecurityNewAction)} <br>
* {@link EquitySecurityController#add(EquitySecurityNewAction)} <br>
* Тест проверяет получение сущности {@link EquitySecurityNewAction} по REST API и отправку в Apache Kafka.<br>
* Входной запрос {@link EquitySecurityNewAction}:<br>
*/
@ -39,7 +39,7 @@ class CudEquitySecurityControllerTest extends AbstractControllerTest {
}
/**
* {@link CudEquitySecurityController#update(Long, EquitySecurityUpdateAction)} <br>
* {@link EquitySecurityController#update(Long, EquitySecurityUpdateAction)} <br>
* Тест проверяет получение сущности {@link EquitySecurityUpdateAction} по REST API и отправку в Apache Kafka.<br>
* Входной запрос {@link EquitySecurityUpdateAction}:<br>
*/
@ -66,7 +66,7 @@ class CudEquitySecurityControllerTest extends AbstractControllerTest {
}
/**
* {@link CudEquitySecurityController#delete(Long)} <br>
* {@link EquitySecurityController#delete(Long)} <br>
* Тест проверяет получение id сущности {@link Long} по REST API и отправку в Apache Kafka.<br>
* Входной запрос /securities/equity-securities/{@link Long}: - 0L<br>
*/
@ -85,7 +85,7 @@ class CudEquitySecurityControllerTest extends AbstractControllerTest {
}
/**
* {@link CudEquitySecurityController#getAll()} <br>
* {@link EquitySecurityController#getAll()} <br>
* Тест проверяет получение запроса по REST API.<br>
* Входной запрос /securities/equity-securities/ <br>
* Ответ CommonGetAllResponse <br>

8
clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/securities/CudFixedIncomeCashFlowControllerTest.java → clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/securities/FixedIncomeCashFlowControllerTest.java
View file

@ -8,13 +8,13 @@ import ru.spcex.clearing.imdg.IMDGDistributedNames;
import java.math.BigDecimal;
import java.time.LocalDate;
class CudFixedIncomeCashFlowControllerTest extends AbstractControllerTest {
public static final String REST_URL = "/securities/fixed-income-cash-flow-securities/";
class FixedIncomeCashFlowControllerTest extends AbstractControllerTest {
public static final String REST_URL = "/securities/fixed-income-cash-flows/";
/**
* {@link CudFixedIncomeCashFlowController#getAll()} <br>
* {@link FixedIncomeCashFlowController#getAll()} <br>
* Тест проверяет получение запроса по REST API.<br>
* Входной запрос /securities/fixed-income-cash-flow-securities/ <br>
* Входной запрос /securities/fixed-income-cash-flows/ <br>
* Ответ CommonGetAllResponse <br>
*/
@Test

10
clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/securities/CudFixedIncomeSecurityControllerTest.java → clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/securities/FixedIncomeSecurityControllerTest.java
View file

@ -12,11 +12,11 @@ import ru.spcex.platform.enumeration.Status;
import java.math.BigDecimal;
class CudFixedIncomeSecurityControllerTest extends AbstractControllerTest {
class FixedIncomeSecurityControllerTest extends AbstractControllerTest {
public static final String REST_URL = "/securities/fixed-income-securities/";
/**
* {@link CudFixedIncomeSecurityController#add(FixedIncomeSecurityNewAction)} <br>
* {@link FixedIncomeSecurityController#add(FixedIncomeSecurityNewAction)} <br>
* Тест проверяет получение сущности {@link FixedIncomeSecurityNewAction} по REST API и отправку в Apache Kafka.<br>
* Входной запрос {@link FixedIncomeSecurityNewAction}:<br>
*/
@ -39,7 +39,7 @@ class CudFixedIncomeSecurityControllerTest extends AbstractControllerTest {
}
/**
* {@link CudFixedIncomeSecurityController#update(Long, FixedIncomeSecurityUpdateAction)} <br>
* {@link FixedIncomeSecurityController#update(Long, FixedIncomeSecurityUpdateAction)} <br>
* Тест проверяет получение сущности {@link FixedIncomeSecurityUpdateAction} по REST API и отправку в Apache Kafka.<br>
* Входной запрос {@link FixedIncomeSecurityUpdateAction}:<br>
*/
@ -66,7 +66,7 @@ class CudFixedIncomeSecurityControllerTest extends AbstractControllerTest {
}
/**
* {@link CudFixedIncomeSecurityController#delete(Long)} <br>
* {@link FixedIncomeSecurityController#delete(Long)} <br>
* Тест проверяет получение id сущности {@link Long} по REST API и отправку в Apache Kafka.<br>
* Входной запрос /securities/fixed-income-securities/{@link Long}: - 0L<br>
*/
@ -85,7 +85,7 @@ class CudFixedIncomeSecurityControllerTest extends AbstractControllerTest {
}
/**
* {@link CudFixedIncomeSecurityController#getAll()} <br>
* {@link FixedIncomeSecurityController#getAll()} <br>
* Тест проверяет получение запроса по REST API.<br>
* Входной запрос /securities/fixed-income-securities/ <br>
* Ответ CommonGetAllResponse <br>

10
clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/securities/CudMoneyMarketSecurityControllerTest.java → clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/securities/MoneyMarketSecurityControllerTest.java
View file

@ -13,11 +13,11 @@ import ru.spcex.platform.enumeration.Status;
import java.math.BigDecimal;
import java.time.LocalDate;
class CudMoneyMarketSecurityControllerTest extends AbstractControllerTest {
class MoneyMarketSecurityControllerTest extends AbstractControllerTest {
public static final String REST_URL = "/securities/money-securities/";
/**
* {@link CudMoneyMarketSecurityController#add(MoneyMarketSecurityNewAction)} <br>
* {@link MoneyMarketSecurityController#add(MoneyMarketSecurityNewAction)} <br>
* Тест проверяет получение сущности {@link MoneyMarketSecurityNewAction} по REST API и отправку в Apache Kafka.<br>
* Входной запрос {@link MoneyMarketSecurityNewAction}:<br>
*/
@ -41,7 +41,7 @@ class CudMoneyMarketSecurityControllerTest extends AbstractControllerTest {
}
/**
* {@link CudMoneyMarketSecurityController#update(Long, MoneyMarketSecurityUpdateAction)} <br>
* {@link MoneyMarketSecurityController#update(Long, MoneyMarketSecurityUpdateAction)} <br>
* Тест проверяет получение сущности {@link MoneyMarketSecurityUpdateAction} по REST API и отправку в Apache Kafka.<br>
* Входной запрос {@link MoneyMarketSecurityUpdateAction}:<br>
*/
@ -67,7 +67,7 @@ class CudMoneyMarketSecurityControllerTest extends AbstractControllerTest {
}
/**
* {@link CudMoneyMarketSecurityController#delete(Long)} <br>
* {@link MoneyMarketSecurityController#delete(Long)} <br>
* Тест проверяет получение id сущности {@link Long} по REST API и отправку в Apache Kafka.<br>
* Входной запрос /securities/money-securities/{@link Long}: - 0L<br>
*/
@ -86,7 +86,7 @@ class CudMoneyMarketSecurityControllerTest extends AbstractControllerTest {
}
/**
* {@link CudMoneyMarketSecurityController#getAll()} <br>
* {@link MoneyMarketSecurityController#getAll()} <br>
* Тест проверяет получение запроса по REST API.<br>
* Входной запрос /securities/money-securities/ <br>
* Ответ CommonGetAllResponse <br>

24
clearing-parent/db-scripts/src/main/resources/db/DATA.sql
View file

@ -416,29 +416,29 @@ INSERT INTO TASK_DICTIONARY(ID, CODE, NAME) values (37, 'SPOC', 'Запуск п
INSERT INTO TASK_DICTIONARY(ID, CODE, NAME) values (38, 'LIMM', 'Выгрузка в торговую систему остатков секции МКР') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
INSERT INTO TASK_DICTIONARY(ID, CODE, NAME) values (38, 'LIMF', 'Выгрузка в торговую систему остатков Фондовой секции') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
INSERT INTO TASK_DICTIONARY(ID, CODE, NAME) values (39, 'LIMF', 'Выгрузка в торговую систему остатков Фондовой секции') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
INSERT INTO TASK_DICTIONARY(ID, CODE, NAME) values (39, 'LIQU', 'Ликвидационная сессия по обязательтсвам участника') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
INSERT INTO TASK_DICTIONARY(ID, CODE, NAME) values (40, 'LIQU', 'Ликвидационная сессия по обязательтсвам участника') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
INSERT INTO TASK_DICTIONARY(ID, CODE, NAME) values (40, 'STRM', 'Начало торговой сессии секции МКР') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
INSERT INTO TASK_DICTIONARY(ID, CODE, NAME) values (41, 'STRM', 'Начало торговой сессии секции МКР') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
INSERT INTO TASK_DICTIONARY(ID, CODE, NAME) values (41, 'ETRM', 'Завершение торговой сессии секции МКР') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
INSERT INTO TASK_DICTIONARY(ID, CODE, NAME) values (42, 'ETRM', 'Завершение торговой сессии секции МКР') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
INSERT INTO TASK_DICTIONARY(ID, CODE, NAME) values (42, 'SIPO', 'Начало торговой сессии по первичным торгам') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
INSERT INTO TASK_DICTIONARY(ID, CODE, NAME) values (43, 'SIPO', 'Начало торговой сессии по первичным торгам') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
INSERT INTO TASK_DICTIONARY(ID, CODE, NAME) values (43, 'EIPO', 'Завершение торговой сессии по первичным торгам') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
INSERT INTO TASK_DICTIONARY(ID, CODE, NAME) values (44, 'EIPO', 'Завершение торговой сессии по первичным торгам') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
INSERT INTO TASK_DICTIONARY(ID, CODE, NAME) values (44, 'STRF', 'Начало торговой сессии по вторичным торгам') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
INSERT INTO TASK_DICTIONARY(ID, CODE, NAME) values (45, 'STRF', 'Начало торговой сессии по вторичным торгам') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
INSERT INTO TASK_DICTIONARY(ID, CODE, NAME) values (45, 'ETRF', 'Завершение торговой сессии по вторичным торгам') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
INSERT INTO TASK_DICTIONARY(ID, CODE, NAME) values (46, 'ETRF', 'Завершение торговой сессии по вторичным торгам') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
INSERT INTO TASK_DICTIONARY(ID, CODE, NAME) values (46, 'RCHK', 'Запрос на сверку активов') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
INSERT INTO TASK_DICTIONARY(ID, CODE, NAME) values (47, 'RCHK', 'Запрос на сверку активов') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
INSERT INTO TASK_DICTIONARY(ID, CODE, NAME) values (47, 'GRYT', 'Сформировать регистр на текущий день') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
INSERT INTO TASK_DICTIONARY(ID, CODE, NAME) values (48, 'GRYT', 'Сформировать регистр на текущий день') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
INSERT INTO TASK_DICTIONARY(ID, CODE, NAME) values (48, 'GRRT', 'Сформировать реестр на текущий день') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
INSERT INTO TASK_DICTIONARY(ID, CODE, NAME) values (49, 'GRRT', 'Сформировать реестр на текущий день') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
INSERT INTO TASK_DICTIONARY(ID, CODE, NAME) values (49, 'GORD', 'Формирование реестра распоряжений, направленных расчетному депозитарию') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
INSERT INTO TASK_DICTIONARY(ID, CODE, NAME) values (50, 'GORD', 'Формирование реестра распоряжений, направленных расчетному депозитарию') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
INSERT INTO TASK_STATUS_DICTIONARY(ID, CODE, NAME) values (1, 'ACTV', 'Активна') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;