From c35ac0d44c21b5d7e60fcf0aa80191644f9ec4cc Mon Sep 17 00:00:00 2001
From: ialbert <ialbert@mfd.ru>
Date: Wed, 28 Aug 2024 12:35:36 +0300
Subject: [PATCH] session step 3 (ObligationAdmission) - [account is active
 validation] NLP bugfix

---
 .../validation/admission/AccountActiveValidationRule.java      | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/validation/admission/AccountActiveValidationRule.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/validation/admission/AccountActiveValidationRule.java
index fc39d34a9..e7e25e8d2 100644
--- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/validation/admission/AccountActiveValidationRule.java
+++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/validation/admission/AccountActiveValidationRule.java
@@ -23,6 +23,9 @@ public class AccountActiveValidationRule implements IValidationRule<ImdgValidati
     public Optional<EnumMessage> validate(ImdgValidationContext<Registry> context) {
         Registry validatedObject = context.getValidatedObject();
         Imdg<Account> accImdg = context.obtainMap(IMDGDistributedNames.Map_Account, Account.class);
+        if (validatedObject.getAccountId() == null) {
+            return of(ClearingError.AccountNotActive, validatedObject.getAccountId());
+        }
         Account account = accImdg.getSingleObjectByID(validatedObject.getAccountId());
         if (account == null || (!IEnumKey.contains(account.getStatus(), ServiceStatus.Active, ServiceStatus.Reopened))) {
             return of(ClearingError.AccountNotActive, validatedObject.getAccountId());