Skip to content

CAD-1464 fix-2 #121

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

Merged
rajkumarmeena merged 1 commit into from
Jul 10, 2026
Merged

CAD-1464 fix-2 #121

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
12 changes: 9 additions & 3 deletions ...ov/moj/cpp/sjp/event/processor/results/converter/judicialresult/JudicialResultHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import static java.lang.System.lineSeparator;
import static java.util.UUID.fromString;
import static java.util.stream.Collectors.joining;
import static org.apache.commons.lang3.StringUtils.isNotBlank;
import static uk.gov.justice.core.courts.JudicialResult.judicialResult;

import uk.gov.justice.core.courts.JudicialResult;
Expand Down Expand Up @@ -96,14 +97,19 @@ public static JudicialResultPrompt.Builder populatePromptDefinitionAttributesBas
.stream()
.filter(prompt -> prompt.getString("id").equals(jsPrompt.getId().toString()))
.filter(prompt -> prompt.containsKey(DURATION))
.filter(prompt -> duration.equals(prompt.getString(DURATION))
||duration.toUpperCase().contains(prompt.getString(DURATION).toUpperCase())
|| prompt.getString(DURATION).toUpperCase().contains(duration.toUpperCase()))
.filter(prompt -> isNotBlank(prompt.getString(DURATION)) && isNotBlank(duration))
.filter(prompt -> isDurationStringMatchesPromptValue(duration, prompt))
.findFirst();

return populatePrompt(jsPrompt, promptJson);
}

private static boolean isDurationStringMatchesPromptValue(final String duration, final JsonObject prompt) {
final String alphaOnlyPattern = "[^a-zA-Z]";
final String promptValue = prompt.getString(DURATION).replaceAll(alphaOnlyPattern, "");
return duration.equals(promptValue) || duration.toUpperCase().contains(promptValue.toUpperCase()) || promptValue.toUpperCase().contains(duration.toUpperCase());
}

@SuppressWarnings("squid:S00112")
private static JudicialResultPrompt.Builder populatePrompt(final JPrompt jsPrompt,
final Optional<JsonObject> promptJson) {
Expand Down
79 changes: 74 additions & 5 deletions ...oj/cpp/sjp/event/processor/results/converter/judicialresult/JudicialResultHelperTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
import java.util.HashMap;
import java.util.UUID;

import javax.json.Json;
import javax.json.JsonObject;

import org.junit.jupiter.api.BeforeEach;
Expand All @@ -33,7 +34,7 @@ public void setUp() {
@Test
public void shouldPopulatePromptDefinitionAttributesForYearsDuration() {
final JudicialResultPrompt.Builder builder = JudicialResultHelper.populatePromptDefinitionAttributesBasedOnDuration(
DDP_DISQUALIFICATION_PERIOD, resultDefinition, "Year(s)");
DDP_DISQUALIFICATION_PERIOD, resultDefinition, "Years");

final JudicialResultPrompt prompt = builder.build();

Expand All @@ -51,7 +52,7 @@ public void shouldPopulatePromptDefinitionAttributesForYearsDuration() {
@Test
public void shouldPopulatePromptDefinitionAttributesForMonthsDuration() {
final JudicialResultPrompt.Builder builder = JudicialResultHelper.populatePromptDefinitionAttributesBasedOnDuration(
DDP_DISQUALIFICATION_PERIOD, resultDefinition, "MONTH");
DDP_DISQUALIFICATION_PERIOD, resultDefinition, "Months");

final JudicialResultPrompt prompt = builder.build();

Expand All @@ -69,7 +70,7 @@ public void shouldPopulatePromptDefinitionAttributesForMonthsDuration() {
@Test
public void shouldPopulatePromptDefinitionAttributesForDaysDuration() {
final JudicialResultPrompt.Builder builder = JudicialResultHelper.populatePromptDefinitionAttributesBasedOnDuration(
DDP_DISQUALIFICATION_PERIOD, resultDefinition, "Day(s)");
DDP_DISQUALIFICATION_PERIOD, resultDefinition, "Days");

final JudicialResultPrompt prompt = builder.build();

Expand All @@ -84,10 +85,78 @@ public void shouldPopulatePromptDefinitionAttributesForDaysDuration() {
assertThat(prompt.getIsFinancialImposition(), is(false));
}

@Test
public void shouldPopulatePromptDefinitionAttributesWhenDurationDiffersOnlyByCase() {
final JudicialResultPrompt.Builder builder = JudicialResultHelper.populatePromptDefinitionAttributesBasedOnDuration(
DDP_DISQUALIFICATION_PERIOD, resultDefinition, "months");

final JudicialResultPrompt prompt = builder.build();

assertThat(prompt.getJudicialResultPromptTypeId(), is(DISQUALIFICATION_PERIOD_PROMPT_ID));
assertThat(prompt.getPromptReference(), is("disqualificationPeriod"));
}

@Test
public void shouldPopulatePromptDefinitionAttributesWhenDurationIsSingularFormOfPromptValue() {
final JudicialResultPrompt.Builder builder = JudicialResultHelper.populatePromptDefinitionAttributesBasedOnDuration(
DDP_DISQUALIFICATION_PERIOD, resultDefinition, "Year");

final JudicialResultPrompt prompt = builder.build();

assertThat(prompt.getJudicialResultPromptTypeId(), is(DISQUALIFICATION_PERIOD_PROMPT_ID));
assertThat(prompt.getPromptReference(), is("disqualificationPeriod"));
}

@Test
public void shouldPopulatePromptDefinitionAttributesWhenPromptValueIsSubstringOfDuration() {
final JudicialResultPrompt.Builder builder = JudicialResultHelper.populatePromptDefinitionAttributesBasedOnDuration(
DDP_DISQUALIFICATION_PERIOD, resultDefinition, "CalendarDays");

final JudicialResultPrompt prompt = builder.build();

assertThat(prompt.getJudicialResultPromptTypeId(), is(DISQUALIFICATION_PERIOD_PROMPT_ID));
assertThat(prompt.getPromptReference(), is("disqualificationPeriod"));
}

@Test
public void shouldThrowRuntimeExceptionWhenPromptNotFoundForDuration() {
assertThrows(RuntimeException.class, () ->
JudicialResultHelper.populatePromptDefinitionAttributesBasedOnDuration(
JPrompt.AMOUNT_OF_FINE, resultDefinition, "Year(s)"));
JPrompt.AMOUNT_OF_FINE, resultDefinition, "Years"));
}

@Test
public void shouldThrowRuntimeExceptionWhenDurationDoesNotMatchAnyPromptValue() {
assertThrows(RuntimeException.class, () ->
JudicialResultHelper.populatePromptDefinitionAttributesBasedOnDuration(
DDP_DISQUALIFICATION_PERIOD, resultDefinition, "Weeks"));
}

@Test
public void shouldThrowRuntimeExceptionWhenDurationIsBlank() {
assertThrows(RuntimeException.class, () ->
JudicialResultHelper.populatePromptDefinitionAttributesBasedOnDuration(
DDP_DISQUALIFICATION_PERIOD, resultDefinition, ""));
}

@Test
public void shouldThrowRuntimeExceptionWhenDurationIsNull() {
assertThrows(RuntimeException.class, () ->
JudicialResultHelper.populatePromptDefinitionAttributesBasedOnDuration(
DDP_DISQUALIFICATION_PERIOD, resultDefinition, null));
}

@Test
public void shouldThrowRuntimeExceptionWhenMatchingPromptHasBlankDurationValue() {
final JsonObject resultDefinitionWithBlankDuration = Json.createObjectBuilder()
.add("prompts", Json.createArrayBuilder()
.add(Json.createObjectBuilder()
.add("id", DISQUALIFICATION_PERIOD_PROMPT_ID.toString())
.add("duration", "")))
.build();

assertThrows(RuntimeException.class, () ->
JudicialResultHelper.populatePromptDefinitionAttributesBasedOnDuration(
DDP_DISQUALIFICATION_PERIOD, resultDefinitionWithBlankDuration, "Years"));
}
}
}
Loading