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

backend-api http://jira.mfd.msk:8088/browse/CLS-331 валидация рексестов, обновление meta для подключения валидаторов запросов

Browse source
This commit is contained in:
AKurakin 2023-05-25 18:04:26 +03:00
parent 14f7a814aa
commit 11b0afdd4a
23 changed files with 1 additions and 266 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -30,18 +30,6 @@ public class AccountNewAction implements IAction<AccountNewRequest> {
@JsonProperty
private String accountType;
@Override
public Collection<EnumMessage> validate() {
List<EnumMessage> errors = new ArrayList<>();
if (this.companyId == null)
errors.add(new EnumMessage(BackEndError.ValidationError, "companyId"));
if (!StringUtils.hasLength(this.account))
errors.add(new EnumMessage(BackEndError.ValidationError, "account"));
if (!StringUtils.hasLength(this.accountType))
errors.add(new EnumMessage(BackEndError.ValidationError, "accountType"));
return errors.isEmpty() ? Collections.emptyList() : errors;
}
@Override
public AccountNewRequest toRequest() {
var req = new AccountNewRequest();

10
clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/account/AccountUpdateAction.java
View file

@ -32,16 +32,6 @@ public class AccountUpdateAction implements IAction<AccountUpdateRequest> {
@JsonProperty
private String accountType;
@Override
public Collection<EnumMessage> validate() {
List<EnumMessage> errors = new ArrayList<>();
if (this.id == null)
errors.add(new EnumMessage(BackEndError.ValidationError, "id"));
if (!StringUtils.hasLength(this.accountType))
errors.add(new EnumMessage(BackEndError.ValidationError, "accountType"));
return errors.isEmpty() ? Collections.emptyList() : errors;
}
@Override
public AccountUpdateRequest toRequest() {
var req = new AccountUpdateRequest();

13
clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/account/BankAccountNewAction.java
View file

@ -51,31 +51,18 @@ public class BankAccountNewAction implements IAction<BankAccountNewRequest> {
@Override
public Collection<EnumMessage> validate() {
List<EnumMessage> errors = new ArrayList<>();
if (!StringUtils.hasLength(this.bankIdentificationCode))
errors.add(new EnumMessage(BackEndError.ValidationError, "bankIdentificationCode"));
if (!StringUtils.hasLength(this.bankName))
errors.add(new EnumMessage(BackEndError.ValidationError, "bankIdentificationCode"));
if ("RUB".equalsIgnoreCase(this.currency) && !StringUtils.hasLength(correspondentAccount)) {
errors.add(new EnumMessage(BackEndError.ValidationError, "correspondentAccount"));
}
if ("RUB".equalsIgnoreCase(this.currency) && !StringUtils.hasLength(correspondentAccountName)) {
errors.add(new EnumMessage(BackEndError.ValidationError, "correspondentAccountName"));
}
if (!StringUtils.hasLength(currency)) {
errors.add(new EnumMessage(BackEndError.ValidationError, "currency"));
}
if (!StringUtils.hasLength(destination)) {
errors.add(new EnumMessage(BackEndError.ValidationError, "destination"));
}
if ("RUB".equalsIgnoreCase(this.currency) && !StringUtils.hasLength(taxpayerIdentificationNumber)) {
errors.add(new EnumMessage(BackEndError.ValidationError, "taxpayerIdentificationNumber"));
}
if ("RUB".equalsIgnoreCase(this.currency) && !StringUtils.hasLength(taxRegistrationReasonCode)) {
errors.add(new EnumMessage(BackEndError.ValidationError, "taxRegistrationReasonCode"));
}
if (TextUtil.isEmpty(account)) {
errors.add(new EnumMessage(BackEndError.ValidationError, "account"));
}
return errors.isEmpty() ? Collections.emptyList() : errors;
}

5
clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/account/BankAccountUpdateAction.java
View file

@ -42,11 +42,6 @@ public class BankAccountUpdateAction implements IAction<BankAccountUpdateRequest
@ApiModelProperty(value = "Номер счета", example = "11111222223333344444")
private String account;
@Override
public Collection<EnumMessage> validate() {
return Collections.emptyList();
}
@Override
public BankAccountUpdateRequest toRequest() {
var req = new BankAccountUpdateRequest();

10
clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/account/ClientCodeNewAction.java
View file

@ -35,16 +35,6 @@ public class ClientCodeNewAction implements IAction<ClientCodeNewRequest> {
@JsonProperty
private String status;
@Override
public Collection<EnumMessage> validate() {
List<EnumMessage> errors = new ArrayList<>();
if (this.companyId == null)
errors.add(new EnumMessage(BackEndError.ValidationError, "companyId"));
if (!StringUtils.hasLength(this.code))
errors.add(new EnumMessage(BackEndError.ValidationError, "code"));
return errors.isEmpty() ? Collections.emptyList() : errors;
}
@Override
public ClientCodeNewRequest toRequest() {
var req = new ClientCodeNewRequest();

7
clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/account/ClientCodeUpdateAction.java
View file

@ -36,13 +36,6 @@ public class ClientCodeUpdateAction implements IAction<ClientCodeUpdateRequest>
@JsonProperty
private String status;
@Override
public Collection<EnumMessage> validate() {
List<EnumMessage> errors = new ArrayList<>();
if (this.id == null)
errors.add(new EnumMessage(BackEndError.ValidationError, "id"));
return errors.isEmpty() ? Collections.emptyList() : errors;
}
@Override
public ClientCodeUpdateRequest toRequest() {

10
clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/payment/PIClearingOutbondActionNew.java
View file

@ -36,16 +36,6 @@ public class PIClearingOutbondActionNew implements IAction<PIClearingOutbondActi
public Long debitLeg_accountId;
@Override
public Collection<EnumMessage> validate() {
List<EnumMessage> errors = new ArrayList<>();
if (this.senderId == null)
errors.add(new EnumMessage(BackEndError.ValidationError, "senderId"));
if (this.addresseeId == null)
errors.add(new EnumMessage(BackEndError.ValidationError, "addresseeId"));
return errors.isEmpty() ? Collections.emptyList() : errors;
}
@Override
public PIClearingOutbondActionNewRequest toRequest() {
var req = new PIClearingOutbondActionNewRequest();

11
clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/registry/RSplitDepositActionNew.java
View file

@ -37,17 +37,6 @@ public class RSplitDepositActionNew implements IAction<RegistrySplitDepositActio
@JsonProperty
public String contract;
@Override
public Collection<EnumMessage> validate() {
List<EnumMessage> errors = new ArrayList<>();
if (StringUtils.isEmpty(this.contract))
errors.add(new EnumMessage(BackEndError.ValidationError, "contract"));
if (this.refundDate == null)
errors.add(new EnumMessage(BackEndError.ValidationError, "refundDate"));
if (this.outboundAmount == null)
errors.add(new EnumMessage(BackEndError.ValidationError, "outboundAmount"));
return errors.isEmpty() ? Collections.emptyList() : errors;
}
@Override
public RegistrySplitDepositActionRequest toRequest() {

9
clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/registry/TradingClearingRegistryNewAction.java
View file

@ -27,15 +27,6 @@ public class TradingClearingRegistryNewAction implements IAction<TradingClearing
@JsonProperty
private String status;
@Override
public Collection<EnumMessage> validate() {
List<EnumMessage> errors = new ArrayList<>();
if (this.companyId == null)
errors.add(new EnumMessage(BackEndError.ValidationError, "companyId"));
if (this.moneyAccountId == null)
errors.add(new EnumMessage(BackEndError.ValidationError, "moneyAccountId"));
return errors.isEmpty() ? Collections.emptyList() : errors;
}
@Override
public TradingClearingRegistryNewRequest toRequest() {

9
clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/registry/TradingClearingRegistryUpdateAction.java
View file

@ -35,15 +35,6 @@ public class TradingClearingRegistryUpdateAction implements IAction<TradingClear
@JsonProperty
private String status;
@Override
public Collection<EnumMessage> validate() {
List<EnumMessage> errors = new ArrayList<>();
if (this.id == null)
errors.add(new EnumMessage(BackEndError.ValidationError, "id"));
if (StringUtils.isEmpty(this.status))
errors.add(new EnumMessage(BackEndError.ValidationError, "status"));
return errors.isEmpty() ? Collections.emptyList() : errors;
}
@Override
public TradingClearingRegistryUpdateRequest toRequest() {

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

@ -46,18 +46,6 @@ public class ClearingCalendarNewAction implements IAction<ClearingCalendarNewReq
return ActionType.NEW;
}
@Override
public Collection<EnumMessage> validate() {
List<EnumMessage> errors = new ArrayList<>();
if (clearingDate == null) {
errors.add(new EnumMessage(BackEndError.ValidationError,"clearingDate"));
}
if (TextUtil.isEmpty(dayStatus)) {
errors.add(new EnumMessage(BackEndError.ValidationError,"taskStatus"));
}
return errors;
}
public LocalDate getClearingDate() {
return clearingDate;
}

15
clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/schedule/ClearingCalendarUpdateAction.java
View file

@ -52,21 +52,6 @@ public class ClearingCalendarUpdateAction implements IAction<ClearingCalendarUpd
return ActionType.UPDATE;
}
@Override
public Collection<EnumMessage> validate() {
List<EnumMessage> errors = new ArrayList<>();
if (id == null) {
errors.add(new EnumMessage(BackEndError.ValidationError,"id"));
}
if (clearingDate == null) {
errors.add(new EnumMessage(BackEndError.ValidationError,"clearingDate"));
}
if (TextUtil.isEmpty(dayStatus)) {
errors.add(new EnumMessage(BackEndError.ValidationError,"taskStatus"));
}
return errors;
}
@Override
public Long getId() {
return id;

17
clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/schedule/PlannerNewAction.java
View file

@ -78,23 +78,6 @@ public class PlannerNewAction implements IAction<PlannerNewRequest> {
return ActionType.NEW;
}
@Override
public Collection<EnumMessage> validate() {
List<EnumMessage> errors = new ArrayList<>();
if (TextUtil.isEmpty(task)) {
errors.add(new EnumMessage(BackEndError.ValidationError,"task"));
}
if (taskTime == null) {
errors.add(new EnumMessage(BackEndError.ValidationError,"taskTime"));
}
if (clearingDate == null) {
errors.add(new EnumMessage(BackEndError.ValidationError,"clearingDate"));
}
if (TextUtil.isEmpty(taskStatus)) {
errors.add(new EnumMessage(BackEndError.ValidationError,"taskStatus"));
}
return errors;
}
public String getTask() {
return task;

14
clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/schedule/PlannerTemplateNewAction.java
View file

@ -62,20 +62,6 @@ public class PlannerTemplateNewAction implements IAction<PlannerTemplateNewReque
return ActionType.NEW;
}
@Override
public Collection<EnumMessage> validate() {
List<EnumMessage> errors = new ArrayList<>();
if (TextUtil.isEmpty(task)) {
errors.add(new EnumMessage(BackEndError.ValidationError,"task"));
}
if (taskTime == null) {
errors.add(new EnumMessage(BackEndError.ValidationError,"taskTime"));
}
if (TextUtil.isEmpty(taskStatus)) {
errors.add(new EnumMessage(BackEndError.ValidationError,"taskStatus"));
}
return errors;
}
public String getTask() {
return task;

17
clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/schedule/PlannerTemplateUpdateAction.java
View file

@ -67,23 +67,6 @@ public class PlannerTemplateUpdateAction implements IAction<PlannerTemplateUpdat
return ActionType.UPDATE;
}
@Override
public Collection<EnumMessage> validate() {
List<EnumMessage> errors = new ArrayList<>();
if (id == null) {
errors.add(new EnumMessage(BackEndError.ValidationError,"id"));
}
if (TextUtil.isEmpty(task)) {
errors.add(new EnumMessage(BackEndError.ValidationError,"task"));
}
if (taskTime == null) {
errors.add(new EnumMessage(BackEndError.ValidationError,"taskTime"));
}
if (TextUtil.isEmpty(taskStatus)) {
errors.add(new EnumMessage(BackEndError.ValidationError,"taskStatus"));
}
return errors;
}
@Override
public Long getId() {

21
clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/schedule/PlannerUpdateAction.java
View file

@ -84,27 +84,6 @@ public class PlannerUpdateAction implements IAction<PlannerUpdateRequest>, WithI
return ActionType.UPDATE;
}
@Override
public Collection<EnumMessage> validate() {
List<EnumMessage> errors = new ArrayList<>();
if (id == null) {
errors.add(new EnumMessage(BackEndError.ValidationError,"id"));
}
if (TextUtil.isEmpty(task)) {
errors.add(new EnumMessage(BackEndError.ValidationError,"task"));
}
if (taskTime == null) {
errors.add(new EnumMessage(BackEndError.ValidationError,"taskTime"));
}
if (clearingDate == null) {
errors.add(new EnumMessage(BackEndError.ValidationError,"clearingDate"));
}
if (TextUtil.isEmpty(taskStatus)) {
errors.add(new EnumMessage(BackEndError.ValidationError,"taskStatus"));
}
return errors;
}
@Override
public Long getId() {
return id;

14
clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/securities/EquitySecurityNewAction.java
View file

@ -51,20 +51,6 @@ public class EquitySecurityNewAction implements IAction<EquitySecurityNewRequest
@JsonProperty
public String instrumentType;
@Override
public Collection<EnumMessage> validate() {
List<EnumMessage> errors = new ArrayList<>();
if (TextUtil.isEmpty(shortName))
errors.add(new EnumMessage(BackEndError.ValidationError, "shortName"));
if (TextUtil.isEmpty(securitySymbol))
errors.add(new EnumMessage(BackEndError.ValidationError, "securitySymbol"));
if (lotSize == null)
errors.add(new EnumMessage(BackEndError.ValidationError, "lotSize"));
if (TextUtil.isEmpty(instrumentType))
errors.add(new EnumMessage(BackEndError.ValidationError, "instrumentType"));
return errors.size() > 0 ? errors : Collections.emptyList();
}
@Override
public EquitySecurityNewRequest toRequest() {
var req = new EquitySecurityNewRequest();

7
clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/securities/EquitySecurityUpdateAction.java
View file

@ -53,13 +53,6 @@ public class EquitySecurityUpdateAction implements IAction<EquitySecurityUpdateR
@JsonProperty
public String instrumentType;
@Override
public Collection<EnumMessage> validate() {
List<EnumMessage> errors = new ArrayList<>();
if (id == null)
errors.add(new EnumMessage(BackEndError.ValidationError, "id"));
return errors.size() > 0 ? errors : Collections.emptyList();
}
@Override
public EquitySecurityUpdateRequest toRequest() {

13
clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/securities/FixedIncomeSecurityNewAction.java
View file

@ -73,19 +73,6 @@ public class FixedIncomeSecurityNewAction implements IAction<FixedIncomeSecurity
@JsonProperty
public String instrumentType;
@Override
public Collection<EnumMessage> validate() {
List<EnumMessage> errors = new ArrayList<>();
if (TextUtil.isEmpty(securitySymbol))
errors.add(new EnumMessage(BackEndError.ValidationError, "securitySymbol"));
if (TextUtil.isEmpty(shortName))
errors.add(new EnumMessage(BackEndError.ValidationError, "shortName"));
if (lotSize == null)
errors.add(new EnumMessage(BackEndError.ValidationError, "lotSize"));
if (TextUtil.isEmpty(instrumentType))
errors.add(new EnumMessage(BackEndError.ValidationError, "instrumentType"));
return errors.size() > 0 ? errors : Collections.emptyList();
}
@Override
public FixedIncomeSecurityNewRequest toRequest() {

8
clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/securities/FixedIncomeSecurityUpdateAction.java
View file

@ -75,14 +75,6 @@ public class FixedIncomeSecurityUpdateAction implements IAction<FixedIncomeSecur
@JsonProperty
public String instrumentType;
@Override
public Collection<EnumMessage> validate() {
List<EnumMessage> errors = new ArrayList<>();
if (id == null)
errors.add(new EnumMessage(BackEndError.ValidationError, "id"));
return errors.size() > 0 ? errors : Collections.emptyList();
}
@Override
public FixedIncomeSecurityUpdateRequest toRequest() {
var req = new FixedIncomeSecurityUpdateRequest();

23
clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/securities/MoneyMarketSecurityNewAction.java
View file

@ -74,29 +74,6 @@ public class MoneyMarketSecurityNewAction implements IAction<MoneyMarketSecurity
@JsonProperty
public String instrumentType;
@Override
public Collection<EnumMessage> validate() {
List<EnumMessage> errors = new ArrayList<>();
if (TextUtil.isEmpty(securitySymbol))
errors.add(new EnumMessage(BackEndError.ValidationError, "securitySymbol"));
if (TextUtil.isEmpty(shortName))
errors.add(new EnumMessage(BackEndError.ValidationError, "shortName"));
if (this.lotSize == null)
errors.add(new EnumMessage(BackEndError.ValidationError, "lotSize"));
if (this.nominalValue == null)
errors.add(new EnumMessage(BackEndError.ValidationError, "nominalValue"));
if (TextUtil.isEmpty(nominalCurrency))
errors.add(new EnumMessage(BackEndError.ValidationError, "nominalCurrency"));
if (this.startDate == null)
errors.add(new EnumMessage(BackEndError.ValidationError, "startDate"));
if (this.endDate == null)
errors.add(new EnumMessage(BackEndError.ValidationError, "endDate"));
if (this.termType == null)
errors.add(new EnumMessage(BackEndError.ValidationError, "termType"));
if (TextUtil.isEmpty(instrumentType))
errors.add(new EnumMessage(BackEndError.ValidationError, "instrumentType"));
return errors.size() > 0 ? errors : Collections.emptyList();
}
@Override
public MoneyMarketSecurityNewRequest toRequest() {

8
clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/securities/MoneyMarketSecurityUpdateAction.java
View file

@ -99,14 +99,6 @@ public class MoneyMarketSecurityUpdateAction implements IAction<MoneyMarketSecur
return req;
}
@Override
public Collection<EnumMessage> validate() {
List<EnumMessage> errors = new ArrayList<>();
if (this.id == null)
errors.add(new EnumMessage(BackEndError.ValidationError, "id"));
return errors.size() > 0 ? errors : Collections.emptyList();
}
@ApiModelProperty(hidden = true)
@Override
public ActionType getActionType() {

2
clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/service/validation/ActionMetaValidation.java
View file

@ -107,7 +107,7 @@ public class ActionMetaValidation implements InitializingBean {
@Override
public String ruleName() {
return getClass().getSimpleName() + " of " + metaField.getClassName();
return getClass().getSimpleName() + " of " + metaAction.getClassName();
}
}