Skip to content

SNI-8712 - Fix #94

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

Open
shettyshrikanth wants to merge 1 commit into
base: team/SNI-8712
Choose a base branch
from
Open

SNI-8712 - Fix #94

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
14 changes: 8 additions & 6 deletions ...jp-query-view/src/main/java/uk/gov/moj/cpp/sjp/query/view/service/ProgressionService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,12 +90,13 @@ public List<String> findDefendantOffences(UUID caseId, DefendantDetail defendant
private boolean defendantMatch(JsonObject caseDefendant, DefendantDetail defendant) {
final JsonObject personDefendant = caseDefendant.getJsonObject(PERSON_DEFENDANT_FIELD_NAME);
final JsonObject caseDefendantPersonalDetails = personDefendant.getJsonObject(PERSON_DETAILS_FIELD_NAME);
final String firstName = caseDefendantPersonalDetails.getString(FIRSTNAME_FIELD_NAME);
final String lastName = caseDefendantPersonalDetails.getString(LASTNAME_FIELD_NAME);
final String dateOfBirth = caseDefendantPersonalDetails.getString(DOB_FIELD_NAME);
final JsonObject address = caseDefendantPersonalDetails.getJsonObject(ADDRESS_FIELD_NAME);
final String addressLine1 = address.getString(ADDRESS1_FIELD_NAME);
final String postCode = address.getString(POSTCODE_FIELD_NAME);
final String firstName = caseDefendantPersonalDetails.getString(FIRSTNAME_FIELD_NAME, null);
final String lastName = caseDefendantPersonalDetails.getString(LASTNAME_FIELD_NAME, null);
final String dateOfBirth = caseDefendantPersonalDetails.getString(DOB_FIELD_NAME, null);
final JsonObject address = caseDefendantPersonalDetails.containsKey(ADDRESS_FIELD_NAME) ?
caseDefendantPersonalDetails.getJsonObject(ADDRESS_FIELD_NAME) : createObjectBuilder().build();
final String addressLine1 = address.getString(ADDRESS1_FIELD_NAME, null);
final String postCode = address.getString(POSTCODE_FIELD_NAME, null);

final PersonalDetails personalDetails = defendant.getPersonalDetails();

Expand All @@ -106,3 +107,4 @@ private boolean defendantMatch(JsonObject caseDefendant, DefendantDetail defenda
Objects.equals(postCode, defendant.getAddress().getPostcode());
}
}

130 changes: 130 additions & 0 deletions ...uery-view/src/test/java/uk/gov/moj/cpp/sjp/query/view/service/ProgressionServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,60 @@ public void shouldFindNoMatchingDefendantOffencesFromProsecutionCase() {
assertTrue(defendantOffences.isEmpty());
}

@Test
public void shouldReturnNoOffencesWhenFirstNameIsMissingInJson() {
final DefendantDetail defendantDetail = createDefaultDefendantDetail();
lenient().when(envelope.payloadAsJsonObject()).thenReturn(createProsecutionCaseWithMissingField("firstName"));
final List<String> defendantOffences =
progressionService.findDefendantOffences(UUID.randomUUID(), defendantDetail);
assertTrue(defendantOffences.isEmpty());
}

@Test
public void shouldReturnNoOffencesWhenLastNameIsMissingInJson() {
final DefendantDetail defendantDetail = createDefaultDefendantDetail();
lenient().when(envelope.payloadAsJsonObject()).thenReturn(createProsecutionCaseWithMissingField("lastName"));
final List<String> defendantOffences =
progressionService.findDefendantOffences(UUID.randomUUID(), defendantDetail);
assertTrue(defendantOffences.isEmpty());
}

@Test
public void shouldReturnNoOffencesWhenDateOfBirthIsMissingInJson() {
final DefendantDetail defendantDetail = createDefaultDefendantDetail();
lenient().when(envelope.payloadAsJsonObject()).thenReturn(createProsecutionCaseWithMissingField("dateOfBirth"));
final List<String> defendantOffences =
progressionService.findDefendantOffences(UUID.randomUUID(), defendantDetail);
assertTrue(defendantOffences.isEmpty());
}

@Test
public void shouldReturnNoOffencesWhenAddressLine1IsMissingInJson() {
final DefendantDetail defendantDetail = createDefaultDefendantDetail();
lenient().when(envelope.payloadAsJsonObject()).thenReturn(createProsecutionCaseWithMissingAddressField("address1"));
final List<String> defendantOffences =
progressionService.findDefendantOffences(UUID.randomUUID(), defendantDetail);
assertTrue(defendantOffences.isEmpty());
}

@Test
public void shouldReturnNoOffencesWhenPostcodeIsMissingInJson() {
final DefendantDetail defendantDetail = createDefaultDefendantDetail();
lenient().when(envelope.payloadAsJsonObject()).thenReturn(createProsecutionCaseWithMissingAddressField("postcode"));
final List<String> defendantOffences =
progressionService.findDefendantOffences(UUID.randomUUID(), defendantDetail);
assertTrue(defendantOffences.isEmpty());
}

@Test
public void shouldReturnNoOffencesWhenEntireAddressObjectIsMissingInJson() {
final DefendantDetail defendantDetail = createDefaultDefendantDetail();
lenient().when(envelope.payloadAsJsonObject()).thenReturn(createProsecutionCaseWithNoAddressObject());
final List<String> defendantOffences =
progressionService.findDefendantOffences(UUID.randomUUID(), defendantDetail);
assertTrue(defendantOffences.isEmpty());
}

private DefendantDetail createDefaultDefendantDetail() {
final DefendantDetail defendantDetail = new DefendantDetail(UUID.randomUUID());

Expand Down Expand Up @@ -130,4 +184,80 @@ private JsonObject createProsecutionCase(PersonalDetails personalDetails) {
createObjectBuilder().add("defendants", defendants)).build();
}

private JsonObject createProsecutionCaseWithMissingField(String omittedPersonField) {
final JsonArray offences = createArrayBuilder().
add(createObjectBuilder().add("wording", "Offence-1").build()).
build();
final PersonalDetails pd = defaultDefendant.getPersonalDetails();
javax.json.JsonObjectBuilder personDetailsBuilder = createObjectBuilder();
if (!omittedPersonField.equals("firstName")) personDetailsBuilder.add("firstName", pd.getFirstName());
if (!omittedPersonField.equals("lastName")) personDetailsBuilder.add("lastName", pd.getLastName());
if (!omittedPersonField.equals("dateOfBirth")) personDetailsBuilder.add("dateOfBirth", pd.getDateOfBirth().toString());
personDetailsBuilder.add("address", createObjectBuilder().
add("address1", defaultDefendant.getAddress().getAddress1()).
add("postcode", defaultDefendant.getAddress().getPostcode()).
build());
final JsonObject personDefendant = createObjectBuilder().
add("personDetails", personDetailsBuilder.build()).
build();
final JsonArray defendants = createArrayBuilder().
add(createObjectBuilder().
add("offences", offences).
add("personDefendant", personDefendant).
build()).
build();
return createObjectBuilder().add("prosecutionCase",
createObjectBuilder().add("defendants", defendants)).build();
}

private JsonObject createProsecutionCaseWithNoAddressObject() {
final JsonArray offences = createArrayBuilder().
add(createObjectBuilder().add("wording", "Offence-1").build()).
build();
final PersonalDetails pd = defaultDefendant.getPersonalDetails();
final JsonObject personDetails = createObjectBuilder().
add("firstName", pd.getFirstName()).
add("lastName", pd.getLastName()).
add("dateOfBirth", pd.getDateOfBirth().toString()).
build();
final JsonObject personDefendant = createObjectBuilder().
add("personDetails", personDetails).
build();
final JsonArray defendants = createArrayBuilder().
add(createObjectBuilder().
add("offences", offences).
add("personDefendant", personDefendant).
build()).
build();
return createObjectBuilder().add("prosecutionCase",
createObjectBuilder().add("defendants", defendants)).build();
}

private JsonObject createProsecutionCaseWithMissingAddressField(String omittedAddressField) {
final JsonArray offences = createArrayBuilder().
add(createObjectBuilder().add("wording", "Offence-1").build()).
build();
final PersonalDetails pd = defaultDefendant.getPersonalDetails();
javax.json.JsonObjectBuilder addressBuilder = createObjectBuilder();
if (!omittedAddressField.equals("address1")) addressBuilder.add("address1", defaultDefendant.getAddress().getAddress1());
if (!omittedAddressField.equals("postcode")) addressBuilder.add("postcode", defaultDefendant.getAddress().getPostcode());
final JsonObject personDetails = createObjectBuilder().
add("firstName", pd.getFirstName()).
add("lastName", pd.getLastName()).
add("dateOfBirth", pd.getDateOfBirth().toString()).
add("address", addressBuilder.build()).
build();
final JsonObject personDefendant = createObjectBuilder().
add("personDetails", personDetails).
build();
final JsonArray defendants = createArrayBuilder().
add(createObjectBuilder().
add("offences", offences).
add("personDefendant", personDefendant).
build()).
build();
return createObjectBuilder().add("prosecutionCase",
createObjectBuilder().add("defendants", defendants)).build();
}

}
Loading