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 @@ 4.0.0 clearing-utils - Clearing-module (classes, IMDG and other) dependency version of platform-utils + Clearing-module, dependency version of platform-utils jar SPCEX-1.0.0.0 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 @@ ru.spcex.clearing classes + + ru.spcex.platform + platform-enum + + + ru.spcex.clearing + security-util + + + ru.spcex.clearing + clearing-utils + org.springframework.boot spring-boot-starter 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 @@ ${global.project.version} + + ru.spcex.clearing + clearing-utils + ${global.project.version} + + + ru.spcex.clearing + security-util + ${global.project.version} + + ru.spcex.platform platform-classes-base