SSCS-12063 - Revert video email changes (#593)

Co-authored-by: DGordonV1 <[email protected]>
hmcts · Mar 28, 2024 · 361109c · 361109c
1 parent 316c08c
commit 361109c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 46 deletions.
diff --git a/src/main/java/uk/gov/hmcts/reform/sscs/helper/mapping/HearingsPartiesMapping.java b/src/main/java/uk/gov/hmcts/reform/sscs/helper/mapping/HearingsPartiesMapping.java
@@ -33,7 +33,6 @@
 import uk.gov.hmcts.reform.sscs.model.single.hearing.UnavailabilityRange;
 import uk.gov.hmcts.reform.sscs.reference.data.model.Language;
 import uk.gov.hmcts.reform.sscs.service.holder.ReferenceDataServiceHolder;
-import uk.gov.hmcts.reform.sscs.utility.EmailUtil;
 import uk.gov.hmcts.reform.sscs.utility.HearingChannelUtil;
 
 import java.time.LocalDate;
@@ -377,23 +376,11 @@ public static String getIndividualVulnerabilityDetails() {
         return null;
     }
 
-    public static List<String> getIndividualHearingChannelEmail(HearingSubtype hearingSubtype)throws ListingException {
+    public static List<String> getIndividualHearingChannelEmail(HearingSubtype hearingSubtype) {
         List<String> emails = new ArrayList<>();
-
-        if (isNull(hearingSubtype)) {
-            return emails;
-        }
-
-        String hearingVideoEmail = hearingSubtype.getHearingVideoEmail();
-
-        if (isNotBlank(hearingVideoEmail) && EmailUtil.isEmailValid(hearingVideoEmail)) {
-            emails.add(hearingVideoEmail);
-            return emails;
-        }
-        if (isYes(hearingSubtype.getWantsHearingTypeVideo())) {
-            throw new ListingException("Hearing video email address must be valid email address");
+        if (nonNull(hearingSubtype) && isNotBlank(hearingSubtype.getHearingVideoEmail())) {
+            emails.add(hearingSubtype.getHearingVideoEmail());
         }
-
         return emails;
     }
 

diff --git a/src/test/java/uk/gov/hmcts/reform/sscs/helper/mapping/HearingsPartiesMappingTest.java b/src/test/java/uk/gov/hmcts/reform/sscs/helper/mapping/HearingsPartiesMappingTest.java
@@ -936,7 +936,7 @@ void getIndividualVulnerabilityDetails() {
     @DisplayName("When a hearingVideoEmail has a email, getIndividualHearingChannelEmail "
         + "returns a list with only that email ")
     @Test
-    void testGetIndividualHearingChannelEmail() throws ListingException {
+    void testGetIndividualHearingChannelEmail() {
 
         HearingSubtype subtype = HearingSubtype.builder()
             .hearingVideoEmail(EMAIL_ADDRESS)
@@ -953,48 +953,22 @@ void testGetIndividualHearingChannelEmail() throws ListingException {
         + "returns an empty list")
     @ParameterizedTest
     @NullAndEmptySource
-    void testGetIndividualHearingChannelEmailBlank(String value) throws ListingException {
+    void testGetIndividualHearingChannelEmail(String value) {
 
         HearingSubtype subtype = HearingSubtype.builder()
-            .wantsHearingTypeVideo(YES.getValue())
             .hearingVideoEmail(value)
             .build();
 
-        assertThrows(ListingException.class, () -> HearingsPartiesMapping.getIndividualHearingChannelEmail(subtype));
-    }
-
-    @DisplayName("When a hearingVideoEmail has an email, and wants video hearing getIndividualHearingChannelEmail "
-        + "returns a list with only that email ")
-    @Test
-    void testGetIndividualHearingChannelEmailWithWantsVideo() throws ListingException {
-        HearingSubtype subtype = HearingSubtype.builder()
-            .hearingVideoEmail(EMAIL_ADDRESS)
-            .wantsHearingTypeVideo(YES.getValue())
-            .build();
-
         List<String> result = HearingsPartiesMapping.getIndividualHearingChannelEmail(subtype);
 
         assertThat(result)
-            .hasSize(1)
-            .containsOnly(EMAIL_ADDRESS);
-    }
-
-    @DisplayName("When a hearingVideoEmail has an invalid email, and wants video hearing getIndividualHearingChannelEmail "
-        + "throws a listing error")
-    @Test
-    void testGetIndividualHearingChannelEmailWithInvalidEmail() {
-        HearingSubtype subtype = HearingSubtype.builder()
-            .hearingVideoEmail("invalidemailaddress")
-            .wantsHearingTypeVideo(YES.getValue())
-            .build();
-
-        assertThrows(ListingException.class, () -> HearingsPartiesMapping.getIndividualHearingChannelEmail(subtype));
+            .isEmpty();
     }
 
     @DisplayName("When a HearingSubtype is null, getIndividualHearingChannelEmail "
         + "returns an empty list")
     @Test
-    void testGetIndividualHearingChannelEmailNull() throws ListingException {
+    void testGetIndividualHearingChannelEmailNull() {
         List<String> result = HearingsPartiesMapping.getIndividualHearingChannelEmail(null);
 
         assertThat(result)