From 6e62a0bd19a88156c2dd973a40526ad48efc1c88 Mon Sep 17 00:00:00 2001
From: emelianov <troits@list.ru>
Date: Wed, 27 May 2026 17:55:03 +0300
Subject: [PATCH] -sonar

---
 helm/pcp-ui-service/values-dev.yaml              |  2 ++
 helm/pcp-ui-service/values-master.yaml           |  2 ++
 .../service/TleMonitoringService.kt              | 16 +++++++++++-----
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/helm/pcp-ui-service/values-dev.yaml b/helm/pcp-ui-service/values-dev.yaml
index af09cc6..b8c233f 100644
--- a/helm/pcp-ui-service/values-dev.yaml
+++ b/helm/pcp-ui-service/values-dev.yaml
@@ -13,3 +13,5 @@ ingress:
 extraEnv:
   - name: SERVER_PORT
     value: "8080"
+  - name: SETTINGS_TLE_MONITORING_SERVICE
+    value: "http://tle-monitoring-service:8080"
diff --git a/helm/pcp-ui-service/values-master.yaml b/helm/pcp-ui-service/values-master.yaml
index 75f7c6e..0f91eb0 100644
--- a/helm/pcp-ui-service/values-master.yaml
+++ b/helm/pcp-ui-service/values-master.yaml
@@ -12,3 +12,5 @@ ingress:
 extraEnv:
   - name: SERVER_PORT
     value: "8080"
+  - name: SETTINGS_TLE_MONITORING_SERVICE
+    value: "http://tle-monitoring-service:8080"
diff --git a/services/pcp-ui-service/src/main/kotlin/space/nstart/pcp/slots_service/service/TleMonitoringService.kt b/services/pcp-ui-service/src/main/kotlin/space/nstart/pcp/slots_service/service/TleMonitoringService.kt
index 20588bb..bcf30fc 100644
--- a/services/pcp-ui-service/src/main/kotlin/space/nstart/pcp/slots_service/service/TleMonitoringService.kt
+++ b/services/pcp-ui-service/src/main/kotlin/space/nstart/pcp/slots_service/service/TleMonitoringService.kt
@@ -16,17 +16,18 @@ class TleMonitoringService(webClientBuilderProvider: ObjectProvider<WebClient.Bu
     private val webClientBuilder: WebClient.Builder = webClientBuilderProvider.ifAvailable ?: WebClient.builder()
     private val logger = LoggerFactory.getLogger(this::class.java)
 
-    @Value("\${settings.tle-monitoring-service:tle-monitoring-service}")
+    @Value("\${settings.tle-monitoring-service:http://tle-monitoring-service:8080}")
     private val tleMonitoringUrl: String = ""
 
     fun allTles(): List<TLEExtensionDTO> {
-        logger.info("TLE monitoring client all TLE request started")
+        val baseUrl = tleMonitoringUrl.trimEnd('/')
+        logger.info("TLE monitoring client all TLE request started: baseUrl={}", baseUrl)
         return runCatching {
             var records = emptyList<TLEExtensionDTO>()
             val durationMs = measureTimeMillis {
                 records = webClientBuilder.build()
                     .get()
-                    .uri("$tleMonitoringUrl/v1/api/tle")
+                    .uri("$baseUrl/v1/api/tle")
                     .retrieve()
                     .onStatus({ status -> status.isError }, ::mapError)
                     .bodyToFlux(TLEExtensionDTO::class.java)
@@ -47,13 +48,18 @@ class TleMonitoringService(webClientBuilderProvider: ObjectProvider<WebClient.Bu
     }
 
     fun satelliteTles(satelliteId: Long): List<TLEExtensionDTO> {
-        logger.info("TLE monitoring client satellite TLE request started: satelliteId={}", satelliteId)
+        val baseUrl = tleMonitoringUrl.trimEnd('/')
+        logger.info(
+            "TLE monitoring client satellite TLE request started: satelliteId={}, baseUrl={}",
+            satelliteId,
+            baseUrl
+        )
         return runCatching {
             var records = emptyList<TLEExtensionDTO>()
             val durationMs = measureTimeMillis {
                 records = webClientBuilder.build()
                     .get()
-                    .uri("$tleMonitoringUrl/v1/api/tle/satellite/$satelliteId")
+                    .uri("$baseUrl/v1/api/tle/satellite/$satelliteId")
                     .retrieve()
                     .onStatus({ status -> status.isError }, ::mapError)
                     .bodyToFlux(TLEExtensionDTO::class.java)