From a3e0562473a14f1b67c9a92372272362a8aafb85 Mon Sep 17 00:00:00 2001 From: "adel.ka" Date: Thu, 28 Aug 2025 15:57:41 +0300 Subject: [PATCH] SUPPORT-9359: fix idm --- .../component/service/AbstractIdmValidatorService.java | 7 +++---- .../service/AccountFetchService.java | 10 ++++------ .../service/constant/PathConstant.java | 1 - 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/backend/src/main/java/ru/micord/ervu/account_applications/component/service/AbstractIdmValidatorService.java b/backend/src/main/java/ru/micord/ervu/account_applications/component/service/AbstractIdmValidatorService.java index fa4aacf8..4b83e7b5 100644 --- a/backend/src/main/java/ru/micord/ervu/account_applications/component/service/AbstractIdmValidatorService.java +++ b/backend/src/main/java/ru/micord/ervu/account_applications/component/service/AbstractIdmValidatorService.java @@ -20,8 +20,8 @@ public abstract class AbstractIdmValidatorService implements IdmValidatorService protected RestTemplate restTemplate; protected SecurityContext securityContext; - @Value("${ervu.url}") - protected String ervuUrl; + @Value("${idm.url}") + protected String idmUrl; protected AbstractIdmValidatorService(RestTemplate restTemplate, SecurityContext securityContext) { this.restTemplate = restTemplate; @@ -30,8 +30,7 @@ public abstract class AbstractIdmValidatorService implements IdmValidatorService protected boolean checkExistsByQuery(String endpoint, String queryParamName, String queryParamValue) { URI uri = UriComponentsBuilder - .fromHttpUrl(ervuUrl) - .path(PathConstant.IDM_PATH) + .fromHttpUrl(idmUrl) .pathSegment(PathConstant.PERSONS_PATH) .path(endpoint) .queryParam(queryParamName, queryParamValue) diff --git a/backend/src/main/java/ru/micord/ervu/account_applications/service/AccountFetchService.java b/backend/src/main/java/ru/micord/ervu/account_applications/service/AccountFetchService.java index 905f2b00..f9a8b0c7 100644 --- a/backend/src/main/java/ru/micord/ervu/account_applications/service/AccountFetchService.java +++ b/backend/src/main/java/ru/micord/ervu/account_applications/service/AccountFetchService.java @@ -50,8 +50,8 @@ public class AccountFetchService implements EntityFetchService { private final RestTemplate restTemplate; private final ObjectMapper mapper; private final SecurityContext securityContext; - @Value("${ervu.url}") - private String ervuUrl; + @Value("${idm.url}") + private String idmUrl; @ObjectRef public EditableGridColumn editableGridColumnRef; @@ -77,8 +77,7 @@ public class AccountFetchService implements EntityFetchService { headers.setBearerAuth(securityContext.getToken()); HttpEntity httpEntity = new HttpEntity<>(request, headers); - URI uri = UriComponentsBuilder.fromHttpUrl(ervuUrl) - .path(PathConstant.IDM_PATH) + URI uri = UriComponentsBuilder.fromHttpUrl(idmUrl) .pathSegment(PathConstant.ACCOUNTS_PATH, "search", "v1") .build() .toUri(); @@ -118,8 +117,7 @@ public class AccountFetchService implements EntityFetchService { } private Account fetchAccountById(Object id) { - URI uri = UriComponentsBuilder.fromHttpUrl(ervuUrl) - .path(PathConstant.IDM_PATH) + URI uri = UriComponentsBuilder.fromHttpUrl(idmUrl) .pathSegment(PathConstant.ACCOUNTS_PATH, id.toString(), "v1") .build() .toUri(); diff --git a/backend/src/main/java/ru/micord/ervu/account_applications/service/constant/PathConstant.java b/backend/src/main/java/ru/micord/ervu/account_applications/service/constant/PathConstant.java index 5ba4dbc6..f6f2faaa 100644 --- a/backend/src/main/java/ru/micord/ervu/account_applications/service/constant/PathConstant.java +++ b/backend/src/main/java/ru/micord/ervu/account_applications/service/constant/PathConstant.java @@ -6,7 +6,6 @@ package ru.micord.ervu.account_applications.service.constant; public final class PathConstant { public static final String ACCOUNTS_PATH = "accounts"; public static final String PERSONS_PATH = "persons"; - public static final String IDM_PATH = "/service/idm"; private PathConstant() { }