From 3c22c99e516f7e9de1077caeb5f4d34dd437026e Mon Sep 17 00:00:00 2001
From: etreshenkov <etreshenkov@mfd.ru>
Date: Thu, 24 Aug 2023 20:04:10 +0300
Subject: [PATCH] =?UTF-8?q?Revert=20"backend-api=20update=20meta=20=D0=BF?=
 =?UTF-8?q?=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D0=B8=D0=BB=20=D0=BF=D0=BE=D0=BB?=
 =?UTF-8?q?=D0=B5=20=D0=B2=20ChangeRefundDateActionNew.java=20=D0=B2=20?=
 =?UTF-8?q?=D1=81=D0=BE=D0=BE=D1=82=D0=B2=D0=B5=D1=82=D1=81=D1=82=D0=B2?=
 =?UTF-8?q?=D0=B8=D0=B8=20=D1=81=20=D0=BC=D0=B5=D1=82=D0=BE=D0=B9=20(fix)"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit d7f0860726833d42c1830291f0c82ba6fb177a09.
---
 .../cud/registry/ChangeRefundDateActionNew.java       |  9 +++++----
 .../cud/registry/RegistryChangeRefundDateRequest.java | 11 +++++++++++
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/registry/ChangeRefundDateActionNew.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/registry/ChangeRefundDateActionNew.java
index 62badeaa2..01c39712b 100644
--- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/registry/ChangeRefundDateActionNew.java
+++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/registry/ChangeRefundDateActionNew.java
@@ -23,10 +23,7 @@ public class ChangeRefundDateActionNew implements IAction<RegistryChangeRefundDa
 
     @JsonIgnore
     public Long groupId;
-    /**
-     * Для совместимости с метой, поле не используется.
-     */
-    @JsonProperty(required = false)
+    @JsonIgnore
     public String contract;
     @JsonProperty
     @JsonSerialize(using = LocalDateSerializer.class)
@@ -37,6 +34,7 @@ public class ChangeRefundDateActionNew implements IAction<RegistryChangeRefundDa
     public RegistryChangeRefundDateRequest toRequest() {
         var req = new RegistryChangeRefundDateRequest();
         req.setGroupId(groupId);
+        req.setContract(contract);
         req.setRefundDate(refundDate);
         return req;
     }
@@ -47,6 +45,9 @@ public class ChangeRefundDateActionNew implements IAction<RegistryChangeRefundDa
         if (groupId == null) {
             errors.add(new EnumMessage(BackEndError.ValidationError, "url parameter 'groupId'"));
         }
+        if (StringUtils.isEmpty(contract)) {
+            errors.add(new EnumMessage(BackEndError.ValidationError, "contract"));
+        }
         if (refundDate == null) {
             errors.add(new EnumMessage(BackEndError.ValidationError, "refundDate"));
         }
diff --git a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/RegistryChangeRefundDateRequest.java b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/RegistryChangeRefundDateRequest.java
index 7f959507a..6db252b0d 100644
--- a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/RegistryChangeRefundDateRequest.java
+++ b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/RegistryChangeRefundDateRequest.java
@@ -1,5 +1,6 @@
 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.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
@@ -11,6 +12,8 @@ import java.time.LocalDate;
 public class RegistryChangeRefundDateRequest {
     @JsonProperty
     private Long groupId;
+    @JsonIgnore
+    public String contract;
     @JsonProperty
     @JsonSerialize(using = LocalDateSerializer.class)
     @JsonDeserialize(using = LocalDateDeserializer.class)
@@ -24,6 +27,14 @@ public class RegistryChangeRefundDateRequest {
         this.groupId = groupId;
     }
 
+    public String getContract() {
+        return contract;
+    }
+
+    public void setContract(String contract) {
+        this.contract = contract;
+    }
+
     public LocalDate getRefundDate() {
         return refundDate;
     }