From 5144b26a855bde02850d3ba3a9ac1b70b4c374f9 Mon Sep 17 00:00:00 2001
From: AKurakin <akurakin@mfd.ru>
Date: Sat, 27 May 2023 11:10:10 +0300
Subject: [PATCH] =?UTF-8?q?backend-api=20SecurityController=20=D0=BE=D1=82?=
 =?UTF-8?q?=D0=B4=D0=B0=D1=87=D0=B0=20=D0=B2=D1=81=D0=B5=D1=85=20Security?=
 =?UTF-8?q?=20(3=20=D0=B2=D0=B8=D0=B4=D0=B0)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../queue/securities/SecurityController.java    | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/securities/SecurityController.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/securities/SecurityController.java
index cc00f19eb..f3b7a523a 100644
--- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/securities/SecurityController.java
+++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/securities/SecurityController.java
@@ -8,11 +8,15 @@ import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
+import ru.clearing.classes.statics.data.instrument.issue.EquitySecurity;
+import ru.clearing.classes.statics.data.instrument.issue.FixedIncomeSecurity;
+import ru.clearing.classes.statics.data.security.MoneyMarketSecurity;
 import ru.clearing.classes.statics.data.security.Security;
 import ru.spcex.clearing.backendapi.controller.response.entity.CommonGetAllResponse;
 import ru.spcex.clearing.backendapi.service.IStateLoader;
 import ru.spcex.clearing.imdg.IMDGDistributedNames;
 
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Map;
 
@@ -34,9 +38,16 @@ public class SecurityController {
     @RequestMapping(method = RequestMethod.GET)
     @ResponseBody
     public CommonGetAllResponse getAll() {
-        Collection<Map<String, Object>> all = stateLoader.getAllMetaTransformSpecificClass(
-                IMDGDistributedNames.Map_MoneyMarketSecurity,
-                Security.class);
+        Collection<Map<String, Object>> all = new ArrayList<>();
+        all.addAll(stateLoader.getAllMetaTransformSpecificClass(
+                IMDGDistributedNames.Map_MoneyMarketSecurity, MoneyMarketSecurity.class
+        ));
+        all.addAll(stateLoader.getAllMetaTransformSpecificClass(
+                IMDGDistributedNames.Map_FixedIncomeSecurity, FixedIncomeSecurity.class
+        ));
+        all.addAll(stateLoader.getAllMetaTransformSpecificClass(
+                IMDGDistributedNames.Map_EquitySecurity, EquitySecurity.class
+        ));
         CommonGetAllResponse response = new CommonGetAllResponse();
         response.fromEntity(all);
         return response;