From 5c1bcc3b1b522be4da37b674033705b969aa740e Mon Sep 17 00:00:00 2001
From: ialbert <ialbert@mfd.ru>
Date: Wed, 19 Jul 2023 14:45:22 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9F=D1=80=D0=BE=D0=BC=D0=B5=D0=B6=D1=83?=
 =?UTF-8?q?=D1=82=D0=BE=D1=87=D0=BD=D0=B0=D1=8F=20=D1=81=D0=B5=D1=81=D1=81?=
 =?UTF-8?q?=D0=B8=D1=8F=20=D0=9C=D0=9A=D0=A0:=205=20=D1=88=D0=B0=D0=B3=20?=
 =?UTF-8?q?=D1=81=D0=B5=D1=81=D1=81=D0=B8=D0=B9=20=D0=BF=D0=BE=20=D1=81?=
 =?UTF-8?q?=D0=B5=D0=B3=D0=BE=D0=B4=D0=BD=D1=8F=D1=88=D0=BD=D0=B8=D0=BC=20?=
 =?UTF-8?q?=D1=81=D0=B4=D0=B5=D0=BB=D0=BA=D0=B0=D0=BC,=20=D1=81=D1=82?=
 =?UTF-8?q?=D0=B0=D1=82=D1=83=D1=81=D1=8B=20FAIL/UNCV=20->=20MNG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../stage/impl/InspectionObligations.java     | 58 ++++++++-----------
 1 file changed, 23 insertions(+), 35 deletions(-)

diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/InspectionObligations.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/InspectionObligations.java
index 2870874da..19edd51a6 100644
--- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/InspectionObligations.java
+++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/InspectionObligations.java
@@ -28,47 +28,19 @@ import java.time.LocalDate;
 import java.util.*;
 import java.util.stream.Collectors;
 
+import static ru.spcex.platform.enumeration.RegistryTradingParams.*;
+
 
 @Service
 @Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE)
 public class InspectionObligations implements ISessionStage {
     private final Logger log = LoggerFactory.getLogger(getClass());
-    private ImdgProvider imdgProvider;
-    private Imdg<Registry> registryImdg;
+    private final Imdg<Registry> registryImdg;
     private final IMessageResolver msgResolver = new SimpleMessageResolver();
     private SessionType sessionType;
 
-    private final static RegistryTradingParams OS_T;
-    private final static RegistryTradingParams OM_T;
-    private final static RegistryTradingParams TS_T;
-    private final static RegistryTradingParams TM_T;
-
-    static {
-        OS_T = new RegistryTradingParams(RegistryDesignation.O,
-                RegistryInstrumentType.S,
-                null,
-                RegistryUnit.T);
-
-        OM_T = new RegistryTradingParams(RegistryDesignation.O,
-                RegistryInstrumentType.M,
-                null,
-                RegistryUnit.T);
-
-        TS_T = new RegistryTradingParams(RegistryDesignation.T,
-                RegistryInstrumentType.S,
-                null,
-                RegistryUnit.T);
-
-        TM_T = new RegistryTradingParams(RegistryDesignation.T,
-                RegistryInstrumentType.M,
-                null,
-                RegistryUnit.T);
-
-    }
-
     @Autowired
     public InspectionObligations(ImdgProvider imdgProvider) {
-        this.imdgProvider = imdgProvider;
         this.registryImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_Registry, Registry.class);
     }
 
@@ -164,11 +136,11 @@ public class InspectionObligations implements ISessionStage {
                                 !registry.getRegistryDesignation().equals(checkResult.registry.getRegistryDesignation())
                 ).findFirst();
                 if (checkResult.isUncovered) {
-                    updateRegistryStatus(checkResult.registry, RegistryStatus.UNCV);
-                    tRegistryWithSameCompany.ifPresent(registry -> updateRegistryStatus(registry, RegistryStatus.FAIL));
+                    updateRegistryStatus(checkResult.registry, uncvStatus());
+                    tRegistryWithSameCompany.ifPresent(registry -> updateRegistryStatus(registry, failStatus()));
                 } else {
-                    updateRegistryStatus(checkResult.registry, RegistryStatus.FAIL);
-                    tRegistryWithSameCompany.ifPresent(registry -> updateRegistryStatus(registry, RegistryStatus.FAIL));
+                    updateRegistryStatus(checkResult.registry, failStatus());
+                    tRegistryWithSameCompany.ifPresent(registry -> updateRegistryStatus(registry, failStatus()));
                 }
             }
             //проверяем есть ли второй день для сделки (он не входит в пул, поэтому ищем отдельно)
@@ -203,4 +175,20 @@ public class InspectionObligations implements ISessionStage {
 
     private record CheckResult(Registry registry, boolean isUncovered) {
     }
+
+    private RegistryStatus uncvStatus() {
+        if (SessionType.MEDM.equals(sessionType)) {
+            return RegistryStatus.MNG;
+        } else {
+            return RegistryStatus.UNCV;
+        }
+    }
+
+    private RegistryStatus failStatus() {
+        if (SessionType.MEDM.equals(sessionType)) {
+            return RegistryStatus.MNG;
+        } else {
+            return RegistryStatus.FAIL;
+        }
+    }
 }