From 454bb99dfa636f580fc38116b824909dcb9994a8 Mon Sep 17 00:00:00 2001
From: etreschenkov <ETreschenkov@mfd.ru>
Date: Wed, 2 Oct 2024 18:14:33 +0300
Subject: [PATCH] fix naming for riskParameter/rates

---
 .../controller/request/cud/securities/RatesNewAction.java   | 6 ++++++
 .../backend-api/src/main/resources/meta/meta.json           | 6 +++---
 .../backend-api/src/main/resources/meta/meta.xml            | 6 +++---
 .../messaging/domain/cud/security/RatesNewRequest.java      | 6 ++++++
 4 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/securities/RatesNewAction.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/securities/RatesNewAction.java
index 8b71e4175..76cd987f2 100644
--- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/securities/RatesNewAction.java
+++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/securities/RatesNewAction.java
@@ -1,12 +1,16 @@
 package ru.spcex.clearing.backendapi.controller.request.cud.securities;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import io.swagger.annotations.ApiModelProperty;
 import java.math.BigDecimal;
 import java.time.LocalDate;
 import ru.spcex.clearing.backendapi.domain.actions.IAction;
 import ru.spcex.clearing.platform.messaging.domain.ActionType;
 import ru.spcex.clearing.platform.messaging.domain.cud.security.RatesNewRequest;
+import ru.spcex.clearing.platform.messaging.domain.json.deserialize.LocalDateDeserializer;
+import ru.spcex.clearing.platform.messaging.domain.json.serialize.LocalDateSerializer;
 
 public class RatesNewAction implements IAction<RatesNewRequest> {
 
@@ -14,6 +18,8 @@ public class RatesNewAction implements IAction<RatesNewRequest> {
     @JsonProperty
     private BigDecimal value;
     @ApiModelProperty(value = "Дата.", example = "1234")
+    @JsonSerialize(using = LocalDateSerializer.class)
+    @JsonDeserialize(using = LocalDateDeserializer.class)
     @JsonProperty
     private LocalDate valueDate;
     @ApiModelProperty(value = "Валюта.", example = "1234")
diff --git a/clearing-parent/backend-api/src/main/resources/meta/meta.json b/clearing-parent/backend-api/src/main/resources/meta/meta.json
index d7de1f4b1..3a23e8f41 100644
--- a/clearing-parent/backend-api/src/main/resources/meta/meta.json
+++ b/clearing-parent/backend-api/src/main/resources/meta/meta.json
@@ -1,6 +1,6 @@
 
 {
-	"version": "3.15.206.108",
+	"version": "3.15.206.110",
 
 	"enums": {
 
@@ -10589,7 +10589,7 @@
 
 				"fields": [
 					{"code": "currencyPairId",
-						"name": "Идентификатор валютной пары","shortname": "Валютная пара","type": 1,"link": "currencyPair","linkCode": "code"
+						"name": "Идентификатор валютной пары","shortname": "Валютная пара","type": 1,"link": "currencyPair","linkCode": "code","linkKeyCode": "id"
 					}
 				,
 					{"code": "settlementType",
@@ -10677,7 +10677,7 @@
 
 				"fields": [
 					{"code": "currencyId",
-						"name": "Идентификатор валюты","shortname": "Валюта","type": 1,"link": "currency","linkCode": "code"
+						"name": "Идентификатор валюты","shortname": "Валюта","type": 1,"link": "currencyCode","linkCode": "code","linkKeyCode": "id"
 					}
 				,
 					{"code": "valueDate",
diff --git a/clearing-parent/backend-api/src/main/resources/meta/meta.xml b/clearing-parent/backend-api/src/main/resources/meta/meta.xml
index d77bcee9f..819a1d27b 100644
--- a/clearing-parent/backend-api/src/main/resources/meta/meta.xml
+++ b/clearing-parent/backend-api/src/main/resources/meta/meta.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--?xml-stylesheet type="text/xsl" href="\..\corp-reports\src\data\meta\meta.server.xslt"?-->
-<meta version="3.15.206.108">
+<meta version="3.15.206.110">
 	<!-- _xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" _xsi:noNamespaceSchemaLocation="file:///E:/d/projects/meta/from/meta.xsd" -->
 	<!--Здесь словари-->
 	<enums>
@@ -2451,7 +2451,7 @@
 			<workflowStatus name="Статус" shortname="Статус" type="2" length="4" link="workflowStatus"/>
 			<actions>
 				<post name="Добавление параметров риска" confirmation="value,settlementType,currencyPairId,status" class="ru.spcex.clearing.backendapi.controller.request.cud.securities.RiskParameterNewAction">
-					<currencyPairId name="Идентификатор валютной пары" shortname="Валютная пара" type="1" link="currencyPair" linkCode="code"/>
+					<currencyPairId name="Идентификатор валютной пары" shortname="Валютная пара" type="1" link="currencyPair" linkCode="code" linkKeyCode="id"/>
 					<settlementType name="Код расчёта" shortname="Код расчёта" type="12" link="currencySettlementType" linkCode="code"/>
 					<value name="Ставка" shortname="Ставка" type="10"/>
 					<status name="Статус" shortname="Статус" type="2" length="4" link="workflowStatus"/>
@@ -2472,7 +2472,7 @@
 			<workflowStatus name="Статус" shortname="Статус" type="2" length="4" link="workflowStatus"/>
 			<actions>
 				<post name="Добавление расчетного курса" confirmation="value,valueDate,currencyId,status" class="ru.spcex.clearing.backendapi.controller.request.cud.securities.RatesNewAction">
-					<currencyId name="Идентификатор валюты" shortname="Валюта" type="1" link="currency" linkCode="code"/>
+					<currencyId name="Идентификатор валюты" shortname="Валюта" type="1" link="currencyCode" linkCode="code" linkKeyCode="id"/>
 					<valueDate name="Дата, на которую  расчетный курс" shortname="Дата" type="6"/>
 					<value name="Расчетный курс" shortname="Расчетный курс" type="10"/>
 					<status name="Статус" shortname="Статус" type="2" length="4" link="workflowStatus"/>
diff --git a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/security/RatesNewRequest.java b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/security/RatesNewRequest.java
index bb125c38c..665088823 100644
--- a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/security/RatesNewRequest.java
+++ b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/security/RatesNewRequest.java
@@ -1,13 +1,19 @@
 package ru.spcex.clearing.platform.messaging.domain.cud.security;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import java.math.BigDecimal;
 import java.time.LocalDate;
+import ru.spcex.clearing.platform.messaging.domain.json.deserialize.LocalDateDeserializer;
+import ru.spcex.clearing.platform.messaging.domain.json.serialize.LocalDateSerializer;
 
 public class RatesNewRequest {
 
     @JsonProperty
     private BigDecimal value;
+    @JsonSerialize(using = LocalDateSerializer.class)
+    @JsonDeserialize(using = LocalDateDeserializer.class)
     @JsonProperty
     private LocalDate valueDate;
     @JsonProperty