From 4968bce3a50e0bee9190aa9d2d89b788f0a64772 Mon Sep 17 00:00:00 2001 From: AKurakin Date: Fri, 12 May 2023 10:53:23 +0300 Subject: [PATCH] =?UTF-8?q?backend-api=20=D0=BC=D0=B5=D0=BB=D0=BA=D0=B8?= =?UTF-8?q?=D0=B9=20=D1=80=D0=B5=D1=84=D0=B0=D0=BA=D1=82=D0=BE=D1=80=D0=B8?= =?UTF-8?q?=D0=BD=D0=B3=203?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cud/company/CompanySymbolNewAction.java | 59 +++++++++++++++++++ .../company/CompanySymbolUpdateAction.java | 12 ---- .../account/BankAccountControllerTest.java | 34 ++++++----- .../company/CompanySymbolUpdateRequest.java | 3 + 4 files changed, 81 insertions(+), 27 deletions(-) create mode 100644 clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/company/CompanySymbolNewAction.java diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/company/CompanySymbolNewAction.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/company/CompanySymbolNewAction.java new file mode 100644 index 000000000..0ed4dcd1a --- /dev/null +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/company/CompanySymbolNewAction.java @@ -0,0 +1,59 @@ +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.CompanySymbolUpdateRequest; + +public class CompanySymbolNewAction implements IAction { + @ApiModelProperty(value = "Идентификатор Компании", example = "1234") + @JsonProperty + private Long companyId; + @ApiModelProperty(value = "Идентификатор справочника", example = "ABCD") + @JsonProperty + private String companySymbol; + @ApiModelProperty(value = "Значение справочника", example = "Company description example") + @JsonProperty + private String companySymbolValue; + + @Override + public CompanySymbolUpdateRequest toRequest() { + CompanySymbolUpdateRequest request = new CompanySymbolUpdateRequest(); + request.setCompanyId(this.companyId); + request.setCompanySymbol(this.companySymbol); + request.setCompanySymbolValue(this.companySymbolValue); + 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 getCompanySymbol() { + return companySymbol; + } + + public void setCompanySymbol(String companySymbol) { + this.companySymbol = companySymbol; + } + + public String getCompanySymbolValue() { + return companySymbolValue; + } + + public void setCompanySymbolValue(String companySymbolValue) { + this.companySymbolValue = companySymbolValue; + } +} diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/company/CompanySymbolUpdateAction.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/company/CompanySymbolUpdateAction.java index e9be0f1f9..77ba70c75 100644 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/company/CompanySymbolUpdateAction.java +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/company/CompanySymbolUpdateAction.java @@ -14,9 +14,6 @@ public class CompanySymbolUpdateAction implements IAction inDocumentJournalImdg = hazelcastServiceTest.getImdg(IMDGDistributedNames.Map_BankAccount, BankAccount.class); inDocumentJournalImdg.insert(existBankAccount); - - BankAccountBackendGetById expected = new BankAccountBackendGetById(); - BankAccountBackendGetFields payload = new BankAccountBackendGetFields(); - payload.setBankName("ooo tinkoff"); - payload.setBankIdentificationCode("99999"); - payload.setCorrespondentAccount("9294189285498598598"); - payload.setCorrespondentAccountName("BIK OF TINKOFF"); - payload.setCurrency("RUB"); - payload.setDestination("OOO ROGA I KOPITA"); - payload.setTaxpayerIdentificationNumber("848484848484"); - payload.setTaxRegistrationReasonCode("886886"); - payload.setId(existBankAccount.getId()); - expected.setPayload(payload); + + CommonGetByIdResponse expected = new CommonGetByIdResponse(); + //expected.getPayload(). + Map payload = new HashMap<>(); + payload.put("bankName", "ooo tinkoff"); + payload.put("bankIdentificationCode", "99999"); + payload.put("correspondentAccount", "9294189285498598598"); + payload.put("correspondentAccountName", "BIK OF TINKOFF"); + payload.put("currency", "RUB"); + payload.put("destination", "OOO ROGA I KOPITA"); + payload.put("taxpayerIdentificationNumber", "848484848484"); + payload.put("taxRegistrationReasonCode", "886886"); + payload.put("id", existBankAccount.getId()); + expected.fromEntity(payload); //ACT perform(MockMvcRequestBuilders.get(REST_URL + existBankAccount.getId()) .contentType(MediaType.APPLICATION_JSON)) diff --git a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/company/CompanySymbolUpdateRequest.java b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/company/CompanySymbolUpdateRequest.java index 111e69afa..fb637060e 100644 --- a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/company/CompanySymbolUpdateRequest.java +++ b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/company/CompanySymbolUpdateRequest.java @@ -9,6 +9,7 @@ public class CompanySymbolUpdateRequest { @JsonProperty private Long companyId; @JsonProperty + @Deprecated // todo новая мета без этого поля private String companySymbol; @JsonProperty private String companySymbolValue; @@ -29,10 +30,12 @@ public class CompanySymbolUpdateRequest { this.companyId = companyId; } + @Deprecated public String getCompanySymbol() { return companySymbol; } + @Deprecated public void setCompanySymbol(String companySymbol) { this.companySymbol = companySymbol; }