From 23bc00d33ceeda29d720e9ad854d4eea2b59d960 Mon Sep 17 00:00:00 2001
From: Jan <jan.weber@avatic.de>
Date: Tue, 6 Jan 2026 18:17:28 +0100
Subject: [PATCH] Improve logging in `DistanceApiService` and
 `DistanceMatrixRepository`: Add fallback to names when external mapping IDs
 are null, fix inconsistent spacing, and enhance error messages with better
 node ID resolution.

---
 .../lcc/repositories/DistanceMatrixRepository.java       | 9 ++++++---
 .../de/avatic/lcc/service/api/DistanceApiService.java    | 8 ++++----
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/main/java/de/avatic/lcc/repositories/DistanceMatrixRepository.java b/src/main/java/de/avatic/lcc/repositories/DistanceMatrixRepository.java
index c25a2a8..2ff959e 100644
--- a/src/main/java/de/avatic/lcc/repositories/DistanceMatrixRepository.java
+++ b/src/main/java/de/avatic/lcc/repositories/DistanceMatrixRepository.java
@@ -88,7 +88,7 @@ public class DistanceMatrixRepository {
                         toId);
 
                 logger.info("Updated existing distance entry for nodes {} -> {}",
-                        distance.getFromNodeId(), distance.getToNodeId());
+                        fromId, toId);
             } else {
                 // Insert new entry
                 String insertQuery = """
@@ -111,11 +111,14 @@ public class DistanceMatrixRepository {
                         distance.getUpdatedAt());
 
                 logger.info("Inserted new distance entry for nodes {} -> {}",
-                        distance.getFromNodeId(), distance.getToNodeId());
+                        fromId, toId);
             }
         } catch (Exception e) {
+            Integer fromId = distance.getFromUserNodeId() != null ? distance.getFromUserNodeId() : distance.getFromNodeId();
+            Integer toId = distance.getToUserNodeId() != null ? distance.getToUserNodeId() : distance.getToNodeId();
+
             logger.error("Error saving distance to database for nodes {} -> {}",
-                    distance.getFromNodeId(), distance.getToNodeId(), e);
+                    fromId, toId, e);
             throw e;
         }
     }
diff --git a/src/main/java/de/avatic/lcc/service/api/DistanceApiService.java b/src/main/java/de/avatic/lcc/service/api/DistanceApiService.java
index b40a16d..5763b29 100644
--- a/src/main/java/de/avatic/lcc/service/api/DistanceApiService.java
+++ b/src/main/java/de/avatic/lcc/service/api/DistanceApiService.java
@@ -89,7 +89,7 @@ public class DistanceApiService {
             distanceMatrixRepository.updateRetries(cachedDistance.get().getId());
         }
 
-        logger.info("Fetching distance from Azure Maps for nodes {} to {}", from.getExternalMappingId(), to.getExternalMappingId());
+        logger.info("Fetching distance from Azure Maps for nodes {} to {}", from.getExternalMappingId() == null ? from.getName() : from.getExternalMappingId(), to.getExternalMappingId() == null ? to.getName() : to.getExternalMappingId());
         AzureMapResponse distanceResponse = fetchDistanceFromAzureMaps(from, isUsrFrom, to, isUsrTo, true);
 
         if (distanceResponse.distance != null) {
@@ -97,7 +97,7 @@ public class DistanceApiService {
             return Optional.of(distanceResponse.distance);
         }
 
-        if(distanceResponse.errorType != AzureMapsErrorType.NO_ERROR) {
+        if (distanceResponse.errorType != AzureMapsErrorType.NO_ERROR) {
             distanceMatrixRepository.saveDistance(getErrorDistance(cachedDistance, from, isUsrFrom, to, isUsrTo));
         }
 
@@ -111,7 +111,7 @@ public class DistanceApiService {
         distance.setUpdatedAt(LocalDateTime.now());
         distance.setRetries(distance.getRetries() == null ? 0 : distance.getRetries() + 1);
 
-        if(cachedDistance.isEmpty()) {
+        if (cachedDistance.isEmpty()) {
             distance.setFromUserNodeId(isUsrFrom ? from.getId() : null);
             distance.setFromNodeId(isUsrFrom ? null : from.getId());
             distance.setToUserNodeId(isUsrTo ? to.getId() : null);
@@ -208,7 +208,7 @@ public class DistanceApiService {
             String errorMessage = errorNode.path("error").path("message").asText();
 
             logger.warn("Azure Maps API Error for nodes {} ({}) to {} ({}): {} - {}",
-                    from.getExternalMappingId(), from.getId(), to.getExternalMappingId(), to.getId(),
+                    from.getExternalMappingId() == null ? from.getName() : from.getExternalMappingId(), from.getId(), to.getExternalMappingId() == null ? to.getName() : to.getExternalMappingId(), to.getId(),
                     errorCode, errorMessage);
 
             if (errorMessage.contains("NO_ROUTE_FOUND"))