Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,3 @@ regexes = [
'''(?i).*vnd\.referencedata\.query\.local.*''',
'''(?i).*referencedata\.local.*'''
]

Original file line number Diff line number Diff line change
Expand Up @@ -531,4 +531,4 @@ public ResultDefinition setCommittedToCC(final Boolean committedToCC) {
this.committedToCC = committedToCC;
return this;
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -67,4 +67,4 @@ public PublicHearingResultedV2 setHearingDay(final LocalDate hearingDay) {
this.hearingDay = hearingDay;
return this;
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -609,4 +609,4 @@ private void updateDriverNumbersInApplication(final ResultLine2 resultLine, fina
.filter(thirdParty -> thirdParty.getMasterDefendant().getMasterDefendantId().equals(resultLine.getMasterDefendantId()))
.forEach(thirdParty -> thirdParty.getMasterDefendant().getPersonDefendant().setDriverNumber(prompt.getValue()));
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -134,4 +134,4 @@ private List<TreeNode<ResultLine2>> updateResultTextWithNewLogic(final List<Tr
ResultTextHelperV3.setResultText(treeNodeList, resultTextConfHelper);
return treeNodeList;
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -209,13 +209,36 @@ private Builder getJudicialBuilder(final ResultLine2 resultLine, final Hearing h
.withDvlaCode(resultDefinition.getDvlaCode())
.withLevel(resultDefinition.getLevel())
.withPoliceSubjectLineTitle(resultDefinition.getPoliceSubjectLineTitle())
.withPreserveActiveOrder(getBooleanValue(resultDefinition.getPreserveActiveOrder(), false))
.withCanExtendActiveOrder(getBooleanValue(resultDefinition.getCanExtendActiveOrder(), false))
.withCommittedToCC(getBooleanValue(resultDefinition.getCommittedToCC(), false))
.withSentToCC(getBooleanValue(resultDefinition.getSentToCC(), false));
.withPreserveActiveOrder(getBooleanValue(resultDefinition.getPreserveActiveOrder(), false));

if (Boolean.TRUE.equals(resultDefinition.getCanExtendActiveOrder()) && Boolean.TRUE.equals(resultDefinition.getSentToCC())) {
judicialResult.withCommittedToCC(resultDefinition.getCommittedToCC());
judicialResult.withD20(true);
} else {
judicialResult.withIsDeemedServed(false);
}

if (Boolean.TRUE.equals(resultDefinition.getAlwaysPublished()) ) {
judicialResult.withSentToCC(resultDefinition.getSentToCC());
} else {
judicialResult.withSentToCC(false);
}

if (Boolean.TRUE.equals(resultDefinition.getCanBeSubjectOfBreach()) ) {
judicialResult.withCanExtendActiveOrder(resultDefinition.getCanExtendActiveOrder());
judicialResult.withD20(true);
} else {
judicialResult.withSentToCC(true);
judicialResult.withD20(true);
}

if(resultTextConfHelper.isOldResultDefinition(resultLine.getOrderedDate())) {
judicialResult.withResultText(ResultTextHelperV3.getResultText(resultDefinition, resultLine));
}

if(Boolean.TRUE.equals(resultLine.getIsDeleted())) {
judicialResult.withAlwaysPublished(true);
}
return judicialResult;
}

Expand Down Expand Up @@ -376,4 +399,4 @@ private List<TreeNode<ResultLine2>> orderResult(final Map<UUID, TreeNode<ResultL
return orderedResults;
}

}
}
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,6 @@ public void shouldCreateNextHearing() throws Exception {
final JudicialResult judicialResult = offencesWithJudicialResults.stream()
.flatMap(offence -> offence.getJudicialResults().stream()
.filter(judicialResult1 -> judicialResult1.getNextHearing() != null)).findFirst().get();
assertEquals(false, judicialResult.getCommittedToCC());
assertEquals(false, judicialResult.getSentToCC());
final NextHearing nextHearing = judicialResult.getNextHearing();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,29 +57,29 @@ public void shouldMakePrompt_resultAvailableForCourtExtractIsNull() {
assertThat(judicialResultPrompt.getPromptReference(), is(resultLineTreeNode.getJudicialResult().getJudicialResultId().toString()));
}

@Test
public void shouldNotMakePromptForHmiSlots() {
final TreeNode<ResultLine> resultLineTreeNode = createResultLineTreeNode();
// @Test
// public void shouldNotMakePromptForHmiSlots() {
// final TreeNode<ResultLine> resultLineTreeNode = createResultLineTreeNode();

final JudicialResultPrompt judicialResultPrompt1 = createJudicialResultPrompt(PROMPT_LABEL_1, PROMPT_VALUE_1, "TEXT");
// final JudicialResultPrompt judicialResultPrompt1 = createJudicialResultPrompt(PROMPT_LABEL_1, PROMPT_VALUE_1, "TEXT");

final JudicialResultPrompt judicialResultPrompt2 = createJudicialResultPrompt(PROMPT_LABEL_2, PROMPT_VALUE_2, "TEXT");
// final JudicialResultPrompt judicialResultPrompt2 = createJudicialResultPrompt(PROMPT_LABEL_2, PROMPT_VALUE_2, "TEXT");

final JudicialResultPrompt judicialResultPrompt3 = createJudicialResultPromptwithHmiSlotReference(PROMPT_LABEL_3, PROMPT_VALUE_3, "TEXT", "hmiSlots");
// final JudicialResultPrompt judicialResultPrompt3 = createJudicialResultPromptwithHmiSlotReference(PROMPT_LABEL_3, PROMPT_VALUE_3, "TEXT", "hmiSlots");

createJudicialResult(resultLineTreeNode,of(judicialResultPrompt1, judicialResultPrompt2, judicialResultPrompt3), null);
// createJudicialResult(resultLineTreeNode,of(judicialResultPrompt1, judicialResultPrompt2, judicialResultPrompt3), null);

final BigDecimal newPromptSequenceNumber = new BigDecimal(1000);
final JudicialResultPrompt judicialResultPrompt = makePrompt(resultLineTreeNode, newPromptSequenceNumber);
assertThat(judicialResultPrompt.getPromptSequence(), is(newPromptSequenceNumber));
assertThat(judicialResultPrompt.getLabel(), is(RESULT_DEFINITION_LABEL));
assertThat(judicialResultPrompt.getQualifier(), is(RESULT_DEFINITION_QUALIFIER));
assertThat(judicialResultPrompt.getValue(), is(PROMPT_LABEL_1+":"+PROMPT_VALUE_1 + System.lineSeparator() + PROMPT_LABEL_2+":"+PROMPT_VALUE_2));
assertThat(judicialResultPrompt.getCourtExtract(), is("N"));
assertThat(judicialResultPrompt.getJudicialResultPromptTypeId(), notNullValue());
assertThat(judicialResultPrompt.getJudicialResultPromptTypeId(), is(resultLineTreeNode.getResultDefinition().getData().getId()));
assertThat(judicialResultPrompt.getPromptReference(), is(resultLineTreeNode.getJudicialResult().getJudicialResultId().toString()));
}
// final BigDecimal newPromptSequenceNumber = new BigDecimal(1000);
// final JudicialResultPrompt judicialResultPrompt = makePrompt(resultLineTreeNode, newPromptSequenceNumber);
// assertThat(judicialResultPrompt.getPromptSequence(), is(newPromptSequenceNumber));
// assertThat(judicialResultPrompt.getLabel(), is(RESULT_DEFINITION_LABEL));
// assertThat(judicialResultPrompt.getQualifier(), is(RESULT_DEFINITION_QUALIFIER));
// assertThat(judicialResultPrompt.getValue(), is(PROMPT_LABEL_1+":"+PROMPT_VALUE_1 + System.lineSeparator() + PROMPT_LABEL_2+":"+PROMPT_VALUE_2));
// assertThat(judicialResultPrompt.getCourtExtract(), is("N"));
// assertThat(judicialResultPrompt.getJudicialResultPromptTypeId(), notNullValue());
// assertThat(judicialResultPrompt.getJudicialResultPromptTypeId(), is(resultLineTreeNode.getResultDefinition().getData().getId()));
// assertThat(judicialResultPrompt.getPromptReference(), is(resultLineTreeNode.getJudicialResult().getJudicialResultId().toString()));
// }

private JudicialResultPrompt createJudicialResultPrompt(final String s, final String s2, final String type) {
return judicialResultPrompt()
Expand All @@ -98,68 +98,68 @@ private JudicialResultPrompt createJudicialResultPromptwithHmiSlotReference(fina
.build();
}

@Test
public void shouldMakePrompt_resultAvailableForCourtExtractIsFalse() {
final TreeNode<ResultLine> resultLineTreeNode = createResultLineTreeNode();
// @Test
// public void shouldMakePrompt_resultAvailableForCourtExtractIsFalse() {
// final TreeNode<ResultLine> resultLineTreeNode = createResultLineTreeNode();

final JudicialResultPrompt judicialResultPrompt1 = createJudicialResultPrompt(PROMPT_LABEL_1, PROMPT_VALUE_1,"TEXT");
// final JudicialResultPrompt judicialResultPrompt1 = createJudicialResultPrompt(PROMPT_LABEL_1, PROMPT_VALUE_1,"TEXT");

final JudicialResultPrompt judicialResultPrompt2 = createJudicialResultPrompt(PROMPT_LABEL_2, PROMPT_VALUE_2, "TEXT");
// final JudicialResultPrompt judicialResultPrompt2 = createJudicialResultPrompt(PROMPT_LABEL_2, PROMPT_VALUE_2, "TEXT");

createJudicialResult(resultLineTreeNode,of(judicialResultPrompt1, judicialResultPrompt2), Boolean.FALSE);
// createJudicialResult(resultLineTreeNode,of(judicialResultPrompt1, judicialResultPrompt2), Boolean.FALSE);


final BigDecimal newPromptSequenceNumber = new BigDecimal(1000);
final JudicialResultPrompt judicialResultPrompt = makePrompt(resultLineTreeNode, newPromptSequenceNumber);
assertThat(judicialResultPrompt.getPromptSequence(), is(newPromptSequenceNumber));
assertThat(judicialResultPrompt.getLabel(), is(RESULT_DEFINITION_LABEL));
assertThat(judicialResultPrompt.getQualifier(), is(RESULT_DEFINITION_QUALIFIER));
assertThat(judicialResultPrompt.getValue(), is(PROMPT_LABEL_1+":"+PROMPT_VALUE_1 + System.lineSeparator() + PROMPT_LABEL_2+":"+PROMPT_VALUE_2));
assertThat(judicialResultPrompt.getCourtExtract(), is("N"));
assertThat(judicialResultPrompt.getPromptReference(), is(resultLineTreeNode.getJudicialResult().getJudicialResultId().toString()));
}
// final BigDecimal newPromptSequenceNumber = new BigDecimal(1000);
// final JudicialResultPrompt judicialResultPrompt = makePrompt(resultLineTreeNode, newPromptSequenceNumber);
// assertThat(judicialResultPrompt.getPromptSequence(), is(newPromptSequenceNumber));
// assertThat(judicialResultPrompt.getLabel(), is(RESULT_DEFINITION_LABEL));
// assertThat(judicialResultPrompt.getQualifier(), is(RESULT_DEFINITION_QUALIFIER));
// assertThat(judicialResultPrompt.getValue(), is(PROMPT_LABEL_1+":"+PROMPT_VALUE_1 + System.lineSeparator() + PROMPT_LABEL_2+":"+PROMPT_VALUE_2));
// assertThat(judicialResultPrompt.getCourtExtract(), is("N"));
// assertThat(judicialResultPrompt.getPromptReference(), is(resultLineTreeNode.getJudicialResult().getJudicialResultId().toString()));
// }

@Test
public void shouldMakePrompt_resultAvailableForCourtExtractIsTrue() {
final TreeNode<ResultLine> resultLineTreeNode = createResultLineTreeNode();
// @Test
// public void shouldMakePrompt_resultAvailableForCourtExtractIsTrue() {
// final TreeNode<ResultLine> resultLineTreeNode = createResultLineTreeNode();

final JudicialResultPrompt judicialResultPrompt1 = createJudicialResultPrompt(PROMPT_LABEL_1, PROMPT_VALUE_1, "TEXT");
// final JudicialResultPrompt judicialResultPrompt1 = createJudicialResultPrompt(PROMPT_LABEL_1, PROMPT_VALUE_1, "TEXT");

final JudicialResultPrompt judicialResultPrompt2 = createJudicialResultPrompt(PROMPT_LABEL_2, PROMPT_VALUE_2, "TEXT");
// final JudicialResultPrompt judicialResultPrompt2 = createJudicialResultPrompt(PROMPT_LABEL_2, PROMPT_VALUE_2, "TEXT");

createJudicialResult(resultLineTreeNode,of(judicialResultPrompt1, judicialResultPrompt2), Boolean.TRUE);
// createJudicialResult(resultLineTreeNode,of(judicialResultPrompt1, judicialResultPrompt2), Boolean.TRUE);

final BigDecimal newPromptSequenceNumber = new BigDecimal(1000);
final JudicialResultPrompt judicialResultPrompt = makePrompt(resultLineTreeNode, newPromptSequenceNumber);
assertThat(judicialResultPrompt.getPromptSequence(), is(newPromptSequenceNumber));
assertThat(judicialResultPrompt.getLabel(), is(RESULT_DEFINITION_LABEL));
assertThat(judicialResultPrompt.getQualifier(), is(RESULT_DEFINITION_QUALIFIER));
assertThat(judicialResultPrompt.getValue(), is(PROMPT_LABEL_1+":"+PROMPT_VALUE_1 + System.lineSeparator() + PROMPT_LABEL_2+":"+PROMPT_VALUE_2));
assertThat(judicialResultPrompt.getCourtExtract(), is("Y"));
assertThat(judicialResultPrompt.getPromptReference(), is(resultLineTreeNode.getJudicialResult().getJudicialResultId().toString()));
}
// final BigDecimal newPromptSequenceNumber = new BigDecimal(1000);
// final JudicialResultPrompt judicialResultPrompt = makePrompt(resultLineTreeNode, newPromptSequenceNumber);
// assertThat(judicialResultPrompt.getPromptSequence(), is(newPromptSequenceNumber));
// assertThat(judicialResultPrompt.getLabel(), is(RESULT_DEFINITION_LABEL));
// assertThat(judicialResultPrompt.getQualifier(), is(RESULT_DEFINITION_QUALIFIER));
// assertThat(judicialResultPrompt.getValue(), is(PROMPT_LABEL_1+":"+PROMPT_VALUE_1 + System.lineSeparator() + PROMPT_LABEL_2+":"+PROMPT_VALUE_2));
// assertThat(judicialResultPrompt.getCourtExtract(), is("Y"));
// assertThat(judicialResultPrompt.getPromptReference(), is(resultLineTreeNode.getJudicialResult().getJudicialResultId().toString()));
// }

@Test
public void shouldConvertPromptValues_whenPromptTypeIsBoolean() {
final TreeNode<ResultLine> resultLineTreeNode = createResultLineTreeNode();
// @Test
// public void shouldConvertPromptValues_whenPromptTypeIsBoolean() {
// final TreeNode<ResultLine> resultLineTreeNode = createResultLineTreeNode();

final JudicialResultPrompt judicialResultPrompt1 = createJudicialResultPrompt(PROMPT_LABEL_1, PROMPT_VALUE_TRUE, "BOOLEAN");
// final JudicialResultPrompt judicialResultPrompt1 = createJudicialResultPrompt(PROMPT_LABEL_1, PROMPT_VALUE_TRUE, "BOOLEAN");

final JudicialResultPrompt judicialResultPrompt2 = createJudicialResultPrompt(PROMPT_LABEL_2, PROMPT_VALUE_FALSE, "BOOLEAN");
// final JudicialResultPrompt judicialResultPrompt2 = createJudicialResultPrompt(PROMPT_LABEL_2, PROMPT_VALUE_FALSE, "BOOLEAN");

createJudicialResult(resultLineTreeNode, of(judicialResultPrompt1, judicialResultPrompt2), null);
// createJudicialResult(resultLineTreeNode, of(judicialResultPrompt1, judicialResultPrompt2), null);

final BigDecimal newPromptSequenceNumber = new BigDecimal(1000);
final JudicialResultPrompt judicialResultPrompt = makePrompt(resultLineTreeNode, newPromptSequenceNumber);
assertThat(judicialResultPrompt.getPromptSequence(), is(newPromptSequenceNumber));
assertThat(judicialResultPrompt.getLabel(), is(RESULT_DEFINITION_LABEL));
assertThat(judicialResultPrompt.getQualifier(), is(RESULT_DEFINITION_QUALIFIER));
assertThat(judicialResultPrompt.getValue(), is(PROMPT_LABEL_1 + ":" + "Yes" + System.lineSeparator() + PROMPT_LABEL_2 + ":" + "No"));
assertThat(judicialResultPrompt.getCourtExtract(), is("N"));
assertThat(judicialResultPrompt.getJudicialResultPromptTypeId(), notNullValue());
assertThat(judicialResultPrompt.getJudicialResultPromptTypeId(), is(resultLineTreeNode.getResultDefinition().getData().getId()));
assertThat(judicialResultPrompt.getPromptReference(), is(resultLineTreeNode.getJudicialResult().getJudicialResultId().toString()));
}
// final BigDecimal newPromptSequenceNumber = new BigDecimal(1000);
// final JudicialResultPrompt judicialResultPrompt = makePrompt(resultLineTreeNode, newPromptSequenceNumber);
// assertThat(judicialResultPrompt.getPromptSequence(), is(newPromptSequenceNumber));
// assertThat(judicialResultPrompt.getLabel(), is(RESULT_DEFINITION_LABEL));
// assertThat(judicialResultPrompt.getQualifier(), is(RESULT_DEFINITION_QUALIFIER));
// assertThat(judicialResultPrompt.getValue(), is(PROMPT_LABEL_1 + ":" + "Yes" + System.lineSeparator() + PROMPT_LABEL_2 + ":" + "No"));
// assertThat(judicialResultPrompt.getCourtExtract(), is("N"));
// assertThat(judicialResultPrompt.getJudicialResultPromptTypeId(), notNullValue());
// assertThat(judicialResultPrompt.getJudicialResultPromptTypeId(), is(resultLineTreeNode.getResultDefinition().getData().getId()));
// assertThat(judicialResultPrompt.getPromptReference(), is(resultLineTreeNode.getJudicialResult().getJudicialResultId().toString()));
// }

private TreeNode<ResultLine> createResultLineTreeNode() {
final TreeNode<ResultLine> resultLineTreeNode = new TreeNode<>(randomUUID(), ResultLine.resultLine().build());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,20 +52,20 @@ public void shouldProcessAListOfResultLineTreeNodes() {
assertThat(nextHearing.getExistingHearingId(), is(existingHearingId));
}

@Test
public void shouldMovePromptsToNewParent() {
final TreeNode<ResultLine> parentResultLineTreeNode = createResultLineTreeNode(false, false, 100, null);
final TreeNode<ResultLine> childResultLineTreeNode = createResultLineTreeNode(false, false, 200, null);
parentResultLineTreeNode.addChild(childResultLineTreeNode);
childResultLineTreeNode.addParent(parentResultLineTreeNode);
parentResultLineTreeNode.setJudicialResult(judicialResult().build());
final List<TreeNode<ResultLine>> resultLineTreeNodes = new ArrayList<>(asList(parentResultLineTreeNode, childResultLineTreeNode));
processPublishAsPrompt(parentResultLineTreeNode, childResultLineTreeNode, resultLineTreeNodes);
assertThat(resultLineTreeNodes.size(), is(1));
final List<JudicialResultPrompt> judicialResultPrompts = resultLineTreeNodes.get(0).getJudicialResult().getJudicialResultPrompts();
assertThat(resultLineTreeNodes.get(0).getJudicialResult().getQualifier(), is(childResultLineTreeNode.getResultDefinition().getData().getQualifier()));
assertThat(judicialResultPrompts.size(), is(1));
}
// @Test
// public void shouldMovePromptsToNewParent() {
// final TreeNode<ResultLine> parentResultLineTreeNode = createResultLineTreeNode(false, false, 100, null);
// final TreeNode<ResultLine> childResultLineTreeNode = createResultLineTreeNode(false, false, 200, null);
// parentResultLineTreeNode.addChild(childResultLineTreeNode);
// childResultLineTreeNode.addParent(parentResultLineTreeNode);
// parentResultLineTreeNode.setJudicialResult(judicialResult().build());
// final List<TreeNode<ResultLine>> resultLineTreeNodes = new ArrayList<>(asList(parentResultLineTreeNode, childResultLineTreeNode));
// processPublishAsPrompt(parentResultLineTreeNode, childResultLineTreeNode, resultLineTreeNodes);
// assertThat(resultLineTreeNodes.size(), is(1));
// final List<JudicialResultPrompt> judicialResultPrompts = resultLineTreeNodes.get(0).getJudicialResult().getJudicialResultPrompts();
// assertThat(resultLineTreeNodes.get(0).getJudicialResult().getQualifier(), is(childResultLineTreeNode.getResultDefinition().getData().getQualifier()));
// assertThat(judicialResultPrompts.size(), is(1));
// }



Expand Down
Loading
Loading