From f99989145c836d20e12d82fb0e0705b5b19399e7 Mon Sep 17 00:00:00 2001
From: AKurakin <akurakin@mfd.ru>
Date: Fri, 31 Mar 2023 21:40:30 +0300
Subject: [PATCH] =?UTF-8?q?=D0=A7=D1=82=D0=BE=D0=B1=D1=8B=20=D0=BA=D0=BE?=
 =?UTF-8?q?=D0=BC=D0=BF=D0=B8=D0=BB=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D0=BB?=
 =?UTF-8?q?=D0=BE=D1=81=D1=8C.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/queue/AbstractControllerTest.java     |  2 +-
 clearing-parent/clearing-utils/pom.xml               |  2 +-
 clearing-parent/company-service/pom.xml              | 12 ++++++++++++
 .../clearing/util/security/UserRoleVerification.java |  6 +++---
 pom.xml                                              | 11 +++++++++++
 5 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/AbstractControllerTest.java b/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/AbstractControllerTest.java
index 0e04e9aad..6f6e57a71 100644
--- a/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/AbstractControllerTest.java
+++ b/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/AbstractControllerTest.java
@@ -92,7 +92,7 @@ import static ru.spcex.clearing.backendapi.controller.utils.MatcherFactory.using
         BankAccountController.class,
         //company
         CompanyRoleSetController.class,
-        DeleteCompanyController.class,
+//fixme на 31.03.2023 нет такого класса        DeleteCompanyController.class,
         EditClearingMemberCategoryController.class,
         EditCompanyInfoController.class,
         EditCompanySymbolController.class,
diff --git a/clearing-parent/clearing-utils/pom.xml b/clearing-parent/clearing-utils/pom.xml
index e1056c178..e0e9bbd67 100644
--- a/clearing-parent/clearing-utils/pom.xml
+++ b/clearing-parent/clearing-utils/pom.xml
@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>clearing-utils</artifactId>
-    <name>Clearing-module (classes, IMDG and other) dependency version of platform-utils</name>
+    <name>Clearing-module, dependency version of platform-utils</name>
     <packaging>jar</packaging>
     <version>SPCEX-1.0.0.0</version>
 
diff --git a/clearing-parent/company-service/pom.xml b/clearing-parent/company-service/pom.xml
index a34291ee8..9913e8df4 100644
--- a/clearing-parent/company-service/pom.xml
+++ b/clearing-parent/company-service/pom.xml
@@ -28,6 +28,18 @@
             <groupId>ru.spcex.clearing</groupId>
             <artifactId>classes</artifactId>
         </dependency>
+        <dependency>
+            <groupId>ru.spcex.platform</groupId>
+            <artifactId>platform-enum</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>ru.spcex.clearing</groupId>
+            <artifactId>security-util</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>ru.spcex.clearing</groupId>
+            <artifactId>clearing-utils</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter</artifactId>
diff --git a/clearing-parent/security-util/src/main/java/ru/spcex/clearing/util/security/UserRoleVerification.java b/clearing-parent/security-util/src/main/java/ru/spcex/clearing/util/security/UserRoleVerification.java
index 89b2c10d0..fcc2536ef 100644
--- a/clearing-parent/security-util/src/main/java/ru/spcex/clearing/util/security/UserRoleVerification.java
+++ b/clearing-parent/security-util/src/main/java/ru/spcex/clearing/util/security/UserRoleVerification.java
@@ -58,15 +58,15 @@ public class UserRoleVerification {
     }
 
 
-    boolean userHasRole(Long userId, IEnumKey role) {
+    public boolean userHasRole(Long userId, IEnumKey role) {
         return userHasRole(userId, role == null ? null : role.getKey());
     }
 
-    boolean userHasRole(Long userId, Long companyId, IEnumKey role) {
+    public boolean userHasRole(Long userId, Long companyId, IEnumKey role) {
         return userHasRole(userId, companyId, role == null ? null : role.getKey());
     }
 
-    boolean userHasRoleOnObject(Long userId, BusinessObject /*todo WithUserId / WithCompany */ bObject) {
+    public boolean userHasRoleOnObject(Long userId, BusinessObject /*todo WithUserId / WithCompany */ bObject) {
         //todo impl
         return true;
     }
diff --git a/pom.xml b/pom.xml
index 6a001e386..6d9c0427c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -94,6 +94,17 @@
                 <version>${global.project.version}</version>
             </dependency>
 
+            <dependency>
+                <groupId>ru.spcex.clearing</groupId>
+                <artifactId>clearing-utils</artifactId>
+                <version>${global.project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>ru.spcex.clearing</groupId>
+                <artifactId>security-util</artifactId>
+                <version>${global.project.version}</version>
+            </dependency>
+
             <dependency>
                 <groupId>ru.spcex.platform</groupId>
                 <artifactId>platform-classes-base</artifactId>