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

backend-api update meta поправил поле в ChangeRefundDateActionNew.java в соответствии с метой (fix)

Browse source
This commit is contained in:
AKurakin 2023-08-24 15:27:34 +03:00
parent e053ff652d
commit d7f0860726
2 changed files with 4 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -23,7 +23,10 @@ public class ChangeRefundDateActionNew implements IAction<RegistryChangeRefundDa
@JsonIgnore @JsonIgnore
public Long groupId; public Long groupId;
@JsonIgnore /**
* Для совместимости с метой, поле не используется.
*/
@JsonProperty(required = false)
public String contract; public String contract;
@JsonProperty @JsonProperty
@JsonSerialize(using = LocalDateSerializer.class) @JsonSerialize(using = LocalDateSerializer.class)
@ -34,7 +37,6 @@ public class ChangeRefundDateActionNew implements IAction<RegistryChangeRefundDa
public RegistryChangeRefundDateRequest toRequest() { public RegistryChangeRefundDateRequest toRequest() {
var req = new RegistryChangeRefundDateRequest(); var req = new RegistryChangeRefundDateRequest();
req.setGroupId(groupId); req.setGroupId(groupId);
req.setContract(contract);
req.setRefundDate(refundDate); req.setRefundDate(refundDate);
return req; return req;
} }
@ -45,9 +47,6 @@ public class ChangeRefundDateActionNew implements IAction<RegistryChangeRefundDa
if (groupId == null) { if (groupId == null) {
errors.add(new EnumMessage(BackEndError.ValidationError, "url parameter 'groupId'")); errors.add(new EnumMessage(BackEndError.ValidationError, "url parameter 'groupId'"));
} }
if (StringUtils.isEmpty(contract)) {
errors.add(new EnumMessage(BackEndError.ValidationError, "contract"));
}
if (refundDate == null) { if (refundDate == null) {
errors.add(new EnumMessage(BackEndError.ValidationError, "refundDate")); errors.add(new EnumMessage(BackEndError.ValidationError, "refundDate"));
} }

11
platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/RegistryChangeRefundDateRequest.java
View file

@ -1,6 +1,5 @@
package ru.spcex.clearing.platform.messaging.domain.cud.registry; package ru.spcex.clearing.platform.messaging.domain.cud.registry;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize;
@ -12,8 +11,6 @@ import java.time.LocalDate;
public class RegistryChangeRefundDateRequest { public class RegistryChangeRefundDateRequest {
@JsonProperty @JsonProperty
private Long groupId; private Long groupId;
@JsonIgnore
public String contract;
@JsonProperty @JsonProperty
@JsonSerialize(using = LocalDateSerializer.class) @JsonSerialize(using = LocalDateSerializer.class)
@JsonDeserialize(using = LocalDateDeserializer.class) @JsonDeserialize(using = LocalDateDeserializer.class)
@ -27,14 +24,6 @@ public class RegistryChangeRefundDateRequest {
this.groupId = groupId; this.groupId = groupId;
} }
public String getContract() {
return contract;
}
public void setContract(String contract) {
this.contract = contract;
}
public LocalDate getRefundDate() { public LocalDate getRefundDate() {
return refundDate; return refundDate;
} }