From 13a45ff83a0bb9ea715a5247bdc48271453325ae Mon Sep 17 00:00:00 2001
From: AKurakin <akurakin@mfd.ru>
Date: Thu, 7 Sep 2023 16:06:11 +0300
Subject: [PATCH] securities-service http://jira.mfd.msk:8088/browse/CLS-516
 api-gateway

---
 .../validation/FixedIncomeCashFlowValidationConfig.java   | 3 ---
 .../securities/service/cud/GatewaySecurityService.java    | 8 +++++++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/config/validation/FixedIncomeCashFlowValidationConfig.java b/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/config/validation/FixedIncomeCashFlowValidationConfig.java
index fd39f581c..49fe22471 100644
--- a/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/config/validation/FixedIncomeCashFlowValidationConfig.java
+++ b/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/config/validation/FixedIncomeCashFlowValidationConfig.java
@@ -52,9 +52,6 @@ public class FixedIncomeCashFlowValidationConfig {
                             }),
                     FieldRequiredRule.instance("nominalValue",
                             FixedIncomeCashFlowNewRequest::getNominalValue,
-                            SecuritiesError.RequiredFieldIsEmpty),
-                    FieldRequiredRule.instance("number",
-                            FixedIncomeCashFlowNewRequest::getNumber,
                             SecuritiesError.RequiredFieldIsEmpty)
             );
         };
diff --git a/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/service/cud/GatewaySecurityService.java b/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/service/cud/GatewaySecurityService.java
index 440ef9868..8c310db84 100644
--- a/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/service/cud/GatewaySecurityService.java
+++ b/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/service/cud/GatewaySecurityService.java
@@ -37,6 +37,7 @@ import ru.spcex.platform.enumeration.WorkflowStatus;
 import ru.spcex.platform.imdg.api.Imdg;
 import ru.spcex.platform.imdg.api.ImdgId;
 import ru.spcex.platform.imdg.api.ImdgProvider;
+import ru.spcex.platform.imdg.api.predicate.ImdgPredicateBuilder;
 import ru.spcex.platform.utils.enumeration.IMessageResolver;
 import ru.spcex.platform.utils.error.ValidationException;
 
@@ -335,7 +336,12 @@ public class GatewaySecurityService extends QueueConsumer implements Initializin
     CouponPeriod findCouponPeriod(CouponPeriodNewRequest byRequest) {
         if (byRequest.getSecurityId() == null)
             return null;
-        CouponPeriod existCouponPeriod = couponPeriodImdg.getFirstObjectByFieldValues(Map.of("securityId", byRequest.getSecurityId()));
+
+        ImdgPredicateBuilder pb = couponPeriodImdg.predicateBuilder();
+        CouponPeriod existCouponPeriod = couponPeriodImdg.getFirstObjectByPredicate(pb.and(
+                pb.equals("securityId", byRequest.getSecurityId()),
+                pb.equals("number", byRequest.getNumber()) // предикатом на случай null, но такого не должно быть
+        ));
 
         if (existCouponPeriod == null)
             log.trace("CouponPeriod not found by securityId={}", byRequest.getSecurityId());