From 9d1bb95169181d8886b27d8d3b040f5aac90ebff Mon Sep 17 00:00:00 2001 From: AKurakin Date: Fri, 28 Apr 2023 15:01:17 +0300 Subject: [PATCH 1/5] =?UTF-8?q?http://jira.mfd.msk:8088/browse/CLS-270=20h?= =?UTF-8?q?ttp://jira.mfd.msk:8088/browse/CLS-273=20api=20url=20=D0=BF?= =?UTF-8?q?=D1=80=D0=BE=D0=BF=D0=B8=D1=81=D0=B0=D0=BD=D1=8B=20=D0=B2=20?= =?UTF-8?q?=D0=BC=D0=B5=D1=82=D0=B5=20destination?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/queue/account/ClientCodeController.java | 2 +- .../queue/registry/TradingClearingRegistryController.java | 2 +- .../queue/account/ClientCodeControllerTest.java | 6 +++--- .../registry/TradingClearingRegistryControllerTest.java | 8 ++++---- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/account/ClientCodeController.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/account/ClientCodeController.java index 06cb48671..59bffe21a 100644 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/account/ClientCodeController.java +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/account/ClientCodeController.java @@ -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; diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/registry/TradingClearingRegistryController.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/registry/TradingClearingRegistryController.java index a609c42ba..0d984ff0f 100644 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/registry/TradingClearingRegistryController.java +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/registry/TradingClearingRegistryController.java @@ -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; diff --git a/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/account/ClientCodeControllerTest.java b/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/account/ClientCodeControllerTest.java index 32a66547e..9aac531c5 100644 --- a/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/account/ClientCodeControllerTest.java +++ b/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/account/ClientCodeControllerTest.java @@ -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)}
@@ -98,7 +98,7 @@ class ClientCodeControllerTest extends AbstractControllerTest { /** * {@link ClientCodeController#delete(Long)}
* Тест проверяет получение id сущности {@link Long} по REST API и отправку в Apache Kafka.
- * Входной запрос /accounting/client-codes/{@link Long}: - 0L
+ * Входной запрос /client-codes/{@link Long}: - 0L
*/ @Test void delete() throws Exception { @@ -114,7 +114,7 @@ class ClientCodeControllerTest extends AbstractControllerTest { /** * {@link ClientCodeController#getAll()}
* Тест проверяет получение запроса по REST API и отправку всех записей из таблицы hazelcast Map_ClientCode.
- * Входной запрос /accounting/client-codes/
+ * Входной запрос /client-codes/
* Ответ CommonGetAllResponse
*/ @Test diff --git a/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/registry/TradingClearingRegistryControllerTest.java b/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/registry/TradingClearingRegistryControllerTest.java index d09377db7..c45ddd2ed 100644 --- a/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/registry/TradingClearingRegistryControllerTest.java +++ b/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/registry/TradingClearingRegistryControllerTest.java @@ -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)}
@@ -87,7 +87,7 @@ class TradingClearingRegistryControllerTest extends AbstractControllerTest { /** * {@link TradingClearingRegistryController#delete(Long)}
* Тест проверяет получение id сущности {@link Long} по REST API и отправку в Apache Kafka.
- * Входной запрос /registry/trading-clearing-registry/{@link Long}: - 0L
+ * Входной запрос /trading-clearing-registries/{@link Long}: - 0L
*/ @Test void delete() throws Exception { @@ -103,7 +103,7 @@ class TradingClearingRegistryControllerTest extends AbstractControllerTest { /** * {@link TradingClearingRegistryController#getById(Long)}
* Тест проверяет получение запроса по REST API и отправку всех записей из таблицы hazelcast Map_TradingClearingRegistry.
- * Входной запрос /registry/trading-clearing-registry/{@link Long}: - 0L
+ * Входной запрос /trading-clearing-registries/{@link Long}: - 0L
* Ответ BankAccountBackendGetById
*/ @Test @@ -150,7 +150,7 @@ class TradingClearingRegistryControllerTest extends AbstractControllerTest { /** * {@link TradingClearingRegistryController#getAll()}
* Тест проверяет получение запроса по REST API и отправку всех записей из таблицы hazelcast Map_BankAccount.
- * Входной запрос /registry/trading-clearing-registry/
+ * Входной запрос /trading-clearing-registries/
* Ответ CommonGetAllResponse
*/ @Test From fb7ff4711a08b40869de94fafc69638c4dfc66f3 Mon Sep 17 00:00:00 2001 From: AKurakin Date: Fri, 28 Apr 2023 15:11:55 +0300 Subject: [PATCH 2/5] =?UTF-8?q?http://jira.mfd.msk:8088/browse/CLS-257=20?= =?UTF-8?q?=D0=BF=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D0=B8=D0=BB=20=D0=BD=D0=B0?= =?UTF-8?q?=D0=B7=D0=B2=D0=B0=D0=BD=D0=B8=D1=8F=20=D0=BA=D0=BE=D0=BD=D1=82?= =?UTF-8?q?=D1=80=D0=BE=D0=BB=D0=BB=D0=B5=D1=80=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...riodController.java => CouponPeriodController.java} | 6 +++--- ...tyController.java => EquitySecurityController.java} | 4 ++-- ...troller.java => FixedIncomeCashFlowController.java} | 6 +++--- ...troller.java => FixedIncomeSecurityController.java} | 4 ++-- ...troller.java => MoneyMarketSecurityController.java} | 4 ++-- .../controller/queue/AbstractControllerTest.java | 10 +++++----- ...rollerTest.java => CouponPeriodControllerTest.java} | 8 ++++---- ...llerTest.java => EquitySecurityControllerTest.java} | 10 +++++----- ...est.java => FixedIncomeCashFlowControllerTest.java} | 8 ++++---- ...est.java => FixedIncomeSecurityControllerTest.java} | 10 +++++----- ...est.java => MoneyMarketSecurityControllerTest.java} | 10 +++++----- 11 files changed, 40 insertions(+), 40 deletions(-) rename clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/securities/{CudCouponPeriodController.java => CouponPeriodController.java} (88%) rename clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/securities/{CudEquitySecurityController.java => EquitySecurityController.java} (96%) rename clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/securities/{CudFixedIncomeCashFlowController.java => FixedIncomeCashFlowController.java} (87%) rename clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/securities/{CudFixedIncomeSecurityController.java => FixedIncomeSecurityController.java} (96%) rename clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/securities/{CudMoneyMarketSecurityController.java => MoneyMarketSecurityController.java} (96%) rename clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/securities/{CudCouponPeriodControllerTest.java => CouponPeriodControllerTest.java} (85%) rename clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/securities/{CudEquitySecurityControllerTest.java => EquitySecurityControllerTest.java} (93%) rename clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/securities/{CudFixedIncomeCashFlowControllerTest.java => FixedIncomeCashFlowControllerTest.java} (88%) rename clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/securities/{CudFixedIncomeSecurityControllerTest.java => FixedIncomeSecurityControllerTest.java} (93%) rename clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/securities/{CudMoneyMarketSecurityControllerTest.java => MoneyMarketSecurityControllerTest.java} (93%) diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/securities/CudCouponPeriodController.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/securities/CouponPeriodController.java similarity index 88% rename from clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/securities/CudCouponPeriodController.java rename to clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/securities/CouponPeriodController.java index cc6de3e0c..65c856a84 100644 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/securities/CudCouponPeriodController.java +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/securities/CouponPeriodController.java @@ -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; } diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/securities/CudEquitySecurityController.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/securities/EquitySecurityController.java similarity index 96% rename from clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/securities/CudEquitySecurityController.java rename to clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/securities/EquitySecurityController.java index 39579df45..6a6542568 100644 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/securities/CudEquitySecurityController.java +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/securities/EquitySecurityController.java @@ -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; } diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/securities/CudFixedIncomeCashFlowController.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/securities/FixedIncomeCashFlowController.java similarity index 87% rename from clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/securities/CudFixedIncomeCashFlowController.java rename to clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/securities/FixedIncomeCashFlowController.java index 2a088010c..00cb58b98 100644 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/securities/CudFixedIncomeCashFlowController.java +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/securities/FixedIncomeCashFlowController.java @@ -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; } diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/securities/CudFixedIncomeSecurityController.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/securities/FixedIncomeSecurityController.java similarity index 96% rename from clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/securities/CudFixedIncomeSecurityController.java rename to clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/securities/FixedIncomeSecurityController.java index 7bb82f98c..527554d73 100644 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/securities/CudFixedIncomeSecurityController.java +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/securities/FixedIncomeSecurityController.java @@ -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; } diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/securities/CudMoneyMarketSecurityController.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/securities/MoneyMarketSecurityController.java similarity index 96% rename from clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/securities/CudMoneyMarketSecurityController.java rename to clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/securities/MoneyMarketSecurityController.java index d1709ade9..98c321858 100644 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/securities/CudMoneyMarketSecurityController.java +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/securities/MoneyMarketSecurityController.java @@ -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; } diff --git a/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/AbstractControllerTest.java b/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/AbstractControllerTest.java index 4f345a0a4..92d491451 100644 --- a/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/AbstractControllerTest.java +++ b/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/AbstractControllerTest.java @@ -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 diff --git a/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/securities/CudCouponPeriodControllerTest.java b/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/securities/CouponPeriodControllerTest.java similarity index 85% rename from clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/securities/CudCouponPeriodControllerTest.java rename to clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/securities/CouponPeriodControllerTest.java index 4f21fada5..d9f307c5b 100644 --- a/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/securities/CudCouponPeriodControllerTest.java +++ b/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/securities/CouponPeriodControllerTest.java @@ -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()}
+ * {@link CouponPeriodController#getAll()}
* Тест проверяет получение запроса по REST API.
- * Входной запрос /securities/coupon-period-securities/
+ * Входной запрос /securities/coupon-periods/
* Ответ CommonGetAllResponse
*/ @Test diff --git a/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/securities/CudEquitySecurityControllerTest.java b/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/securities/EquitySecurityControllerTest.java similarity index 93% rename from clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/securities/CudEquitySecurityControllerTest.java rename to clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/securities/EquitySecurityControllerTest.java index c6ab1760d..8c9c8e52f 100644 --- a/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/securities/CudEquitySecurityControllerTest.java +++ b/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/securities/EquitySecurityControllerTest.java @@ -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)}
+ * {@link EquitySecurityController#add(EquitySecurityNewAction)}
* Тест проверяет получение сущности {@link EquitySecurityNewAction} по REST API и отправку в Apache Kafka.
* Входной запрос {@link EquitySecurityNewAction}:
*/ @@ -39,7 +39,7 @@ class CudEquitySecurityControllerTest extends AbstractControllerTest { } /** - * {@link CudEquitySecurityController#update(Long, EquitySecurityUpdateAction)}
+ * {@link EquitySecurityController#update(Long, EquitySecurityUpdateAction)}
* Тест проверяет получение сущности {@link EquitySecurityUpdateAction} по REST API и отправку в Apache Kafka.
* Входной запрос {@link EquitySecurityUpdateAction}:
*/ @@ -66,7 +66,7 @@ class CudEquitySecurityControllerTest extends AbstractControllerTest { } /** - * {@link CudEquitySecurityController#delete(Long)}
+ * {@link EquitySecurityController#delete(Long)}
* Тест проверяет получение id сущности {@link Long} по REST API и отправку в Apache Kafka.
* Входной запрос /securities/equity-securities/{@link Long}: - 0L
*/ @@ -85,7 +85,7 @@ class CudEquitySecurityControllerTest extends AbstractControllerTest { } /** - * {@link CudEquitySecurityController#getAll()}
+ * {@link EquitySecurityController#getAll()}
* Тест проверяет получение запроса по REST API.
* Входной запрос /securities/equity-securities/
* Ответ CommonGetAllResponse
diff --git a/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/securities/CudFixedIncomeCashFlowControllerTest.java b/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/securities/FixedIncomeCashFlowControllerTest.java similarity index 88% rename from clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/securities/CudFixedIncomeCashFlowControllerTest.java rename to clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/securities/FixedIncomeCashFlowControllerTest.java index 4cab2c42f..31b58b92a 100644 --- a/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/securities/CudFixedIncomeCashFlowControllerTest.java +++ b/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/securities/FixedIncomeCashFlowControllerTest.java @@ -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()}
+ * {@link FixedIncomeCashFlowController#getAll()}
* Тест проверяет получение запроса по REST API.
- * Входной запрос /securities/fixed-income-cash-flow-securities/
+ * Входной запрос /securities/fixed-income-cash-flows/
* Ответ CommonGetAllResponse
*/ @Test diff --git a/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/securities/CudFixedIncomeSecurityControllerTest.java b/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/securities/FixedIncomeSecurityControllerTest.java similarity index 93% rename from clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/securities/CudFixedIncomeSecurityControllerTest.java rename to clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/securities/FixedIncomeSecurityControllerTest.java index c60a9b989..c03d5819d 100644 --- a/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/securities/CudFixedIncomeSecurityControllerTest.java +++ b/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/securities/FixedIncomeSecurityControllerTest.java @@ -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)}
+ * {@link FixedIncomeSecurityController#add(FixedIncomeSecurityNewAction)}
* Тест проверяет получение сущности {@link FixedIncomeSecurityNewAction} по REST API и отправку в Apache Kafka.
* Входной запрос {@link FixedIncomeSecurityNewAction}:
*/ @@ -39,7 +39,7 @@ class CudFixedIncomeSecurityControllerTest extends AbstractControllerTest { } /** - * {@link CudFixedIncomeSecurityController#update(Long, FixedIncomeSecurityUpdateAction)}
+ * {@link FixedIncomeSecurityController#update(Long, FixedIncomeSecurityUpdateAction)}
* Тест проверяет получение сущности {@link FixedIncomeSecurityUpdateAction} по REST API и отправку в Apache Kafka.
* Входной запрос {@link FixedIncomeSecurityUpdateAction}:
*/ @@ -66,7 +66,7 @@ class CudFixedIncomeSecurityControllerTest extends AbstractControllerTest { } /** - * {@link CudFixedIncomeSecurityController#delete(Long)}
+ * {@link FixedIncomeSecurityController#delete(Long)}
* Тест проверяет получение id сущности {@link Long} по REST API и отправку в Apache Kafka.
* Входной запрос /securities/fixed-income-securities/{@link Long}: - 0L
*/ @@ -85,7 +85,7 @@ class CudFixedIncomeSecurityControllerTest extends AbstractControllerTest { } /** - * {@link CudFixedIncomeSecurityController#getAll()}
+ * {@link FixedIncomeSecurityController#getAll()}
* Тест проверяет получение запроса по REST API.
* Входной запрос /securities/fixed-income-securities/
* Ответ CommonGetAllResponse
diff --git a/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/securities/CudMoneyMarketSecurityControllerTest.java b/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/securities/MoneyMarketSecurityControllerTest.java similarity index 93% rename from clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/securities/CudMoneyMarketSecurityControllerTest.java rename to clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/securities/MoneyMarketSecurityControllerTest.java index 14414ea13..0aff07b3c 100644 --- a/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/securities/CudMoneyMarketSecurityControllerTest.java +++ b/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/securities/MoneyMarketSecurityControllerTest.java @@ -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)}
+ * {@link MoneyMarketSecurityController#add(MoneyMarketSecurityNewAction)}
* Тест проверяет получение сущности {@link MoneyMarketSecurityNewAction} по REST API и отправку в Apache Kafka.
* Входной запрос {@link MoneyMarketSecurityNewAction}:
*/ @@ -41,7 +41,7 @@ class CudMoneyMarketSecurityControllerTest extends AbstractControllerTest { } /** - * {@link CudMoneyMarketSecurityController#update(Long, MoneyMarketSecurityUpdateAction)}
+ * {@link MoneyMarketSecurityController#update(Long, MoneyMarketSecurityUpdateAction)}
* Тест проверяет получение сущности {@link MoneyMarketSecurityUpdateAction} по REST API и отправку в Apache Kafka.
* Входной запрос {@link MoneyMarketSecurityUpdateAction}:
*/ @@ -67,7 +67,7 @@ class CudMoneyMarketSecurityControllerTest extends AbstractControllerTest { } /** - * {@link CudMoneyMarketSecurityController#delete(Long)}
+ * {@link MoneyMarketSecurityController#delete(Long)}
* Тест проверяет получение id сущности {@link Long} по REST API и отправку в Apache Kafka.
* Входной запрос /securities/money-securities/{@link Long}: - 0L
*/ @@ -86,7 +86,7 @@ class CudMoneyMarketSecurityControllerTest extends AbstractControllerTest { } /** - * {@link CudMoneyMarketSecurityController#getAll()}
+ * {@link MoneyMarketSecurityController#getAll()}
* Тест проверяет получение запроса по REST API.
* Входной запрос /securities/money-securities/
* Ответ CommonGetAllResponse
From f542cc0441dfdf3f27e5e26d4e6b09f2d3c69fff Mon Sep 17 00:00:00 2001 From: AKurakin Date: Fri, 28 Apr 2023 15:43:35 +0300 Subject: [PATCH 3/5] =?UTF-8?q?http://jira.mfd.msk:8088/browse/CLS-256=20?= =?UTF-8?q?=D0=BD=D0=B5=D0=B1=D0=BE=D0=BB=D1=8C=D1=88=D0=B0=D1=8F=20=D1=87?= =?UTF-8?q?=D0=B8=D1=81=D1=82=D0=BA=D0=B0=20=D0=BA=D0=BE=D0=B4=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../queue/AbstractQueueController.java | 1 + ... => ClearingMemberCategoryController.java} | 4 +- ...roller.java => CompanyInfoController.java} | 7 +--- ...ller.java => CompanySymbolController.java} | 4 +- ...Controller.java => ContactController.java} | 4 +- .../queue/AbstractControllerTest.java | 10 ++--- ...ClearingMemberCategoryControllerTest.java} | 12 +++--- ...erTest.java => CompanyControllerTest.java} | 39 +++++++++++++++++-- ...st.java => CompanyInfoControllerTest.java} | 8 ++-- ....java => CompanySymbolControllerTest.java} | 8 ++-- ...erTest.java => ContactControllerTest.java} | 8 ++-- 11 files changed, 68 insertions(+), 37 deletions(-) rename clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/company/{EditClearingMemberCategoryController.java => ClearingMemberCategoryController.java} (96%) rename clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/company/{EditCompanyInfoController.java => CompanyInfoController.java} (90%) rename clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/company/{EditCompanySymbolController.java => CompanySymbolController.java} (94%) rename clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/company/{EditContactController.java => ContactController.java} (95%) rename clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/company/{EditClearingMemberCategoryControllerTest.java => ClearingMemberCategoryControllerTest.java} (92%) rename clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/company/{DeleteCompanyControllerTest.java => CompanyControllerTest.java} (52%) rename clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/company/{EditCompanyInfoControllerTest.java => CompanyInfoControllerTest.java} (96%) rename clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/company/{EditCompanySymbolControllerTest.java => CompanySymbolControllerTest.java} (93%) rename clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/company/{EditContactControllerTest.java => ContactControllerTest.java} (94%) diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/AbstractQueueController.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/AbstractQueueController.java index 15d7d0b4e..a1c437ad4 100644 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/AbstractQueueController.java +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/AbstractQueueController.java @@ -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 { diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/company/EditClearingMemberCategoryController.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/company/ClearingMemberCategoryController.java similarity index 96% rename from clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/company/EditClearingMemberCategoryController.java rename to clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/company/ClearingMemberCategoryController.java index dc8b1bd1b..82cc85002 100644 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/company/EditClearingMemberCategoryController.java +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/company/ClearingMemberCategoryController.java @@ -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; } diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/company/EditCompanyInfoController.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/company/CompanyInfoController.java similarity index 90% rename from clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/company/EditCompanyInfoController.java rename to clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/company/CompanyInfoController.java index b922132ed..6ac88b427 100644 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/company/EditCompanyInfoController.java +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/company/CompanyInfoController.java @@ -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 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; } diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/company/EditCompanySymbolController.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/company/CompanySymbolController.java similarity index 94% rename from clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/company/EditCompanySymbolController.java rename to clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/company/CompanySymbolController.java index 235599627..b14070c55 100644 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/company/EditCompanySymbolController.java +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/company/CompanySymbolController.java @@ -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; } diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/company/EditContactController.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/company/ContactController.java similarity index 95% rename from clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/company/EditContactController.java rename to clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/company/ContactController.java index 7851b556d..aaeba5b88 100644 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/company/EditContactController.java +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/company/ContactController.java @@ -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; } diff --git a/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/AbstractControllerTest.java b/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/AbstractControllerTest.java index 92d491451..5a1b80c25 100644 --- a/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/AbstractControllerTest.java +++ b/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/AbstractControllerTest.java @@ -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 @@ -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 BASE_REQUEST_MATCHER = usingIgnoringFieldsComparatorForClass(BaseRequest.class,"userId"); diff --git a/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/company/EditClearingMemberCategoryControllerTest.java b/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/company/ClearingMemberCategoryControllerTest.java similarity index 92% rename from clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/company/EditClearingMemberCategoryControllerTest.java rename to clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/company/ClearingMemberCategoryControllerTest.java index 116f90605..8ea3d4ba6 100644 --- a/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/company/EditClearingMemberCategoryControllerTest.java +++ b/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/company/ClearingMemberCategoryControllerTest.java @@ -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)}
+ * {@link ClearingMemberCategoryController#add(ClearingMemberCategoryNewAction)}
* Тест проверяет получение сущности {@link ClearingMemberCategoryNewAction} по REST API и отправку в Apache Kafka.
* Входной запрос {@link ClearingMemberCategoryNewAction}:
* {@link ClearingMemberCategoryNewAction#clearingMemberCategory} - "Category"
@@ -40,7 +40,7 @@ class EditClearingMemberCategoryControllerTest extends AbstractControllerTest { } /** - * {@link EditClearingMemberCategoryController#add(ClearingMemberCategoryNewAction)}
+ * {@link ClearingMemberCategoryController#add(ClearingMemberCategoryNewAction)}
* Тест проверяет получение сущности {@link ClearingMemberCategoryNewAction} по REST API и отправку в Apache Kafka.
* Входной запрос {@link ClearingMemberCategoryNewAction}:
* {@link ClearingMemberCategoryNewAction#clearingMemberCategory} - "Category"
@@ -53,7 +53,7 @@ class EditClearingMemberCategoryControllerTest extends AbstractControllerTest { } /** - * {@link EditClearingMemberCategoryController#update(Long, ClearingMemberCategoryUpdateAction)}
+ * {@link ClearingMemberCategoryController#update(Long, ClearingMemberCategoryUpdateAction)}
* Тест проверяет получение сущности {@link ClearingMemberCategoryUpdateAction} по REST API и отправку в Apache Kafka.
* Входной запрос {@link ClearingMemberCategoryUpdateAction}:
* {@link ClearingMemberCategoryUpdateAction#clearingMemberCategory} - Category
@@ -72,7 +72,7 @@ class EditClearingMemberCategoryControllerTest extends AbstractControllerTest { } /** - * {@link EditClearingMemberCategoryController#delete(Long)}
+ * {@link ClearingMemberCategoryController#delete(Long)}
* Тест проверяет получение id сущности {@link Long} по REST API и отправку в Apache Kafka.
* Входной запрос /clearing-member-categories/{@link Long}: - currentId
*/ @@ -88,7 +88,7 @@ class EditClearingMemberCategoryControllerTest extends AbstractControllerTest { } /** - * {@link EditClearingMemberCategoryController#getAll()}
+ * {@link ClearingMemberCategoryController#getAll()}
* Тест проверяет получение запроса по REST API и отправку всех записей из таблицы hazelcast Map_ClearingMemberCategory.
* Входной запрос /clearing-member-categories/
* Ответ CommonGetAllResponse
diff --git a/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/company/DeleteCompanyControllerTest.java b/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/company/CompanyControllerTest.java similarity index 52% rename from clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/company/DeleteCompanyControllerTest.java rename to clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/company/CompanyControllerTest.java index 125b18ed2..57bf69d00 100644 --- a/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/company/DeleteCompanyControllerTest.java +++ b/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/company/CompanyControllerTest.java @@ -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)}
+ * {@link CompanyController#delete(Long)}
* Тест проверяет получение id сущности {@link Long} по REST API и отправку в Apache Kafka.
* Входной запрос /companies/{@link Long}: - 0L
*/ @@ -27,7 +31,7 @@ class DeleteCompanyControllerTest extends AbstractControllerTest { } /** - * {@link DeleteCompanyController#getAll()}
+ * {@link CompanyController#getAll()}
* Тест проверяет получение запроса по REST API и отправку всех записей из таблицы hazelcast Map_Company.
* Входной запрос /companies
*/ @@ -45,4 +49,33 @@ class DeleteCompanyControllerTest extends AbstractControllerTest { //ACT and ASSERT checkGettingAllFromRestApi(IMDGDistributedNames.Map_Company, existCompany, REST_URL); } + + /** + * {@link CompanyController#add(CompanyNewAction)}
+ * Тест проверяет создание сущности {@link CompanyNewAction} по REST API и отправку в Apache Kafka.
+ * Входной запрос {@link CompanyNewAction}:
+ * {@link CompanyNewAction#fullName "Full name"
+ * {@link CompanyNewAction#companySymbol "CLRC"
+ * {@link CompanyNewAction#companySymbolValue "NAME1"
+ * {@link CompanyNewAction#workflowStatus "ACTV"
+ */ + @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; + } + } \ No newline at end of file diff --git a/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/company/EditCompanyInfoControllerTest.java b/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/company/CompanyInfoControllerTest.java similarity index 96% rename from clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/company/EditCompanyInfoControllerTest.java rename to clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/company/CompanyInfoControllerTest.java index 3e9622306..4afd10abf 100644 --- a/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/company/EditCompanyInfoControllerTest.java +++ b/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/company/CompanyInfoControllerTest.java @@ -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)}
+ * {@link CompanyInfoController#update(Long, CompanyInfoUpdateAction)}
* Тест проверяет получение сущности {@link CompanyInfoUpdateAction} по REST API и отправку в Apache Kafka.
* Входной запрос {@link CompanyInfoUpdateAction}:
* {@link CompanyInfoUpdateAction#workflowStatus} - ACTV
@@ -54,7 +54,7 @@ class EditCompanyInfoControllerTest extends AbstractControllerTest { } /** - * {@link EditCompanyInfoController#update(Long, CompanyInfoUpdateAction)}
+ * {@link CompanyInfoController#update(Long, CompanyInfoUpdateAction)}
* Тест проверяет получение сущности {@link CompanyInfoUpdateAction} по REST API и отправку в Apache Kafka.
* Входной запрос {@link CompanyInfoUpdateAction}:
* {@link CompanyInfoUpdateAction#workflowStatus} - ACTV
@@ -95,7 +95,7 @@ class EditCompanyInfoControllerTest extends AbstractControllerTest { } /** - * {@link EditCompanyInfoController#getAll()}
+ * {@link CompanyInfoController#getAll()}
* Тест проверяет получение запроса по REST API и отправку всех записей из таблицы hazelcast Map_Company.
* Входной запрос /company-infos/
* Ответ CommonGetAllResponse
diff --git a/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/company/EditCompanySymbolControllerTest.java b/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/company/CompanySymbolControllerTest.java similarity index 93% rename from clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/company/EditCompanySymbolControllerTest.java rename to clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/company/CompanySymbolControllerTest.java index 8aed79ead..33fd8d787 100644 --- a/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/company/EditCompanySymbolControllerTest.java +++ b/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/company/CompanySymbolControllerTest.java @@ -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)}
+ * {@link CompanySymbolController#update(Long, CompanySymbolUpdateAction)}
* Тест проверяет получение сущности {@link CompanySymbolUpdateAction} по REST API и отправку в Apache Kafka.
* Входной запрос {@link CompanySymbolUpdateAction}:
* {@link CompanySymbolUpdateAction#companyId} - 1000L
@@ -35,7 +35,7 @@ class EditCompanySymbolControllerTest extends AbstractControllerTest { } /** - * {@link EditCompanySymbolController#update(Long, CompanySymbolUpdateAction)}
+ * {@link CompanySymbolController#update(Long, CompanySymbolUpdateAction)}
* Тест проверяет получение сущности {@link CompanySymbolUpdateAction} по REST API и отправку в Apache Kafka.
* Входной запрос {@link CompanySymbolUpdateAction}:
* {@link CompanySymbolUpdateAction#companyId} - 1000L
@@ -58,7 +58,7 @@ class EditCompanySymbolControllerTest extends AbstractControllerTest { } /** - * {@link EditCompanySymbolController#getAll()}
+ * {@link CompanySymbolController#getAll()}
* Тест проверяет получение запроса по REST API и отправку всех записей из таблицы hazelcast Map_CompanySymbols.
* Входной запрос /clearing-member-categories/
* Ответ CommonGetAllResponse
diff --git a/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/company/EditContactControllerTest.java b/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/company/ContactControllerTest.java similarity index 94% rename from clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/company/EditContactControllerTest.java rename to clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/company/ContactControllerTest.java index b445858aa..d8f795774 100644 --- a/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/company/EditContactControllerTest.java +++ b/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/company/ContactControllerTest.java @@ -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)}
+ * {@link CompanySymbolController#update(Long, CompanySymbolUpdateAction)}
* Тест проверяет получение сущности {@link CompanySymbolUpdateAction} по REST API и отправку в Apache Kafka.
* Входной запрос {@link CompanySymbolUpdateAction}:
* {@link CompanySymbolUpdateAction#companyId} - 1000L
@@ -36,7 +36,7 @@ class EditContactControllerTest extends AbstractControllerTest { } /** - * {@link EditContactController#update(Long, ContactUpdateAction)}
+ * {@link ContactController#update(Long, ContactUpdateAction)}
* Тест проверяет получение сущности {@link ContactUpdateAction} по REST API и отправку в Apache Kafka.
* Входной запрос {@link ContactUpdateAction}:
* {@link ContactUpdateAction#contactType} - ContactType
@@ -57,7 +57,7 @@ class EditContactControllerTest extends AbstractControllerTest { } /** - * {@link EditContactController#getAll()}
+ * {@link ContactController#getAll()}
* Тест проверяет получение запроса по REST API и отправку всех записей из таблицы hazelcast Map_Contact.
* Входной запрос /contacts/
* Ответ CommonGetAllResponse
From 0d35f74b1c4b15006f99c9e162610e8ab8c66eac Mon Sep 17 00:00:00 2001 From: AKurakin Date: Fri, 28 Apr 2023 19:54:33 +0300 Subject: [PATCH 4/5] http://jira.mfd.msk:8088/browse/CLS-288 fix API endpoint --- .../InformationAccountController.java | 4 ++-- .../InformationAccountControllerTest.java | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) rename clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/{securities => account}/InformationAccountController.java (92%) rename clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/{securities => account}/InformationAccountControllerTest.java (77%) diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/securities/InformationAccountController.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/account/InformationAccountController.java similarity index 92% rename from clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/securities/InformationAccountController.java rename to clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/account/InformationAccountController.java index f1cafb851..a9d221ad3 100644 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/securities/InformationAccountController.java +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/account/InformationAccountController.java @@ -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; diff --git a/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/securities/InformationAccountControllerTest.java b/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/account/InformationAccountControllerTest.java similarity index 77% rename from clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/securities/InformationAccountControllerTest.java rename to clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/account/InformationAccountControllerTest.java index 00bbd1b10..4131c8f96 100644 --- a/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/securities/InformationAccountControllerTest.java +++ b/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/account/InformationAccountControllerTest.java @@ -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()}
* Тест проверяет получение запроса по REST API.
- * Входной запрос /securities/information-accounts/
+ * Входной запрос /accounting/information-account/
* Ответ CommonGetAllResponse
*/ @Test From 74238e1f23c9a9ca7ecfec31b5017499e8f8c932 Mon Sep 17 00:00:00 2001 From: AKurakin Date: Tue, 2 May 2023 14:17:17 +0300 Subject: [PATCH 5/5] =?UTF-8?q?http://jira.mfd.msk:8088/browse/CLS-267=20?= =?UTF-8?q?=D0=BF=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D0=B8=D0=BB=20=D0=B7=D0=BD?= =?UTF-8?q?=D0=B0=D1=87=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=B2=20TASK=5FDICTIONA?= =?UTF-8?q?RY?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/meta/data.xml | 26 +++++++++---------- .../db-scripts/src/main/resources/db/DATA.sql | 24 ++++++++--------- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/clearing-parent/backend-api/src/main/resources/meta/data.xml b/clearing-parent/backend-api/src/main/resources/meta/data.xml index 26636a991..f3efd0b8d 100644 --- a/clearing-parent/backend-api/src/main/resources/meta/data.xml +++ b/clearing-parent/backend-api/src/main/resources/meta/data.xml @@ -208,19 +208,19 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/clearing-parent/db-scripts/src/main/resources/db/DATA.sql b/clearing-parent/db-scripts/src/main/resources/db/DATA.sql index 8303e3f10..20a64eaaa 100644 --- a/clearing-parent/db-scripts/src/main/resources/db/DATA.sql +++ b/clearing-parent/db-scripts/src/main/resources/db/DATA.sql @@ -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;