Merge pull request #239 from Health-Education-England/fix/handleEmpty…

…SubmissionDateStringOnAddDoctor

fix: handle empty submission date string on add doctor (for when exce…

src/main/java/uk/nhs/hee/tis/revalidation/connection/service/GmcClientService.java

@@ -63,8 +63,8 @@ public class GmcClientService {
   /**
    * add GMC connection for a doctor.
    *
-   * @param gmcId id of doctor to add
-   * @param changeReason reason for adding doctor
+   * @param gmcId              id of doctor to add
+   * @param changeReason       reason for adding doctor
    * @param designatedBodyCode DBC which is going to add for the doctor
    */
   public GmcConnectionResponseDto tryAddDoctor(final String gmcId, final String changeReason,
@@ -74,21 +74,24 @@ public GmcConnectionResponseDto tryAddDoctor(final String gmcId, final String ch
 
     final var tryAddDoctorResponse = submitTryAddDoctor(tryAddDoctor);
     final var tryAddDoctorResult = tryAddDoctorResponse.getTryAddDoctorResult();
+    final var submissionDateString = tryAddDoctorResult.getSubmissionDate();
 
     final DateTimeFormatter formatter = DateTimeFormatter.ofPattern("dd/MM/yyyy");
+    final LocalDate submissionDate =
+        submissionDateString.isBlank() ? null : LocalDate.parse(submissionDateString, formatter);
     return GmcConnectionResponseDto.builder()
         .clientRequestId(tryAddDoctorResult.getClientRequestID())
         .gmcRequestId(tryAddDoctorResult.getGMCRequestID())
-        .submissionDate(LocalDate.parse(tryAddDoctorResult.getSubmissionDate(), formatter))
+        .submissionDate(submissionDate)
         .returnCode(tryAddDoctorResult.getReturnCode())
         .build();
   }
 
   /**
    * remove GMC connection from a doctor.
    *
-   * @param gmcId id of doctor to remove
-   * @param changeReason reason for removing doctor
+   * @param gmcId              id of doctor to remove
+   * @param changeReason       reason for removing doctor
    * @param designatedBodyCode DBC which is going to remove from the doctor
    */
   public GmcConnectionResponseDto tryRemoveDoctor(final String gmcId, final String changeReason,

src/test/java/uk/nhs/hee/tis/revalidation/connection/service/GmcClientServiceTest.java

@@ -23,6 +23,7 @@
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
+import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.when;
 
@@ -126,6 +127,31 @@ void shouldSubmitTryAddDoctorRequest() {
     assertThat(gmcConnectionResponseDto.getReturnCode(), is(returnCode));
   }
 
+  @Test
+  void shouldHandleEmptySubmissionDateOnTryAddDoctorRequest() {
+
+    final var addDoctorDto = UpdateConnectionDto.builder()
+        .changeReason(changeReason)
+        .designatedBodyCode(designatedBodyCode)
+        .doctors(buildDoctorsList())
+        .build();
+
+    when(webServiceTemplate.marshalSendAndReceive(any(String.class), any(
+        TryAddDoctor.class), any(SoapActionCallback.class))).thenReturn(tryAddDoctorResponse);
+    when(tryAddDoctorResponse.getTryAddDoctorResult()).thenReturn(tryAddDoctorResponseCT);
+    when(tryAddDoctorResponseCT.getClientRequestID()).thenReturn(gmcId);
+    when(tryAddDoctorResponseCT.getGMCRequestID()).thenReturn(gmcRequestId);
+    when(tryAddDoctorResponseCT.getSubmissionDate()).thenReturn("");
+    when(tryAddDoctorResponseCT.getReturnCode()).thenReturn(returnCode);
+    final var gmcConnectionResponseDto =
+        gmcClientService.tryAddDoctor(gmcId, changeReason, designatedBodyCode);
+
+    assertThat(gmcConnectionResponseDto.getClientRequestId(), is(gmcId));
+    assertThat(gmcConnectionResponseDto.getGmcRequestId(), is(gmcRequestId));
+    assertNull(gmcConnectionResponseDto.getSubmissionDate());
+    assertThat(gmcConnectionResponseDto.getReturnCode(), is(returnCode));
+  }
+
   @Test
   void shouldSubmitTryRemoveDoctorRequest() {