From d027b75fe9103cb6c3c3ac4a7cd382a2170bd433 Mon Sep 17 00:00:00 2001
From: ialbert <ialbert@mfd.ru>
Date: Sat, 12 Oct 2024 10:20:57 +0300
Subject: [PATCH] identification funds ANLT search by DMAU [2]

---
 .../service/validation/AnltAccLoad.java       |  6 ++----
 .../IdentificationFundsValidationRule.java    | 19 -------------------
 2 files changed, 2 insertions(+), 23 deletions(-)

diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/validation/AnltAccLoad.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/validation/AnltAccLoad.java
index 7dd1ad5ef..596111a58 100644
--- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/validation/AnltAccLoad.java
+++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/validation/AnltAccLoad.java
@@ -5,7 +5,6 @@ import ru.clearing.classes.statics.data.registry.Registry;
 import ru.spcex.clearing.imdg.IMDGDistributedNames;
 import ru.spcex.platform.classes.base.SpcexObjectBase;
 import ru.spcex.platform.enumeration.AccountType;
-import ru.spcex.platform.enumeration.Sender;
 import ru.spcex.platform.imdg.api.Imdg;
 import ru.spcex.platform.imdg.api.predicate.ImdgPredicate;
 import ru.spcex.platform.imdg.api.predicate.ImdgPredicateBuilder;
@@ -32,9 +31,8 @@ public class AnltAccLoad implements IValidationRule<ImdgValidationContext<Object
         Imdg<SpcexObjectBase> accImdg = context.obtainMap(IMDGDistributedNames.Map_Account, SpcexObjectBase.class);
         ImdgPredicateBuilder pb = accImdg.predicateBuilder();
         ImdgPredicate prdct = pb.and(
-                pb.equals("companyId", Sender.One.getId()),
-                pb.equals("accountType", AccountType.Anlt.getKey()),
-                pb.equals("currency", rgs.getSecuritySymbol())
+            pb.equals("id", rgs.getAccountId()),
+            pb.equals("accountType", AccountType.Anlt.getKey())
         );
         Object anltAcc = accImdg.getSingleObjectByPredicate(prdct);
         if (anltAcc == null) {
diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/validation/IdentificationFundsValidationRule.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/validation/IdentificationFundsValidationRule.java
index f986c3f63..550e0a676 100644
--- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/validation/IdentificationFundsValidationRule.java
+++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/validation/IdentificationFundsValidationRule.java
@@ -21,8 +21,6 @@ import ru.spcex.platform.enumeration.AccountType;
 import ru.spcex.platform.enumeration.RegistryTradingParams;
 import ru.spcex.platform.enumeration.ServiceStatus;
 import ru.spcex.platform.imdg.api.Imdg;
-import ru.spcex.platform.imdg.api.predicate.ImdgPredicate;
-import ru.spcex.platform.imdg.api.predicate.ImdgPredicateBuilder;
 import ru.spcex.platform.imdg.validation.ImdgValidationContext;
 import ru.spcex.platform.imdg.validation.Stored;
 import ru.spcex.platform.utils.enumeration.EnumMessage;
@@ -138,23 +136,6 @@ public enum IdentificationFundsValidationRule implements IValidationRule<ImdgVal
             context.storeObject(ValidationStored.IdentificationFundsAssetTrio, assetTrio.get());
             return Optional.empty();
         }
-    },
-    AnltLoad() {
-        @Override
-        public Optional<EnumMessage> validate(ImdgValidationContext<IdentificationFundsRequest> context) {
-            Imdg<Account> accImdg = context.obtainMap(IMDGDistributedNames.Map_Account, Account.class);
-            ImdgPredicateBuilder pb = accImdg.predicateBuilder();
-            Registry rgs = context.getStoredObject(Stored.PresentById);
-            ImdgPredicate prdct = pb.and(
-                    pb.equals("id", rgs.getAccountId()),
-                    pb.equals("accountType", AccountType.Anlt.getKey())
-            );
-            Account anltAcc = accImdg.getSingleObjectByPredicate(prdct);
-            if (anltAcc == null) {
-                return of(ClearingError.GeneralError);
-            }
-            return empty();
-        }
     }
     ;
     private final static Logger log = LoggerFactory.getLogger(IdentificationFundsValidationRule.class);