From 56f027c3138ff44a47b478641006885ce094b321 Mon Sep 17 00:00:00 2001 From: ialbert Date: Tue, 6 Dec 2022 16:43:54 +0300 Subject: [PATCH] http://jira.mfd.msk:8088/browse/CLS-75 added companyInfo GET method --- .../company/EditCompanyInfoController.java | 42 +++++++++++++------ .../response/entity/CommonGetAllResponse.java | 4 +- 2 files changed, 32 insertions(+), 14 deletions(-) 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/EditCompanyInfoController.java index 6148f1bb9..e2fce230c 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/EditCompanyInfoController.java @@ -8,25 +8,38 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.MediaType; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.*; +import ru.clearing.classes.statics.data.company.Company; import ru.spcex.clearing.backendapi.controller.queue.AbstractQueueController; import ru.spcex.clearing.backendapi.controller.request.cud.company.CompanyInfoUpdateAction; import ru.spcex.clearing.backendapi.controller.response.BasicSpcexResponse; 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; +import ru.spcex.platform.imdg.api.ImdgProvider; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Map; import java.util.concurrent.ExecutionException; @Controller @RequestMapping("/company-infos") public class EditCompanyInfoController extends AbstractQueueController { private final IStateLoader stateLoader; + private final Imdg companyImdg; + private final GetResponseFactory responseFactory; @Autowired - public EditCompanyInfoController(IOperator operator, IStateLoader stateLoader) { + public EditCompanyInfoController(IOperator operator, IStateLoader stateLoader, ImdgProvider imdgProvider, GetResponseFactory responseFactory) { super(operator); this.stateLoader = stateLoader; + this.companyImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_Company, Company.class); + this.responseFactory = responseFactory; } @ApiOperation(value = "update company info.") @@ -42,15 +55,20 @@ public class EditCompanyInfoController extends AbstractQueueController { return processRequest(Consts.DESTINATION_COMPANY_INFO_UPDATE, companyInfoUpdateAction); } - //todo -// @ApiOperation(value = "get all CompanyInfo's.") -// @ApiResponses(value = {@ApiResponse(code = 200, message = "OK", response = CompanyBackendInfoGetAll.class)}) -// @RequestMapping(method = RequestMethod.GET) -// @ResponseBody -// public CompanyBackendInfoGetAll getAll() { -// Collection all = stateLoader.getAll(IMDGDistributedNames.Map_Company, CompanyInfo.class); -// CompanyBackendGetAll response = new CompanyBackendGetAll(); -// response.fromEntity(all); -// return response; -// } + @ApiOperation(value = "get all CompanyInfo's.") + @ApiResponses(value = {@ApiResponse(code = 200, message = "OK", response = CommonGetAllResponse.class)}) + @RequestMapping(method = RequestMethod.GET) + @ResponseBody + public CommonGetAllResponse getAll() { + Collection> all = new ArrayList<>(); + Collection companies = companyImdg.getAllValues(); + for (Company company : companies) { + if (company.getProfile() != null) { // пока возвращает "пустой" CompanyInfo если его нет для Company + all.add(responseFactory.responseFromObject(company.getProfile())); + } + } + CommonGetAllResponse response = new CommonGetAllResponse(); + response.fromEntity(all); + return response; + } } diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/CommonGetAllResponse.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/CommonGetAllResponse.java index 7848ac5cf..3082f5066 100644 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/CommonGetAllResponse.java +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/CommonGetAllResponse.java @@ -39,8 +39,8 @@ public class CommonGetAllResponse extends BasicSpcexResponse { public void fromEntity(Collection> anyObjectFields) { var payload = this.getPayload(); - for (Map moneyMarketSecurity : anyObjectFields) { - payload.getItems().add(moneyMarketSecurity); + for (Map allObjFields : anyObjectFields) { + payload.getItems().add(allObjFields); } } } \ No newline at end of file