Skip to content

Dev/sni 8307 rel #85

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
sajanchandran wants to merge 4 commits into
base: team/rel-3rd-line-2605
Choose a base branch
from
Open

Dev/sni 8307 rel #85

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5648161
SNI-8307 Incorrect Remand status in caag
sajanchandran Jan 9, 2026
c14ec15
Merge pull request #30 from hmcts/dev/sni-8307
sajanchandran Jan 12, 2026
4f05b84
New 17.0.225-SNI-8307-SNAPSHOT
Jan 12, 2026
f0a1e56
Updated pom version
sajanchandran Feb 17, 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
4 changes: 2 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,9 @@
<material.version>17.0.72</material.version>
<json-transformer.version>1.0.6</json-transformer.version>
<access.control.version>6.4.1</access.control.version>
<referencedata.version>17.0.120</referencedata.version>
<referencedata.version>17.103.124</referencedata.version>
<listing.version>17.0.125</listing.version>
<hearing.version>17.0.134</hearing.version>
<hearing.version>17.0.142</hearing.version>
<usersgroups.version>17.0.37</usersgroups.version>
<defence.version>17.0.85</defence.version>
<referencedata.offence.version>17.0.38</referencedata.offence.version>
Expand Down
24 changes: 13 additions & 11 deletions ...on-domain-aggregate/src/main/java/uk/gov/moj/cpp/progression/aggregate/CaseAggregate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -617,17 +617,19 @@ private void handleProsecutionCaseOffencesUpdated(final ProsecutionCaseOffencesU
offenceSet.addAll(prosecutionCaseOffencesUpdated.getDefendantCaseOffences().getOffences());
offenceSet.addAll(defendant.getOffences());
Defendant.Builder builder = Defendant.defendant().withValuesFrom(defendant);
uk.gov.moj.cpp.progression.events.CustodialEstablishment custodialEstablishment = defendantCustodialEstablishmentMap.get(defendant.getId());
if (custodialEstablishment != null) {
final uk.gov.justice.core.courts.CustodialEstablishment.Builder custodialEstablishmentBuilder = uk.gov.justice.core.courts.CustodialEstablishment.custodialEstablishment();
custodialEstablishmentBuilder.withCustody(custodialEstablishment.getCustody())
.withId(custodialEstablishment.getId())
.withName(custodialEstablishment.getName());
Defendant latestDefendant = this.defendantsMap.get(defendant.getId());
PersonDefendant personDefendant = PersonDefendant.personDefendant().withValuesFrom(defendant.getPersonDefendant())
.withBailStatus(latestDefendant.getPersonDefendant().getBailStatus())
.withCustodialEstablishment(custodialEstablishmentBuilder.build()).build();
builder.withPersonDefendant(personDefendant);
Defendant latestDefendant = this.defendantsMap.get(defendant.getId());
if(defendant.getPersonDefendant() != null){
PersonDefendant.Builder personDefendant = PersonDefendant.personDefendant().withValuesFrom(defendant.getPersonDefendant())
.withBailStatus(latestDefendant.getPersonDefendant().getBailStatus());
uk.gov.moj.cpp.progression.events.CustodialEstablishment custodialEstablishment = defendantCustodialEstablishmentMap.get(defendant.getId());
if (custodialEstablishment != null) {
final uk.gov.justice.core.courts.CustodialEstablishment.Builder custodialEstablishmentBuilder = uk.gov.justice.core.courts.CustodialEstablishment.custodialEstablishment();
custodialEstablishmentBuilder.withCustody(custodialEstablishment.getCustody())
.withId(custodialEstablishment.getId())
.withName(custodialEstablishment.getName());
personDefendant.withCustodialEstablishment(custodialEstablishmentBuilder.build());
}
builder.withPersonDefendant(personDefendant.build());
}
defendantList.add(builder.withOffences(offenceSet.stream().collect(toList()))
.build());
Expand Down
57 changes: 57 additions & 0 deletions ...omain-aggregate/src/test/java/uk/gov/moj/cpp/progression/aggregate/CaseAggregateTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,7 @@
import java.util.Optional;
import java.util.Set;
import java.util.UUID;
import java.util.stream.Collectors;
import java.util.stream.Stream;

import javax.json.Json;
Expand Down Expand Up @@ -325,6 +326,7 @@ class CaseAggregateTest {
.withLastName("lastName")
.withDateOfBirth(LocalDate.now().minusYears(20))
.build())
.withBailStatus(BailStatus.bailStatus().withCode("C").withDescription("Custody").build())
.build())
.withCourtProceedingsInitiated(ZonedDateTime.now())
.withOffences(asList(offence().withId(randomUUID())
Expand Down Expand Up @@ -7881,6 +7883,61 @@ void shouldNotRaiseHearingResultedCaseUpdatedEvenIfCaseIsEjected(){
assertThat(eventStream.toList().size(), is(0));
}

@Test
public void shouldRetainCorrectBailStatusAfterLAAReferenceAndRepresentationOrder() {
final UUID caseId = fromString(CASE_ID);
final UUID defendantId = fromString(DEFENDANT_ID);
final UUID offenceId = fromString(OFFENCE_ID);
final UUID defendantId2 = randomUUID();
final UUID associatedOrganisationId = randomUUID();
final UUID currentOrganisationId = randomUUID();
final DefendantsAddedToCourtProceedings defendantsAddedToCourtProceedings = buildDefendantsAddedToCourtProceedings(
caseId, defendantId, defendantId2, offenceId);
Defendant currentDefendant1 = prosecutionCase.getDefendants().get(0);
Defendant.Builder defendant1 = defendant().withValuesFrom(currentDefendant1);
PersonDefendant personDefendant = currentDefendant1.getPersonDefendant();
final PersonDefendant newPersonDefendant = personDefendant().withValuesFrom(personDefendant).withBailStatus(BailStatus.bailStatus()
.withCode("B")
.withDescription("Conditional Bail")
.build()).build();
defendant1.withPersonDefendant(newPersonDefendant);
ProsecutionCase hearingResultedProsecutionCase = ProsecutionCase.prosecutionCase()
.withValuesFrom(prosecutionCase)
.withDefendants(Lists.newArrayList(defendant1.build()))
.build();
final HearingResultedCaseUpdated hearingResultedCaseUpdated = HearingResultedCaseUpdated.hearingResultedCaseUpdated()
.withProsecutionCase(hearingResultedProsecutionCase)
.build();
final CaseAggregate caseAggregate = new CaseAggregate();
caseAggregate.apply(new ProsecutionCaseCreated(prosecutionCase, null));
caseAggregate.apply(hearingResultedCaseUpdated);
caseAggregate.defendantsAddedToCourtProceedings(defendantsAddedToCourtProceedings.getDefendants(),
defendantsAddedToCourtProceedings.getListHearingRequests(), Optional.of(createJsonList())).collect(toList());
final LaaReference laaReference = generateRecordLAAReferenceForOffence("G2", GRANTED.getDescription());

final ReceiveRepresentationOrderForDefendant receiveRepresentationOrderForDefendant = ReceiveRepresentationOrderForDefendant
.receiveRepresentationOrderForDefendant()
.withDefendantId(currentDefendant1.getId())
.withProsecutionCaseId(caseId)
.withOffenceId(currentDefendant1.getOffences().get(0).getId())
.withDefenceOrganisation(DefenceOrganisation.defenceOrganisation()
.withOrganisation(Organisation.organisation()
.withName("XYZ Organisation")
.withId(associatedOrganisationId)
.build())
.withLaaContractNumber("LAA Contract Number")
.build())
.build();
final OrganisationDetails organisationDetails = OrganisationDetails.newBuilder().withId(currentOrganisationId).build();
caseAggregate.recordLAAReferenceForOffence(caseId, currentDefendant1.getId(), currentDefendant1.getOffences().get(0).getId(), laaReference).collect(toList());
final LaaReference laaReference1 = laaReference().withValuesFrom(laaReference).withLaaContractNumber("ABCD").build();
final List<Object> eventStream = caseAggregate.receiveRepresentationOrderForDefendant(receiveRepresentationOrderForDefendant, laaReference1, organisationDetails, associatedOrganisationId.toString())
.collect(Collectors.toUnmodifiableList());
assertThat(eventStream.size(), is(8));
Optional<Object> pcdUpdated = eventStream.stream().filter(event -> event instanceof ProsecutionCaseDefendantUpdated).findFirst();
assertThat(((ProsecutionCaseDefendantUpdated)pcdUpdated.get()).getDefendant().getPersonDefendant().getBailStatus().getDescription(), is("Conditional Bail"));
}

private Defendant getDefendant(final UUID defendantId1) {
return Defendant.defendant()
.withOffences(asList(uk.gov.justice.core.courts.Offence.offence().build()))
Expand Down