From 1c9de78f5e09f50a6509272d21b2eb80c6f5de76 Mon Sep 17 00:00:00 2001
From: AKurakin <akurakin@mfd.ru>
Date: Wed, 27 Sep 2023 15:13:22 +0300
Subject: [PATCH] =?UTF-8?q?=20http://jira.mfd.msk:8088/browse/CLS-500=20?=
 =?UTF-8?q?=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=D0=B0=20=D0=BE=D1=88?=
 =?UTF-8?q?=D0=B8=D0=B1=D0=BA=D0=B0=205426?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 clearing-parent/backend-api/src/main/resources/meta/data.xml    | 2 +-
 .../src/main/java/ru/spcex/clearing/error/ClearingError.java    | 1 +
 .../clearing/service/validation/RefundDateValidationRule.java   | 2 +-
 clearing-parent/db-scripts/src/main/resources/db/DATA.sql       | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/clearing-parent/backend-api/src/main/resources/meta/data.xml b/clearing-parent/backend-api/src/main/resources/meta/data.xml
index 19a11c86b..34cbeb614 100644
--- a/clearing-parent/backend-api/src/main/resources/meta/data.xml
+++ b/clearing-parent/backend-api/src/main/resources/meta/data.xml
@@ -466,7 +466,7 @@
 		<errorCode id="5423" code="CLRN" name="Новые сделки отсутствуют."/>
 		<errorCode id="5424" code="CLRN" name="Идентифицированные средства по возврату депозита превышают обязательства"/>
 		<errorCode id="5425" code="CLRN" name="Запрещена идентификация средства по рассчитанным обязательствам."/>
-		<errorCode id="5426" code="CLRN" name="Режим списаний и зачислений отключен в настройках модуля."/>
+		<errorCode id="5426" code="CLRN" name="Дата оплаты вклада депозита меньше новой даты возврата."/>
 		<errorCode id="5427" code="CLRN" name="Найдено больше одной записи %s."/>
 		<errorCode id="5428" code="CLRN" name="Активная клиринговая сессия уже существует."/>
 		<errorCode id="5429" code="CLRN" name="ДФ57 Счет %s не соответствует компании %s"/>
diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/error/ClearingError.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/error/ClearingError.java
index b3ca256ca..77f155ee0 100644
--- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/error/ClearingError.java
+++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/error/ClearingError.java
@@ -28,6 +28,7 @@ public enum ClearingError implements IErrorEnumId {
     NewDealsNotFound(5423L),
     IdentifiedFundsExceedObligations(5424L),
     ObligationsAlreadyCalculated(5425L),
+    RefundDtLessThatValueDt(5426L),
     ActiveSessionIsPresent(5428L),
     AccountIsNotMatchedWithCompany(5429L),
     RgsWrongCode(5430L),
diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/validation/RefundDateValidationRule.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/validation/RefundDateValidationRule.java
index 97035600f..0e52d3834 100644
--- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/validation/RefundDateValidationRule.java
+++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/validation/RefundDateValidationRule.java
@@ -60,7 +60,7 @@ public enum RefundDateValidationRule implements IValidationRule<ImdgValidationCo
             }
             for (Registry rgs : rgss) {
                 if (!validatedObject.getRefundDate().isAfter(rgs.getValueDate())) { // если request.RefundDate <= ValueDate - то ошибка
-                    return of(ClearingError.WrongField, "refundDate");
+                    return of(ClearingError.RefundDtLessThatValueDt, "refundDate");
                 }
             }
             context.storeObject(ValidationStored.RefundDateChangeRegistries, rgss);
diff --git a/clearing-parent/db-scripts/src/main/resources/db/DATA.sql b/clearing-parent/db-scripts/src/main/resources/db/DATA.sql
index 29b19364a..86f5f59bb 100644
--- a/clearing-parent/db-scripts/src/main/resources/db/DATA.sql
+++ b/clearing-parent/db-scripts/src/main/resources/db/DATA.sql
@@ -902,7 +902,7 @@ INSERT INTO ERROR_CODE_DICTIONARY(ID, CODE, NAME) values (5424, 'CLRN', 'Иде
 
 INSERT INTO ERROR_CODE_DICTIONARY(ID, CODE, NAME) values (5425, 'CLRN', 'Запрещена идентификация средства по рассчитанным обязательствам.') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
 
-INSERT INTO ERROR_CODE_DICTIONARY(ID, CODE, NAME) values (5426, 'CLRN', 'Режим списаний и зачислений отключен в настройках модуля.') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
+INSERT INTO ERROR_CODE_DICTIONARY(ID, CODE, NAME) values (5426, 'CLRN', 'Дата оплаты вклада депозита меньше новой даты возврата.') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
 
 INSERT INTO ERROR_CODE_DICTIONARY(ID, CODE, NAME) values (5427, 'CLRN', 'Найдено больше одной записи %s.') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;