From 4099d3d1c03777e3ce35495180167948ad600625 Mon Sep 17 00:00:00 2001
From: etreschenkov <ETreschenkov@mfd.ru>
Date: Tue, 3 Jun 2025 11:39:48 +0300
Subject: [PATCH] http://jira.mfd.msk:8088/browse/CLS-851

---
 .../DigitalSecurityRequestAdapter.java        | 22 +++++++++++--------
 .../config/validation/ValidationConfig.java   |  2 ++
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/adapter/DigitalSecurityRequestAdapter.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/adapter/DigitalSecurityRequestAdapter.java
index 68f07c0b5..fd2e769ff 100644
--- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/adapter/DigitalSecurityRequestAdapter.java
+++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/adapter/DigitalSecurityRequestAdapter.java
@@ -27,15 +27,19 @@ public class DigitalSecurityRequestAdapter {
         gatewayRequest.setSettlementOrganization(digitalCertificate.getSettlementOrganization());
         gatewayRequest.setSettlementDepository(digitalCertificate.getSettlementDepository());
 
-        Optional<DigitalNominal> digitalNominal = digitalCertificate.getNominal().stream()
-            .filter(
-                nominal -> nominal.getIndexDate().isEqual(LocalDate.now()))
-            .findFirst();
-        digitalNominal.ifPresent(nominal -> {
-            gatewayRequest.setNominalIndexDate(nominal.getIndexDate());
-            gatewayRequest.setNominalDenominationUnitForDate(nominal.getDenominationUnitForDate());
-            gatewayRequest.setNominalIndexFact(nominal.getIndexFact());
-        });
+        if (digitalCertificate.getTypeCode().equals("U")) {
+            gatewayRequest.setNominalDenominationUnitForDate(digitalCertificate.getUcp().getDenominationUnitBase());
+        } else {
+            Optional<DigitalNominal> digitalNominal = digitalCertificate.getNominal().stream()
+                .filter(
+                    nominal -> nominal.getIndexDate().isEqual(LocalDate.now()))
+                .findFirst();
+            digitalNominal.ifPresent(nominal -> {
+                gatewayRequest.setNominalIndexDate(nominal.getIndexDate());
+                gatewayRequest.setNominalDenominationUnitForDate(nominal.getDenominationUnitForDate());
+                gatewayRequest.setNominalIndexFact(nominal.getIndexFact());
+            });
+        }
         return gatewayRequest;
     }
 }
diff --git a/clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/config/validation/ValidationConfig.java b/clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/config/validation/ValidationConfig.java
index caf60a95d..25a1f02d7 100644
--- a/clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/config/validation/ValidationConfig.java
+++ b/clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/config/validation/ValidationConfig.java
@@ -5,6 +5,7 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Scope;
 import ru.clearing.classes.statics.data.company.Company;
+import ru.clearing.classes.statics.data.misc.ValidationSymbols;
 import ru.clearing.classes.statics.data.scheduler.ClearingCalendar;
 import ru.clearing.classes.statics.data.scheduler.Planner;
 import ru.clearing.classes.statics.data.scheduler.PlannerTemplate;
@@ -43,6 +44,7 @@ public class ValidationConfig {
         addImdg.accept(IMDGDistributedNames.Map_Security, Security.class);
         addImdg.accept(IMDGDistributedNames.Map_DayStatusDictionary, DayStatusDictionary.class);
         addImdg.accept(IMDGDistributedNames.Map_SessionTypeDictionary, SessionTypeDictionary.class);
+        addImdg.accept(IMDGDistributedNames.Map_ValidationSymbols, ValidationSymbols.class);
         return imdg;
     }