treshenkov/clearing
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

backend-api мелкий рефакторинг 3

Browse source
This commit is contained in:
AKurakin 2023-05-12 10:53:23 +03:00
parent 41faf64289
commit 4968bce3a5
4 changed files with 81 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/company/CompanySymbolNewAction.java Normal file
View file

@ -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<CompanySymbolUpdateRequest> {
@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;
}
}

12
clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/company/CompanySymbolUpdateAction.java
View file

@ -14,9 +14,6 @@ public class CompanySymbolUpdateAction implements IAction<CompanySymbolUpdateReq
@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;
@ -26,7 +23,6 @@ public class CompanySymbolUpdateAction implements IAction<CompanySymbolUpdateReq
CompanySymbolUpdateRequest request = new CompanySymbolUpdateRequest();
request.setId(this.id);
request.setCompanyId(this.companyId);
request.setCompanySymbol(this.companySymbol);
request.setCompanySymbolValue(this.companySymbolValue);
return request;
}
@ -53,14 +49,6 @@ public class CompanySymbolUpdateAction implements IAction<CompanySymbolUpdateReq
this.companyId = companyId;
}
public String getCompanySymbol() {
return companySymbol;
}
public void setCompanySymbol(String companySymbol) {
this.companySymbol = companySymbol;
}
public String getCompanySymbolValue() {
return companySymbolValue;
}

34
clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/account/BankAccountControllerTest.java
View file

@ -9,8 +9,8 @@ import ru.spcex.clearing.backendapi.controller.queue.AbstractControllerTest;
import ru.spcex.clearing.backendapi.controller.request.cud.account.BankAccountNewAction;
import ru.spcex.clearing.backendapi.controller.request.cud.account.BankAccountUpdateAction;
import ru.spcex.clearing.backendapi.controller.request.cud.common.CommonDeleteAction;
import ru.spcex.clearing.backendapi.controller.response.entity.account.BankAccountBackendGetById;
import ru.spcex.clearing.backendapi.controller.response.entity.account.BankAccountBackendGetFields;
import ru.spcex.clearing.backendapi.controller.response.entity.CommonGetAllResponse;
import ru.spcex.clearing.backendapi.controller.response.entity.CommonGetByIdResponse;
import ru.spcex.clearing.backendapi.domain.actions.IAction;
import ru.spcex.clearing.backendapi.errors.ActionValidationException;
import ru.spcex.clearing.imdg.IMDGDistributedNames;
@ -18,6 +18,9 @@ import ru.spcex.clearing.platform.messaging.domain.Consts;
import ru.spcex.clearing.platform.messaging.domain.cud.account.BankAccountNewRequest;
import ru.spcex.platform.imdg.api.Imdg;
import java.util.HashMap;
import java.util.Map;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
@ -159,19 +162,20 @@ class BankAccountControllerTest extends AbstractControllerTest {
Imdg<BankAccount> 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<String, Object> 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))

3
platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/company/CompanySymbolUpdateRequest.java
View file

@ -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;
}