From e13968a1483af52af14a01691c3b2f7250953332 Mon Sep 17 00:00:00 2001 From: AKurakin Date: Fri, 12 May 2023 12:21:47 +0300 Subject: [PATCH 1/2] =?UTF-8?q?backend-api=20=D0=BC=D0=B5=D0=BB=D0=BA?= =?UTF-8?q?=D0=B8=D0=B9=20=D1=80=D0=B5=D1=84=D0=B0=D0=BA=D1=82=D0=BE=D1=80?= =?UTF-8?q?=D0=B8=D0=BD=D0=B3=204?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../queue/company/ContactController.java | 11 ++++ .../request/cud/company/ContactNewAction.java | 60 +++++++++++++++++++ .../request/cud/schedule/LauncherNew.java | 6 +- .../cud/schedule/PlannerNewAction.java | 33 ++++++++-- .../schedule/PlannerTemplateNewAction.java | 24 ++++++++ .../schedule/PlannerTemplateUpdateAction.java | 24 ++++++++ .../cud/schedule/PlannerUpdateAction.java | 25 ++++++-- .../queue/company/ContactControllerTest.java | 23 +++++++ .../validation/PlannerValidationConfig.java | 8 +-- .../scheduler/service/PlannerService.java | 4 +- .../scheduler/AbstractServiceTest.java | 3 + .../scheduler/service/PlannerServiceTest.java | 4 +- .../service/PlannerTemplateServiceTest.java | 4 ++ .../cud/schedule/PlannerNewRequest.java | 21 +++++-- .../schedule/PlannerTemplateNewRequest.java | 20 +++++++ .../PlannerTemplateUpdateRequest.java | 20 +++++++ .../cud/schedule/PlannerUpdateRequest.java | 20 +++++-- 17 files changed, 277 insertions(+), 33 deletions(-) create mode 100644 clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/company/ContactNewAction.java diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/company/ContactController.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/company/ContactController.java index aaeba5b88..4caf0f997 100644 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/company/ContactController.java +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/company/ContactController.java @@ -10,6 +10,7 @@ import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.*; import ru.clearing.classes.statics.data.profile.Contact; import ru.spcex.clearing.backendapi.controller.queue.AbstractQueueController; +import ru.spcex.clearing.backendapi.controller.request.cud.company.ContactNewAction; import ru.spcex.clearing.backendapi.controller.request.cud.company.ContactUpdateAction; import ru.spcex.clearing.backendapi.controller.response.BasicSpcexResponse; import ru.spcex.clearing.backendapi.controller.response.cud.CudResponse; @@ -47,6 +48,16 @@ public class ContactController extends AbstractQueueController { return processRequest(Consts.DESTINATION_CONTACT_UPDATE, contactUpdateAction); } + @ApiOperation(value = "create company contact.") + @ApiResponses(value = {@ApiResponse(code = 200, message = "OK", response = CudResponse.class), @ApiResponse(code = 400, message = "Ошибка валидации", response = BasicSpcexResponse.class)}) + @RequestMapping(method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE) + @ResponseBody + public CudResponse create( + @ApiParam(value = "Значения полей нового объекта.", required = true) + @RequestBody ContactNewAction contactNewAction) throws ExecutionException, InterruptedException { + return processRequest(Consts.DESTINATION_CONTACT_NEW, contactNewAction); + } + @ApiOperation(value = "get all Contacts.") @ApiResponses(value = {@ApiResponse(code = 200, message = "OK", response = CommonGetAllResponse.class)}) @RequestMapping(method = RequestMethod.GET) diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/company/ContactNewAction.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/company/ContactNewAction.java new file mode 100644 index 000000000..5aeba3802 --- /dev/null +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/company/ContactNewAction.java @@ -0,0 +1,60 @@ +package ru.spcex.clearing.backendapi.controller.request.cud.company; + +import com.fasterxml.jackson.annotation.JsonProperty; +import io.swagger.annotations.ApiModelProperty; +import ru.spcex.clearing.backendapi.domain.actions.IAction; +import ru.spcex.clearing.platform.messaging.domain.ActionType; +import ru.spcex.clearing.platform.messaging.domain.cud.company.ContactNewRequest; +import ru.spcex.clearing.platform.messaging.domain.cud.company.ContactUpdateRequest; + +public class ContactNewAction implements IAction { + + @ApiModelProperty(value = "Наименование компании", example = "ABCD") + @JsonProperty + private Long companyId; + @ApiModelProperty(value = "Идентификатор справочника", example = "ABCD") + @JsonProperty + private String contactType; + @ApiModelProperty(value = "Значение справочника", example = "example contact string") + @JsonProperty + private String contactValue; + + @Override + public ContactNewRequest toRequest() { + ContactNewRequest request = new ContactNewRequest(); + request.setCompanyId(this.companyId); + request.setContactType(this.contactType); + request.setContactValue(this.contactValue); + return request; + } + + @ApiModelProperty(hidden = true) + @Override + public ActionType getActionType() { + return ActionType.NEW; + } + + public Long getCompanyId() { + return companyId; + } + + public void setCompanyId(Long companyId) { + this.companyId = companyId; + } + + public String getContactType() { + return contactType; + } + + public void setContactType(String contactType) { + this.contactType = contactType; + } + + public String getContactValue() { + return contactValue; + } + + public void setContactValue(String contactValue) { + this.contactValue = contactValue; + } +} diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/schedule/LauncherNew.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/schedule/LauncherNew.java index 9977df62f..e602b6e1e 100644 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/schedule/LauncherNew.java +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/schedule/LauncherNew.java @@ -14,13 +14,13 @@ import java.util.Collections; import java.util.List; public class LauncherNew implements IAction { - @ApiModelProperty(value = "Идентификатор единоличного исполнительного органа", example = "ABCD") + @ApiModelProperty(value = "Код задачи", example = "ABCD") @JsonProperty private String task; - @ApiModelProperty(value = "Идентификатор инициатора", example = "1000") + @ApiModelProperty(value = "Наименование инициатора", example = "1000") @JsonProperty private Long companyId; - @ApiModelProperty(value = "Идентификатор инструмента", example = "1000") + @ApiModelProperty(value = "Наименование инструмента", example = "1000") @JsonProperty private Long securityId; @JsonIgnore diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/schedule/PlannerNewAction.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/schedule/PlannerNewAction.java index 6bba90535..6867b0fca 100644 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/schedule/PlannerNewAction.java +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/schedule/PlannerNewAction.java @@ -40,7 +40,11 @@ public class PlannerNewAction implements IAction { @ApiModelProperty(value = "Секция", example = "ABCD") @JsonProperty - public String market; + public String section; + + @ApiModelProperty(value = "Тип клиринговой сессии", example = "ABCD") + @JsonProperty + public String sessionType; @ApiModelProperty(value = "Статус", example = "ABCD") @JsonProperty @@ -60,7 +64,8 @@ public class PlannerNewAction implements IAction { plannerNewRequest.setTask(task); plannerNewRequest.setTaskTime(taskTime); plannerNewRequest.setClearingDate(clearingDate); - plannerNewRequest.setMarket(market); + plannerNewRequest.setSection(section); + plannerNewRequest.setSessionType(sessionType); plannerNewRequest.setTaskStatus(taskStatus); plannerNewRequest.setCompanyId(companyId); plannerNewRequest.setSecurityId(securityId); @@ -115,12 +120,28 @@ public class PlannerNewAction implements IAction { this.clearingDate = clearingDate; } - public String getMarket() { - return market; + public String getSection() { + return section; } - public void setMarket(String market) { - this.market = market; + public void setSection(String section) { + this.section = section; + } + + public String getSessionType() { + return sessionType; + } + + public void setSessionType(String sessionType) { + this.sessionType = sessionType; + } + + public Long getCompanyId() { + return companyId; + } + + public void setCompanyId(Long companyId) { + this.companyId = companyId; } public String getTaskStatus() { diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/schedule/PlannerTemplateNewAction.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/schedule/PlannerTemplateNewAction.java index 6ab3eb845..3b8ce5635 100644 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/schedule/PlannerTemplateNewAction.java +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/schedule/PlannerTemplateNewAction.java @@ -27,6 +27,12 @@ public class PlannerTemplateNewAction implements IAction, WithI @ApiModelProperty(value = "Секция", example = "ABCD") @JsonProperty - public String market; + public String section; + + @ApiModelProperty(value = "Тип клиринговой сессии", example = "ABCD") + @JsonProperty + public String sessionType; @ApiModelProperty(value = "Статус", example = "ABCD") @JsonProperty @@ -66,7 +70,8 @@ public class PlannerUpdateAction implements IAction, WithI plannerUpdateRequest.setTask(task); plannerUpdateRequest.setTaskTime(taskTime); plannerUpdateRequest.setClearingDate(clearingDate); - plannerUpdateRequest.setMarket(market); + plannerUpdateRequest.setSection(section); + plannerUpdateRequest.setSessionType(sessionType); plannerUpdateRequest.setTaskStatus(taskStatus); plannerUpdateRequest.setCompanyId(companyId); plannerUpdateRequest.setSecurityId(securityId); @@ -133,12 +138,20 @@ public class PlannerUpdateAction implements IAction, WithI this.clearingDate = clearingDate; } - public String getMarket() { - return market; + public String getSection() { + return section; } - public void setMarket(String market) { - this.market = market; + public void setSection(String section) { + this.section = section; + } + + public String getSessionType() { + return sessionType; + } + + public void setSessionType(String sessionType) { + this.sessionType = sessionType; } public String getTaskStatus() { diff --git a/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/company/ContactControllerTest.java b/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/company/ContactControllerTest.java index d8f795774..50a013101 100644 --- a/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/company/ContactControllerTest.java +++ b/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/company/ContactControllerTest.java @@ -8,6 +8,7 @@ import ru.clearing.classes.statics.data.profile.Contact; import ru.spcex.clearing.backendapi.controller.queue.AbstractControllerTest; import ru.spcex.clearing.backendapi.controller.request.cud.company.ClearingMemberCategoryNewAction; import ru.spcex.clearing.backendapi.controller.request.cud.company.CompanySymbolUpdateAction; +import ru.spcex.clearing.backendapi.controller.request.cud.company.ContactNewAction; import ru.spcex.clearing.backendapi.controller.request.cud.company.ContactUpdateAction; import ru.spcex.clearing.backendapi.domain.actions.IAction; import ru.spcex.clearing.backendapi.errors.ActionValidationException; @@ -35,6 +36,28 @@ class ContactControllerTest extends AbstractControllerTest { assertThrowsFor(getClearingMemberCategoryNewAction("", 0L)); } + + /** + * {@link ContactController#create(Long, ContactNewAction)}
+ * Тест проверяет получение сущности {@link ContactNewAction} по REST API и отправку в Apache Kafka.
+ * Входной запрос {@link ContactNewAction}:
+ * {@link ContactNewAction#contactType} - ContactType
+ * {@link ContactNewAction#contactValue} - ContactValue
+ * {@link ContactNewAction#id} - currentId
+ */ + @Test + void create() throws Exception { + //ARRANGE + ContactNewAction companySymbolNewAction = new ContactNewAction(); + companySymbolNewAction.setContactType("ContactType"); + companySymbolNewAction.setContactValue("ContactValue"); + companySymbolNewAction.setCompanyId(currentId.get()); + + //ACT and ASSERT + checkAddingByRestApi(REST_URL, companySymbolNewAction); + checkSendedMessegeFromKafka(Consts.DESTINATION_CONTACT_NEW, companySymbolNewAction); + } + /** * {@link ContactController#update(Long, ContactUpdateAction)}
* Тест проверяет получение сущности {@link ContactUpdateAction} по REST API и отправку в Apache Kafka.
diff --git a/clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/config/validation/PlannerValidationConfig.java b/clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/config/validation/PlannerValidationConfig.java index fa6e186af..0000a1b57 100644 --- a/clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/config/validation/PlannerValidationConfig.java +++ b/clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/config/validation/PlannerValidationConfig.java @@ -49,8 +49,8 @@ public class PlannerValidationConfig { TimeNotBeforeRule.instance("taskTime", PlannerNewRequest::getTaskTime, LocalDate.now().equals(plannerNewRequest.getClearingDate())), - EnumPresentRule.instance("market", - PlannerNewRequest::getMarket, + EnumPresentRule.instance("section", + PlannerNewRequest::getSection, Market.values(), false), DictionaryPresentRule.instance("taskStatus", @@ -104,8 +104,8 @@ public class PlannerValidationConfig { DateNotBeforeRule.instance("clearingDate", PlannerUpdateRequest::getClearingDate, false), - EnumPresentRule.instance("market", - PlannerUpdateRequest::getMarket, + EnumPresentRule.instance("section", + PlannerUpdateRequest::getSection, Market.values(), false), DictionaryPresentRule.instance("taskStatus", diff --git a/clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/service/PlannerService.java b/clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/service/PlannerService.java index 6376777c2..2bc905bf0 100644 --- a/clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/service/PlannerService.java +++ b/clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/service/PlannerService.java @@ -95,7 +95,7 @@ public class PlannerService extends QueueConsumer implements InitializingBean { planner.setTask(req.getTask()); planner.setTaskTime(req.getTaskTime()); planner.setClearingDate(req.getClearingDate()); - planner.setMarket(req.getMarket()); + planner.setMarket(req.getSection()); planner.setTaskStatus(req.getTaskStatus()); planner.setCompanyId(req.getCompanyId()); planner.setSecurityId(req.getSecurityId()); @@ -122,7 +122,7 @@ public class PlannerService extends QueueConsumer implements InitializingBean { planner.setTask(req.getTask()); planner.setTaskTime(req.getTaskTime()); planner.setClearingDate(req.getClearingDate()); - planner.setMarket(req.getMarket()); + planner.setMarket(req.getSection()); planner.setTaskStatus(req.getTaskStatus()); planner.setCompanyId(req.getCompanyId()); planner.setSecurityId(req.getSecurityId()); diff --git a/clearing-parent/scheduler-service/src/test/java/ru/spcex/clearing/scheduler/AbstractServiceTest.java b/clearing-parent/scheduler-service/src/test/java/ru/spcex/clearing/scheduler/AbstractServiceTest.java index 51e4f577f..2cc26df78 100644 --- a/clearing-parent/scheduler-service/src/test/java/ru/spcex/clearing/scheduler/AbstractServiceTest.java +++ b/clearing-parent/scheduler-service/src/test/java/ru/spcex/clearing/scheduler/AbstractServiceTest.java @@ -11,6 +11,7 @@ import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit.jupiter.SpringExtension; import ru.clearing.classes.statics.data.company.Company; +import ru.clearing.classes.statics.data.misc.Market; import ru.clearing.classes.statics.data.scheduler.*; import ru.clearing.classes.statics.data.security.Security; import ru.clearing.platform.dictionary.DayStatusDictionary; @@ -140,6 +141,8 @@ public abstract class AbstractServiceTest { plannerTemplate.setTask(Task.accountBlock.getKey()); plannerTemplate.setTaskTime(LocalTime.now().plusHours(1).withNano(0)); plannerTemplate.setTaskStatus(Status.Active.getKey()); + plannerTemplate.setSection("BMIC"); + plannerTemplate.setSessionType("FINL"); plannerTemplate.setCompanyId(companyId); plannerTemplate.setSecurityId(testSecurityId); return plannerTemplate; diff --git a/clearing-parent/scheduler-service/src/test/java/ru/spcex/clearing/scheduler/service/PlannerServiceTest.java b/clearing-parent/scheduler-service/src/test/java/ru/spcex/clearing/scheduler/service/PlannerServiceTest.java index e8b198b5b..eb486e8d8 100644 --- a/clearing-parent/scheduler-service/src/test/java/ru/spcex/clearing/scheduler/service/PlannerServiceTest.java +++ b/clearing-parent/scheduler-service/src/test/java/ru/spcex/clearing/scheduler/service/PlannerServiceTest.java @@ -59,7 +59,7 @@ class PlannerServiceTest extends AbstractServiceTest { plannerNewRequest.setTaskTime(planner.getTaskTime()); plannerNewRequest.setTaskStatus(planner.getTaskStatus()); plannerNewRequest.setClearingDate(planner.getClearingDate()); - plannerNewRequest.setMarket(planner.getMarket()); + plannerNewRequest.setSection(planner.getMarket()); plannerNewRequest.setCompanyId(planner.getCompanyId()); plannerNewRequest.setSecurityId(planner.getSecurityId()); @@ -94,7 +94,7 @@ class PlannerServiceTest extends AbstractServiceTest { plannerUpdateRequest.setTaskTime(planner.getTaskTime()); plannerUpdateRequest.setTaskStatus(planner.getTaskStatus()); plannerUpdateRequest.setClearingDate(planner.getClearingDate()); - plannerUpdateRequest.setMarket(planner.getMarket()); + plannerUpdateRequest.setSection(planner.getMarket()); plannerUpdateRequest.setCompanyId(planner.getCompanyId()); plannerUpdateRequest.setSecurityId(planner.getSecurityId()); diff --git a/clearing-parent/scheduler-service/src/test/java/ru/spcex/clearing/scheduler/service/PlannerTemplateServiceTest.java b/clearing-parent/scheduler-service/src/test/java/ru/spcex/clearing/scheduler/service/PlannerTemplateServiceTest.java index abed817dd..2b60f10b7 100644 --- a/clearing-parent/scheduler-service/src/test/java/ru/spcex/clearing/scheduler/service/PlannerTemplateServiceTest.java +++ b/clearing-parent/scheduler-service/src/test/java/ru/spcex/clearing/scheduler/service/PlannerTemplateServiceTest.java @@ -50,6 +50,8 @@ class PlannerTemplateServiceTest extends AbstractServiceTest { PlannerTemplateNewRequest templateNewRequest = new PlannerTemplateNewRequest(); templateNewRequest.setTask(plannerTemplate.getTask()); templateNewRequest.setTaskTime(plannerTemplate.getTaskTime()); + templateNewRequest.setSection(plannerTemplate.getSection()); + templateNewRequest.setSessionType(plannerTemplate.getSessionType()); templateNewRequest.setTaskStatus(plannerTemplate.getTaskStatus()); templateNewRequest.setCompanyId(plannerTemplate.getCompanyId()); templateNewRequest.setSecurityId(plannerTemplate.getSecurityId()); @@ -83,6 +85,8 @@ class PlannerTemplateServiceTest extends AbstractServiceTest { plannerTemplateUpdateRequest.setId(plannerTemplate.getId()); plannerTemplateUpdateRequest.setTask(plannerTemplate.getTask()); plannerTemplateUpdateRequest.setTaskTime(plannerTemplate.getTaskTime()); + plannerTemplateUpdateRequest.setSection(plannerTemplate.getSection()); + plannerTemplateUpdateRequest.setSessionType(plannerTemplate.getSessionType()); plannerTemplateUpdateRequest.setTaskStatus(plannerTemplate.getTaskStatus()); plannerTemplateUpdateRequest.setCompanyId(plannerTemplate.getCompanyId()); plannerTemplateUpdateRequest.setSecurityId(plannerTemplate.getSecurityId()); diff --git a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/schedule/PlannerNewRequest.java b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/schedule/PlannerNewRequest.java index 104469fbc..5ef3066d5 100644 --- a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/schedule/PlannerNewRequest.java +++ b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/schedule/PlannerNewRequest.java @@ -27,7 +27,10 @@ public class PlannerNewRequest { public LocalDate clearingDate; @JsonProperty - public String market; + public String section; + + @JsonProperty + public String sessionType; @JsonProperty public String taskStatus; @@ -62,12 +65,20 @@ public class PlannerNewRequest { this.clearingDate = clearingDate; } - public String getMarket() { - return market; + public String getSection() { + return section; } - public void setMarket(String market) { - this.market = market; + public void setSection(String section) { + this.section = section; + } + + public String getSessionType() { + return sessionType; + } + + public void setSessionType(String sessionType) { + this.sessionType = sessionType; } public String getTaskStatus() { diff --git a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/schedule/PlannerTemplateNewRequest.java b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/schedule/PlannerTemplateNewRequest.java index 4705b5c4d..6f1e069e5 100644 --- a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/schedule/PlannerTemplateNewRequest.java +++ b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/schedule/PlannerTemplateNewRequest.java @@ -17,6 +17,10 @@ public class PlannerTemplateNewRequest { @JsonProperty public LocalTime taskTime; @JsonProperty + public String section; + @JsonProperty + public String sessionType; + @JsonProperty public String taskStatus; @JsonProperty public Long companyId; @@ -47,6 +51,22 @@ public class PlannerTemplateNewRequest { this.taskStatus = taskStatus; } + public String getSection() { + return section; + } + + public void setSection(String section) { + this.section = section; + } + + public String getSessionType() { + return sessionType; + } + + public void setSessionType(String sessionType) { + this.sessionType = sessionType; + } + public Long getCompanyId() { return companyId; } diff --git a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/schedule/PlannerTemplateUpdateRequest.java b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/schedule/PlannerTemplateUpdateRequest.java index 0c22d6520..b56cf2664 100644 --- a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/schedule/PlannerTemplateUpdateRequest.java +++ b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/schedule/PlannerTemplateUpdateRequest.java @@ -20,6 +20,10 @@ public class PlannerTemplateUpdateRequest { @JsonProperty public LocalTime taskTime; @JsonProperty + public String section; + @JsonProperty + public String sessionType; + @JsonProperty public String taskStatus; @JsonProperty public Long companyId; @@ -50,6 +54,22 @@ public class PlannerTemplateUpdateRequest { this.taskStatus = taskStatus; } + public String getSection() { + return section; + } + + public void setSection(String section) { + this.section = section; + } + + public String getSessionType() { + return sessionType; + } + + public void setSessionType(String sessionType) { + this.sessionType = sessionType; + } + public Long getId() { return id; } diff --git a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/schedule/PlannerUpdateRequest.java b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/schedule/PlannerUpdateRequest.java index 3c186a7a5..d64df8901 100644 --- a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/schedule/PlannerUpdateRequest.java +++ b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/schedule/PlannerUpdateRequest.java @@ -26,7 +26,9 @@ public class PlannerUpdateRequest { @JsonProperty public LocalDate clearingDate; @JsonProperty - public String market; + public String section; + @JsonProperty + public String sessionType; @JsonProperty public String taskStatus; @JsonProperty @@ -66,12 +68,20 @@ public class PlannerUpdateRequest { this.clearingDate = clearingDate; } - public String getMarket() { - return market; + public String getSection() { + return section; } - public void setMarket(String market) { - this.market = market; + public void setSection(String section) { + this.section = section; + } + + public String getSessionType() { + return sessionType; + } + + public void setSessionType(String sessionType) { + this.sessionType = sessionType; } public String getTaskStatus() { From 39b476b91771c2d29eea524ccf8e993e80c17b79 Mon Sep 17 00:00:00 2001 From: AKurakin Date: Fri, 12 May 2023 12:23:25 +0300 Subject: [PATCH 2/2] =?UTF-8?q?http://jira.mfd.msk:8088/browse/CLS-293=20m?= =?UTF-8?q?eta=204:=20=D0=B4=D0=BE=D0=B4=D0=B5=D0=BB=D0=B0=D0=BB=20=D0=BE?= =?UTF-8?q?=D0=BF=D0=B5=D1=87=D0=B0=D1=82=D0=BA=D1=83=20=D0=B2=20TradingCl?= =?UTF-8?q?earingRegistry?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/TradingClearingRegistryService.java | 4 ++-- .../service/TradingClearingRegistryServiceTest.java | 2 +- .../TradingClearingRegistryBackendGetById.java | 2 +- .../TradingClearingRegistryBackendGetFields.java | 10 +++++----- .../TradingClearingRegistryControllerTest.java | 6 +++--- .../data/registry/TradingClearingRegistry.java | 11 +++++------ .../clearing/company/service/ClientCodeService.java | 2 +- .../company/service/ClientCodeServiceTest.java | 2 +- .../TradingClearingRegistryHistoryMapStore.java | 4 ++-- .../TradingClearingRegistryMapStore.java | 6 +++--- 10 files changed, 24 insertions(+), 25 deletions(-) diff --git a/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/TradingClearingRegistryService.java b/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/TradingClearingRegistryService.java index 479db94a1..2d2ab5c80 100644 --- a/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/TradingClearingRegistryService.java +++ b/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/TradingClearingRegistryService.java @@ -130,7 +130,7 @@ public class TradingClearingRegistryService extends QueueConsumer implements Ini tradingClearingRegistry.setId(id); tradingClearingRegistry.setCompanyId(req.getCompanyId()); tradingClearingRegistry.setMoneyAccountId(req.getMoneyAccountId()); - tradingClearingRegistry.setDepoAaccountId(req.getDepoAccountId()); + tradingClearingRegistry.setDepoAccountId(req.getDepoAccountId()); DepoAccount depoAccount = req.getDepoAccountId() != null ? depoAccountImdg.getSingleObjectByID(req.getDepoAccountId()) : null; Account depoAccountMain = depoAccount != null ? accountImdg.getSingleObjectByID(depoAccount.getAccountId()) : null; @@ -277,7 +277,7 @@ public class TradingClearingRegistryService extends QueueConsumer implements Ini tradingClearingRegistry.setId(id); tradingClearingRegistry.setCompanyId(req.getCompanyId()); tradingClearingRegistry.setMoneyAccountId(req.getMoneyAccountId()); - tradingClearingRegistry.setDepoAaccountId(req.getDepoAccountId()); + tradingClearingRegistry.setDepoAccountId(req.getDepoAccountId()); DepoAccount depoAccount = req.getDepoAccountId() != null ? depoAccountImdg.getSingleObjectByID(req.getDepoAccountId()) : null; ClearingAccount clearingAccount = clearingAccountImdg.getSingleObjectByID(req.getMoneyAccountId()); diff --git a/clearing-parent/account-service/src/test/java/ru/spcex/clearing/account/service/TradingClearingRegistryServiceTest.java b/clearing-parent/account-service/src/test/java/ru/spcex/clearing/account/service/TradingClearingRegistryServiceTest.java index 8dfb3495e..2961ebb7f 100644 --- a/clearing-parent/account-service/src/test/java/ru/spcex/clearing/account/service/TradingClearingRegistryServiceTest.java +++ b/clearing-parent/account-service/src/test/java/ru/spcex/clearing/account/service/TradingClearingRegistryServiceTest.java @@ -228,7 +228,7 @@ class TradingClearingRegistryServiceTest { predictableTradingClearingRegistry.setCompanyId(companyId); predictableTradingClearingRegistry.setCode("0077CDAT"); predictableTradingClearingRegistry.setMoneyAccountId(clearingAccountId); - predictableTradingClearingRegistry.setDepoAaccountId(depoAccountId); + predictableTradingClearingRegistry.setDepoAccountId(depoAccountId); predictableTradingClearingRegistry.setTradingClearingRegistryType("DAT"); predictableTradingClearingRegistry.setTradingClearingRegistryPurpose(TradingClearingRegistryPurpose.C.getKey()); predictableTradingClearingRegistry.setStatus(ServiceStatus.Active.getKey()); diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/registry/TradingClearingRegistryBackendGetById.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/registry/TradingClearingRegistryBackendGetById.java index 27feabab4..d734efa4e 100644 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/registry/TradingClearingRegistryBackendGetById.java +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/registry/TradingClearingRegistryBackendGetById.java @@ -34,7 +34,7 @@ public class TradingClearingRegistryBackendGetById extends BasicSpcexResponse { payload.setCompanyId(tcr.getCompanyId()); payload.setCode(tcr.getCode()); payload.setMoneyAccountId(tcr.getMoneyAccountId()); - payload.setDepoAaccountId(tcr.getDepoAaccountId()); + payload.setDepoAccountId(tcr.getDepoAccountId()); payload.setTradingClearingRegistryType(tcr.getTradingClearingRegistryType()); payload.setTradingClearingRegistryLevel(tcr.getTradingClearingRegistryLevel()); payload.setTradingClearingRegistryPurpose(tcr.getTradingClearingRegistryPurpose()); diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/registry/TradingClearingRegistryBackendGetFields.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/registry/TradingClearingRegistryBackendGetFields.java index d4822d731..b83d03219 100644 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/registry/TradingClearingRegistryBackendGetFields.java +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/registry/TradingClearingRegistryBackendGetFields.java @@ -22,7 +22,7 @@ public class TradingClearingRegistryBackendGetFields { private Long moneyAccountId; @JsonProperty @ApiModelProperty(value = "Идентификатор депозитарного счета", example = "") - private Long depoAaccountId; + private Long depoAccountId; @JsonProperty @ApiModelProperty(value = "Код торгово-клирингового регистра", example = "") private String tradingClearingRegistryType; @@ -77,12 +77,12 @@ public class TradingClearingRegistryBackendGetFields { this.moneyAccountId = moneyAccountId; } - public Long getDepoAaccountId() { - return depoAaccountId; + public Long getDepoAccountId() { + return depoAccountId; } - public void setDepoAaccountId(Long depoAaccountId) { - this.depoAaccountId = depoAaccountId; + public void setDepoAccountId(Long depoAaccountId) { + this.depoAccountId = depoAaccountId; } public String getTradingClearingRegistryType() { 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 be9151b6b..959b5ae21 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 @@ -113,7 +113,7 @@ class TradingClearingRegistryControllerTest extends AbstractControllerTest { existTradingClearingRegistry.setCompanyId(365L); existTradingClearingRegistry.setCode("99999"); existTradingClearingRegistry.setMoneyAccountId(404L); - existTradingClearingRegistry.setDepoAaccountId(512L); + existTradingClearingRegistry.setDepoAccountId(512L); existTradingClearingRegistry.setTradingClearingRegistryType("RUB"); existTradingClearingRegistry.setTradingClearingRegistryLevel("OOO ROGA I KOPITA"); existTradingClearingRegistry.setTradingClearingRegistryPurpose("848484848484"); @@ -129,7 +129,7 @@ class TradingClearingRegistryControllerTest extends AbstractControllerTest { payload.setCompanyId(existTradingClearingRegistry.getCompanyId()); payload.setCode(existTradingClearingRegistry.getCode()); payload.setMoneyAccountId(existTradingClearingRegistry.getMoneyAccountId()); - payload.setDepoAaccountId(existTradingClearingRegistry.getDepoAaccountId()); + payload.setDepoAccountId(existTradingClearingRegistry.getDepoAccountId()); payload.setTradingClearingRegistryType(existTradingClearingRegistry.getTradingClearingRegistryType()); payload.setTradingClearingRegistryLevel(existTradingClearingRegistry.getTradingClearingRegistryLevel()); payload.setTradingClearingRegistryPurpose(existTradingClearingRegistry.getTradingClearingRegistryPurpose()); @@ -160,7 +160,7 @@ class TradingClearingRegistryControllerTest extends AbstractControllerTest { existTradingClearingRegistry.setCompanyId(365L); existTradingClearingRegistry.setCode("99999"); existTradingClearingRegistry.setMoneyAccountId(404L); - existTradingClearingRegistry.setDepoAaccountId(512L); + existTradingClearingRegistry.setDepoAccountId(512L); existTradingClearingRegistry.setTradingClearingRegistryType("RUB"); existTradingClearingRegistry.setTradingClearingRegistryLevel("OOO ROGA I KOPITA"); existTradingClearingRegistry.setTradingClearingRegistryPurpose("848484848484"); diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/registry/TradingClearingRegistry.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/registry/TradingClearingRegistry.java index 91bb3ca6f..41ebf3d12 100644 --- a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/registry/TradingClearingRegistry.java +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/registry/TradingClearingRegistry.java @@ -15,8 +15,7 @@ public class TradingClearingRegistry extends BusinessObject { private Long companyId; private String code; private Long moneyAccountId; - // todo fix typo - private Long depoAaccountId; + private Long depoAccountId; private String tradingClearingRegistryType; private String tradingClearingRegistryLevel; private String tradingClearingRegistryPurpose; @@ -46,12 +45,12 @@ public class TradingClearingRegistry extends BusinessObject { this.moneyAccountId = value; } - public Long getDepoAaccountId() { - return depoAaccountId; + public Long getDepoAccountId() { + return depoAccountId; } - public void setDepoAaccountId(Long value) { - this.depoAaccountId = value; + public void setDepoAccountId(Long value) { + this.depoAccountId = value; } public String getTradingClearingRegistryType() { diff --git a/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/ClientCodeService.java b/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/ClientCodeService.java index 183e6da6d..030a8195d 100644 --- a/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/ClientCodeService.java +++ b/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/ClientCodeService.java @@ -260,7 +260,7 @@ public class ClientCodeService extends QueueConsumer implements InitializingBean query.put("moneyAccountId", moneyAccountId); query.put("tradingClearingRegistryType", TradingClearingRegistryType.Client_B.getKey()); if (depoAccountId != null) { - query.put("depoAaccountId", depoAccountId); // todo опечатка в поле класса, см. meta.xml! + query.put("depoAccountId", depoAccountId); } TradingClearingRegistry result = tradingClearingRegistryMap.getSingleObjectByFieldValues(query); log.trace("TradingClearingRegistry by: {}; {}found", query, result == null ? "not " : ""); diff --git a/clearing-parent/company-service/src/test/java/ru/spcex/clearing/company/service/ClientCodeServiceTest.java b/clearing-parent/company-service/src/test/java/ru/spcex/clearing/company/service/ClientCodeServiceTest.java index 2599a0ec9..d4246da92 100644 --- a/clearing-parent/company-service/src/test/java/ru/spcex/clearing/company/service/ClientCodeServiceTest.java +++ b/clearing-parent/company-service/src/test/java/ru/spcex/clearing/company/service/ClientCodeServiceTest.java @@ -114,7 +114,7 @@ class ClientCodeServiceTest { registry1.setCompanyId(COMPANY_ID); registry1.setCode("code-120-101"); registry1.setMoneyAccountId(131L); - registry1.setDepoAaccountId(132L); + registry1.setDepoAccountId(132L); registry1.setTradingClearingRegistryType(TradingClearingRegistryType.Client_B.getKey()); registry1.setStatus(WorkflowStatus.Active.getKey()); tcrImdg.insert(registry1); diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/TradingClearingRegistryHistoryMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/TradingClearingRegistryHistoryMapStore.java index 5f9abd315..990116db2 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/TradingClearingRegistryHistoryMapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/TradingClearingRegistryHistoryMapStore.java @@ -28,7 +28,7 @@ public class TradingClearingRegistryHistoryMapStore extends TemplateEventMapStor @Override public String[] getFields() { return new String[]{"ID","EVENT_TIME", "EVENT_USER_ID", "EVENT_TYPE", - "TRADING_CLEARING_REGISTRY_ID", "COMPANY_ID", "CODE", "MONEY_ACCOUNT_ID", "DEPO_AACCOUNT_ID", "TRADING_CLEARING_REGISTRY_TYPE", "TRADING_CLEARING_REGISTRY_LEVEL", "TRADING_CLEARING_REGISTRY_PURPOSE", "STATUS", "CREATED_AT", "UPDATED_AT" + "TRADING_CLEARING_REGISTRY_ID", "COMPANY_ID", "CODE", "MONEY_ACCOUNT_ID", "DEPO_ACCOUNT_ID", "TRADING_CLEARING_REGISTRY_TYPE", "TRADING_CLEARING_REGISTRY_LEVEL", "TRADING_CLEARING_REGISTRY_PURPOSE", "STATUS", "CREATED_AT", "UPDATED_AT" }; } @@ -45,7 +45,7 @@ public class TradingClearingRegistryHistoryMapStore extends TemplateEventMapStor object.getCompanyId(), object.getCode(), object.getMoneyAccountId(), - object.getDepoAaccountId(), + object.getDepoAccountId(), object.getTradingClearingRegistryType(), object.getTradingClearingRegistryLevel(), object.getTradingClearingRegistryPurpose(), diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/TradingClearingRegistryMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/TradingClearingRegistryMapStore.java index ad13a8dc1..9c19249f5 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/TradingClearingRegistryMapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/TradingClearingRegistryMapStore.java @@ -30,7 +30,7 @@ public class TradingClearingRegistryMapStore extends TemplateMapStore