Revert "SSCSCI-1456" (#1702)

Revert "SSCSCI-1456 (#1694)" This reverts commit 5792bc5.
hmcts · Feb 13, 2025 · e59dd2e · e59dd2e
1 parent 5792bc5
commit e59dd2e
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 62 deletions.
diff --git a/src/main/java/uk/gov/hmcts/reform/sscs/ccd/domain/HearingOptions.java b/src/main/java/uk/gov/hmcts/reform/sscs/ccd/domain/HearingOptions.java
@@ -25,7 +25,6 @@ public class HearingOptions {
     private String agreeLessNotice;
     private HearingRoute hearingRoute;
     private String other;
-    private HmcHearingType hmcHearingType;
 
     @JsonCreator
     public HearingOptions(@JsonProperty("wantsToAttend") String wantsToAttend,
@@ -39,8 +38,7 @@ public HearingOptions(@JsonProperty("wantsToAttend") String wantsToAttend,
                           @JsonProperty("excludeDates") List<ExcludeDate> excludeDates,
                           @JsonProperty("agreeLessNotice") String agreeLessNotice,
                           @JsonProperty("hearingRoute") HearingRoute hearingRoute,
-                          @JsonProperty("other") String other,
-                          @JsonProperty("hmcHearingType") HmcHearingType hmcHearingType) {
+                          @JsonProperty("other") String other) {
         this.wantsToAttend = wantsToAttend;
         this.wantsSupport = wantsSupport;
         this.languageInterpreter = languageInterpreter;
@@ -53,17 +51,16 @@ 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.equalsIgnoreCase("yes");
+        return StringUtils.isNotBlank(wantsToAttend) && wantsToAttend.toLowerCase().equals("yes");
     }
 
     @JsonIgnore
     public Boolean isAgreeLessNotice() {
-        return StringUtils.isNotBlank(agreeLessNotice) && agreeLessNotice.equalsIgnoreCase("yes");
+        return StringUtils.isNotBlank(agreeLessNotice) && agreeLessNotice.toLowerCase().equals("yes");
     }
 
     public Boolean wantsSignLanguageInterpreter() {

diff --git a/src/main/java/uk/gov/hmcts/reform/sscs/ccd/domain/HmcHearingType.java b/src/main/java/uk/gov/hmcts/reform/sscs/ccd/domain/HmcHearingType.java
diff --git a/src/main/java/uk/gov/hmcts/reform/sscs/ccd/domain/OverrideFields.java b/src/main/java/uk/gov/hmcts/reform/sscs/ccd/domain/OverrideFields.java
@@ -25,7 +25,6 @@ public class OverrideFields {
     private HearingWindow hearingWindow;
     private YesNo autoList;
     private List<CcdValue<CcdValue<String>>> hearingVenueEpimsIds;
-    private HmcHearingType hmcHearingType;
 
     @SuppressWarnings("unused")
     @JsonIgnore

diff --git a/src/main/java/uk/gov/hmcts/reform/sscs/ccd/domain/SscsCaseData.java b/src/main/java/uk/gov/hmcts/reform/sscs/ccd/domain/SscsCaseData.java
@@ -404,13 +404,6 @@ public class SscsCaseData implements CaseData {
 
     private YesNo ignoreCallbackWarnings;
 
-    @JsonInclude(JsonInclude.Include.NON_NULL)
-    private YesNo selectNextHmcHearingType;
-
-    @JsonInclude(JsonInclude.Include.NON_NULL)
-    @JsonProperty("hmcHearingType")
-    private HmcHearingType hmcHearingType;
-
     @JsonIgnore
     private EventDetails getLatestEvent() {
         return events != null && !events.isEmpty() ? events.get(0).getValue() : null;

diff --git a/src/test/java/uk/gov/hmcts/reform/sscs/ccd/domain/HmcHearingTypeTest.java b/src/test/java/uk/gov/hmcts/reform/sscs/ccd/domain/HmcHearingTypeTest.java