SSCSCI-1456 (#1705)

* Revert "Revert "SSCSCI-1456" (#1704)"

This reverts commit aa5e8ae.

* fix by adding constructor without hmcHearingType

* attempted fix

* checkstyle fix

* removing redundant constructor and isNullCheck

src/main/java/uk/gov/hmcts/reform/sscs/ccd/domain/HearingOptions.java

@@ -25,6 +25,8 @@ public class HearingOptions {
     private String agreeLessNotice;
     private HearingRoute hearingRoute;
     private String other;
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    private HmcHearingType hmcHearingType;
 
     @JsonCreator
     public HearingOptions(@JsonProperty("wantsToAttend") String wantsToAttend,
@@ -38,7 +40,8 @@ public HearingOptions(@JsonProperty("wantsToAttend") String wantsToAttend,
                           @JsonProperty("excludeDates") List<ExcludeDate> excludeDates,
                           @JsonProperty("agreeLessNotice") String agreeLessNotice,
                           @JsonProperty("hearingRoute") HearingRoute hearingRoute,
-                          @JsonProperty("other") String other) {
+                          @JsonProperty("other") String other,
+                          @JsonProperty("hmcHearingType") HmcHearingType hmcHearingType) {
         this.wantsToAttend = wantsToAttend;
         this.wantsSupport = wantsSupport;
         this.languageInterpreter = languageInterpreter;
@@ -51,16 +54,17 @@ public HearingOptions(@JsonProperty("wantsToAttend") String wantsToAttend,
         this.agreeLessNotice = agreeLessNotice;
         this.hearingRoute = hearingRoute;
         this.other = other;
+        this.hmcHearingType = hmcHearingType;
     }
 
     @JsonIgnore
     public Boolean isWantsToAttendHearing() {
-        return StringUtils.isNotBlank(wantsToAttend) && wantsToAttend.toLowerCase().equals("yes");
+        return StringUtils.isNotBlank(wantsToAttend) && wantsToAttend.equalsIgnoreCase("yes");
     }
 
     @JsonIgnore
     public Boolean isAgreeLessNotice() {
-        return StringUtils.isNotBlank(agreeLessNotice) && agreeLessNotice.toLowerCase().equals("yes");
+        return StringUtils.isNotBlank(agreeLessNotice) && agreeLessNotice.equalsIgnoreCase("yes");
     }
 
     public Boolean wantsSignLanguageInterpreter() {

src/main/java/uk/gov/hmcts/reform/sscs/ccd/domain/HmcHearingType.java

@@ -0,0 +1,23 @@
+package uk.gov.hmcts.reform.sscs.ccd.domain;
+
+import com.fasterxml.jackson.annotation.JsonValue;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+@Getter
+@RequiredArgsConstructor
+public enum HmcHearingType {
+    SUBSTANTIVE("BBA3-SUB", "Substantive", null),
+    DIRECTION_HEARINGS("BBA3-DIR", "Direction Hearings", null),
+    CHAMBERS_OUTCOME("BBA3-CHA", "Chambers Outcome", null);
+
+    private final String hmcReference;
+    private final String valueEn;
+    private final String valueCy;
+
+    @Override
+    @JsonValue
+    public String toString() {
+        return hmcReference;
+    }
+}

src/main/java/uk/gov/hmcts/reform/sscs/ccd/domain/OverrideFields.java

@@ -17,14 +17,21 @@
 @Builder(toBuilder = true)
 @AllArgsConstructor
 @NoArgsConstructor
-@JsonInclude
 public class OverrideFields {
+    @JsonInclude
     private Integer duration;
+    @JsonInclude
     private HearingInterpreter appellantInterpreter;
+    @JsonInclude
     private HearingChannel appellantHearingChannel;
+    @JsonInclude
     private HearingWindow hearingWindow;
+    @JsonInclude
     private YesNo autoList;
+    @JsonInclude
     private List<CcdValue<CcdValue<String>>> hearingVenueEpimsIds;
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    private HmcHearingType hmcHearingType;
 
     @SuppressWarnings("unused")
     @JsonIgnore
@@ -34,6 +41,7 @@ && isNull(appellantInterpreter)
             && isNull(appellantHearingChannel)
             && isNull(hearingWindow)
             && isNull(autoList)
-            && isNull(hearingVenueEpimsIds);
+            && isNull(hearingVenueEpimsIds)
+            && isNull(hmcHearingType);
     }
 }

src/main/java/uk/gov/hmcts/reform/sscs/ccd/domain/SscsCaseData.java

@@ -404,6 +404,12 @@ public class SscsCaseData implements CaseData {
 
     private YesNo ignoreCallbackWarnings;
 
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    private YesNo selectNextHmcHearingType;
+
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    private HmcHearingType hmcHearingType;
+
     @JsonIgnore
     private EventDetails getLatestEvent() {
         return events != null && !events.isEmpty() ? events.get(0).getValue() : null;

src/test/java/uk/gov/hmcts/reform/sscs/ccd/domain/HmcHearingTypeTest.java

@@ -0,0 +1,25 @@
+package uk.gov.hmcts.reform.sscs.ccd.domain;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+import junitparams.JUnitParamsRunner;
+import junitparams.Parameters;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(JUnitParamsRunner.class)
+public class HmcHearingTypeTest {
+
+    @Test
+    @Parameters({
+        "SUBSTANTIVE,BBA3-SUB,Substantive",
+        "DIRECTION_HEARINGS,BBA3-DIR,Direction Hearings",
+        "CHAMBERS_OUTCOME,BBA3-CHA,Chambers Outcome"
+    })
+    public void shouldReturnCorrectValues(HmcHearingType hmcHearingType, String hmcReference, String valueEn) {
+        assertEquals(hmcReference, hmcHearingType.getHmcReference());
+        assertEquals(valueEn, hmcHearingType.getValueEn());
+        assertNull(hmcHearingType.getValueCy());
+    }
+}