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 9e41d8c20..f2240ba97 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.8.0.47",
+ "version": "3.8.0.48",
"enums": {
@@ -2739,7 +2739,7 @@
"destination": "securities/traded-money-securities",
- "class": "ru.clearing.classes.statics.data.misc.TradedMoneyMarketSecurity",
+ "class": "ru.clearing.classes.statics.data.security.TradedMoneyMarketSecurity",
"table": "traded_money_market_security",
@@ -5275,11 +5275,11 @@
"fields": [
{"code": "section",
- "type": 12,"name": "Секция","shortname": "Секция","link": "section","linkCode": "name","linkKeyCode": "code"
+ "type": 12,"name": "Секция","shortname": "Секция","link": "section","linkCode": "name","linkKeyCode": "code","required": true
}
,
{"code": "sessionType",
- "type": 12,"name": "Тип клиринговой сессии","shortname": "Тип клиринговой сессии","link": "sessionType","linkCode": "name","linkKeyCode": "code"
+ "type": 12,"name": "Тип клиринговой сессии","shortname": "Тип клиринговой сессии","link": "sessionType","linkCode": "name","linkKeyCode": "code","required": true
}
,
{"code": "companyId",
@@ -5408,7 +5408,7 @@
"group": "Формирование отчетности",
- "name": "Формирование отчетности по сделкам",
+ "name": "Формирование отчетности PFX64/PFX65",
"fields": []
}
@@ -5903,7 +5903,7 @@
}
,
{"code": "interestAmount",
- "type": 11,"name": "Объем процентов","shortname": "Проценты","visible": true,"searchable": true,"sortable": true
+ "type": 11,"name": "НКД","shortName": "НКД","visible": true,"searchable": true,"sortable": true
}
,
{"code": "exchangeOrderId",
@@ -5911,7 +5911,7 @@
}
,
{"code": "price",
- "type": 10,"name": "Ставка по депозиту","shortname": "Ставка, %","visible": true,"searchable": true,"sortable": true
+ "type": 10,"name": "Цена %","shortName": "Цена %","visible": true,"searchable": true,"sortable": true
}
,
{"code": "settlementAmount",
@@ -8195,7 +8195,7 @@
}
,
{"code": "acc_name",
- "type": 2,"length": 30,"name": "Наименование участника клиринга","shortname": "Наименование УК","searchable": true,"sortable": true,"visible": true
+ "field": "accName","type": 2,"length": 30,"name": "Наименование участника клиринга","shortname": "Наименование УК","searchable": true,"sortable": true,"visible": true
}
,
{"code": "account",
@@ -9181,7 +9181,7 @@
"destination": "operations",
- "class": "",
+ "class": "ru.clearing.classes.statics.data.payment.Operation",
"table": "operation",
@@ -9227,7 +9227,7 @@
"destination": "market-data-liquidations",
- "class": "",
+ "class": "ru.clearing.classes.statics.data.misc.MarketDataLiquidation",
"table": "market_data_liquidation",
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 8b0a76a60..932e018a1 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 @@
-
+
@@ -632,7 +632,7 @@
-
+
@@ -1222,8 +1222,8 @@
-
-
+
+
@@ -1247,7 +1247,7 @@
-
+
@@ -1365,9 +1365,9 @@
-
+
-
+
@@ -1893,7 +1893,7 @@
-
+
@@ -2125,7 +2125,7 @@
-
+
@@ -2135,7 +2135,7 @@
-
+
diff --git a/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/meta/GetResponseFactoryTestConfiguration.java b/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/meta/GetResponseFactoryTestConfiguration.java
index ce01e1103..d7937691c 100644
--- a/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/meta/GetResponseFactoryTestConfiguration.java
+++ b/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/meta/GetResponseFactoryTestConfiguration.java
@@ -20,7 +20,7 @@ import java.nio.file.Paths;
public class GetResponseFactoryTestConfiguration {
@Bean("metaJsonTestPath")
public Resource metaJsonPath() {
- Path path = Paths.get("src", "main", "resources", "meta.json");
+ Path path = Paths.get("src", "main", "resources", "meta", "meta.json");
return new PathResource(path);
}
diff --git a/clearing-parent/backend-api/src/test/resources/meta.json b/clearing-parent/backend-api/src/test/resources/meta.json
index 9e41d8c20..f2240ba97 100644
--- a/clearing-parent/backend-api/src/test/resources/meta.json
+++ b/clearing-parent/backend-api/src/test/resources/meta.json
@@ -1,6 +1,6 @@
{
- "version": "3.8.0.47",
+ "version": "3.8.0.48",
"enums": {
@@ -2739,7 +2739,7 @@
"destination": "securities/traded-money-securities",
- "class": "ru.clearing.classes.statics.data.misc.TradedMoneyMarketSecurity",
+ "class": "ru.clearing.classes.statics.data.security.TradedMoneyMarketSecurity",
"table": "traded_money_market_security",
@@ -5275,11 +5275,11 @@
"fields": [
{"code": "section",
- "type": 12,"name": "Секция","shortname": "Секция","link": "section","linkCode": "name","linkKeyCode": "code"
+ "type": 12,"name": "Секция","shortname": "Секция","link": "section","linkCode": "name","linkKeyCode": "code","required": true
}
,
{"code": "sessionType",
- "type": 12,"name": "Тип клиринговой сессии","shortname": "Тип клиринговой сессии","link": "sessionType","linkCode": "name","linkKeyCode": "code"
+ "type": 12,"name": "Тип клиринговой сессии","shortname": "Тип клиринговой сессии","link": "sessionType","linkCode": "name","linkKeyCode": "code","required": true
}
,
{"code": "companyId",
@@ -5408,7 +5408,7 @@
"group": "Формирование отчетности",
- "name": "Формирование отчетности по сделкам",
+ "name": "Формирование отчетности PFX64/PFX65",
"fields": []
}
@@ -5903,7 +5903,7 @@
}
,
{"code": "interestAmount",
- "type": 11,"name": "Объем процентов","shortname": "Проценты","visible": true,"searchable": true,"sortable": true
+ "type": 11,"name": "НКД","shortName": "НКД","visible": true,"searchable": true,"sortable": true
}
,
{"code": "exchangeOrderId",
@@ -5911,7 +5911,7 @@
}
,
{"code": "price",
- "type": 10,"name": "Ставка по депозиту","shortname": "Ставка, %","visible": true,"searchable": true,"sortable": true
+ "type": 10,"name": "Цена %","shortName": "Цена %","visible": true,"searchable": true,"sortable": true
}
,
{"code": "settlementAmount",
@@ -8195,7 +8195,7 @@
}
,
{"code": "acc_name",
- "type": 2,"length": 30,"name": "Наименование участника клиринга","shortname": "Наименование УК","searchable": true,"sortable": true,"visible": true
+ "field": "accName","type": 2,"length": 30,"name": "Наименование участника клиринга","shortname": "Наименование УК","searchable": true,"sortable": true,"visible": true
}
,
{"code": "account",
@@ -9181,7 +9181,7 @@
"destination": "operations",
- "class": "",
+ "class": "ru.clearing.classes.statics.data.payment.Operation",
"table": "operation",
@@ -9227,7 +9227,7 @@
"destination": "market-data-liquidations",
- "class": "",
+ "class": "ru.clearing.classes.statics.data.misc.MarketDataLiquidation",
"table": "market_data_liquidation",