Merge pull request #68 from patientsknowbest/feature/phr-8877-add-cor…

…relationid-method Add method to create a UUID if no correlationId is present [PHR-8877]
patientsknowbest · Sep 29, 2021 · 3266596 · 3266596
2 parents 634a556 + 75d0575
commit 3266596
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/infrastructure/src/main/java/com/pkb/util/CorrelationIdUtil.java b/infrastructure/src/main/java/com/pkb/util/CorrelationIdUtil.java
@@ -35,6 +35,10 @@ public Optional<UUID> maybeGet() {
         return Optional.ofNullable(StringUtils.trimToNull(MDC.get(CORRELATION_ID))).map(UUID::fromString);
     }
 
+    public UUID getOrDefault() {
+        return maybeGet().orElse(getAlternativeUUID());
+    }
+
     public void putIfAbsent(UUID value) {
         if (get() == null) {
             put(value);

diff --git a/infrastructure/src/test/java/com/pkb/util/CorrelationIdUtilTest.java b/infrastructure/src/test/java/com/pkb/util/CorrelationIdUtilTest.java
@@ -42,6 +42,19 @@ void testCorrelationIdAsUUIDIsPutAndRead() {
         assertThat(expected, sameBeanAs(actual));
     }
 
+    @Test
+    void testCorrelationIdIsCreatedIfAbsent() {
+        // GIVEN
+        UUID actual = randomUUID();
+        when(underTest.getAlternativeUUID()).thenReturn(actual);
+
+        // WHEN
+        UUID expected = underTest.getOrDefault();
+
+        // THEN
+        assertThat(expected, sameBeanAs(actual));
+    }
+
     @Test
     void testCorrelationIdAsUUIDIsPutOnlyIfAbsentAndRead() {
         // GIVEN