EPA-231: Better logging

Author: thomasrichner-oviva

epa4all-client/src/main/java/com/oviva/telematik/epa4all/client/internal/Epa4AllClientFactory.java

@@ -20,6 +20,7 @@
 import java.security.*;
 import java.time.Duration;
 import java.util.List;
+import java.util.stream.Collectors;
 import javax.net.ssl.SSLContext;
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
 import org.bouncycastle.pqc.jcajce.provider.BouncyCastlePQCProvider;
@@ -120,24 +121,38 @@ private static SmcbCard findSmcBCard(KonnektorService konnektorService, String t
     }
     if (telematikId == null) {
       if (cards.size() > 1) {
-        log.atInfo().log("more than one SMC-B card found, using first one");
+        log.atInfo().log(
+            "more than one SMC-B card found, using first one - available: %s"
+                .formatted(cardListToString(cards)));
       }
       return cards.getFirst();
     }
 
-    cards = cards.stream().filter(c -> c.telematikId().equals(telematikId)).toList();
-    if (cards.isEmpty()) {
-      throw new Epa4AllClientException("no SMC-B card found for telematikId " + telematikId);
+    var selectedCard = cards.stream().filter(c -> c.telematikId().equals(telematikId)).toList();
+    if (selectedCard.isEmpty()) {
+      throw new Epa4AllClientException(
+          "no SMC-B card found for telematikId '%s', available %s"
+              .formatted(telematikId, cardListToString(cards)));
     }
-    if (cards.size() > 1) {
+    if (selectedCard.size() > 1) {
       log.atInfo()
           .addKeyValue("telematikId", telematikId)
           .log(
               "more than one SMC-B card found for telematikId \"{}\", using first one",
               telematikId);
     }
 
-    return cards.getFirst();
+    return selectedCard.getFirst();
+  }
+
+  private static String cardListToString(List<SmcbCard> cards) {
+    return "[ "
+        + cards.stream().map(Epa4AllClientFactory::cardToString).collect(Collectors.joining(", "))
+        + " ]";
+  }
+
+  private static String cardToString(SmcbCard card) {
+    return "'" + card.telematikId() + "' (" + card.holderName() + ")";
   }
 
   private static VauProxy buildVauProxy(

epa4all-client/src/test/java/com/oviva/telematik/epa4all/client/internal/E2eEpa4AllClientImplTest.java

@@ -25,13 +25,17 @@ class E2eEpa4AllClientImplTest {
   @Test
   void writeDocument() {
 
+    var telematikIdTinaGraefin = "9-SMC-B-Testkarte-883110000145356";
+    var telematikIdFeliGraefin = "9-SMC-B-Testkarte-883110000157665";
+
     System.setProperty("jdk.httpclient.HttpClient.log", "errors,requests,headers");
 
     try (var cf =
         Epa4AllClientFactoryBuilder.newBuilder()
             .konnektorProxyAddress(
                 new InetSocketAddress(KONNEKTOR_PROXY_HOST, KONNEKTOR_PROXY_PORT))
             .konnektorService(TestKonnektors.riseKonnektor_RU())
+            .telematikId(telematikIdTinaGraefin)
             .environment(Environment.RU)
             .build()) {