From 960a19c4cc311b7c115963cc5f56a4e31ba988e7 Mon Sep 17 00:00:00 2001
From: ialbert <ialbert@mfd.ru>
Date: Tue, 11 Jun 2024 18:52:00 +0300
Subject: [PATCH] unit session section -> MULT

---
 .../RegistryStep3ValidationRule.java          | 36 +++++++++----------
 1 file changed, 17 insertions(+), 19 deletions(-)

diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/validation/RegistryStep3ValidationRule.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/validation/RegistryStep3ValidationRule.java
index cd3280df5..8ecb45f2c 100644
--- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/validation/RegistryStep3ValidationRule.java
+++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/validation/RegistryStep3ValidationRule.java
@@ -2,14 +2,12 @@ package ru.spcex.clearing.service.validation;
 
 import java.util.Map;
 import java.util.Optional;
-import java.util.function.Supplier;
 import ru.clearing.classes.statics.data.account.Account;
 import ru.clearing.classes.statics.data.company.Company;
 import ru.clearing.classes.statics.data.company.relation.Relation;
 import ru.clearing.classes.statics.data.misc.Session;
 import ru.clearing.classes.statics.data.registry.Registry;
 import ru.clearing.classes.statics.data.registry.TradingClearingRegistry;
-import ru.clearing.platform.dictionary.SectionDictionary;
 import ru.spcex.clearing.error.ClearingError;
 import ru.spcex.clearing.imdg.IMDGDistributedNames;
 import ru.spcex.platform.enumeration.ServiceStatus;
@@ -25,23 +23,23 @@ public enum RegistryStep3ValidationRule implements IValidationRule<ImdgValidatio
         @Override
         public Optional<EnumMessage> validate(ImdgValidationContext<Registry> context) {
             Registry validatedObject = context.getValidatedObject();
-            Supplier<String> sectionFind = () -> {
-                Imdg<Session> sessionImdg = context.obtainMap(IMDGDistributedNames.Map_Session, Session.class);
-                Imdg<SectionDictionary> sectionDictionaryImdg = context.obtainMap(IMDGDistributedNames.Map_SectionDictionary, SectionDictionary.class);
-                Session session = sessionImdg.getSingleObjectByID(validatedObject.getSessionId());
-                if (session == null) {
-                    return "null";
-                } else {
-                    SectionDictionary section = sectionDictionaryImdg.getFirstObjectBySQL("code ='" + session.getSection() + "'");
-                    if (section == null) {
-                        return "null";
-                    } else {
-                        return section.getName();
-                    }
-                }
-            };
+//            Supplier<String> sectionFind = () -> {
+//                Imdg<Session> sessionImdg = context.obtainMap(IMDGDistributedNames.Map_Session, Session.class);
+//                Imdg<SectionDictionary> sectionDictionaryImdg = context.obtainMap(IMDGDistributedNames.Map_SectionDictionary, SectionDictionary.class);
+//                Session session = sessionImdg.getSingleObjectByID(validatedObject.getSessionId());
+//                if (session == null) {
+//                    return "null";
+//                } else {
+//                    SectionDictionary section = sectionDictionaryImdg.getFirstObjectBySQL("code ='" + session.getSection() + "'");
+//                    if (section == null) {
+//                        return "null";
+//                    } else {
+//                        return section.getName();
+//                    }
+//                }
+//            };
             if (validatedObject.getCompanyId() == null) {
-                return of(ClearingError.ClearingUnavailableForCompany, sectionFind.get());
+                return of(ClearingError.ClearingUnavailableForCompany, validatedObject.getSection());
             }
             Imdg<Relation> relationImdg = context.obtainMap(IMDGDistributedNames.Map_Relation, Relation.class);
             Imdg<Session> sessionImdg = context.obtainMap(IMDGDistributedNames.Map_Session, Session.class);
@@ -50,7 +48,7 @@ public enum RegistryStep3ValidationRule implements IValidationRule<ImdgValidatio
                     "consumerId", validatedObject.getCompanyId(),
                     "service", validatedObject.getSection()));
             if (relation == null || (!ServiceStatus.Active.equalsByKey(relation.getServiceStatus()) && !ServiceStatus.Reopened.equalsByKey(relation.getServiceStatus()))) {
-                return of(ClearingError.ClearingUnavailableForCompany, sectionFind.get(), validatedObject.getCompanyId());
+                return of(ClearingError.ClearingUnavailableForCompany, validatedObject.getSection(), validatedObject.getCompanyId());
             }
             context.storeObject(RegistryValidationStored.Relation, relation);
             return empty();