Skip to content

DD-42950 | add DR-AGE-001 imprisonment result age restriction rule #239

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
sahil-arora-hmcts wants to merge 2 commits into
base: team/DD-42950
Choose a base branch
from
Open

DD-42950 | add DR-AGE-001 imprisonment result age restriction rule #239

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a6e63d3
DD-42950 | add DR-AGE-001 imprisonment result age restriction rule
Jul 21, 2026
1a7e84c
DD-42950 | add tests for group proceedings case filtering in GetHeari…
Jul 21, 2026
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
2 changes: 1 addition & 1 deletion hearing-command/hearing-command-api/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>uk.gov.moj.cpp.hearing</groupId>
<artifactId>hearing-command</artifactId>
<version>17.104.181-SNAPSHOT</version>
<version>17.104.181-DD-42950-SNAPSHOT</version>
</parent>
<artifactId>hearing-command-api</artifactId>
<packaging>war</packaging>
Expand Down
2 changes: 1 addition & 1 deletion hearing-command/hearing-command-handler/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>uk.gov.moj.cpp.hearing</groupId>
<artifactId>hearing-command</artifactId>
<version>17.104.181-SNAPSHOT</version>
<version>17.104.181-DD-42950-SNAPSHOT</version>
</parent>
<artifactId>hearing-command-handler</artifactId>
<packaging>war</packaging>
Expand Down
14 changes: 14 additions & 0 deletions ...src/main/java/uk/gov/moj/cpp/hearing/command/handler/service/validation/DefendantDto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,20 @@
package uk.gov.moj.cpp.hearing.command.handler.service.validation;

import java.time.LocalDate;

public class DefendantDto {
private final String defendantId;
private final String firstName;
private final String lastName;
private final String masterDefendantId;
private final LocalDate dateOfBirth;

private DefendantDto(Builder builder) {
this.defendantId = builder.defendantId;
this.firstName = builder.firstName;
this.lastName = builder.lastName;
this.masterDefendantId = builder.masterDefendantId;
this.dateOfBirth = builder.dateOfBirth;
}

public String getDefendantId() {
Expand All @@ -29,6 +33,10 @@ public String getMasterDefendantId() {
return masterDefendantId;
}

public LocalDate getDateOfBirth() {
return dateOfBirth;
}

public static Builder builder() {
return new Builder();
}
Expand All @@ -38,6 +46,7 @@ public static final class Builder {
private String firstName;
private String lastName;
private String masterDefendantId;
private LocalDate dateOfBirth;

public Builder withDefendantId(String defendantId) {
this.defendantId = defendantId;
Expand All @@ -59,6 +68,11 @@ public Builder withMasterDefendantId(String masterDefendantId) {
return this;
}

public Builder withDateOfBirth(LocalDate dateOfBirth) {
this.dateOfBirth = dateOfBirth;
return this;
}

public DefendantDto build() {
return new DefendantDto(this);
}
Expand Down
1 change: 1 addition & 0 deletions ...va/uk/gov/moj/cpp/hearing/command/handler/service/validation/ValidationRequestMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ private DefendantDto toDefendantDto(final Defendant defendant) {
.withFirstName(personDetails != null ? personDetails.getFirstName() : null)
.withLastName(personDetails != null ? personDetails.getLastName() : null)
.withMasterDefendantId(uuidToString(defendant.getMasterDefendantId()))
.withDateOfBirth(personDetails != null ? personDetails.getDateOfBirth() : null)
.build();
}

Expand Down
35 changes: 35 additions & 0 deletions ...k/gov/moj/cpp/hearing/command/handler/service/validation/ValidationRequestMapperTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,41 @@ void shouldHandleNullPersonDefendantGracefully() {
assertThat(request.getDefendants(), hasSize(1));
assertThat(request.getDefendants().get(0).getFirstName(), is(nullValue()));
assertThat(request.getDefendants().get(0).getLastName(), is(nullValue()));
assertThat(request.getDefendants().get(0).getDateOfBirth(), is(nullValue()));
}

@Test
void shouldMapDefendantDateOfBirthFromPersonDetails() {
final UUID defendantId = randomUUID();
final LocalDate dateOfBirth = LocalDate.of(1990, 5, 20);

final Person person = Person.person()
.withDateOfBirth(dateOfBirth)
.build();

final PersonDefendant personDefendant = PersonDefendant.personDefendant()
.withPersonDetails(person)
.build();

final Defendant defendant = Defendant.defendant()
.withId(defendantId)
.withPersonDefendant(personDefendant)
.build();

final ProsecutionCase prosecutionCase = ProsecutionCase.prosecutionCase()
.withDefendants(List.of(defendant))
.build();

final Hearing hearing = Hearing.hearing()
.withProsecutionCases(List.of(prosecutionCase))
.build();

final ShareDaysResultsCommand command = buildCommand(randomUUID(), LocalDate.now(), emptyList());

final ValidationRequest request = mapper.toValidationRequest(command, hearing);

assertThat(request.getDefendants(), hasSize(1));
assertThat(request.getDefendants().get(0).getDateOfBirth(), is(dateOfBirth));
}

@Test
Expand Down
2 changes: 1 addition & 1 deletion hearing-command/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>uk.gov.moj.cpp.hearing</groupId>
<artifactId>hearing-parent</artifactId>
<version>17.104.181-SNAPSHOT</version>
<version>17.104.181-DD-42950-SNAPSHOT</version>
</parent>
<artifactId>hearing-command</artifactId>
<packaging>pom</packaging>
Expand Down
2 changes: 1 addition & 1 deletion hearing-common/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>hearing-parent</artifactId>
<groupId>uk.gov.moj.cpp.hearing</groupId>
<version>17.104.181-SNAPSHOT</version>
<version>17.104.181-DD-42950-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion hearing-domain/hearing-domain-aggregate/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>uk.gov.moj.cpp.hearing</groupId>
<artifactId>hearing-domain</artifactId>
<version>17.104.181-SNAPSHOT</version>
<version>17.104.181-DD-42950-SNAPSHOT</version>
</parent>
<artifactId>hearing-domain-aggregate</artifactId>
<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion hearing-domain/hearing-domain-common/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>uk.gov.moj.cpp.hearing</groupId>
<artifactId>hearing-domain</artifactId>
<version>17.104.181-SNAPSHOT</version>
<version>17.104.181-DD-42950-SNAPSHOT</version>
</parent>
<artifactId>hearing-domain-common</artifactId>

Expand Down
2 changes: 1 addition & 1 deletion hearing-domain/hearing-domain-event/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>uk.gov.moj.cpp.hearing</groupId>
<artifactId>hearing-domain</artifactId>
<version>17.104.181-SNAPSHOT</version>
<version>17.104.181-DD-42950-SNAPSHOT</version>
</parent>
<artifactId>hearing-domain-event</artifactId>

Expand Down
2 changes: 1 addition & 1 deletion hearing-domain/hearing-domain-xhibit/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>uk.gov.moj.cpp.hearing</groupId>
<artifactId>hearing-domain</artifactId>
<version>17.104.181-SNAPSHOT</version>
<version>17.104.181-DD-42950-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion hearing-domain/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>uk.gov.moj.cpp.hearing</groupId>
<artifactId>hearing-parent</artifactId>
<version>17.104.181-SNAPSHOT</version>
<version>17.104.181-DD-42950-SNAPSHOT</version>
</parent>
<artifactId>hearing-domain</artifactId>
<packaging>pom</packaging>
Expand Down
2 changes: 1 addition & 1 deletion hearing-event-sources/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>hearing-parent</artifactId>
<groupId>uk.gov.moj.cpp.hearing</groupId>
<version>17.104.181-SNAPSHOT</version>
<version>17.104.181-DD-42950-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion hearing-event/hearing-event-listener/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>uk.gov.moj.cpp.hearing</groupId>
<artifactId>hearing-event</artifactId>
<version>17.104.181-SNAPSHOT</version>
<version>17.104.181-DD-42950-SNAPSHOT</version>
</parent>
<artifactId>hearing-event-listener</artifactId>
<packaging>war</packaging>
Expand Down
2 changes: 1 addition & 1 deletion hearing-event/hearing-event-processor/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>hearing-event</artifactId>
<groupId>uk.gov.moj.cpp.hearing</groupId>
<version>17.104.181-SNAPSHOT</version>
<version>17.104.181-DD-42950-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>war</packaging>
Expand Down
2 changes: 1 addition & 1 deletion hearing-event/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>uk.gov.moj.cpp.hearing</groupId>
<artifactId>hearing-parent</artifactId>
<version>17.104.181-SNAPSHOT</version>
<version>17.104.181-DD-42950-SNAPSHOT</version>
</parent>
<artifactId>hearing-event</artifactId>
<packaging>pom</packaging>
Expand Down
2 changes: 1 addition & 1 deletion hearing-healthchecks/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>hearing-parent</artifactId>
<groupId>uk.gov.moj.cpp.hearing</groupId>
<version>17.104.181-SNAPSHOT</version>
<version>17.104.181-DD-42950-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion hearing-integration-test/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>uk.gov.moj.cpp.hearing</groupId>
<artifactId>hearing-parent</artifactId>
<version>17.104.181-SNAPSHOT</version>
<version>17.104.181-DD-42950-SNAPSHOT</version>
</parent>

<artifactId>hearing-integration-test</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion hearing-json/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>hearing-parent</artifactId>
<groupId>uk.gov.moj.cpp.hearing</groupId>
<version>17.104.181-SNAPSHOT</version>
<version>17.104.181-DD-42950-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion hearing-query/hearing-query-api/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>uk.gov.moj.cpp.hearing</groupId>
<artifactId>hearing-query</artifactId>
<version>17.104.181-SNAPSHOT</version>
<version>17.104.181-DD-42950-SNAPSHOT</version>
</parent>
<artifactId>hearing-query-api</artifactId>
<packaging>war</packaging>
Expand Down
2 changes: 1 addition & 1 deletion hearing-query/hearing-query-view/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>uk.gov.moj.cpp.hearing</groupId>
<artifactId>hearing-query</artifactId>
<version>17.104.181-SNAPSHOT</version>
<version>17.104.181-DD-42950-SNAPSHOT</version>
</parent>
<artifactId>hearing-query-view</artifactId>
<packaging>jar</packaging>
Expand Down
57 changes: 57 additions & 0 deletions ...rc/test/java/uk/gov/moj/cpp/hearing/query/view/service/GetHearingCaseTransformerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,4 +88,61 @@ void shouldReturnHearingDateMatchingTheQueriedDayForMultiDayHearing() {

assertThat(result.getHearingDate(), is(tomorrow.toLocalDate().toString()));
}

@Test
void shouldIncludeGroupMasterCaseWhenHearingIsGroupProceedings() {
final UUID masterCaseId = randomUUID();
final Hearing hearing = hearing().withId(randomUUID())
.withCourtCentre(courtCentre().withId(randomUUID()).withRoomId(randomUUID()).build())
.withIsGroupProceedings(true)
.withProsecutionCases(List.of(
prosecutionCase().withId(masterCaseId)
.withIsGroupMaster(true)
.withIsGroupMember(true)
.build()
))
.build();

final HearingCases result = transformer.hearingCases(hearing, LocalDate.now()).build();

assertThat(result.getProsecutionCases(), equalTo(List.of(masterCaseId)));
}

@Test
void shouldIncludeNonGroupMemberCaseWhenHearingIsGroupProceedings() {
final UUID caseId = randomUUID();
final Hearing hearing = hearing().withId(randomUUID())
.withCourtCentre(courtCentre().withId(randomUUID()).withRoomId(randomUUID()).build())
.withIsGroupProceedings(true)
.withProsecutionCases(List.of(
prosecutionCase().withId(caseId)
.withIsGroupMaster(false)
.withIsGroupMember(null)
.build()
))
.build();

final HearingCases result = transformer.hearingCases(hearing, LocalDate.now()).build();

assertThat(result.getProsecutionCases(), equalTo(List.of(caseId)));
}

@Test
void shouldExcludeGroupMemberCaseWhenHearingIsGroupProceedings() {
final UUID memberCaseId = randomUUID();
final Hearing hearing = hearing().withId(randomUUID())
.withCourtCentre(courtCentre().withId(randomUUID()).withRoomId(randomUUID()).build())
.withIsGroupProceedings(true)
.withProsecutionCases(List.of(
prosecutionCase().withId(memberCaseId)
.withIsGroupMaster(false)
.withIsGroupMember(true)
.build()
))
.build();

final HearingCases result = transformer.hearingCases(hearing, LocalDate.now()).build();

assertThat(result.getProsecutionCases(), is(emptyList()));
}
}
2 changes: 1 addition & 1 deletion hearing-query/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>uk.gov.moj.cpp.hearing</groupId>
<artifactId>hearing-parent</artifactId>
<version>17.104.181-SNAPSHOT</version>
<version>17.104.181-DD-42950-SNAPSHOT</version>
</parent>
<artifactId>hearing-query</artifactId>
<packaging>pom</packaging>
Expand Down
2 changes: 1 addition & 1 deletion hearing-service/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>uk.gov.moj.cpp.hearing</groupId>
<artifactId>hearing-parent</artifactId>
<version>17.104.181-SNAPSHOT</version>
<version>17.104.181-DD-42950-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion hearing-viewstore/hearing-viewstore-liquibase/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>uk.gov.moj.cpp.hearing</groupId>
<artifactId>hearing-viewstore</artifactId>
<version>17.104.181-SNAPSHOT</version>
<version>17.104.181-DD-42950-SNAPSHOT</version>
</parent>
<artifactId>hearing-viewstore-liquibase</artifactId>

Expand Down
2 changes: 1 addition & 1 deletion hearing-viewstore/hearing-viewstore-persistence/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>uk.gov.moj.cpp.hearing</groupId>
<artifactId>hearing-viewstore</artifactId>
<version>17.104.181-SNAPSHOT</version>
<version>17.104.181-DD-42950-SNAPSHOT</version>
</parent>
<artifactId>hearing-viewstore-persistence</artifactId>
<properties>
Expand Down
2 changes: 1 addition & 1 deletion hearing-viewstore/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>uk.gov.moj.cpp.hearing</groupId>
<artifactId>hearing-parent</artifactId>
<version>17.104.181-SNAPSHOT</version>
<version>17.104.181-DD-42950-SNAPSHOT</version>
</parent>
<artifactId>hearing-viewstore</artifactId>
<packaging>pom</packaging>
Expand Down
2 changes: 1 addition & 1 deletion pojo-plugin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>uk.gov.moj.cpp.hearing</groupId>
<artifactId>hearing-parent</artifactId>
<version>17.104.181-SNAPSHOT</version>
<version>17.104.181-DD-42950-SNAPSHOT</version>
</parent>
<artifactId>pojo-plugin</artifactId>

Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</parent>
<groupId>uk.gov.moj.cpp.hearing</groupId>
<artifactId>hearing-parent</artifactId>
<version>17.104.181-SNAPSHOT</version>
<version>17.104.181-DD-42950-SNAPSHOT</version>
<packaging>pom</packaging>

<name>Hearing Context - Parent Module</name>
Expand Down
2 changes: 1 addition & 1 deletion test-utilities/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>uk.gov.moj.cpp.hearing</groupId>
<artifactId>hearing-parent</artifactId>
<version>17.104.181-SNAPSHOT</version>
<version>17.104.181-DD-42950-SNAPSHOT</version>
</parent>

<dependencies>
Expand Down
Loading