Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "SSCSCI-1456" #1702

Merged
merged 1 commit into from
Feb 13, 2025
Merged

Revert "SSCSCI-1456" #1702

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions src/main/java/uk/gov/hmcts/reform/sscs/ccd/domain/HearingOptions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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;
Expand All @@ -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() {
Expand Down
23 changes: 0 additions & 23 deletions src/main/java/uk/gov/hmcts/reform/sscs/ccd/domain/HmcHearingType.java
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion src/main/java/uk/gov/hmcts/reform/sscs/ccd/domain/OverrideFields.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 0 additions & 7 deletions src/main/java/uk/gov/hmcts/reform/sscs/ccd/domain/SscsCaseData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
25 changes: 0 additions & 25 deletions src/test/java/uk/gov/hmcts/reform/sscs/ccd/domain/HmcHearingTypeTest.java
View file
Open in desktop

This file was deleted.