diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/register/GatewayResultController.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/register/GatewayResultController.java new file mode 100644 index 000000000..107458ea1 --- /dev/null +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/register/GatewayResultController.java @@ -0,0 +1,41 @@ +package ru.spcex.clearing.backendapi.controller.queue.register; + +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiResponse; +import io.swagger.annotations.ApiResponses; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.*; +import ru.clearing.classes.statics.data.register.GatewayResult; +import ru.spcex.clearing.backendapi.controller.queue.AbstractQueueController; +import ru.spcex.clearing.backendapi.controller.response.entity.CommonGetAllResponse; +import ru.spcex.clearing.backendapi.service.IOperator; +import ru.spcex.clearing.backendapi.service.IStateLoader; +import ru.spcex.clearing.imdg.IMDGDistributedNames; + +import java.util.Collection; +import java.util.Map; + +@Controller +@RequestMapping("/gateway-result") +public class GatewayResultController extends AbstractQueueController { + private final IStateLoader stateLoader; + + @Autowired + public GatewayResultController(IOperator operator, IStateLoader stateLoader) { + super(operator); + this.stateLoader = stateLoader; + } + + @ApiOperation(value = "get all pair-sdf.") + @ApiResponses(value = {@ApiResponse(code = 200, message = "OK", response = CommonGetAllResponse.class)}) + @RequestMapping(method = RequestMethod.GET) + @ResponseBody + public CommonGetAllResponse getAll() { + Collection> all = stateLoader.getAllMetaTransform(IMDGDistributedNames.Map_GatewayResult, GatewayResult.class); + CommonGetAllResponse response = new CommonGetAllResponse(); + response.fromEntity(all); + return response; + } + +} diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/register/PairSdfController.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/register/PairSdfController.java new file mode 100644 index 000000000..61fc9b0b8 --- /dev/null +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/register/PairSdfController.java @@ -0,0 +1,41 @@ +package ru.spcex.clearing.backendapi.controller.queue.register; + +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiResponse; +import io.swagger.annotations.ApiResponses; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.*; +import ru.clearing.classes.statics.data.register.PairSdf; +import ru.spcex.clearing.backendapi.controller.queue.AbstractQueueController; +import ru.spcex.clearing.backendapi.controller.response.entity.CommonGetAllResponse; +import ru.spcex.clearing.backendapi.service.IOperator; +import ru.spcex.clearing.backendapi.service.IStateLoader; +import ru.spcex.clearing.imdg.IMDGDistributedNames; + +import java.util.Collection; +import java.util.Map; + +@Controller +@RequestMapping("/pair-sdf") +public class PairSdfController extends AbstractQueueController { + private final IStateLoader stateLoader; + + @Autowired + public PairSdfController(IOperator operator, IStateLoader stateLoader) { + super(operator); + this.stateLoader = stateLoader; + } + + @ApiOperation(value = "get all pair-sdf.") + @ApiResponses(value = {@ApiResponse(code = 200, message = "OK", response = CommonGetAllResponse.class)}) + @RequestMapping(method = RequestMethod.GET) + @ResponseBody + public CommonGetAllResponse getAll() { + Collection> all = stateLoader.getAllMetaTransform(IMDGDistributedNames.Map_PairSdf, PairSdf.class); + CommonGetAllResponse response = new CommonGetAllResponse(); + response.fromEntity(all); + return response; + } + +} 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 49135b618..9a98de0ba 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 @@ -127,6 +127,8 @@ import static ru.spcex.clearing.test.json.MatcherFactoryWithJson.usingIgnoringFi MoneyBalanceRegisterController.class, ContractRegisterController.class, ReportRegisterController.class, + GatewayResultController.class, + PairSdfController.class, //registry RegistryController.class, TradingClearingRegistryController.class, diff --git a/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/register/GatewayResultControllerTest.java b/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/register/GatewayResultControllerTest.java new file mode 100644 index 000000000..8838744b6 --- /dev/null +++ b/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/register/GatewayResultControllerTest.java @@ -0,0 +1,35 @@ +package ru.spcex.clearing.backendapi.controller.queue.register; + +import org.junit.jupiter.api.Test; +import ru.clearing.classes.statics.data.register.GatewayResult; +import ru.spcex.clearing.backendapi.controller.queue.AbstractControllerTest; +import ru.spcex.clearing.imdg.IMDGDistributedNames; + +import java.time.Instant; + +class GatewayResultControllerTest extends AbstractControllerTest { + private static final String REST_URL = "/gateway-result/"; + + /** + * {@link GatewayResultController#getAll()}
+ * Тест проверяет получение запроса по REST API.
+ * Входной запрос /gateway-result/
+ * Ответ CommonGetAllResponse
+ */ + @Test + void getAll() throws Exception { + //ARRANGE + GatewayResult gatewayResult = new GatewayResult(); + gatewayResult.setId(currentId.get()); + gatewayResult.setGatewayResultStatus("NACK"); + gatewayResult.setResult("TEST"); + gatewayResult.setRequest("req"); + gatewayResult.setNameRequest("nameReq"); + gatewayResult.setRequestId("req-id"); + gatewayResult.setCreated(Instant.now()); + + //ACT and ASSERT + checkGettingAllFromRestApi(IMDGDistributedNames.Map_GatewayResult, gatewayResult, REST_URL); + } + +} \ No newline at end of file diff --git a/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/register/PairSdfControllerTest.java b/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/register/PairSdfControllerTest.java new file mode 100644 index 000000000..8fb23ed8c --- /dev/null +++ b/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/register/PairSdfControllerTest.java @@ -0,0 +1,35 @@ +package ru.spcex.clearing.backendapi.controller.queue.register; + +import org.junit.jupiter.api.Test; +import ru.clearing.classes.statics.data.register.PairSdf; +import ru.spcex.clearing.backendapi.controller.queue.AbstractControllerTest; +import ru.spcex.clearing.imdg.IMDGDistributedNames; + +import java.time.Instant; + +class PairSdfControllerTest extends AbstractControllerTest { + private static final String REST_URL = "/pair-sdf/"; + + /** + * {@link PairSdfController#getAll()}
+ * Тест проверяет получение запроса по REST API.
+ * Входной запрос /pair-sdf/
+ * Ответ CommonGetAllResponse
+ */ + @Test + void getAll() throws Exception { + //ARRANGE + PairSdf pairSdf = new PairSdf(); + pairSdf.setId(currentId.get()); + pairSdf.setCreated(Instant.now()); + pairSdf.setId(3L); + pairSdf.setInSDf("in-sdf"); + pairSdf.setInSDfId("in-id"); + pairSdf.setOutSDf("out-sdf"); + pairSdf.setOutSDfId("out-id"); + + //ACT and ASSERT + checkGettingAllFromRestApi(IMDGDistributedNames.Map_PairSdf, pairSdf, REST_URL); + } + +} \ No newline at end of file