Skip to content

Dev/release 2617 #117

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
kumarvinay23 merged 5 commits into from
Jul 2, 2026
Merged

Dev/release 2617 #117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8e15564
CIMD-3936 Convert UTC time into local/BST time before set to result p…
kumarsajan1983 Jun 1, 2026
6a01f9b
pom version (#108)
kumarsajan1983 Jun 1, 2026
84be66e
Dev/sjp rebase (#116)
kumarsajan1983 Jun 25, 2026
2fcc660
New 17.103.176-CIMD-3936-SNAPSHOT
Jun 25, 2026
e02b037
Merge remote-tracking branch 'origin' into dev/release-2617
Jun 30, 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: 3 additions & 1 deletion ...lts/converter/judicialresult/aggregator/ReferForCourtHearingDecisionResultAggregator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
import uk.gov.moj.cpp.sjp.event.processor.results.converter.judicialresult.DecisionAggregate;
import uk.gov.moj.cpp.sjp.event.processor.results.converter.judicialresult.JCachedReferenceData;

import java.time.ZoneId;
import java.time.ZonedDateTime;
import java.util.ArrayList;
import java.util.HashMap;
Expand Down Expand Up @@ -160,7 +161,8 @@ private void populateCourtTimingDetails(final JsonObject resultDefinition,
.withJudicialResultPromptTypeId(NHMC_DURATION_IN_MINUTES.getId())
.withValue(caseOffenceListedInCriminalCourts.getHearingDays().get(0).getListedDurationMinutes().toString()).build());

final ZonedDateTime sittingDateTime = caseOffenceListedInCriminalCourts.getHearingDays().get(0).getSittingDay();
final ZonedDateTime sittingDateTime = caseOffenceListedInCriminalCourts.getHearingDays().get(0).getSittingDay()
.withZoneSameInstant(ZoneId.of("Europe/London"));

judicialResultPrompts.add(getPrompt(NHMC_HOUSE_HEARING_TIME, resultDefinition)
.withJudicialResultPromptTypeId(NHMC_HOUSE_HEARING_TIME.getId())
Expand Down
63 changes: 59 additions & 4 deletions ...converter/judicialresult/aggregator/ReferForCourtHearingDecisionResultAggregatorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
import uk.gov.moj.cpp.sjp.event.CaseOffenceListedInCriminalCourts;
import uk.gov.moj.cpp.sjp.event.processor.results.converter.CourtCentreConverter;

import java.time.ZoneId;
import java.time.ZonedDateTime;
import java.util.Arrays;
import java.util.Collections;
Expand Down Expand Up @@ -94,7 +95,8 @@ public void shouldPopulateResultWithRightPrompts() {
"Note",
30,
courtOptions, null);
final ZonedDateTime zonedDateTime = ZonedDateTime.now().plusDays(1);
final ZonedDateTime zonedDateTime = ZonedDateTime.now(ZoneId.of("UTC")).plusDays(1);
final ZonedDateTime zonedDateTimeLocal = zonedDateTime.withZoneSameInstant(ZoneId.of("Europe/London"));
final UUID caseId = randomUUID();
final UUID defendantId = randomUUID();
final UUID hearingId = randomUUID();
Expand All @@ -116,7 +118,7 @@ public void shouldPopulateResultWithRightPrompts() {
assertThat(judicialResult.getJudicialResultId().toString(), is("600edfc3-a584-4f9f-a52e-5bb8a99646c1"));
assertThat(judicialResult.getOrderedDate(), is(resultedOn.format(DATE_FORMAT)));

assertThat(judicialResult.getResultText(), is("Refer for a full court hearing\n" +"Reasons for referring to court referral reason (referral sub reason)\nCourthouse organisation name Court Name\nCourtroom Court Room Name\nEstimated duration 123456\nTime of hearing "+zonedDateTime.toLocalTime()+"\nDate of hearing "+zonedDateTime.toLocalDate()+"\nCourthouse address line 1 Address 1\nCourthouse address line 2 Address 2\nCourthouse address line 3 Address 3\nCourthouse address line 4 Address 4\nCourthouse address line 5 Address 5\nCourthouse post code DD4 4DD"));
assertThat(judicialResult.getResultText(), is("Refer for a full court hearing\n" +"Reasons for referring to court referral reason (referral sub reason)\nCourthouse organisation name Court Name\nCourtroom Court Room Name\nEstimated duration 123456\nTime of hearing "+zonedDateTimeLocal.toLocalTime()+"\nDate of hearing "+zonedDateTimeLocal.toLocalDate()+"\nCourthouse address line 1 Address 1\nCourthouse address line 2 Address 2\nCourthouse address line 3 Address 3\nCourthouse address line 4 Address 4\nCourthouse address line 5 Address 5\nCourthouse post code DD4 4DD"));


assertThat(judicialResult.getJudicialResultPrompts().size(), is(12));
Expand Down Expand Up @@ -147,7 +149,8 @@ public void shouldNotPopulateResultWithEmptyValuePrompts() {
"Note",
30,
courtOptions, null);
final ZonedDateTime zonedDateTime = ZonedDateTime.now().plusDays(1);
final ZonedDateTime zonedDateTime = ZonedDateTime.now(ZoneId.of("UTC")).plusDays(1);
final ZonedDateTime zonedDateTimeLocal = zonedDateTime.withZoneSameInstant(ZoneId.of("Europe/London"));
final UUID caseId = randomUUID();
final UUID defendantId = randomUUID();
final UUID hearingId = randomUUID();
Expand All @@ -170,7 +173,7 @@ public void shouldNotPopulateResultWithEmptyValuePrompts() {
assertThat(judicialResult.getJudicialResultId().toString(), is("600edfc3-a584-4f9f-a52e-5bb8a99646c1"));
assertThat(judicialResult.getOrderedDate(), is(resultedOn.format(DATE_FORMAT)));

assertThat(judicialResult.getResultText(), is("Refer for a full court hearing\n" +"Reasons for referring to court referral reason (referral sub reason)\nCourthouse organisation name Court Name\nCourtroom Court Room Name\nEstimated duration 123456\nTime of hearing "+zonedDateTime.toLocalTime()+"\nDate of hearing "+zonedDateTime.toLocalDate()+"\nCourthouse address line 1 Address 1"));
assertThat(judicialResult.getResultText(), is("Refer for a full court hearing\n" +"Reasons for referring to court referral reason (referral sub reason)\nCourthouse organisation name Court Name\nCourtroom Court Room Name\nEstimated duration 123456\nTime of hearing "+zonedDateTimeLocal.toLocalTime()+"\nDate of hearing "+zonedDateTimeLocal.toLocalDate()+"\nCourthouse address line 1 Address 1"));
assertThat(resultsAggregate.getFinalOffence(offence1Id),is(nullValue()));
assertThat(judicialResult.getJudicialResultPrompts().size(), is(7));
assertThat(judicialResult.getJudicialResultPrompts(),
Expand All @@ -192,6 +195,58 @@ public void shouldNotPopulateResultWithEmptyValuePrompts() {

}

@Test
public void shouldConvertUtcSittingTimeToBstInResultTextDuringSummer() {
// 10:00 UTC on a BST date (May) should appear as 11:00 in the result text
final ZonedDateTime utcSummerDateTime = ZonedDateTime.parse("2026-05-28T10:00:00.000Z");

final ReferForCourtHearing offenceDecision = new ReferForCourtHearing(null,
Collections.singletonList(createOffenceDecisionInformation(offence1Id, PROVED_SJP)),
REFERRAL_REASON_ID, "Note", 30, courtOptions, null);

final List<HearingDay> hearingDays = Arrays.asList(HearingDay.hearingDay()
.withSittingDay(utcSummerDateTime)
.withListedDurationMinutes(60)
.build());
final CaseOffenceListedInCriminalCourts caseOffenceListedInCriminalCourts =
new CaseOffenceListedInCriminalCourts(randomUUID(), randomUUID(), Arrays.asList(offence1Id),
randomUUID(), createCourtCenter(), hearingDays, hearingType);
final CaseListedInCriminalCourtsV2 caseListedInCcForReferToCourt =
new CaseListedInCriminalCourtsV2(Arrays.asList(caseOffenceListedInCriminalCourts), null, randomUUID());

aggregator.aggregate(offenceDecision, sjpSessionEnvelope, resultsAggregate, caseListedInCcForReferToCourt, resultedOn);

final JudicialResult judicialResult = resultsAggregate.getResults(offence1Id).get(0);
assertThat(judicialResult.getResultText(), Matchers.containsString("Time of hearing 11:00"));
assertThat(judicialResult.getResultText(), Matchers.containsString("Date of hearing 2026-05-28"));
}

@Test
public void shouldNotOffsetUtcSittingTimeInResultTextDuringWinter() {
// 10:00 UTC on a GMT date (December) should appear as 10:00 in the result text (no offset)
final ZonedDateTime utcWinterDateTime = ZonedDateTime.parse("2026-12-28T10:00:00.000Z");

final ReferForCourtHearing offenceDecision = new ReferForCourtHearing(null,
Collections.singletonList(createOffenceDecisionInformation(offence1Id, PROVED_SJP)),
REFERRAL_REASON_ID, "Note", 30, courtOptions, null);

final List<HearingDay> hearingDays = Arrays.asList(HearingDay.hearingDay()
.withSittingDay(utcWinterDateTime)
.withListedDurationMinutes(60)
.build());
final CaseOffenceListedInCriminalCourts caseOffenceListedInCriminalCourts =
new CaseOffenceListedInCriminalCourts(randomUUID(), randomUUID(), Arrays.asList(offence1Id),
randomUUID(), createCourtCenter(), hearingDays, hearingType);
final CaseListedInCriminalCourtsV2 caseListedInCcForReferToCourt =
new CaseListedInCriminalCourtsV2(Arrays.asList(caseOffenceListedInCriminalCourts), null, randomUUID());

aggregator.aggregate(offenceDecision, sjpSessionEnvelope, resultsAggregate, caseListedInCcForReferToCourt, resultedOn);

final JudicialResult judicialResult = resultsAggregate.getResults(offence1Id).get(0);
assertThat(judicialResult.getResultText(), Matchers.containsString("Time of hearing 10:00"));
assertThat(judicialResult.getResultText(), Matchers.containsString("Date of hearing 2026-12-28"));
}

private CourtCentre createCourtCenterWithEmptyAddresses() {
return CourtCentre.courtCentre()
.withId(randomUUID())
Expand Down
Loading