Improved error handling and added some more tests (#54)

src/main/java/no/ssb/dlp/pseudo/service/sid/SidMapper.java

@@ -65,7 +65,8 @@ public Object map(Object data) {
                     }
                 }
             }
-            SidInfo result = bulkRequest.get(fnr).awaitResult().get(fnr);
+            SidInfo result = bulkRequest.get(fnr).awaitResult()
+                    .orElseThrow(() -> new RuntimeException("SID service did not respond")).get(fnr);
             if (result == null || result.getSnr() == null) {
                 log.warn("No SID-mapping found for fnr starting with {}", Strings.padEnd(fnr, 6, ' ').substring(0, 6));
                 return fnr;
@@ -140,8 +141,8 @@ public void onComplete() {
             log.info("Thread completed after {} seconds", stopwatch.stop().elapsed(TimeUnit.SECONDS));
         }
 
-        public T awaitResult() {
-            return await().result;
+        public Optional<T> awaitResult() {
+            return Optional.ofNullable(await().result);
         }
 
         private ObservableSubscriber<T> await() {

src/test/java/no/ssb/dlp/pseudo/service/sid/ExternalSidServiceTest.java

@@ -0,0 +1,53 @@
+package no.ssb.dlp.pseudo.service.sid;
+
+import io.micronaut.core.async.publisher.Publishers;
+import io.micronaut.test.annotation.MockBean;
+import io.micronaut.test.extensions.junit5.annotation.MicronautTest;
+import org.junit.jupiter.api.Test;
+
+import javax.inject.Inject;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Optional;
+
+import static org.mockito.Mockito.*;
+
+@MicronautTest
+public class ExternalSidServiceTest {
+
+    @Inject
+    SidService sidService;
+    @Inject
+    SidClient sidClient;
+
+    @Test
+    public void testInvokeSingleFnr() {
+        // sidService should call our sidClient mock
+        when(sidClient.lookup(any(SidRequest.class))).thenReturn(Publishers.just(
+                SidInfo.builder().fnr("11854898347").snr("0001ha3").build())
+        );
+        sidService.lookupFnr("11854898347", Optional.ofNullable(null));
+
+        verify(sidClient, times(1)).lookup(any(SidRequest.class));
+    }
+
+    @Test
+    public void testInvokeMultiFnr() {
+        // sidService should call our sidClient mock
+        when(sidClient.lookup(any(MultiSidRequest.class))).thenReturn(Publishers.just(
+                MultiSidResponse.builder().mapping(MultiSidResponse.Mapping.builder()
+                        .fnrList(Arrays.asList("11854898347"))
+                        .fnr(Arrays.asList("11854898347"))
+                        .snr(Arrays.asList("0001ha3"))
+                        .build()).build())
+        );
+        sidService.lookupFnr(List.of("11854898347"), Optional.ofNullable(null));
+
+        verify(sidClient, times(1)).lookup(any(MultiSidRequest.class));
+    }
+    @MockBean(SidClient.class)
+    SidClient sidClient() {
+        return mock(SidClient.class);
+    }
+}