From be00ce26f7691e202a4463091b1a220516abb423 Mon Sep 17 00:00:00 2001 From: Nilay Date: Thu, 13 Feb 2025 15:16:30 +0000 Subject: [PATCH] Revert "SSCSCI-1456 (#1694)" This reverts commit 5792bc53004df9268606eb763dce002da40ae049. --- .../sscs/ccd/domain/HearingOptions.java | 9 +++---- .../sscs/ccd/domain/HmcHearingType.java | 23 ----------------- .../sscs/ccd/domain/OverrideFields.java | 1 - .../reform/sscs/ccd/domain/SscsCaseData.java | 7 ------ .../sscs/ccd/domain/HmcHearingTypeTest.java | 25 ------------------- 5 files changed, 3 insertions(+), 62 deletions(-) delete mode 100644 src/main/java/uk/gov/hmcts/reform/sscs/ccd/domain/HmcHearingType.java delete mode 100644 src/test/java/uk/gov/hmcts/reform/sscs/ccd/domain/HmcHearingTypeTest.java 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 index ae7b3a594d..373e3921b8 100644 --- 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 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 deleted file mode 100644 index 7928d9f612..0000000000 --- a/src/main/java/uk/gov/hmcts/reform/sscs/ccd/domain/HmcHearingType.java +++ /dev/null @@ -1,23 +0,0 @@ -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; - } -} 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 index 4ad55fcf01..8c4eea1ebf 100644 --- 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>> 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 index 367ca91349..261e084af1 100644 --- 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 deleted file mode 100644 index c037a828d1..0000000000 --- a/src/test/java/uk/gov/hmcts/reform/sscs/ccd/domain/HmcHearingTypeTest.java +++ /dev/null @@ -1,25 +0,0 @@ -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()); - } -}