diff --git a/hearing-command/hearing-command-api/pom.xml b/hearing-command/hearing-command-api/pom.xml index beaac75988..9bee2ecfc5 100644 --- a/hearing-command/hearing-command-api/pom.xml +++ b/hearing-command/hearing-command-api/pom.xml @@ -3,7 +3,7 @@ uk.gov.moj.cpp.hearing hearing-command - 17.104.158-SNAPSHOT + 17.104.158-CCSPH2-SNAPSHOT hearing-command-api war diff --git a/hearing-command/hearing-command-handler/pom.xml b/hearing-command/hearing-command-handler/pom.xml index a1f6d93159..dfac9db07d 100644 --- a/hearing-command/hearing-command-handler/pom.xml +++ b/hearing-command/hearing-command-handler/pom.xml @@ -3,7 +3,7 @@ uk.gov.moj.cpp.hearing hearing-command - 17.104.158-SNAPSHOT + 17.104.158-CCSPH2-SNAPSHOT hearing-command-handler war @@ -92,8 +92,20 @@ ${project.version} + + org.apache.httpcomponents + httpclient + + + + uk.gov.justice.utils + test-utils-logging-log4j + pom + test + + uk.gov.justice.services test-utils-core diff --git a/hearing-command/hearing-command-handler/src/main/java/uk/gov/moj/cpp/hearing/command/handler/HearingEventCommandHandler.java b/hearing-command/hearing-command-handler/src/main/java/uk/gov/moj/cpp/hearing/command/handler/HearingEventCommandHandler.java index 6303cff766..6331593358 100644 --- a/hearing-command/hearing-command-handler/src/main/java/uk/gov/moj/cpp/hearing/command/handler/HearingEventCommandHandler.java +++ b/hearing-command/hearing-command-handler/src/main/java/uk/gov/moj/cpp/hearing/command/handler/HearingEventCommandHandler.java @@ -3,21 +3,27 @@ import static java.util.UUID.fromString; import static uk.gov.justice.services.core.annotation.Component.COMMAND_HANDLER; +import uk.gov.justice.core.courts.HearingDay; import uk.gov.justice.services.core.annotation.Handles; import uk.gov.justice.services.core.annotation.ServiceComponent; import uk.gov.justice.services.eventsourcing.source.core.exception.EventStreamException; import uk.gov.justice.services.messaging.JsonEnvelope; +import uk.gov.moj.cpp.hearing.command.handler.service.ReferenceDataService; import uk.gov.moj.cpp.hearing.command.logEvent.CorrectLogEventCommand; import uk.gov.moj.cpp.hearing.command.logEvent.CreateHearingEventDefinitionsCommand; import uk.gov.moj.cpp.hearing.command.logEvent.LogEventCommand; import uk.gov.moj.cpp.hearing.command.updateEvent.UpdateHearingEventsCommand; +import uk.gov.moj.cpp.hearing.domain.CourtCentre; import uk.gov.moj.cpp.hearing.domain.aggregate.HearingAggregate; import uk.gov.moj.cpp.hearing.domain.aggregate.HearingEventDefinitionAggregate; import uk.gov.moj.cpp.hearing.eventlog.HearingEvent; +import java.time.ZonedDateTime; import java.util.List; +import java.util.Optional; import java.util.UUID; +import javax.inject.Inject; import javax.json.JsonArray; import javax.json.JsonObject; @@ -38,6 +44,9 @@ public class HearingEventCommandHandler extends AbstractCommandHandler { private static final UUID PAUSE_HEARING_EVENT_DEFINITION_ID = UUID.fromString("160ecb51-29ee-4954-bbbf-daab18a24fbb"); + @Inject + private ReferenceDataService referenceDataService; + @Handles("hearing.create-hearing-event-definitions") public void createHearingEventDefinitions(final JsonEnvelope jsonEnvelope) throws EventStreamException { if (LOGGER.isDebugEnabled()) { @@ -94,12 +103,14 @@ public void logHearingEvent(final JsonEnvelope jsonEnvelope) throws EventStreamE .build(); final UUID activeHearingId = UUID.fromString(activeHearings.getString(index)); + final CourtCentre pauseCourtCentre = resolveCourtCentre(activeHearingId, logEventCommand.getEventTime()); - aggregate(HearingAggregate.class, activeHearingId, jsonEnvelope, a -> a.logHearingEvent(activeHearingId, PAUSE_HEARING_EVENT_DEFINITION_ID, alterable, defenceCounselId, pauseHearingEvent, hearingTypeIds, userId)); + aggregate(HearingAggregate.class, activeHearingId, jsonEnvelope, a -> a.logHearingEvent(activeHearingId, PAUSE_HEARING_EVENT_DEFINITION_ID, alterable, defenceCounselId, pauseHearingEvent, hearingTypeIds, userId, pauseCourtCentre)); } } - aggregate(HearingAggregate.class, logEventCommand.getHearingId(), jsonEnvelope, a -> a.logHearingEvent(hearingId, hearingEventDefinitionId, alterable, defenceCounselId, hearingEvent, hearingTypeIds, userId)); + final CourtCentre courtCentre = resolveCourtCentre(hearingId, logEventCommand.getEventTime()); + aggregate(HearingAggregate.class, logEventCommand.getHearingId(), jsonEnvelope, a -> a.logHearingEvent(hearingId, hearingEventDefinitionId, alterable, defenceCounselId, hearingEvent, hearingTypeIds, userId, courtCentre)); } @Handles("hearing.command.update-hearing-events") @@ -130,12 +141,33 @@ public void correctEvent(final JsonEnvelope jsonEnvelope) throws EventStreamExce .withLastModifiedTime(correctLogEventCommand.getLastModifiedTime()) .withRecordedLabel(correctLogEventCommand.getRecordedLabel()) .withNote(correctLogEventCommand.getNote()).build(); + final CourtCentre courtCentre = resolveCourtCentre(correctLogEventCommand.getHearingId(), correctLogEventCommand.getEventTime()); aggregate(HearingAggregate.class, correctLogEventCommand.getHearingId(), jsonEnvelope, a -> a.correctHearingEvent(correctLogEventCommand.getLatestHearingEventId(), correctLogEventCommand.getHearingId(), correctLogEventCommand.getHearingEventDefinitionId(), correctLogEventCommand.getAlterable(), correctLogEventCommand.getDefenceCounselId(), hearingEvent, - userId)); + userId, + courtCentre)); + } + + private CourtCentre resolveCourtCentre(final UUID hearingId, final ZonedDateTime eventTime) { + try { + final HearingAggregate aggregate = aggregate(HearingAggregate.class, hearingId); + final Optional matchedDay = aggregate.findHearingDayFor(eventTime); + if (matchedDay.isEmpty()) { + return null; + } + final UUID centreId = matchedDay.get().getCourtCentreId(); + final UUID roomId = matchedDay.get().getCourtRoomId(); + if (centreId == null || roomId == null) { + return null; + } + return referenceDataService.resolveCourtCentre(centreId, roomId).orElse(null); + } catch (Exception e) { + LOGGER.warn("Failed to resolve court centre for hearing {} at {}; falling back to top-level", hearingId, eventTime, e); + return null; + } } } diff --git a/hearing-command/hearing-command-handler/src/main/java/uk/gov/moj/cpp/hearing/command/handler/ShareResultsCommandHandler.java b/hearing-command/hearing-command-handler/src/main/java/uk/gov/moj/cpp/hearing/command/handler/ShareResultsCommandHandler.java index b015a34d4e..6cbd41c254 100644 --- a/hearing-command/hearing-command-handler/src/main/java/uk/gov/moj/cpp/hearing/command/handler/ShareResultsCommandHandler.java +++ b/hearing-command/hearing-command-handler/src/main/java/uk/gov/moj/cpp/hearing/command/handler/ShareResultsCommandHandler.java @@ -26,8 +26,13 @@ import uk.gov.moj.cpp.hearing.command.result.SharedResultsCommandResultLineV2; import uk.gov.moj.cpp.hearing.command.result.UpdateDaysResultLinesStatusCommand; import uk.gov.moj.cpp.hearing.command.result.UpdateResultLinesStatusCommand; +import uk.gov.moj.cpp.hearing.command.handler.service.validation.ResultsValidator; +import uk.gov.moj.cpp.hearing.command.handler.service.validation.ValidationRequest; +import uk.gov.moj.cpp.hearing.command.handler.service.validation.ValidationRequestMapper; +import uk.gov.moj.cpp.hearing.command.handler.service.validation.ValidationResponse; import uk.gov.moj.cpp.hearing.domain.aggregate.ApplicationAggregate; import uk.gov.moj.cpp.hearing.domain.aggregate.HearingAggregate; +import uk.gov.moj.cpp.hearing.domain.event.result.ResultsValidationFailed; import java.util.HashSet; import java.util.List; @@ -35,7 +40,6 @@ import java.util.Optional; import java.util.Set; import java.util.UUID; -import java.util.stream.Collectors; import java.util.stream.Stream; import javax.inject.Inject; @@ -56,6 +60,12 @@ public class ShareResultsCommandHandler extends AbstractCommandHandler { @Inject private ReferenceDataService referenceDataService; + @Inject + private ResultsValidator resultsValidationClient; + + @Inject + private ValidationRequestMapper validationRequestMapper; + @Handles("hearing.command.save-draft-result") public void saveDraftResult(final JsonEnvelope envelope) throws EventStreamException { @@ -174,10 +184,28 @@ public void shareResultForDay(final JsonEnvelope envelope) throws EventStreamExc } final ShareDaysResultsCommand command = convertToObject(envelope, ShareDaysResultsCommand.class); final UUID userId = envelope.metadata().userId().map(UUID::fromString).orElse(null); + long start = System.currentTimeMillis(); + final EventStream eventStream = eventSource.getStreamById(command.getHearingId()); + final HearingAggregate hearingAggregate = aggregateService.get(eventStream, HearingAggregate.class); - aggregate(HearingAggregate.class, command.getHearingId(), envelope, - aggregate -> shareDaysResultsEnrichedWithYouthCourt(aggregate, command, userId)); + final ValidationRequest validationRequest = validationRequestMapper.toValidationRequest(command, hearingAggregate.getHearing()); + final String userIdString = userId != null ? userId.toString() : ""; + + final ValidationResponse validationResponse = resultsValidationClient.validate(validationRequest, userIdString); + long end = System.currentTimeMillis(); + LOGGER.info("Validation API call took {} ms for userId={} and for hearingId={}", end - start, userIdString, validationRequest.getHearingId()); + + if (validationResponse.hasErrors()) { + LOGGER.info("Share blocked by validation errors for hearing {}", command.getHearingId()); + final ResultsValidationFailed failedEvent = buildValidationFailedEvent(command, userIdString, validationResponse); + eventStream.append(Stream.of(failedEvent).map(enveloper.withMetadataFrom(envelope))); + return; + } + + eventStream.append( + shareDaysResultsEnrichedWithYouthCourt(hearingAggregate, command, userId) + .map(enveloper.withMetadataFrom(envelope))); } @Handles("hearing.command.update-result-lines-status") @@ -215,6 +243,30 @@ public void replicateAllSharedResultsForHearing(final JsonEnvelope envelope) thr aggregate -> aggregate.replicateSharedResultsForHearing(hearingId)); } + private ResultsValidationFailed buildValidationFailedEvent(final ShareDaysResultsCommand command, + final String userId, + final ValidationResponse validationResponse) { + return ResultsValidationFailed.builder() + .withHearingId(command.getHearingId()) + .withHearingDay(command.getHearingDay()) + .withUserId(userId) + .withErrors(validationResponse.getErrors().stream() + .map(e -> new ResultsValidationFailed.ValidationError( + e.getRuleId(), e.getSeverity(), e.getMessage(), + e.getAffectedOffences().stream() + .map(o -> o.getId()) + .toList())) + .toList()) + .withWarnings(validationResponse.getWarnings().stream() + .map(w -> new ResultsValidationFailed.ValidationError( + w.getRuleId(), w.getSeverity(), w.getMessage(), + w.getAffectedOffences().stream() + .map(o -> o.getId()) + .toList())) + .toList()) + .build(); + } + private Stream shareResultsEnrichedWithYouthCourt(final HearingAggregate hearingAggregate, final ShareResultsCommand command ) { final Hearing hearing = hearingAggregate.getHearing(); @@ -278,7 +330,7 @@ List getAdditionalApplications(final Set distinctApplica return null; }) .filter(Objects::nonNull) - .collect(Collectors.toList()); + .toList(); } } diff --git a/hearing-command/hearing-command-handler/src/main/java/uk/gov/moj/cpp/hearing/command/handler/service/ReferenceDataService.java b/hearing-command/hearing-command-handler/src/main/java/uk/gov/moj/cpp/hearing/command/handler/service/ReferenceDataService.java index f78bb8511c..41ad6c4597 100644 --- a/hearing-command/hearing-command-handler/src/main/java/uk/gov/moj/cpp/hearing/command/handler/service/ReferenceDataService.java +++ b/hearing-command/hearing-command-handler/src/main/java/uk/gov/moj/cpp/hearing/command/handler/service/ReferenceDataService.java @@ -8,15 +8,18 @@ import uk.gov.justice.services.messaging.Envelope; import uk.gov.justice.services.messaging.JsonEnvelope; import uk.gov.justice.services.messaging.MetadataBuilder; +import uk.gov.moj.cpp.hearing.domain.CourtCentre; import javax.inject.Inject; import javax.json.JsonArray; import javax.json.JsonObject; import java.util.List; +import java.util.Optional; import java.util.Set; import java.util.UUID; import java.util.stream.Collectors; +import static java.util.Objects.isNull; import static java.util.UUID.randomUUID; import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.core.annotation.Component.COMMAND_API; @@ -129,6 +132,72 @@ public void setId(UUID id) { } + public Optional resolveCourtCentre(final UUID courtCentreId, final UUID courtRoomId) { + if (courtCentreId == null || courtRoomId == null) { + return Optional.empty(); + } + + final JsonArray organisationUnits = queryCourtCentresFor(courtCentreId); + if (organisationUnits == null || organisationUnits.isEmpty()) { + return Optional.empty(); + } + + return findMatchingOrganisationUnit(organisationUnits, courtCentreId) + .flatMap(ou -> buildCourtCentreFromRoom(ou, courtCentreId, courtRoomId)); + } + + private JsonArray queryCourtCentresFor(final UUID courtCentreId) { + final JsonObject payload = createObjectBuilder() + .add("courtCentreId", courtCentreId.toString()) + .build(); + + final JsonEnvelope requestEnvelope = envelopeFrom( + metadataBuilder() + .withName(REFERENCEDATA_QUERY_COURT_CENTRES) + .withId(randomUUID()) + .build(), + payload); + + return requester.requestAsAdmin(requestEnvelope) + .payloadAsJsonObject() + .getJsonArray("organisationunits"); + } + + private Optional findMatchingOrganisationUnit(final JsonArray organisationUnits, final UUID courtCentreId) { + final String idAsString = courtCentreId.toString(); + return organisationUnits.getValuesAs(JsonObject.class).stream() + .filter(unit -> idAsString.equals(getStringOrNull(unit, "id"))) + .findFirst(); + } + + private Optional buildCourtCentreFromRoom(final JsonObject ou, final UUID courtCentreId, final UUID courtRoomId) { + final JsonArray courtrooms = ou.getJsonArray("courtrooms"); + if (isNull(courtrooms)) { + return Optional.empty(); + } + + return courtrooms.getValuesAs(JsonObject.class).stream() + .filter(room -> roomIdMatches(room, courtRoomId)) + .findFirst() + .map(room -> CourtCentre.courtCentre() + .withId(courtCentreId) + .withName(getStringOrNull(ou, "oucodeL3Name")) + .withWelshName(getStringOrNull(ou, "oucodeL3WelshName")) + .withRoomId(courtRoomId) + .withRoomName(getStringOrNull(room, "courtroomName")) + .withWelshRoomName(getStringOrNull(room, "welshCourtroomName")) + .build()); + } + + private static boolean roomIdMatches(final JsonObject room, final UUID courtRoomId) { + final String id = getStringOrNull(room, "id"); + return id != null && courtRoomId.equals(UUID.fromString(id)); + } + + private static String getStringOrNull(final JsonObject json, final String key) { + return json.containsKey(key) ? json.getString(key) : null; + } + public Set retrieveGuiltyPleaTypes() { final MetadataBuilder metadataBuilder = metadataBuilder() .withId(randomUUID()) diff --git a/hearing-command/hearing-command-handler/src/main/java/uk/gov/moj/cpp/hearing/command/handler/service/validation/DefendantDto.java b/hearing-command/hearing-command-handler/src/main/java/uk/gov/moj/cpp/hearing/command/handler/service/validation/DefendantDto.java new file mode 100644 index 0000000000..3aa6d701e6 --- /dev/null +++ b/hearing-command/hearing-command-handler/src/main/java/uk/gov/moj/cpp/hearing/command/handler/service/validation/DefendantDto.java @@ -0,0 +1,66 @@ +package uk.gov.moj.cpp.hearing.command.handler.service.validation; + +public class DefendantDto { + private final String id; + private final String firstName; + private final String lastName; + private final String masterDefendantId; + + private DefendantDto(Builder builder) { + this.id = builder.id; + this.firstName = builder.firstName; + this.lastName = builder.lastName; + this.masterDefendantId = builder.masterDefendantId; + } + + public String getId() { + return id; + } + + public String getFirstName() { + return firstName; + } + + public String getLastName() { + return lastName; + } + + public String getMasterDefendantId() { + return masterDefendantId; + } + + public static Builder builder() { + return new Builder(); + } + + public static final class Builder { + private String id; + private String firstName; + private String lastName; + private String masterDefendantId; + + public Builder withId(String id) { + this.id = id; + return this; + } + + public Builder withFirstName(String firstName) { + this.firstName = firstName; + return this; + } + + public Builder withLastName(String lastName) { + this.lastName = lastName; + return this; + } + + public Builder withMasterDefendantId(String masterDefendantId) { + this.masterDefendantId = masterDefendantId; + return this; + } + + public DefendantDto build() { + return new DefendantDto(this); + } + } +} diff --git a/hearing-command/hearing-command-handler/src/main/java/uk/gov/moj/cpp/hearing/command/handler/service/validation/HttpClientProducer.java b/hearing-command/hearing-command-handler/src/main/java/uk/gov/moj/cpp/hearing/command/handler/service/validation/HttpClientProducer.java new file mode 100644 index 0000000000..b1890c9d78 --- /dev/null +++ b/hearing-command/hearing-command-handler/src/main/java/uk/gov/moj/cpp/hearing/command/handler/service/validation/HttpClientProducer.java @@ -0,0 +1,85 @@ +package uk.gov.moj.cpp.hearing.command.handler.service.validation; + +import uk.gov.justice.services.common.configuration.Value; + +import java.io.Closeable; +import java.util.concurrent.TimeUnit; + +import javax.annotation.PreDestroy; +import javax.enterprise.context.ApplicationScoped; +import javax.enterprise.inject.Produces; +import javax.inject.Inject; + +import org.apache.http.client.HttpClient; +import org.apache.http.client.config.RequestConfig; +import org.apache.http.impl.client.CloseableHttpClient; +import org.apache.http.impl.client.HttpClientBuilder; +import org.apache.http.impl.conn.PoolingHttpClientConnectionManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +@ApplicationScoped +public class HttpClientProducer { + + private static final Logger LOGGER = LoggerFactory.getLogger(HttpClientProducer.class); + + @Inject + @Value(key = "resultsvalidator.timeout.ms", defaultValue = "5000") + private String socketTimeoutMs; + + @Inject + @Value(key = "resultsvalidator.timeout.connect.ms", defaultValue = "1000") + private String connectTimeoutMs; + + @Inject + @Value(key = "resultsvalidator.timeout.connection.request.ms", defaultValue = "1000") + private String connectionRequestTimeoutMs; + + @Inject + @Value(key = "resultsvalidator.pool.max.total", defaultValue = "400") + private String poolMaxTotal; + + @Inject + @Value(key = "resultsvalidator.pool.max.per.route", defaultValue = "200") + private String poolMaxPerRoute; + + @Inject + @Value(key = "resultsvalidator.evict.idle.seconds", defaultValue = "30") + private String evictIdleSeconds; + + private Closeable client; + + @Produces + @ApplicationScoped + public HttpClient createHttpClient() { + final PoolingHttpClientConnectionManager connectionManager = new PoolingHttpClientConnectionManager(); + connectionManager.setMaxTotal(Integer.parseInt(poolMaxTotal)); + connectionManager.setDefaultMaxPerRoute(Integer.parseInt(poolMaxPerRoute)); + + final RequestConfig requestConfig = RequestConfig.custom() + .setConnectTimeout(Integer.parseInt(connectTimeoutMs)) + .setSocketTimeout(Integer.parseInt(socketTimeoutMs)) + .setConnectionRequestTimeout(Integer.parseInt(connectionRequestTimeoutMs)) + .build(); + + final CloseableHttpClient httpClient = HttpClientBuilder.create() + .setConnectionManager(connectionManager) + .setDefaultRequestConfig(requestConfig) + .evictIdleConnections(Long.parseLong(evictIdleSeconds), TimeUnit.SECONDS) + .evictExpiredConnections() + .build(); + client = httpClient; + return httpClient; + } + + @PreDestroy + public void close() { + if (client != null) { + try { + client.close(); + } catch (final Exception e) { + LOGGER.warn("Failed to close HttpClient", e); + } + } + } +} diff --git a/hearing-command/hearing-command-handler/src/main/java/uk/gov/moj/cpp/hearing/command/handler/service/validation/OffenceDto.java b/hearing-command/hearing-command-handler/src/main/java/uk/gov/moj/cpp/hearing/command/handler/service/validation/OffenceDto.java new file mode 100644 index 0000000000..b1bbb07fed --- /dev/null +++ b/hearing-command/hearing-command-handler/src/main/java/uk/gov/moj/cpp/hearing/command/handler/service/validation/OffenceDto.java @@ -0,0 +1,68 @@ +package uk.gov.moj.cpp.hearing.command.handler.service.validation; +public class OffenceDto { + + private final String id; + private final String offenceCode; + private final String offenceTitle; + private final Integer orderIndex; + private final String caseUrn; + + private OffenceDto(Builder builder) { + this.id = builder.id; + this.offenceCode = builder.offenceCode; + this.offenceTitle = builder.offenceTitle; + this.orderIndex = builder.orderIndex; + this.caseUrn = builder.caseUrn; + } + + // Getters + public String getId() { return id; } + public String getOffenceCode() { return offenceCode; } + public String getOffenceTitle() { return offenceTitle; } + public Integer getOrderIndex() { return orderIndex; } + public String getCaseUrn() { return caseUrn; } + + // Builder + public static class Builder { + private String id; + private String offenceCode; + private String offenceTitle; + private Integer orderIndex; + private String caseUrn; + + public Builder id(String id) { + this.id = id; + return this; + } + + public Builder offenceCode(String offenceCode) { + this.offenceCode = offenceCode; + return this; + } + + public Builder offenceTitle(String offenceTitle) { + this.offenceTitle = offenceTitle; + return this; + } + + public Builder orderIndex(Integer orderIndex) { + this.orderIndex = orderIndex; + return this; + } + + public Builder caseUrn(String caseUrn) { + this.caseUrn = caseUrn; + return this; + } + + public OffenceDto build() { + return new OffenceDto(this); + } + } + + // Optional convenience method + public static Builder builder() { + return new Builder(); + } +} + diff --git a/hearing-command/hearing-command-handler/src/main/java/uk/gov/moj/cpp/hearing/command/handler/service/validation/ResultLineDto.java b/hearing-command/hearing-command-handler/src/main/java/uk/gov/moj/cpp/hearing/command/handler/service/validation/ResultLineDto.java new file mode 100644 index 0000000000..62f6868c8c --- /dev/null +++ b/hearing-command/hearing-command-handler/src/main/java/uk/gov/moj/cpp/hearing/command/handler/service/validation/ResultLineDto.java @@ -0,0 +1,83 @@ +package uk.gov.moj.cpp.hearing.command.handler.service.validation; + +import com.fasterxml.jackson.annotation.JsonProperty; +public class ResultLineDto { + + private final String id; + private final String shortCode; + private final String label; + private final String defendantId; + private final String offenceId; + @JsonProperty("isConcurrent") + private final Boolean isConcurrent; + private final String consecutiveToOffence; + + private ResultLineDto(Builder builder) { + this.id = builder.id; + this.shortCode = builder.shortCode; + this.label = builder.label; + this.defendantId = builder.defendantId; + this.offenceId = builder.offenceId; + this.isConcurrent = builder.isConcurrent; + this.consecutiveToOffence = builder.consecutiveToOffence; + } + + // Getters + public String getId() { return id; } + public String getShortCode() { return shortCode; } + public String getLabel() { return label; } + public String getDefendantId() { return defendantId; } + public String getOffenceId() { return offenceId; } + public Boolean getIsConcurrent() { return isConcurrent; } + public String getConsecutiveToOffence() { return consecutiveToOffence; } + + // Builder + public static class Builder { + private String id; + private String shortCode; + private String label; + private String defendantId; + private String offenceId; + private Boolean isConcurrent; + private String consecutiveToOffence; + + public Builder id(String id) { + this.id = id; + return this; + } + + public Builder shortCode(String shortCode) { + this.shortCode = shortCode; + return this; + } + + public Builder label(String label) { + this.label = label; + return this; + } + + public Builder defendantId(String defendantId) { + this.defendantId = defendantId; + return this; + } + + public Builder offenceId(String offenceId) { + this.offenceId = offenceId; + return this; + } + + public Builder isConcurrent(Boolean isConcurrent) { + this.isConcurrent = isConcurrent; + return this; + } + + public Builder consecutiveToOffence(String consecutiveToOffence) { + this.consecutiveToOffence = consecutiveToOffence; + return this; + } + + public ResultLineDto build() { + return new ResultLineDto(this); + } + } +} diff --git a/hearing-command/hearing-command-handler/src/main/java/uk/gov/moj/cpp/hearing/command/handler/service/validation/ResultsValidationClient.java b/hearing-command/hearing-command-handler/src/main/java/uk/gov/moj/cpp/hearing/command/handler/service/validation/ResultsValidationClient.java new file mode 100644 index 0000000000..b974924f63 --- /dev/null +++ b/hearing-command/hearing-command-handler/src/main/java/uk/gov/moj/cpp/hearing/command/handler/service/validation/ResultsValidationClient.java @@ -0,0 +1,87 @@ +package uk.gov.moj.cpp.hearing.command.handler.service.validation; + +import uk.gov.justice.services.common.configuration.Value; +import uk.gov.justice.services.core.featurecontrol.FeatureControlGuard; + +import java.io.InputStream; + +import javax.enterprise.context.ApplicationScoped; +import javax.inject.Inject; +import javax.ws.rs.core.Response; + +import com.fasterxml.jackson.databind.ObjectMapper; +import org.apache.http.HttpResponse; +import org.apache.http.client.HttpClient; +import org.apache.http.client.methods.HttpPost; +import org.apache.http.entity.ContentType; +import org.apache.http.entity.StringEntity; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +@ApplicationScoped +public class ResultsValidationClient implements ResultsValidator { + + private static final Logger LOGGER = LoggerFactory.getLogger(ResultsValidationClient.class); + private static final String CJSCPPUID = "CJSCPPUID"; + + @Inject + @Value(key = "resultsvalidator.base.url", defaultValue = "http://localhost:8080/results-validator/api/validation/validate") + protected String validationUrl; + + @Inject + @Value(key = "resultsvalidator.enabled", defaultValue = "true") + protected String enabled; + + @Inject + @Value(key = "resultsvalidator.timeout.ms", defaultValue = "5000") + protected String timeoutMs; + + @Inject + private ObjectMapper objectMapper; + + @Inject + private HttpClient httpClient; + + @Inject + private FeatureControlGuard featureControlGuard; + + public ResultsValidationClient() { + } + + public ValidationResponse validate(final ValidationRequest request, final String userId) { + try { + if (!featureControlGuard.isFeatureEnabled("ResultsValidation")) { + LOGGER.debug("ResultsValidation feature toggle is OFF, skipping validation"); + return ValidationResponse.passThrough(); + } + } catch (final Exception ex) { + LOGGER.warn("ResultsValidation feature toggle lookup failed, proceeding with validation (fail-open)", ex); + } + + if (!"true".equalsIgnoreCase(enabled)) { + LOGGER.debug("Results validation is disabled, proceeding with share"); + return ValidationResponse.passThrough(); + } + + try { + final HttpPost httpPost = new HttpPost(validationUrl); + httpPost.setEntity(new StringEntity(objectMapper.writeValueAsString(request), ContentType.APPLICATION_JSON)); + httpPost.addHeader(CJSCPPUID, userId); + + final HttpResponse httpResponse = httpClient.execute(httpPost); + + if (httpResponse.getStatusLine().getStatusCode() == Response.Status.OK.getStatusCode()) { + try (final InputStream content = httpResponse.getEntity().getContent()) { + return objectMapper.readValue(content, ValidationResponse.class); + } + } else { + LOGGER.error("Results validation service returned status {}, proceeding with share (fail-open)", + httpResponse.getStatusLine().getStatusCode()); + return ValidationResponse.passThrough(); + } + } catch (final Exception ex) { + LOGGER.error("Results validation service call failed, proceeding with share (fail-open)", ex); + return ValidationResponse.passThrough(); + } + } +} diff --git a/hearing-command/hearing-command-handler/src/main/java/uk/gov/moj/cpp/hearing/command/handler/service/validation/ResultsValidator.java b/hearing-command/hearing-command-handler/src/main/java/uk/gov/moj/cpp/hearing/command/handler/service/validation/ResultsValidator.java new file mode 100644 index 0000000000..3e6baa1943 --- /dev/null +++ b/hearing-command/hearing-command-handler/src/main/java/uk/gov/moj/cpp/hearing/command/handler/service/validation/ResultsValidator.java @@ -0,0 +1,6 @@ +package uk.gov.moj.cpp.hearing.command.handler.service.validation; + +public interface ResultsValidator { + + ValidationResponse validate(ValidationRequest request, String userId); +} diff --git a/hearing-command/hearing-command-handler/src/main/java/uk/gov/moj/cpp/hearing/command/handler/service/validation/ValidationIssue.java b/hearing-command/hearing-command-handler/src/main/java/uk/gov/moj/cpp/hearing/command/handler/service/validation/ValidationIssue.java new file mode 100644 index 0000000000..c681bc394b --- /dev/null +++ b/hearing-command/hearing-command-handler/src/main/java/uk/gov/moj/cpp/hearing/command/handler/service/validation/ValidationIssue.java @@ -0,0 +1,67 @@ +package uk.gov.moj.cpp.hearing.command.handler.service.validation; + +import java.util.List; + +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonProperty; + +@JsonIgnoreProperties(ignoreUnknown = true) +public class ValidationIssue { + + private final String ruleId; + private final String severity; + private final String message; + private final List affectedOffences; + + @JsonCreator + public ValidationIssue( + @JsonProperty("ruleId") final String ruleId, + @JsonProperty("severity") final String severity, + @JsonProperty("message") final String message, + @JsonProperty("affectedOffences") final List affectedOffences) { + this.ruleId = ruleId; + this.severity = severity; + this.message = message; + this.affectedOffences = affectedOffences != null ? affectedOffences : List.of(); + } + + public String getRuleId() { + return ruleId; + } + + public String getSeverity() { + return severity; + } + + public String getMessage() { + return message; + } + + public List getAffectedOffences() { + return affectedOffences; + } + + @JsonIgnoreProperties(ignoreUnknown = true) + public static class AffectedOffence { + + private final String id; + private final String title; + + @JsonCreator + public AffectedOffence( + @JsonProperty("id") final String id, + @JsonProperty("title") final String title) { + this.id = id; + this.title = title; + } + + public String getId() { + return id; + } + + public String getTitle() { + return title; + } + } +} diff --git a/hearing-command/hearing-command-handler/src/main/java/uk/gov/moj/cpp/hearing/command/handler/service/validation/ValidationRequest.java b/hearing-command/hearing-command-handler/src/main/java/uk/gov/moj/cpp/hearing/command/handler/service/validation/ValidationRequest.java new file mode 100644 index 0000000000..45ba11d2f9 --- /dev/null +++ b/hearing-command/hearing-command-handler/src/main/java/uk/gov/moj/cpp/hearing/command/handler/service/validation/ValidationRequest.java @@ -0,0 +1,62 @@ +package uk.gov.moj.cpp.hearing.command.handler.service.validation; + +import java.time.LocalDate; +import java.util.List; + +import com.fasterxml.jackson.annotation.JsonProperty; + +public class ValidationRequest { + + private final String hearingId; + private final LocalDate hearingDay; + private final String courtType; + private final String caseId; + private final List resultLines; + private final List offences; + private final List defendants; + + public ValidationRequest( + final String hearingId, + final LocalDate hearingDay, + final String courtType, + final String caseId, + final List resultLines, + final List offences, + final List defendants) { + this.hearingId = hearingId; + this.hearingDay = hearingDay; + this.courtType = courtType; + this.caseId = caseId; + this.resultLines = resultLines; + this.offences = offences; + this.defendants = defendants; + } + + public String getHearingId() { + return hearingId; + } + + public LocalDate getHearingDay() { + return hearingDay; + } + + public String getCourtType() { + return courtType; + } + + public String getCaseId() { + return caseId; + } + + public List getResultLines() { + return resultLines; + } + + public List getOffences() { + return offences; + } + + public List getDefendants() { + return defendants; + } +} diff --git a/hearing-command/hearing-command-handler/src/main/java/uk/gov/moj/cpp/hearing/command/handler/service/validation/ValidationRequestMapper.java b/hearing-command/hearing-command-handler/src/main/java/uk/gov/moj/cpp/hearing/command/handler/service/validation/ValidationRequestMapper.java new file mode 100644 index 0000000000..fc5bc7e6d5 --- /dev/null +++ b/hearing-command/hearing-command-handler/src/main/java/uk/gov/moj/cpp/hearing/command/handler/service/validation/ValidationRequestMapper.java @@ -0,0 +1,128 @@ +package uk.gov.moj.cpp.hearing.command.handler.service.validation; + +import uk.gov.justice.core.courts.Defendant; +import uk.gov.justice.core.courts.Hearing; +import uk.gov.justice.core.courts.Offence; +import uk.gov.justice.core.courts.Person; +import uk.gov.justice.core.courts.PersonDefendant; +import uk.gov.justice.core.courts.ProsecutionCase; +import uk.gov.justice.core.courts.ProsecutionCaseIdentifier; +import uk.gov.moj.cpp.hearing.command.result.ShareDaysResultsCommand; +import uk.gov.moj.cpp.hearing.command.result.SharedResultsCommandPrompt; +import uk.gov.moj.cpp.hearing.command.result.SharedResultsCommandResultLineV2; + +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; + +import javax.enterprise.context.ApplicationScoped; + +@ApplicationScoped +public class ValidationRequestMapper { + + public ValidationRequest toValidationRequest(final ShareDaysResultsCommand command, final Hearing hearing) { + + final String courtType = hearing.getJurisdictionType() != null + ? hearing.getJurisdictionType().name() + : null; + + final List defendants = new ArrayList<>(); + final List offences = new ArrayList<>(); + String caseId = null; + + if (hearing != null && hearing.getProsecutionCases() != null) { + hearing.getProsecutionCases() + .stream() + .forEach(prosecutionCase -> { + final String caseUrn = extractCaseUrn(prosecutionCase); + + prosecutionCase.getDefendants() + .stream() + .forEach(defendant -> { + final Person personDetails = extractPersonDetails(defendant); + defendants.add(DefendantDto.builder() + .withId(uuidToString(defendant.getId())) + .withFirstName(personDetails != null ? personDetails.getFirstName() : null) + .withLastName(personDetails != null ? personDetails.getLastName() : null) + .withMasterDefendantId(uuidToString(defendant.getMasterDefendantId())) + .build()); + + if (defendant != null && defendant.getOffences()!= null) { + defendant.getOffences() + .stream() + .forEach(offence -> offences.add(new OffenceDto.Builder() + .id(uuidToString(offence.getId())) + .offenceCode(offence.getOffenceCode()) + .offenceTitle(offence.getOffenceTitle()) + .orderIndex(offence.getOrderIndex()) + .caseUrn(caseUrn) + .build())); + } + }); + }); + } + final List resultLines = new ArrayList<>(); + if (command.getResultLines() != null) { + for (final SharedResultsCommandResultLineV2 line : command.getResultLines()) { + if (caseId == null && line.getCaseId() != null) { + caseId = line.getCaseId().toString(); + } + resultLines.add(new ResultLineDto.Builder() + .id(uuidToString(line.getResultLineId())) + .shortCode(line.getShortCode()) + .label(line.getResultLabel()) + .defendantId(uuidToString(line.getDefendantId())) + .offenceId(uuidToString(line.getOffenceId())) + .consecutiveToOffence(extractConsecutiveToOffence(line.getPrompts())) + .isConcurrent(extractIsConcurrent(line.getPrompts())) + .build()); + } + } + + return new ValidationRequest( + uuidToString(command.getHearingId()), + command.getHearingDay(), + courtType, + caseId, + resultLines, + offences, + defendants); + } + + private Person extractPersonDetails(final Defendant defendant) { + final PersonDefendant personDefendant = defendant.getPersonDefendant(); + return personDefendant != null ? personDefendant.getPersonDetails() : null; + } + + private String extractCaseUrn(final ProsecutionCase prosecutionCase) { + final ProsecutionCaseIdentifier identifier = prosecutionCase.getProsecutionCaseIdentifier(); + return identifier != null ? identifier.getCaseURN() : null; + } + + private String uuidToString(final UUID uuid) { + return uuid != null ? uuid.toString() : null; + } + + private Boolean extractIsConcurrent(final List prompts) { + if (prompts == null) { + return null; + } + return prompts.stream() + .filter(p -> "concurrent".equals(p.getPromptRef())) + .findFirst() + .map(p -> "true".equalsIgnoreCase(p.getValue())) + .orElse(null); + } + + private String extractConsecutiveToOffence(final List prompts) { + if (prompts == null) { + return null; + } + return prompts.stream() + .filter(p -> "consecutiveToOffenceNumber".equals(p.getPromptRef())) + .findFirst() + .map(SharedResultsCommandPrompt::getValue) + .filter(v -> v != null && !v.isBlank()) + .orElse(null); + } +} diff --git a/hearing-command/hearing-command-handler/src/main/java/uk/gov/moj/cpp/hearing/command/handler/service/validation/ValidationResponse.java b/hearing-command/hearing-command-handler/src/main/java/uk/gov/moj/cpp/hearing/command/handler/service/validation/ValidationResponse.java new file mode 100644 index 0000000000..76f7ef6e73 --- /dev/null +++ b/hearing-command/hearing-command-handler/src/main/java/uk/gov/moj/cpp/hearing/command/handler/service/validation/ValidationResponse.java @@ -0,0 +1,45 @@ +package uk.gov.moj.cpp.hearing.command.handler.service.validation; + +import java.util.List; + +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonProperty; + +@JsonIgnoreProperties(ignoreUnknown = true) +public class ValidationResponse { + + private final boolean isValid; + private final List errors; + private final List warnings; + + @JsonCreator + public ValidationResponse( + @JsonProperty("isValid") final boolean isValid, + @JsonProperty("errors") final List errors, + @JsonProperty("warnings") final List warnings) { + this.isValid = isValid; + this.errors = errors != null ? errors : List.of(); + this.warnings = warnings != null ? warnings : List.of(); + } + + public static ValidationResponse passThrough() { + return new ValidationResponse(true, List.of(), List.of()); + } + + public boolean isValid() { + return isValid; + } + + public boolean hasErrors() { + return !errors.isEmpty(); + } + + public List getErrors() { + return errors; + } + + public List getWarnings() { + return warnings; + } +} diff --git a/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/HearingEventCommandHandlerTest.java b/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/HearingEventCommandHandlerTest.java index ec60590c9b..21b3969b2d 100644 --- a/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/HearingEventCommandHandlerTest.java +++ b/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/HearingEventCommandHandlerTest.java @@ -1,8 +1,11 @@ package uk.gov.moj.cpp.hearing.command.handler; import static java.util.UUID.randomUUID; +import static javax.json.Json.createArrayBuilder; +import static javax.json.Json.createObjectBuilder; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; +import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; import static uk.gov.justice.services.test.utils.core.enveloper.EnveloperFactory.createEnveloperWithEvents; @@ -18,6 +21,7 @@ import static uk.gov.moj.cpp.hearing.test.TestUtilities.with; import static uk.gov.moj.cpp.hearing.test.matchers.BeanMatcher.isBean; +import uk.gov.justice.core.courts.HearingDay; import uk.gov.justice.core.courts.JurisdictionType; import uk.gov.justice.domain.aggregate.Aggregate; import uk.gov.justice.services.common.converter.JsonObjectToObjectConverter; @@ -29,6 +33,7 @@ import uk.gov.justice.services.eventsourcing.source.core.EventStream; import uk.gov.justice.services.messaging.JsonEnvelope; import uk.gov.justice.services.test.utils.framework.api.JsonObjectConvertersFactory; +import uk.gov.moj.cpp.hearing.command.handler.service.ReferenceDataService; import uk.gov.moj.cpp.hearing.command.initiate.InitiateHearingCommand; import uk.gov.moj.cpp.hearing.command.logEvent.CorrectLogEventCommand; import uk.gov.moj.cpp.hearing.command.logEvent.CreateHearingEventDefinitionsCommand; @@ -48,6 +53,7 @@ import java.time.ZonedDateTime; import java.util.Arrays; import java.util.List; +import java.util.Optional; import java.util.Random; import java.util.UUID; import java.util.stream.Collectors; @@ -75,6 +81,8 @@ public class HearingEventCommandHandlerTest { private EventSource eventSource; @Mock private AggregateService aggregateService; + @Mock + private ReferenceDataService referenceDataService; @Spy private ObjectToJsonObjectConverter objectToJsonObjectConverter = new JsonObjectConvertersFactory().objectToJsonObjectConverter(); @Spy @@ -156,6 +164,162 @@ public void logHearingEvent_shouldRaiseHearingEventLogged() throws Exception { ); } + @Test + public void logHearingEvent_shouldUseDayCourtCentreWithLookedUpNames_whenHearingDayHasDifferentRoomFromTopLevel() throws Exception { + + final InitiateHearingCommand initiateHearingCommand = standardInitiateHearingTemplate(); + final UUID hearingId = initiateHearingCommand.getHearing().getId(); + + final ZonedDateTime day1Time = new UtcClock().now().minusDays(2); + final ZonedDateTime day2Time = new UtcClock().now().minusDays(1); + final UUID day2CentreId = randomUUID(); + final UUID day2RoomId = randomUUID(); + + initiateHearingCommand.getHearing().setHearingDays(Arrays.asList( + HearingDay.hearingDay() + .withSittingDay(day1Time) + .withCourtCentreId(randomUUID()) + .withCourtRoomId(randomUUID()) + .withListedDurationMinutes(60) + .build(), + HearingDay.hearingDay() + .withSittingDay(day2Time) + .withCourtCentreId(day2CentreId) + .withCourtRoomId(day2RoomId) + .withListedDurationMinutes(60) + .build() + )); + + final CourtCentre lookedUp = CourtCentre.courtCentre() + .withId(day2CentreId) + .withName("Day 2 Centre") + .withWelshName("Welsh Day 2 Centre") + .withRoomId(day2RoomId) + .withRoomName("Day 2 Room") + .withWelshRoomName("Welsh Day 2 Room") + .build(); + when(referenceDataService.resolveCourtCentre(day2CentreId, day2RoomId)).thenReturn(Optional.of(lookedUp)); + + final LogEventCommand logEventCommand = new LogEventCommand(randomUUID(), hearingId, randomUUID(), STRING.next(), STRING.next(), + day2Time, day2Time, false, randomUUID(), Arrays.asList(randomUUID()), randomUUID()); + + setupMockedEventStream(hearingId, this.eventStream, with(new HearingAggregate(), a -> { + a.apply(new HearingInitiated(initiateHearingCommand.getHearing())); + })); + + final JsonEnvelope jsonEnvelopCommand = envelopeFrom(metadataWithRandomUUID("hearing.log-hearing-event"), objectToJsonObjectConverter.convert(logEventCommand)); + + hearingEventCommandHandler.logHearingEvent(jsonEnvelopCommand); + + final JsonEnvelope jsonEnvelopeEvent = verifyAppendAndGetArgumentFrom(eventStream).findFirst().get(); + + assertThat(uk.gov.moj.cpp.hearing.test.ObjectConverters.asPojo(jsonEnvelopeEvent, HearingEventLogged.class), isBean(HearingEventLogged.class) + .with(HearingEventLogged::getCourtCentre, isBean(uk.gov.moj.cpp.hearing.domain.CourtCentre.class) + .with(uk.gov.moj.cpp.hearing.domain.CourtCentre::getId, is(day2CentreId)) + .with(uk.gov.moj.cpp.hearing.domain.CourtCentre::getRoomId, is(day2RoomId)) + .with(uk.gov.moj.cpp.hearing.domain.CourtCentre::getName, is("Day 2 Centre")) + .with(uk.gov.moj.cpp.hearing.domain.CourtCentre::getRoomName, is("Day 2 Room")) + .with(uk.gov.moj.cpp.hearing.domain.CourtCentre::getWelshName, is("Welsh Day 2 Centre")) + .with(uk.gov.moj.cpp.hearing.domain.CourtCentre::getWelshRoomName, is("Welsh Day 2 Room"))) + ); + } + + @Test + public void logHearingEvent_shouldFallBackToTopLevelCourtCentre_whenNoHearingDayMatchesEventDate() throws Exception { + + final InitiateHearingCommand initiateHearingCommand = standardInitiateHearingTemplate(); + final UUID hearingId = initiateHearingCommand.getHearing().getId(); + + // Single day on a date that won't match the event time + initiateHearingCommand.getHearing().setHearingDays(Arrays.asList( + HearingDay.hearingDay() + .withSittingDay(new UtcClock().now().minusDays(30)) + .withCourtCentreId(randomUUID()) + .withCourtRoomId(randomUUID()) + .withListedDurationMinutes(60) + .build() + )); + + final LogEventCommand logEventCommand = new LogEventCommand(randomUUID(), hearingId, randomUUID(), STRING.next(), STRING.next(), + new UtcClock().now().minusDays(1), new UtcClock().now().minusDays(1), false, randomUUID(), Arrays.asList(randomUUID()), randomUUID()); + + setupMockedEventStream(hearingId, this.eventStream, with(new HearingAggregate(), a -> { + a.apply(new HearingInitiated(initiateHearingCommand.getHearing())); + })); + + final JsonEnvelope jsonEnvelopCommand = envelopeFrom(metadataWithRandomUUID("hearing.log-hearing-event"), objectToJsonObjectConverter.convert(logEventCommand)); + + hearingEventCommandHandler.logHearingEvent(jsonEnvelopCommand); + + final JsonEnvelope jsonEnvelopeEvent = verifyAppendAndGetArgumentFrom(eventStream).findFirst().get(); + + assertThat(uk.gov.moj.cpp.hearing.test.ObjectConverters.asPojo(jsonEnvelopeEvent, HearingEventLogged.class), isBean(HearingEventLogged.class) + .with(HearingEventLogged::getCourtCentre, isBean(uk.gov.moj.cpp.hearing.domain.CourtCentre.class) + .with(uk.gov.moj.cpp.hearing.domain.CourtCentre::getId, is(initiateHearingCommand.getHearing().getCourtCentre().getId())) + .with(uk.gov.moj.cpp.hearing.domain.CourtCentre::getRoomId, is(initiateHearingCommand.getHearing().getCourtCentre().getRoomId()))) + ); + } + + /** + * Covers the override flow that {@code OverrideCourtRoomActiveHearingsIT} + * used to cover end-to-end: when the {@code log-hearing-event} command + * arrives with {@code override=true} and a list of {@code activeHearings}, + * the handler must emit a PAUSE event against each active hearing's + * aggregate, on top of the target hearing's own event. + */ + @Test + public void logHearingEvent_shouldPauseEachActiveHearing_whenOverrideIsTrue() throws Exception { + + final UUID PAUSE_HEARING_EVENT_DEFINITION_ID = UUID.fromString("160ecb51-29ee-4954-bbbf-daab18a24fbb"); + + final InitiateHearingCommand targetInit = standardInitiateHearingTemplate(); + final UUID targetHearingId = targetInit.getHearing().getId(); + + final InitiateHearingCommand activeInit = standardInitiateHearingTemplate(); + final UUID activeHearingId = activeInit.getHearing().getId(); + + final EventStream activeHearingStream = mock(EventStream.class); + setupMockedEventStream(targetHearingId, this.eventStream, with(new HearingAggregate(), a -> { + a.apply(new HearingInitiated(targetInit.getHearing())); + })); + setupMockedEventStream(activeHearingId, activeHearingStream, with(new HearingAggregate(), a -> { + a.apply(new HearingInitiated(activeInit.getHearing())); + })); + + final ZonedDateTime eventTime = getPastDate(); + final UUID targetEventDefId = randomUUID(); + final LogEventCommand logEventCommand = new LogEventCommand(randomUUID(), targetHearingId, targetEventDefId, + STRING.next(), STRING.next(), eventTime, eventTime, false, randomUUID(), + Arrays.asList(randomUUID()), randomUUID()); + + // Same shape as the regular log-hearing-event command, but with override=true and + // activeHearings populated by the Command-API layer (the production code path). + final javax.json.JsonObject baseCommandPayload = objectToJsonObjectConverter.convert(logEventCommand); + final javax.json.JsonObjectBuilder payloadBuilder = createObjectBuilder(); + baseCommandPayload.forEach(payloadBuilder::add); + final javax.json.JsonObject payload = payloadBuilder + .add("override", true) + .add("activeHearings", createArrayBuilder().add(activeHearingId.toString())) + .build(); + + final JsonEnvelope jsonEnvelopCommand = envelopeFrom(metadataWithRandomUUID("hearing.log-hearing-event"), payload); + + hearingEventCommandHandler.logHearingEvent(jsonEnvelopCommand); + + // Target hearing got its own (non-pause) event. + final JsonEnvelope targetEnvelope = verifyAppendAndGetArgumentFrom(eventStream).findFirst().get(); + assertThat(uk.gov.moj.cpp.hearing.test.ObjectConverters.asPojo(targetEnvelope, HearingEventLogged.class), isBean(HearingEventLogged.class) + .with(HearingEventLogged::getHearingId, is(targetHearingId)) + .with(HearingEventLogged::getHearingEventDefinitionId, is(targetEventDefId))); + + // Active hearing was paused via its own aggregate stream. + final JsonEnvelope pauseEnvelope = verifyAppendAndGetArgumentFrom(activeHearingStream).findFirst().get(); + assertThat(uk.gov.moj.cpp.hearing.test.ObjectConverters.asPojo(pauseEnvelope, HearingEventLogged.class), isBean(HearingEventLogged.class) + .with(HearingEventLogged::getHearingId, is(activeHearingId)) + .with(HearingEventLogged::getHearingEventDefinitionId, is(PAUSE_HEARING_EVENT_DEFINITION_ID)) + .with(HearingEventLogged::getRecordedLabel, is("Hearing paused"))); + } + @Test public void logHearingEvent_shouldIgnoreLogEvent_givenEventHasAlreadyBeenLogged() throws Exception { diff --git a/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/ShareResultsCommandHandlerTest.java b/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/ShareResultsCommandHandlerTest.java index b4dd2ac208..ada8b2ffbe 100644 --- a/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/ShareResultsCommandHandlerTest.java +++ b/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/ShareResultsCommandHandlerTest.java @@ -7,6 +7,10 @@ import static org.hamcrest.Matchers.hasItem; import static org.hamcrest.Matchers.is; import static org.hamcrest.core.IsNull.notNullValue; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.lenient; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; import static uk.gov.justice.services.test.utils.core.enveloper.EnveloperFactory.createEnveloperWithEvents; @@ -24,6 +28,16 @@ import uk.gov.justice.core.courts.DefenceCounsel; import uk.gov.justice.core.courts.DelegatedPowers; import uk.gov.justice.core.courts.Hearing; +import uk.gov.moj.cpp.hearing.command.handler.service.validation.ValidationIssue; +import uk.gov.moj.cpp.hearing.command.handler.service.validation.ValidationRequest; +import uk.gov.moj.cpp.hearing.command.result.DeleteDraftResultV2Command; +import uk.gov.moj.cpp.hearing.command.result.SaveDraftResultV2Command; +import uk.gov.moj.cpp.hearing.command.result.SaveMultipleResultsCommand; +import uk.gov.moj.cpp.hearing.command.result.ShareDaysResultsCommand; +import uk.gov.moj.cpp.hearing.command.result.SharedResultsCommandResultLineV2; +import uk.gov.moj.cpp.hearing.command.result.UpdateDaysResultLinesStatusCommand; +import uk.gov.moj.cpp.hearing.command.result.UpdateResultLinesStatusCommand; +import uk.gov.moj.cpp.hearing.domain.aggregate.ApplicationAggregate; import uk.gov.justice.core.courts.Person; import uk.gov.justice.core.courts.PersonDefendant; import uk.gov.justice.core.courts.Prompt; @@ -58,8 +72,12 @@ import uk.gov.moj.cpp.hearing.domain.event.HearingInitiated; import uk.gov.moj.cpp.hearing.domain.event.NowsVariantsSavedEvent; import uk.gov.moj.cpp.hearing.domain.event.ProsecutionCounselAdded; +import uk.gov.moj.cpp.hearing.command.handler.service.validation.ResultsValidator; +import uk.gov.moj.cpp.hearing.command.handler.service.validation.ValidationRequestMapper; +import uk.gov.moj.cpp.hearing.command.handler.service.validation.ValidationResponse; import uk.gov.moj.cpp.hearing.domain.event.result.DraftResultSaved; import uk.gov.moj.cpp.hearing.domain.event.result.ResultsShared; +import uk.gov.moj.cpp.hearing.domain.event.result.ResultsValidationFailed; import uk.gov.moj.cpp.hearing.domain.event.result.SaveDraftResultFailed; import uk.gov.moj.cpp.hearing.test.TestTemplates; @@ -68,10 +86,13 @@ import java.util.Arrays; import java.util.List; 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; + import org.hamcrest.core.IsNull; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; @@ -96,7 +117,7 @@ public class ShareResultsCommandHandlerTest { private static UUID metadataId; private static ZonedDateTime sharedTime; @Spy - private final Enveloper enveloper = createEnveloperWithEvents(ResultsShared.class, SaveDraftResultFailed.class); + private final Enveloper enveloper = createEnveloperWithEvents(ResultsShared.class, SaveDraftResultFailed.class, ResultsValidationFailed.class); private DefendantDetailsUpdated defendantDetailsUpdated; @InjectMocks private ShareResultsCommandHandler shareResultsCommandHandler; @@ -110,6 +131,10 @@ public class ShareResultsCommandHandlerTest { private AggregateService aggregateService; @Mock private Clock clock; + @Mock + private ResultsValidator resultsValidationClient; + @Mock + private ValidationRequestMapper validationRequestMapper; @Spy private JsonObjectToObjectConverter jsonObjectToObjectConverter; @Spy @@ -183,7 +208,7 @@ private static Defendant convert(final uk.gov.justice.core.courts.Defendant curr public void setup() { setField(this.jsonObjectToObjectConverter, "objectMapper", new ObjectMapperProducer().objectMapper()); setField(this.objectToJsonObjectConverter, "mapper", new ObjectMapperProducer().objectMapper()); - when(this.eventSource.getStreamById(initiateHearingCommand.getHearing().getId())).thenReturn(this.hearingEventStream); + lenient().when(this.eventSource.getStreamById(initiateHearingCommand.getHearing().getId())).thenReturn(this.hearingEventStream); defendantDetailsUpdated = new DefendantDetailsUpdated(initiateHearingCommand.getHearing().getId(), convert(initiateHearingCommand.getHearing().getProsecutionCases().get(0).getDefendants().get(0), "Test")); } @@ -410,4 +435,291 @@ private Target getNewTarget(final Target targetToCopyFrom) { .withHearingDay(targetToCopyFrom.getHearingDay()) .build(); } + + @Test + public void shouldSaveDraftResult() throws Exception { + final Target target = saveDraftResultCommandTemplate(initiateHearingCommand, LocalDate.now(), LocalDate.now()).getTarget(); + final HearingAggregate mockAggregate = mock(HearingAggregate.class); + when(mockAggregate.saveDraftResults(any(), any())).thenReturn(Stream.empty()); + when(aggregateService.get(hearingEventStream, HearingAggregate.class)).thenReturn(mockAggregate); + + final JsonEnvelope envelope = envelopeFrom( + metadataOf(metadataId, "hearing.command.save-draft-result").withUserId(randomUUID().toString()), + objectToJsonObjectConverter.convert(target)); + + shareResultsCommandHandler.saveDraftResult(envelope); + + verify(hearingEventStream).append(any()); + } + + @Test + public void shouldSaveDraftResultV2() throws Exception { + final UUID hearingId = initiateHearingCommand.getHearing().getId(); + final SaveDraftResultV2Command command = SaveDraftResultV2Command.saveDraftResultCommand() + .setHearingId(hearingId) + .setHearingDay(LocalDate.now()) + .setVersion(1); + final HearingAggregate mockAggregate = mock(HearingAggregate.class); + when(mockAggregate.saveDraftResultV2(any(), any(), any(), any(), any(), any(), any())).thenReturn(Stream.empty()); + when(aggregateService.get(hearingEventStream, HearingAggregate.class)).thenReturn(mockAggregate); + + final JsonEnvelope envelope = envelopeFrom( + metadataOf(metadataId, "hearing.command.save-draft-result-v2").withUserId(randomUUID().toString()), + objectToJsonObjectConverter.convert(command)); + + shareResultsCommandHandler.saveDraftResultV2(envelope); + + verify(hearingEventStream).append(any()); + } + + @Test + public void shouldDeleteDraftResultV2() throws Exception { + final UUID hearingId = initiateHearingCommand.getHearing().getId(); + final DeleteDraftResultV2Command command = DeleteDraftResultV2Command.deleteDraftResultCommand() + .setHearingId(hearingId) + .setHearingDay(LocalDate.now()); + final HearingAggregate mockAggregate = mock(HearingAggregate.class); + when(mockAggregate.deleteDraftResultV2(any(), any(), any())).thenReturn(Stream.empty()); + when(aggregateService.get(hearingEventStream, HearingAggregate.class)).thenReturn(mockAggregate); + + final JsonEnvelope envelope = envelopeFrom( + metadataOf(metadataId, "hearing.command.delete-draft-result-v2").withUserId(randomUUID().toString()), + objectToJsonObjectConverter.convert(command)); + + shareResultsCommandHandler.deleteDraftResultV2(envelope); + + verify(hearingEventStream).append(any()); + } + + @Test + public void shouldSaveDraftResultForHearingDay() throws Exception { + final Target target = saveDraftResultCommandTemplate(initiateHearingCommand, LocalDate.now(), LocalDate.now()).getTarget(); + final HearingAggregate mockAggregate = mock(HearingAggregate.class); + when(mockAggregate.saveDraftResultForHearingDay(any(), any())).thenReturn(Stream.empty()); + when(aggregateService.get(hearingEventStream, HearingAggregate.class)).thenReturn(mockAggregate); + + final JsonEnvelope envelope = envelopeFrom( + metadataOf(metadataId, "hearing.command.save-days-draft-result").withUserId(randomUUID().toString()), + objectToJsonObjectConverter.convert(target)); + + shareResultsCommandHandler.saveDraftResultForHearingDay(envelope); + + verify(hearingEventStream).append(any()); + } + + @Test + public void shouldSaveMultipleDraftResult() throws Exception { + final UUID hearingId = initiateHearingCommand.getHearing().getId(); + final Target target = Target.target() + .withHearingId(hearingId) + .withDefendantId(randomUUID()) + .withOffenceId(randomUUID()) + .withTargetId(randomUUID()) + .build(); + final SaveMultipleResultsCommand command = new SaveMultipleResultsCommand(hearingId, List.of(target)); + final HearingAggregate mockAggregate = mock(HearingAggregate.class); + when(mockAggregate.saveAllDraftResults(any(), any())).thenReturn(Stream.empty()); + when(aggregateService.get(hearingEventStream, HearingAggregate.class)).thenReturn(mockAggregate); + + final JsonEnvelope envelope = envelopeFrom( + metadataOf(metadataId, "hearing.command.save-multiple-draft-results").withUserId(randomUUID().toString()), + objectToJsonObjectConverter.convert(command)); + + shareResultsCommandHandler.saveMultipleDraftResult(envelope); + + verify(hearingEventStream).append(any()); + } + + @Test + public void shouldShareResultV2() throws Exception { + final ShareDaysResultsCommand command = TestTemplates.ShareResultsCommandTemplates + .standardShareResultsPerDaysCommandTemplate(initiateHearingCommand.getHearing().getId()) + .setResultLines(List.of()); + command.setHearingDay(LocalDate.now()); + final HearingAggregate mockAggregate = mock(HearingAggregate.class); + when(mockAggregate.shareResultsV2(any(), any(), any(), any(), any())).thenReturn(Stream.empty()); + when(aggregateService.get(hearingEventStream, HearingAggregate.class)).thenReturn(mockAggregate); + when(clock.now()).thenReturn(sharedTime); + + final JsonEnvelope envelope = envelopeFrom( + metadataOf(metadataId, "hearing.command.share-results-v2"), + objectToJsonObjectConverter.convert(command)); + + shareResultsCommandHandler.shareResultV2(envelope); + + verify(hearingEventStream).append(any()); + } + + @Test + public void shouldShareDaysResultsWhenValidationPasses() throws Exception { + final ShareDaysResultsCommand command = TestTemplates.ShareResultsCommandTemplates + .standardShareResultsPerDaysCommandTemplate(initiateHearingCommand.getHearing().getId()) + .setResultLines(List.of()); + command.setHearingDay(LocalDate.now()); + final Hearing hearing = initiateHearingCommand.getHearing(); + final HearingAggregate mockAggregate = mock(HearingAggregate.class); + when(mockAggregate.getHearing()).thenReturn(hearing); + when(mockAggregate.shareResultForDay(any(), any(), any(), any(), any(), any(), any(), any(), any(), any())).thenReturn(Stream.empty()); + when(aggregateService.get(hearingEventStream, HearingAggregate.class)).thenReturn(mockAggregate); + final ValidationRequest validationRequest = new ValidationRequest( + command.getHearingId().toString(), command.getHearingDay(), "MAGISTRATE", null, List.of(), List.of(), List.of()); + when(validationRequestMapper.toValidationRequest(any(), any())).thenReturn(validationRequest); + when(resultsValidationClient.validate(any(), any())).thenReturn(ValidationResponse.passThrough()); + when(clock.now()).thenReturn(sharedTime); + + final JsonEnvelope envelope = envelopeFrom( + metadataOf(metadataId, "hearing.command.share-days-results").withUserId(randomUUID().toString()), + objectToJsonObjectConverter.convert(command)); + + shareResultsCommandHandler.shareResultForDay(envelope); + + verify(hearingEventStream).append(any()); + } + + @Test + public void shouldRaiseValidationFailedEventWhenShareDaysResultsHasErrors() throws Exception { + final ShareDaysResultsCommand command = TestTemplates.ShareResultsCommandTemplates + .standardShareResultsPerDaysCommandTemplate(initiateHearingCommand.getHearing().getId()) + .setResultLines(List.of()); + command.setHearingDay(LocalDate.now()); + final Hearing hearing = initiateHearingCommand.getHearing(); + final HearingAggregate mockAggregate = mock(HearingAggregate.class); + when(mockAggregate.getHearing()).thenReturn(hearing); + when(aggregateService.get(hearingEventStream, HearingAggregate.class)).thenReturn(mockAggregate); + final ValidationRequest validationRequest = new ValidationRequest( + command.getHearingId().toString(), command.getHearingDay(), "MAGISTRATE", null, List.of(), List.of(), List.of()); + when(validationRequestMapper.toValidationRequest(any(), any())).thenReturn(validationRequest); + final ValidationIssue error = new ValidationIssue("RULE1", "ERROR", "Validation error", List.of()); + when(resultsValidationClient.validate(any(), any())).thenReturn(new ValidationResponse(false, List.of(error), List.of())); + + final JsonEnvelope envelope = envelopeFrom( + metadataOf(metadataId, "hearing.command.share-days-results").withUserId(randomUUID().toString()), + objectToJsonObjectConverter.convert(command)); + + shareResultsCommandHandler.shareResultForDay(envelope); + + final Stream appended = verifyAppendAndGetArgumentFrom(hearingEventStream); + final Optional validationFailed = appended + .filter(e -> "hearing.events.results-validation-failed".equals(e.metadata().name())) + .findFirst(); + assertThat(validationFailed.isPresent(), is(true)); + } + + @Test + public void shouldUpdateResultLinesStatus() throws Exception { + final UpdateResultLinesStatusCommand command = UpdateResultLinesStatusCommand.builder() + .withHearingId(initiateHearingCommand.getHearing().getId()) + .withCourtClerk(DelegatedPowers.delegatedPowers().withUserId(randomUUID()).withFirstName("test").withLastName("test").build()) + .withLastSharedDateTime(ZonedDateTime.now()) + .withSharedResultLines(List.of()) + .build(); + final HearingAggregate mockAggregate = mock(HearingAggregate.class); + when(mockAggregate.updateResultLinesStatus(any(), any(), any(), any())).thenReturn(Stream.empty()); + when(aggregateService.get(hearingEventStream, HearingAggregate.class)).thenReturn(mockAggregate); + + final JsonEnvelope envelope = envelopeFrom( + metadataOf(metadataId, "hearing.command.update-result-lines-status"), + objectToJsonObjectConverter.convert(command)); + + shareResultsCommandHandler.updateResultLinesStatus(envelope); + + verify(hearingEventStream).append(any()); + } + + @Test + public void shouldUpdateDaysResultLinesStatus() throws Exception { + final UpdateDaysResultLinesStatusCommand command = UpdateDaysResultLinesStatusCommand.builder() + .withHearingId(initiateHearingCommand.getHearing().getId()) + .withCourtClerk(DelegatedPowers.delegatedPowers().withUserId(randomUUID()).withFirstName("test").withLastName("test").build()) + .withLastSharedDateTime(ZonedDateTime.now()) + .withSharedResultLines(List.of()) + .withHearingDay(LocalDate.now()) + .build(); + final HearingAggregate mockAggregate = mock(HearingAggregate.class); + when(mockAggregate.updateDaysResultLinesStatus(any(), any(), any(), any(), any())).thenReturn(Stream.empty()); + when(aggregateService.get(hearingEventStream, HearingAggregate.class)).thenReturn(mockAggregate); + + final JsonEnvelope envelope = envelopeFrom( + metadataOf(metadataId, "hearing.command.update-days-result-lines-status"), + objectToJsonObjectConverter.convert(command)); + + shareResultsCommandHandler.updateDaysResultLinesStatus(envelope); + + verify(hearingEventStream).append(any()); + } + + @Test + public void shouldReplicateSharedResultsForHearing() throws Exception { + final UUID hearingId = initiateHearingCommand.getHearing().getId(); + final HearingAggregate mockAggregate = mock(HearingAggregate.class); + when(mockAggregate.replicateSharedResultsForHearing(any())).thenReturn(Stream.empty()); + when(aggregateService.get(hearingEventStream, HearingAggregate.class)).thenReturn(mockAggregate); + + final JsonEnvelope envelope = envelopeFrom( + metadataOf(metadataId, "hearing.command.replicate-results"), + Json.createObjectBuilder().add("hearingId", hearingId.toString()).build()); + + shareResultsCommandHandler.replicateAllSharedResultsForHearing(envelope); + + verify(hearingEventStream).append(any()); + } + + @Test + public void shouldGetDistinctApplicationIdsFromResultLines() { + final UUID appId1 = randomUUID(); + final UUID appId2 = randomUUID(); + + final SharedResultsCommandResultLineV2 line1 = SharedResultsCommandResultLineV2.sharedResultsCommandResultLine() + .withApplicationIds(appId1).build(); + final SharedResultsCommandResultLineV2 line2 = SharedResultsCommandResultLineV2.sharedResultsCommandResultLine() + .withApplicationIds(appId2).build(); + final SharedResultsCommandResultLineV2 lineDuplicate = SharedResultsCommandResultLineV2.sharedResultsCommandResultLine() + .withApplicationIds(appId1).build(); + final SharedResultsCommandResultLineV2 lineNullApp = SharedResultsCommandResultLineV2.sharedResultsCommandResultLine() + .withApplicationIds(null).build(); + + final Set result = ShareResultsCommandHandler.getDistinctApplicationIdsFromResultLines( + List.of(line1, line2, lineDuplicate, lineNullApp)); + + assertThat(result.size(), is(2)); + assertThat(result.contains(appId1), is(true)); + assertThat(result.contains(appId2), is(true)); + } + + @Test + public void shouldReturnEmptyListFromGetAdditionalApplicationsWhenNoIds() { + final List result = shareResultsCommandHandler.getAdditionalApplications(Set.of(), randomUUID()); + + assertThat(result.isEmpty(), is(true)); + } + + @Test + public void shouldReturnApplicationFromGetAdditionalApplicationsWhenLatestHearingDiffers() { + final UUID applicationId = randomUUID(); + final UUID resultedHearingId = initiateHearingCommand.getHearing().getId(); + final UUID latestHearingId = randomUUID(); + + final uk.gov.justice.services.eventsourcing.source.core.EventStream applicationStream = mock(uk.gov.justice.services.eventsourcing.source.core.EventStream.class); + final uk.gov.justice.services.eventsourcing.source.core.EventStream latestHearingStream = mock(uk.gov.justice.services.eventsourcing.source.core.EventStream.class); + + final ApplicationAggregate appAggregate = mock(ApplicationAggregate.class); + when(appAggregate.getHearingIds()).thenReturn(List.of(latestHearingId)); + + final CourtApplication expectedApp = CourtApplication.courtApplication().withId(applicationId).build(); + final Hearing latestHearing = mock(Hearing.class); + when(latestHearing.getCourtApplications()).thenReturn(List.of(expectedApp)); + final HearingAggregate latestHearingAggregate = mock(HearingAggregate.class); + when(latestHearingAggregate.getHearing()).thenReturn(latestHearing); + + when(eventSource.getStreamById(applicationId)).thenReturn(applicationStream); + when(eventSource.getStreamById(latestHearingId)).thenReturn(latestHearingStream); + when(aggregateService.get(applicationStream, ApplicationAggregate.class)).thenReturn(appAggregate); + when(aggregateService.get(latestHearingStream, HearingAggregate.class)).thenReturn(latestHearingAggregate); + + final List result = shareResultsCommandHandler.getAdditionalApplications( + Set.of(applicationId), resultedHearingId); + + assertThat(result.size(), is(1)); + assertThat(result.get(0).getId(), is(applicationId)); + } } diff --git a/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/service/ReferenceDataServiceTest.java b/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/service/ReferenceDataServiceTest.java index 39763eab3e..f24a745d65 100644 --- a/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/service/ReferenceDataServiceTest.java +++ b/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/service/ReferenceDataServiceTest.java @@ -17,9 +17,11 @@ import uk.gov.justice.services.core.requester.Requester; import uk.gov.justice.services.messaging.Envelope; import uk.gov.justice.services.messaging.JsonEnvelope; +import uk.gov.moj.cpp.hearing.domain.CourtCentre; import java.util.Arrays; import java.util.List; +import java.util.Optional; import java.util.Set; import java.util.UUID; @@ -105,4 +107,88 @@ private JsonObject buildOrgUnit(final UUID courtCentreId) { .add("id", courtCentreId.toString()) .build(); } + + @Test + public void resolveCourtCentre_shouldReturnFullCourtCentreFromReferenceData() { + final UUID courtCentreId = randomUUID(); + final UUID courtRoomId = randomUUID(); + + final JsonEnvelope responseEnvelope = createEnvelope(".", + createObjectBuilder() + .add("organisationunits", createArrayBuilder() + .add(createObjectBuilder() + .add("id", courtCentreId.toString()) + .add("oucodeL3Name", "Centre English") + .add("oucodeL3WelshName", "Centre Welsh") + .add("courtrooms", createArrayBuilder() + .add(createObjectBuilder() + .add("id", randomUUID().toString()) + .add("courtroomName", "Other Room") + .add("welshCourtroomName", "Other Welsh Room")) + .add(createObjectBuilder() + .add("id", courtRoomId.toString()) + .add("courtroomName", "Target Room") + .add("welshCourtroomName", "Welsh Target Room"))))) + .build()); + when(requester.requestAsAdmin(any(JsonEnvelope.class))).thenReturn(responseEnvelope); + ArgumentCaptor captor = ArgumentCaptor.forClass(JsonEnvelope.class); + + final Optional result = referenceDataService.resolveCourtCentre(courtCentreId, courtRoomId); + + verify(requester).requestAsAdmin(captor.capture()); + assertThat(captor.getValue().metadata().name(), is("referencedata.query.courtrooms")); + assertThat(captor.getValue().payloadAsJsonObject().getString("courtCentreId"), is(courtCentreId.toString())); + + assertThat(result.isPresent(), is(true)); + final CourtCentre cc = result.get(); + assertThat(cc.getId(), is(courtCentreId)); + assertThat(cc.getName(), is("Centre English")); + assertThat(cc.getWelshName(), is("Centre Welsh")); + assertThat(cc.getRoomId(), is(courtRoomId)); + assertThat(cc.getRoomName(), is("Target Room")); + assertThat(cc.getWelshRoomName(), is("Welsh Target Room")); + } + + @Test + public void resolveCourtCentre_shouldReturnEmpty_whenRoomNotFoundInOU() { + final UUID courtCentreId = randomUUID(); + final UUID courtRoomId = randomUUID(); + + final JsonEnvelope responseEnvelope = createEnvelope(".", + createObjectBuilder() + .add("organisationunits", createArrayBuilder() + .add(createObjectBuilder() + .add("id", courtCentreId.toString()) + .add("oucodeL3Name", "Centre") + .add("courtrooms", createArrayBuilder() + .add(createObjectBuilder() + .add("id", randomUUID().toString()) + .add("courtroomName", "Other Room"))))) + .build()); + when(requester.requestAsAdmin(any(JsonEnvelope.class))).thenReturn(responseEnvelope); + + final Optional result = referenceDataService.resolveCourtCentre(courtCentreId, courtRoomId); + + assertThat(result.isPresent(), is(false)); + } + + @Test + public void resolveCourtCentre_shouldReturnEmpty_whenInputsAreNull() { + assertThat(referenceDataService.resolveCourtCentre(null, randomUUID()).isPresent(), is(false)); + assertThat(referenceDataService.resolveCourtCentre(randomUUID(), null).isPresent(), is(false)); + assertThat(referenceDataService.resolveCourtCentre(null, null).isPresent(), is(false)); + } + + @Test + public void resolveCourtCentre_shouldReturnEmpty_whenNoOrganisationUnits() { + final JsonEnvelope responseEnvelope = createEnvelope(".", + createObjectBuilder() + .add("organisationunits", createArrayBuilder()) + .build()); + when(requester.requestAsAdmin(any(JsonEnvelope.class))).thenReturn(responseEnvelope); + + final Optional result = referenceDataService.resolveCourtCentre(randomUUID(), randomUUID()); + + assertThat(result.isPresent(), is(false)); + } } diff --git a/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/service/validation/HttpClientProducerTest.java b/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/service/validation/HttpClientProducerTest.java new file mode 100644 index 0000000000..a66d14c5fc --- /dev/null +++ b/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/service/validation/HttpClientProducerTest.java @@ -0,0 +1,125 @@ +package uk.gov.moj.cpp.hearing.command.handler.service.validation; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.instanceOf; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.notNullValue; +import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; +import static uk.gov.justice.services.test.utils.core.reflection.ReflectionUtil.setField; + +import java.io.IOException; + +import org.apache.http.HttpHost; +import org.apache.http.HttpRequest; +import org.apache.http.client.HttpClient; +import org.apache.http.client.methods.CloseableHttpResponse; +import org.apache.http.conn.ClientConnectionManager; +import org.apache.http.impl.client.CloseableHttpClient; +import org.apache.http.protocol.HttpContext; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.InjectMocks; +import org.mockito.junit.jupiter.MockitoExtension; + +@ExtendWith(MockitoExtension.class) +class HttpClientProducerTest { + + private static class FakeCloseableHttpClient extends CloseableHttpClient { + boolean closeCalled = false; + boolean throwOnClose = false; + + @Override + protected CloseableHttpResponse doExecute(final HttpHost target, final HttpRequest request, final HttpContext context) { + return null; + } + + @Override + @Deprecated + public ClientConnectionManager getConnectionManager() { + return null; + } + + @Override + @Deprecated + public org.apache.http.params.HttpParams getParams() { + return null; + } + + @Override + public void close() throws IOException { + closeCalled = true; + if (throwOnClose) { + throw new IOException("connection reset"); + } + } + } + + @InjectMocks + private HttpClientProducer httpClientProducer; + + private FakeCloseableHttpClient closeableHttpClient; + + @BeforeEach + void setUp() { + closeableHttpClient = new FakeCloseableHttpClient(); + setField(httpClientProducer, "socketTimeoutMs", "5000"); + setField(httpClientProducer, "connectTimeoutMs", "1000"); + setField(httpClientProducer, "connectionRequestTimeoutMs", "500"); + setField(httpClientProducer, "poolMaxTotal", "200"); + setField(httpClientProducer, "poolMaxPerRoute", "100"); + setField(httpClientProducer, "evictIdleSeconds", "30"); + } + + @Test + void createHttpClient_shouldReturnNonNullHttpClient() { + final HttpClient client = httpClientProducer.createHttpClient(); + + assertThat(client, is(notNullValue())); + } + + @Test + void createHttpClient_shouldReturnCloseableHttpClient() { + final HttpClient client = httpClientProducer.createHttpClient(); + + assertThat(client, instanceOf(CloseableHttpClient.class)); + } + + @Test + void createHttpClient_shouldReturnHttpClient_withCustomValues() { + setField(httpClientProducer, "socketTimeoutMs", "3000"); + setField(httpClientProducer, "connectTimeoutMs", "2000"); + setField(httpClientProducer, "connectionRequestTimeoutMs", "750"); + setField(httpClientProducer, "poolMaxTotal", "50"); + setField(httpClientProducer, "poolMaxPerRoute", "25"); + setField(httpClientProducer, "evictIdleSeconds", "60"); + + final HttpClient client = httpClientProducer.createHttpClient(); + + assertThat(client, is(notNullValue())); + } + + @Test + void close_whenClientIsNotNull_shouldCloseClient() { + setField(httpClientProducer, "client", closeableHttpClient); + + httpClientProducer.close(); + + assertThat(closeableHttpClient.closeCalled, is(true)); + } + + @Test + void close_whenClientIsNull_shouldNotThrow() { + assertDoesNotThrow(() -> httpClientProducer.close()); + } + + @Test + void close_whenClientThrowsException_shouldNotPropagate() { + setField(httpClientProducer, "client", closeableHttpClient); + closeableHttpClient.throwOnClose = true; + + httpClientProducer.close(); + + assertThat(closeableHttpClient.closeCalled, is(true)); + } +} diff --git a/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/service/validation/ResultsValidationClientTest.java b/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/service/validation/ResultsValidationClientTest.java new file mode 100644 index 0000000000..1103ea665c --- /dev/null +++ b/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/service/validation/ResultsValidationClientTest.java @@ -0,0 +1,209 @@ +package uk.gov.moj.cpp.hearing.command.handler.service.validation; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.empty; +import static org.hamcrest.Matchers.hasSize; +import static org.hamcrest.Matchers.is; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.lenient; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; +import static uk.gov.justice.services.test.utils.core.reflection.ReflectionUtil.setField; + +import uk.gov.justice.services.core.featurecontrol.FeatureControlGuard; + +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.nio.charset.StandardCharsets; +import java.time.LocalDate; +import java.util.List; + +import com.fasterxml.jackson.databind.ObjectMapper; +import org.apache.http.HttpEntity; +import org.apache.http.HttpResponse; +import org.apache.http.StatusLine; +import org.apache.http.client.HttpClient; +import org.apache.http.client.methods.HttpPost; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.junit.jupiter.MockitoExtension; +import uk.gov.justice.services.common.converter.jackson.ObjectMapperProducer; + +@ExtendWith(MockitoExtension.class) +class ResultsValidationClientTest { + + @InjectMocks + private ResultsValidationClient resultsValidationClient; + + @Mock + private HttpClient httpClient; + + @Mock + private FeatureControlGuard featureControlGuard; + + private final ObjectMapper objectMapper = new ObjectMapperProducer().objectMapper(); + + @BeforeEach + void setUp() { + setField(resultsValidationClient, "objectMapper", objectMapper); + setField(resultsValidationClient, "validationUrl", "http://localhost:8082/api/validation/validate"); + setField(resultsValidationClient, "enabled", "true"); + setField(resultsValidationClient, "timeoutMs", "5000"); + lenient().when(featureControlGuard.isFeatureEnabled("ResultsValidation")).thenReturn(true); + } + + @Test + void shouldReturnValidResponseWhenServiceReturns200WithNoErrors() throws Exception { + final String responseJson = """ + {"validationId":"abc","isValid":true,"errors":[],"warnings":[],"rulesEvaluated":["DR-SENT-002"],"processingTimeMs":10} + """; + mockHttpResponse(200, responseJson); + + final ValidationResponse response = resultsValidationClient.validate(buildRequest(), "user-123"); + + assertThat(response.isValid(), is(true)); + assertThat(response.hasErrors(), is(false)); + } + + @Test + void shouldReturnErrorsWhenServiceReturns200WithErrors() throws Exception { + final String responseJson = """ + {"validationId":"abc","isValid":false,"errors":[{"ruleId":"DR-SENT-002","severity":"ERROR","message":"Missing info","affectedOffences":[]}],"warnings":[],"rulesEvaluated":["DR-SENT-002"],"processingTimeMs":10} + """; + mockHttpResponse(200, responseJson); + + final ValidationResponse response = resultsValidationClient.validate(buildRequest(), "user-123"); + + assertThat(response.isValid(), is(false)); + assertThat(response.hasErrors(), is(true)); + assertThat(response.getErrors(), hasSize(1)); + } + + @Test + void shouldReturnNoErrorsWhenServiceReturns200WithWarningsOnly() throws Exception { + final String responseJson = """ + {"validationId":"abc","isValid":true,"errors":[],"warnings":[{"ruleId":"DR-SENT-002","severity":"WARNING","message":"Advisory","affectedOffences":[]}],"rulesEvaluated":["DR-SENT-002"],"processingTimeMs":10} + """; + mockHttpResponse(200, responseJson); + + final ValidationResponse response = resultsValidationClient.validate(buildRequest(), "user-123"); + + assertThat(response.hasErrors(), is(false)); + assertThat(response.getWarnings(), hasSize(1)); + } + + @Test + void shouldReturnPassThroughWhenServiceThrowsIOException() throws Exception { + when(httpClient.execute(any(HttpPost.class))).thenThrow(new IOException("Connection refused")); + + final ValidationResponse response = resultsValidationClient.validate(buildRequest(), "user-123"); + + assertThat(response.isValid(), is(true)); + assertThat(response.hasErrors(), is(false)); + assertThat(response.getErrors(), is(empty())); + } + + @Test + void shouldReturnPassThroughWhenServiceReturnsNon200Status() throws Exception { + final HttpResponse httpResponse = mock(HttpResponse.class); + final StatusLine statusLine = mock(StatusLine.class); + + when(statusLine.getStatusCode()).thenReturn(500); + when(httpResponse.getStatusLine()).thenReturn(statusLine); + when(httpClient.execute(any(HttpPost.class))).thenReturn(httpResponse); + + final ValidationResponse response = resultsValidationClient.validate(buildRequest(), "user-123"); + + assertThat(response.isValid(), is(true)); + assertThat(response.hasErrors(), is(false)); + } + + @Test + void shouldReturnPassThroughWithoutHttpCallWhenDisabled() throws Exception { + setField(resultsValidationClient, "enabled", "false"); + + final ValidationResponse response = resultsValidationClient.validate(buildRequest(), "user-123"); + + assertThat(response.isValid(), is(true)); + assertThat(response.hasErrors(), is(false)); + verify(httpClient, never()).execute(any()); + } + + @Test + void toggle_off_returns_passThrough_without_http_call() throws Exception { + when(featureControlGuard.isFeatureEnabled("ResultsValidation")).thenReturn(false); + + final ValidationResponse response = resultsValidationClient.validate(buildRequest(), "user-123"); + + assertThat(response.isValid(), is(true)); + assertThat(response.hasErrors(), is(false)); + verify(httpClient, never()).execute(any()); + } + + @Test + void toggle_on_invokes_http_client() throws Exception { + final String responseJson = """ + {"validationId":"abc","isValid":true,"errors":[],"warnings":[],"rulesEvaluated":["DR-SENT-002"],"processingTimeMs":10} + """; + mockHttpResponse(200, responseJson); + + final ValidationResponse response = resultsValidationClient.validate(buildRequest(), "user-123"); + + assertThat(response.isValid(), is(true)); + verify(httpClient).execute(any(HttpPost.class)); + } + + @Test + void toggle_lookup_failure_falls_open_and_invokes_http_client() throws Exception { + when(featureControlGuard.isFeatureEnabled("ResultsValidation")).thenThrow(new RuntimeException("feature store unavailable")); + final String responseJson = """ + {"validationId":"abc","isValid":true,"errors":[],"warnings":[],"rulesEvaluated":["DR-SENT-002"],"processingTimeMs":10} + """; + mockHttpResponse(200, responseJson); + + final ValidationResponse response = resultsValidationClient.validate(buildRequest(), "user-123"); + + assertThat(response.isValid(), is(true)); + verify(httpClient).execute(any(HttpPost.class)); + } + + @Test + void existing_static_disabled_path_still_short_circuits() throws Exception { + setField(resultsValidationClient, "enabled", "false"); + + final ValidationResponse response = resultsValidationClient.validate(buildRequest(), "user-123"); + + assertThat(response.isValid(), is(true)); + assertThat(response.hasErrors(), is(false)); + verify(httpClient, never()).execute(any()); + } + + private void mockHttpResponse(final int statusCode, final String body) throws IOException { + final HttpResponse httpResponse = mock(HttpResponse.class); + final StatusLine statusLine = mock(StatusLine.class); + final HttpEntity entity = mock(HttpEntity.class); + + when(statusLine.getStatusCode()).thenReturn(statusCode); + when(httpResponse.getStatusLine()).thenReturn(statusLine); + when(httpResponse.getEntity()).thenReturn(entity); + when(entity.getContent()).thenReturn(new ByteArrayInputStream(body.getBytes(StandardCharsets.UTF_8))); + when(httpClient.execute(any(HttpPost.class))).thenReturn(httpResponse); + } + + private ValidationRequest buildRequest() { + return new ValidationRequest( + "hearing-1", + LocalDate.of(2026, 3, 16), + "MAGISTRATES", + null, + List.of(), + List.of(), + List.of() + ); + } +} diff --git a/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/service/validation/ValidationRequestMapperTest.java b/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/service/validation/ValidationRequestMapperTest.java new file mode 100644 index 0000000000..1dd3c3d3c7 --- /dev/null +++ b/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/service/validation/ValidationRequestMapperTest.java @@ -0,0 +1,378 @@ +package uk.gov.moj.cpp.hearing.command.handler.service.validation; + +import static java.util.Collections.emptyList; +import static java.util.UUID.randomUUID; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.empty; +import static org.hamcrest.Matchers.hasSize; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.nullValue; + +import uk.gov.justice.core.courts.Defendant; +import uk.gov.justice.core.courts.Hearing; +import uk.gov.justice.core.courts.JurisdictionType; +import uk.gov.justice.core.courts.Offence; +import uk.gov.justice.core.courts.Person; +import uk.gov.justice.core.courts.PersonDefendant; +import uk.gov.justice.core.courts.ProsecutionCase; +import uk.gov.justice.core.courts.ProsecutionCaseIdentifier; +import uk.gov.moj.cpp.hearing.command.result.ShareDaysResultsCommand; +import uk.gov.moj.cpp.hearing.command.result.SharedResultsCommandPrompt; +import uk.gov.moj.cpp.hearing.command.result.SharedResultsCommandResultLineV2; + +import java.time.LocalDate; +import java.util.List; +import java.util.UUID; + +import org.junit.jupiter.api.Test; + +class ValidationRequestMapperTest { + + private final ValidationRequestMapper mapper = new ValidationRequestMapper(); + + @Test + void shouldMapHearingIdAndHearingDayFromCommand() { + final UUID hearingId = randomUUID(); + final LocalDate hearingDay = LocalDate.of(2026, 3, 16); + + final ShareDaysResultsCommand command = buildCommand(hearingId, hearingDay, emptyList()); + + final Hearing hearing = Hearing.hearing().build(); + + final ValidationRequest request = mapper.toValidationRequest(command, hearing); + + assertThat(request.getHearingId(), is(hearingId.toString())); + assertThat(request.getHearingDay(), is(hearingDay)); + } + + @Test + void shouldMapCourtTypeFromHearingJurisdictionType() { + final ShareDaysResultsCommand command = buildCommand(randomUUID(), LocalDate.now(), emptyList()); + + final Hearing hearing = Hearing.hearing() + .withJurisdictionType(JurisdictionType.MAGISTRATES) + .build(); + + final ValidationRequest request = mapper.toValidationRequest(command, hearing); + + assertThat(request.getCourtType(), is("MAGISTRATES")); + } + + @Test + void shouldMapDefendantsFromHearingProsecutionCases() { + final UUID defendantId = randomUUID(); + + final Defendant defendant = Defendant.defendant() + .withId(defendantId) + .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).getId(), is(defendantId.toString())); + } + + @Test + void shouldMapDefendantFirstNameAndLastNameFromPersonDetails() { + final UUID defendantId = randomUUID(); + + final Person person = Person.person() + .withFirstName("John") + .withLastName("Smith") + .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).getFirstName(), is("John")); + assertThat(request.getDefendants().get(0).getLastName(), is("Smith")); + } + + @Test + void shouldHandleNullPersonDefendantGracefully() { + final UUID defendantId = randomUUID(); + + final Defendant defendant = Defendant.defendant() + .withId(defendantId) + .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).getFirstName(), is(nullValue())); + assertThat(request.getDefendants().get(0).getLastName(), is(nullValue())); + } + + @Test + void shouldMapOffencesFromHearing() { + final UUID offenceId = randomUUID(); + + final Offence offence = Offence.offence() + .withId(offenceId) + .withOffenceCode("TH68001") + .withOffenceTitle("Theft") + .withOrderIndex(1) + .build(); + + final Defendant defendant = Defendant.defendant() + .withId(randomUUID()) + .withOffences(List.of(offence)) + .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.getOffences(), hasSize(1)); + assertThat(request.getOffences().get(0).getId(), is(offenceId.toString())); + assertThat(request.getOffences().get(0).getOffenceCode(), is("TH68001")); + assertThat(request.getOffences().get(0).getOffenceTitle(), is("Theft")); + assertThat(request.getOffences().get(0).getOrderIndex(), is(1)); + } + + @Test + void shouldMapCaseUrnFromProsecutionCaseIdentifier() { + final UUID offenceId = randomUUID(); + final String caseUrn = "32AH9105826"; + + final Offence offence = Offence.offence() + .withId(offenceId) + .withOffenceCode("TH68001") + .withOffenceTitle("Theft") + .withOrderIndex(1) + .build(); + + final Defendant defendant = Defendant.defendant() + .withId(randomUUID()) + .withOffences(List.of(offence)) + .build(); + + final ProsecutionCase prosecutionCase = ProsecutionCase.prosecutionCase() + .withProsecutionCaseIdentifier(ProsecutionCaseIdentifier.prosecutionCaseIdentifier() + .withCaseURN(caseUrn) + .build()) + .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.getOffences(), hasSize(1)); + assertThat(request.getOffences().get(0).getCaseUrn(), is(caseUrn)); + } + + @Test + void shouldMapResultLinesFromCommand() { + final UUID resultLineId = randomUUID(); + final UUID offenceId = randomUUID(); + final UUID defendantId = randomUUID(); + + final SharedResultsCommandResultLineV2 resultLine = SharedResultsCommandResultLineV2 + .sharedResultsCommandResultLine() + .withResultLineId(resultLineId) + .withShortCode("IMP") + .withResultLabel("Imprisonment") + .withDefendantId(defendantId) + .withOffenceId(offenceId) + .build(); + + final ShareDaysResultsCommand command = buildCommand(randomUUID(), LocalDate.now(), List.of(resultLine)); + + final Hearing hearing = Hearing.hearing().build(); + + final ValidationRequest request = mapper.toValidationRequest(command, hearing); + + assertThat(request.getResultLines(), hasSize(1)); + assertThat(request.getResultLines().get(0).getId(), is(resultLineId.toString())); + assertThat(request.getResultLines().get(0).getShortCode(), is("IMP")); + assertThat(request.getResultLines().get(0).getLabel(), is("Imprisonment")); + assertThat(request.getResultLines().get(0).getDefendantId(), is(defendantId.toString())); + assertThat(request.getResultLines().get(0).getOffenceId(), is(offenceId.toString())); + } + + @Test + void shouldHandleNullProsecutionCasesGracefully() { + final ShareDaysResultsCommand command = buildCommand(randomUUID(), LocalDate.now(), emptyList()); + + final Hearing hearing = Hearing.hearing().build(); + + final ValidationRequest request = mapper.toValidationRequest(command, hearing); + + assertThat(request.getDefendants(), is(empty())); + assertThat(request.getOffences(), is(empty())); + } + + @Test + void shouldHandleNullJurisdictionTypeGracefully() { + final ShareDaysResultsCommand command = buildCommand(randomUUID(), LocalDate.now(), emptyList()); + + final Hearing hearing = Hearing.hearing().build(); + + final ValidationRequest request = mapper.toValidationRequest(command, hearing); + + assertThat(request.getCourtType(), is(nullValue())); + } + + @Test + void shouldMapIsConcurrentFromPrompts() { + final SharedResultsCommandPrompt concurrentPrompt = new SharedResultsCommandPrompt( + randomUUID(), "Concurrent", null, "true", null, null, "concurrent"); + + final SharedResultsCommandResultLineV2 resultLine = SharedResultsCommandResultLineV2 + .sharedResultsCommandResultLine() + .withResultLineId(randomUUID()) + .withShortCode("IMP") + .withDefendantId(randomUUID()) + .withOffenceId(randomUUID()) + .withPrompts(List.of(concurrentPrompt)) + .build(); + + final ShareDaysResultsCommand command = buildCommand(randomUUID(), LocalDate.now(), List.of(resultLine)); + final ValidationRequest request = mapper.toValidationRequest(command, Hearing.hearing().build()); + + assertThat(request.getResultLines().get(0).getIsConcurrent(), is(true)); + assertThat(request.getResultLines().get(0).getConsecutiveToOffence(), is(nullValue())); + } + + @Test + void shouldMapConsecutiveToOffenceFromPrompts() { + final String consecutiveOffenceId = randomUUID().toString(); + final SharedResultsCommandPrompt consecutivePrompt = new SharedResultsCommandPrompt( + randomUUID(), "Consecutive to", null, consecutiveOffenceId, null, null, "consecutiveToOffenceNumber"); + + final SharedResultsCommandResultLineV2 resultLine = SharedResultsCommandResultLineV2 + .sharedResultsCommandResultLine() + .withResultLineId(randomUUID()) + .withShortCode("IMP") + .withDefendantId(randomUUID()) + .withOffenceId(randomUUID()) + .withPrompts(List.of(consecutivePrompt)) + .build(); + + final ShareDaysResultsCommand command = buildCommand(randomUUID(), LocalDate.now(), List.of(resultLine)); + final ValidationRequest request = mapper.toValidationRequest(command, Hearing.hearing().build()); + + assertThat(request.getResultLines().get(0).getIsConcurrent(), is(nullValue())); + assertThat(request.getResultLines().get(0).getConsecutiveToOffence(), is(consecutiveOffenceId)); + } + + @Test + void shouldMapBothConcurrentAndConsecutiveFromPrompts() { + final String consecutiveOffenceId = randomUUID().toString(); + final SharedResultsCommandPrompt concurrentPrompt = new SharedResultsCommandPrompt( + randomUUID(), "Concurrent", null, "false", null, null, "concurrent"); + final SharedResultsCommandPrompt consecutivePrompt = new SharedResultsCommandPrompt( + randomUUID(), "Consecutive to", null, consecutiveOffenceId, null, null, "consecutiveToOffenceNumber"); + + final SharedResultsCommandResultLineV2 resultLine = SharedResultsCommandResultLineV2 + .sharedResultsCommandResultLine() + .withResultLineId(randomUUID()) + .withShortCode("IMP") + .withDefendantId(randomUUID()) + .withOffenceId(randomUUID()) + .withPrompts(List.of(concurrentPrompt, consecutivePrompt)) + .build(); + + final ShareDaysResultsCommand command = buildCommand(randomUUID(), LocalDate.now(), List.of(resultLine)); + final ValidationRequest request = mapper.toValidationRequest(command, Hearing.hearing().build()); + + assertThat(request.getResultLines().get(0).getIsConcurrent(), is(false)); + assertThat(request.getResultLines().get(0).getConsecutiveToOffence(), is(consecutiveOffenceId)); + } + + @Test + void shouldHandleNullPromptsGracefully() { + final SharedResultsCommandResultLineV2 resultLine = SharedResultsCommandResultLineV2 + .sharedResultsCommandResultLine() + .withResultLineId(randomUUID()) + .withShortCode("IMP") + .withDefendantId(randomUUID()) + .withOffenceId(randomUUID()) + .build(); + + final ShareDaysResultsCommand command = buildCommand(randomUUID(), LocalDate.now(), List.of(resultLine)); + final ValidationRequest request = mapper.toValidationRequest(command, Hearing.hearing().build()); + + assertThat(request.getResultLines().get(0).getIsConcurrent(), is(nullValue())); + assertThat(request.getResultLines().get(0).getConsecutiveToOffence(), is(nullValue())); + } + + @Test + void shouldHandleEmptyPromptsGracefully() { + final SharedResultsCommandResultLineV2 resultLine = SharedResultsCommandResultLineV2 + .sharedResultsCommandResultLine() + .withResultLineId(randomUUID()) + .withShortCode("IMP") + .withDefendantId(randomUUID()) + .withOffenceId(randomUUID()) + .withPrompts(emptyList()) + .build(); + + final ShareDaysResultsCommand command = buildCommand(randomUUID(), LocalDate.now(), List.of(resultLine)); + final ValidationRequest request = mapper.toValidationRequest(command, Hearing.hearing().build()); + + assertThat(request.getResultLines().get(0).getIsConcurrent(), is(nullValue())); + assertThat(request.getResultLines().get(0).getConsecutiveToOffence(), is(nullValue())); + } + + private ShareDaysResultsCommand buildCommand(final UUID hearingId, final LocalDate hearingDay, + final List resultLines) { + final ShareDaysResultsCommand command = ShareDaysResultsCommand.shareResultsCommand() + .setHearingId(hearingId) + .setResultLines(resultLines); + command.setHearingDay(hearingDay); + return command; + } +} diff --git a/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/service/validation/ValidationResponseTest.java b/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/service/validation/ValidationResponseTest.java new file mode 100644 index 0000000000..1432b836e5 --- /dev/null +++ b/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/service/validation/ValidationResponseTest.java @@ -0,0 +1,106 @@ +package uk.gov.moj.cpp.hearing.command.handler.service.validation; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.empty; +import static org.hamcrest.Matchers.hasSize; +import static org.hamcrest.Matchers.is; + +import uk.gov.justice.services.common.converter.jackson.ObjectMapperProducer; + +import java.util.List; + +import com.fasterxml.jackson.databind.ObjectMapper; +import org.junit.jupiter.api.Test; + +class ValidationResponseTest { + + private final ObjectMapper objectMapper = new ObjectMapperProducer().objectMapper(); + + @Test + void shouldDeserializeValidResponse() throws Exception { + final String json = """ + { + "validationId": "abc-123", + "isValid": true, + "errors": [], + "warnings": [], + "rulesEvaluated": ["DR-SENT-002"], + "processingTimeMs": 42 + } + """; + + final ValidationResponse response = objectMapper.readValue(json, ValidationResponse.class); + + assertThat(response.isValid(), is(true)); + assertThat(response.getErrors(), is(empty())); + assertThat(response.getWarnings(), is(empty())); + } + + @Test + void shouldDeserializeResponseWithErrors() throws Exception { + final String json = """ + { + "validationId": "abc-123", + "isValid": false, + "errors": [ + { + "ruleId": "DR-SENT-002", + "severity": "ERROR", + "message": "Offences 1, 2 missing info", + "affectedOffences": [ + {"id": "off-1", "title": "Offence 1"} + ] + } + ], + "warnings": [], + "rulesEvaluated": ["DR-SENT-002"], + "processingTimeMs": 42 + } + """; + + final ValidationResponse response = objectMapper.readValue(json, ValidationResponse.class); + + assertThat(response.isValid(), is(false)); + assertThat(response.hasErrors(), is(true)); + assertThat(response.getErrors(), hasSize(1)); + assertThat(response.getErrors().get(0).getRuleId(), is("DR-SENT-002")); + assertThat(response.getErrors().get(0).getSeverity(), is("ERROR")); + assertThat(response.getErrors().get(0).getMessage(), is("Offences 1, 2 missing info")); + } + + @Test + void shouldReturnHasErrorsFalseWhenOnlyWarnings() throws Exception { + final String json = """ + { + "validationId": "abc-123", + "isValid": true, + "errors": [], + "warnings": [ + { + "ruleId": "DR-SENT-002", + "severity": "WARNING", + "message": "Both concurrent and consecutive", + "affectedOffences": [] + } + ], + "rulesEvaluated": ["DR-SENT-002"], + "processingTimeMs": 42 + } + """; + + final ValidationResponse response = objectMapper.readValue(json, ValidationResponse.class); + + assertThat(response.hasErrors(), is(false)); + assertThat(response.getWarnings(), hasSize(1)); + } + + @Test + void shouldCreatePassThroughResponse() { + final ValidationResponse passThrough = ValidationResponse.passThrough(); + + assertThat(passThrough.isValid(), is(true)); + assertThat(passThrough.hasErrors(), is(false)); + assertThat(passThrough.getErrors(), is(empty())); + assertThat(passThrough.getWarnings(), is(empty())); + } +} diff --git a/hearing-command/pom.xml b/hearing-command/pom.xml index 022d619e37..724e00361b 100644 --- a/hearing-command/pom.xml +++ b/hearing-command/pom.xml @@ -3,7 +3,7 @@ uk.gov.moj.cpp.hearing hearing-parent - 17.104.158-SNAPSHOT + 17.104.158-CCSPH2-SNAPSHOT hearing-command pom diff --git a/hearing-common/pom.xml b/hearing-common/pom.xml index c6a7533c9f..26ec585fd2 100644 --- a/hearing-common/pom.xml +++ b/hearing-common/pom.xml @@ -3,7 +3,7 @@ hearing-parent uk.gov.moj.cpp.hearing - 17.104.158-SNAPSHOT + 17.104.158-CCSPH2-SNAPSHOT 4.0.0 diff --git a/hearing-domain/hearing-domain-aggregate/pom.xml b/hearing-domain/hearing-domain-aggregate/pom.xml index 41bf917352..9b7925d9f4 100644 --- a/hearing-domain/hearing-domain-aggregate/pom.xml +++ b/hearing-domain/hearing-domain-aggregate/pom.xml @@ -3,7 +3,7 @@ uk.gov.moj.cpp.hearing hearing-domain - 17.104.158-SNAPSHOT + 17.104.158-CCSPH2-SNAPSHOT hearing-domain-aggregate diff --git a/hearing-domain/hearing-domain-aggregate/src/main/java/uk/gov/moj/cpp/hearing/domain/aggregate/HearingAggregate.java b/hearing-domain/hearing-domain-aggregate/src/main/java/uk/gov/moj/cpp/hearing/domain/aggregate/HearingAggregate.java index c03fbe7104..462bdac068 100644 --- a/hearing-domain/hearing-domain-aggregate/src/main/java/uk/gov/moj/cpp/hearing/domain/aggregate/HearingAggregate.java +++ b/hearing-domain/hearing-domain-aggregate/src/main/java/uk/gov/moj/cpp/hearing/domain/aggregate/HearingAggregate.java @@ -618,11 +618,15 @@ public Stream updateHearingWithIndicatedPlea(final UUID hearingId, final } public Stream logHearingEvent(final UUID hearingId, final UUID hearingEventDefinitionId, final Boolean alterable, final UUID defenceCounselId, final HearingEvent hearingEvent, final List hearingTypeIds, final UUID userId) { + return logHearingEvent(hearingId, hearingEventDefinitionId, alterable, defenceCounselId, hearingEvent, hearingTypeIds, userId, null); + } + + public Stream logHearingEvent(final UUID hearingId, final UUID hearingEventDefinitionId, final Boolean alterable, final UUID defenceCounselId, final HearingEvent hearingEvent, final List hearingTypeIds, final UUID userId, final uk.gov.moj.cpp.hearing.domain.CourtCentre suppliedCourtCentre) { if (this.momento.isDeletedOrDuplicated()) { return warnEventIgnored(hearingId, "logHearingEvent"); } - return apply(Stream.concat(this.hearingEventDelegate.logHearingEvent(hearingId, hearingEventDefinitionId, alterable, defenceCounselId, hearingEvent, userId), + return apply(Stream.concat(this.hearingEventDelegate.logHearingEvent(hearingId, hearingEventDefinitionId, alterable, defenceCounselId, hearingEvent, userId, suppliedCourtCentre), CustodyTimeLimitUtil.stopCTLExpiryForTrialHearingUser(this.momento, hearingEvent, hearingTypeIds))); } @@ -631,7 +635,15 @@ public Stream updateHearingEvents(final UUID hearingId, final List correctHearingEvent(final UUID latestHearingEventId, final UUID hearingId, final UUID hearingEventDefinitionId, final Boolean alterable, final UUID defenceCounselId, final HearingEvent hearingEvent, final UUID userId) { - return apply(this.hearingEventDelegate.correctHearingEvent(latestHearingEventId, hearingId, hearingEventDefinitionId, alterable, defenceCounselId, hearingEvent, userId)); + return correctHearingEvent(latestHearingEventId, hearingId, hearingEventDefinitionId, alterable, defenceCounselId, hearingEvent, userId, null); + } + + public Stream correctHearingEvent(final UUID latestHearingEventId, final UUID hearingId, final UUID hearingEventDefinitionId, final Boolean alterable, final UUID defenceCounselId, final HearingEvent hearingEvent, final UUID userId, final uk.gov.moj.cpp.hearing.domain.CourtCentre suppliedCourtCentre) { + return apply(this.hearingEventDelegate.correctHearingEvent(latestHearingEventId, hearingId, hearingEventDefinitionId, alterable, defenceCounselId, hearingEvent, userId, suppliedCourtCentre)); + } + + public Optional findHearingDayFor(final ZonedDateTime eventTime) { + return this.hearingEventDelegate.findHearingDayFor(eventTime); } public Stream deleteCourtApplicationHearing(final UUID hearingId) { diff --git a/hearing-domain/hearing-domain-aggregate/src/main/java/uk/gov/moj/cpp/hearing/domain/aggregate/hearing/HearingEventDelegate.java b/hearing-domain/hearing-domain-aggregate/src/main/java/uk/gov/moj/cpp/hearing/domain/aggregate/hearing/HearingEventDelegate.java index 96c2afafbd..0cdb37bdab 100644 --- a/hearing-domain/hearing-domain-aggregate/src/main/java/uk/gov/moj/cpp/hearing/domain/aggregate/hearing/HearingEventDelegate.java +++ b/hearing-domain/hearing-domain-aggregate/src/main/java/uk/gov/moj/cpp/hearing/domain/aggregate/hearing/HearingEventDelegate.java @@ -5,6 +5,7 @@ import static java.util.Optional.ofNullable; import uk.gov.justice.core.courts.CourtApplication; +import uk.gov.justice.core.courts.HearingDay; import uk.gov.justice.core.courts.ProsecutionCaseIdentifier; import uk.gov.moj.cpp.hearing.domain.CourtCentre; import uk.gov.moj.cpp.hearing.domain.HearingType; @@ -14,6 +15,8 @@ import uk.gov.moj.cpp.hearing.domain.event.HearingEventsUpdated; import java.io.Serializable; +import java.time.LocalDate; +import java.time.ZonedDateTime; import java.util.List; import java.util.Optional; import java.util.UUID; @@ -47,6 +50,10 @@ public void handleHearingEventDeleted(HearingEventDeleted hearingEventDeleted) { } public Stream logHearingEvent(final UUID hearingId, final UUID hearingEventDefinitionId, final Boolean alterable, final UUID defenceCounselId, final uk.gov.moj.cpp.hearing.eventlog.HearingEvent hearingEvent, final UUID userId) { + return logHearingEvent(hearingId, hearingEventDefinitionId, alterable, defenceCounselId, hearingEvent, userId, null); + } + + public Stream logHearingEvent(final UUID hearingId, final UUID hearingEventDefinitionId, final Boolean alterable, final UUID defenceCounselId, final uk.gov.moj.cpp.hearing.eventlog.HearingEvent hearingEvent, final UUID userId, final CourtCentre suppliedCourtCentre) { Optional ignoreReason = validateHearingEvent(hearingEvent.getHearingEventId()); if (ignoreReason.isPresent()) { @@ -61,14 +68,7 @@ public Stream logHearingEvent(final UUID hearingId, final UUID hearingEv } - final CourtCentre courtCentre = CourtCentre.courtCentre() - .withId(momento.getHearing().getCourtCentre().getId()) - .withName(momento.getHearing().getCourtCentre().getName()) - .withRoomId(momento.getHearing().getCourtCentre().getRoomId()) - .withRoomName(momento.getHearing().getCourtCentre().getRoomName()) - .withWelshName(momento.getHearing().getCourtCentre().getWelshName()) - .withWelshRoomName(momento.getHearing().getCourtCentre().getWelshRoomName()) - .build(); + final CourtCentre courtCentre = chooseCourtCentre(suppliedCourtCentre, hearingEvent.getEventTime()); final HearingType hearingType = HearingType.hearingType() .withId(momento.getHearing().getType().getId()) @@ -108,6 +108,10 @@ public Stream updateHearingEvents(final UUID hearingId, List correctHearingEvent(final UUID latestHearingEventId, final UUID hearingId, final UUID hearingEventDefinitionId, final Boolean alterable, final UUID defenceCounselId, final uk.gov.moj.cpp.hearing.eventlog.HearingEvent hearingEvent, final UUID userId) { + return correctHearingEvent(latestHearingEventId, hearingId, hearingEventDefinitionId, alterable, defenceCounselId, hearingEvent, userId, null); + } + + public Stream correctHearingEvent(final UUID latestHearingEventId, final UUID hearingId, final UUID hearingEventDefinitionId, final Boolean alterable, final UUID defenceCounselId, final uk.gov.moj.cpp.hearing.eventlog.HearingEvent hearingEvent, final UUID userId, final CourtCentre suppliedCourtCentre) { final Optional ignoreReason = validateHearingEventBeforeApplyCorrection(hearingEvent.getHearingEventId()); if (ignoreReason.isPresent()) { @@ -126,14 +130,7 @@ public Stream correctHearingEvent(final UUID latestHearingEventId, final hearingEvent.getEventTime(), hearingEvent.getLastModifiedTime(), alterable, - CourtCentre.courtCentre() - .withId(momento.getHearing().getCourtCentre().getId()) - .withName(momento.getHearing().getCourtCentre().getName()) - .withRoomId(momento.getHearing().getCourtCentre().getRoomId()) - .withRoomName(momento.getHearing().getCourtCentre().getRoomName()) - .withWelshName(momento.getHearing().getCourtCentre().getWelshName()) - .withWelshRoomName(momento.getHearing().getCourtCentre().getWelshRoomName()) - .build(), + chooseCourtCentre(suppliedCourtCentre, hearingEvent.getEventTime()), HearingType.hearingType() .withId(momento.getHearing().getType().getId()) .withDescription(momento.getHearing().getType().getDescription()) @@ -192,6 +189,37 @@ private Optional validateHearingEventBeforeApplyCorrection(final UUID he return Optional.empty(); } + private CourtCentre chooseCourtCentre(final CourtCentre suppliedCourtCentre, final ZonedDateTime eventTime) { + if (nonNull(suppliedCourtCentre) && nonNull(suppliedCourtCentre.getRoomId())) { + return suppliedCourtCentre; + } + return resolveCourtCentre(eventTime); + } + + private CourtCentre resolveCourtCentre(final ZonedDateTime eventTime) { + final uk.gov.justice.core.courts.CourtCentre topLevel = momento.getHearing().getCourtCentre(); + + return CourtCentre.courtCentre() + .withId(topLevel.getId()) + .withName(topLevel.getName()) + .withRoomId(topLevel.getRoomId()) + .withRoomName(topLevel.getRoomName()) + .withWelshName(topLevel.getWelshName()) + .withWelshRoomName(topLevel.getWelshRoomName()) + .build(); + } + + public Optional findHearingDayFor(final ZonedDateTime eventTime) { + if (isNull(eventTime) || isNull(momento.getHearing()) || isNull(momento.getHearing().getHearingDays())) { + return Optional.empty(); + } + final LocalDate eventDate = eventTime.toLocalDate(); + return momento.getHearing().getHearingDays().stream() + .filter(day -> nonNull(day.getSittingDay()) + && day.getSittingDay().toLocalDate().equals(eventDate)) + .findFirst(); + } + public static final class HearingEvent implements Serializable { private static final long serialVersionUID = 1L; diff --git a/hearing-domain/hearing-domain-aggregate/src/test/java/uk/gov/moj/cpp/hearing/domain/aggregate/hearing/HearingEventDelegateTest.java b/hearing-domain/hearing-domain-aggregate/src/test/java/uk/gov/moj/cpp/hearing/domain/aggregate/hearing/HearingEventDelegateTest.java index 0bcf9ba351..8823be29d8 100644 --- a/hearing-domain/hearing-domain-aggregate/src/test/java/uk/gov/moj/cpp/hearing/domain/aggregate/hearing/HearingEventDelegateTest.java +++ b/hearing-domain/hearing-domain-aggregate/src/test/java/uk/gov/moj/cpp/hearing/domain/aggregate/hearing/HearingEventDelegateTest.java @@ -4,10 +4,14 @@ import org.junit.jupiter.api.Test; import uk.gov.justice.core.courts.CourtApplication; import uk.gov.justice.core.courts.Hearing; +import uk.gov.justice.core.courts.HearingDay; import uk.gov.justice.core.courts.ProsecutionCase; import uk.gov.justice.core.courts.ProsecutionCaseIdentifier; +import java.time.ZoneOffset; +import java.time.ZonedDateTime; import java.util.List; +import java.util.Optional; import java.util.UUID; import static org.hamcrest.MatcherAssert.assertThat; @@ -102,6 +106,89 @@ public void handleMomentoHearingWhenCourtApplicationsEmptyCaseURNAndReferenceIsE } + // ------------------------------------------------------------------------ + // findHearingDayFor: per-day resolution used by the override / log-event path + // ------------------------------------------------------------------------ + + @Test + public void findHearingDayFor_shouldReturnEmpty_whenEventTimeIsNull() { + momento.setHearing(Hearing.hearing() + .withId(UUID.randomUUID()) + .withHearingDays(List.of(hearingDayAt(ZonedDateTime.now(ZoneOffset.UTC)))) + .build()); + + assertThat(hearingDelegate.findHearingDayFor(null), is(Optional.empty())); + } + + @Test + public void findHearingDayFor_shouldReturnEmpty_whenMomentoHasNoHearing() { + // momento.getHearing() is null (no setHearing call) + assertThat(hearingDelegate.findHearingDayFor(ZonedDateTime.now(ZoneOffset.UTC)), is(Optional.empty())); + } + + @Test + public void findHearingDayFor_shouldReturnEmpty_whenHearingDaysIsNull() { + momento.setHearing(Hearing.hearing() + .withId(UUID.randomUUID()) + .withHearingDays(null) + .build()); + + assertThat(hearingDelegate.findHearingDayFor(ZonedDateTime.now(ZoneOffset.UTC)), is(Optional.empty())); + } + + @Test + public void findHearingDayFor_shouldReturnDay_whoseSittingDayMatchesEventTimeDate() { + final ZonedDateTime today = ZonedDateTime.now(ZoneOffset.UTC); + final HearingDay yesterdayDay = hearingDayAt(today.minusDays(1)); + final HearingDay todayDay = hearingDayAt(today); + final HearingDay tomorrowDay = hearingDayAt(today.plusDays(1)); + + momento.setHearing(Hearing.hearing() + .withId(UUID.randomUUID()) + .withHearingDays(List.of(yesterdayDay, todayDay, tomorrowDay)) + .build()); + + final Optional matched = hearingDelegate.findHearingDayFor(today); + + assertThat(matched.isPresent(), is(true)); + assertThat(matched.get().getSittingDay().toLocalDate(), is(today.toLocalDate())); + } + + @Test + public void findHearingDayFor_shouldReturnEmpty_whenNoDayMatchesEventTimeDate() { + final ZonedDateTime today = ZonedDateTime.now(ZoneOffset.UTC); + + momento.setHearing(Hearing.hearing() + .withId(UUID.randomUUID()) + .withHearingDays(List.of(hearingDayAt(today.minusDays(1)), hearingDayAt(today.plusDays(1)))) + .build()); + + assertThat(hearingDelegate.findHearingDayFor(today), is(Optional.empty())); + } + + @Test + public void findHearingDayFor_shouldSkipDays_whoseSittingDayIsNull_andReturnMatchAmongstThem() { + final ZonedDateTime today = ZonedDateTime.now(ZoneOffset.UTC); + final HearingDay nullSittingDay = HearingDay.hearingDay().build(); + final HearingDay todayDay = hearingDayAt(today); + + momento.setHearing(Hearing.hearing() + .withId(UUID.randomUUID()) + .withHearingDays(List.of(nullSittingDay, todayDay)) + .build()); + + final Optional matched = hearingDelegate.findHearingDayFor(today); + + assertThat(matched.isPresent(), is(true)); + assertThat(matched.get().getSittingDay().toLocalDate(), is(today.toLocalDate())); + } + + private HearingDay hearingDayAt(final ZonedDateTime sittingDay) { + return HearingDay.hearingDay() + .withSittingDay(sittingDay) + .build(); + } + private CourtApplication createCourtApplication(final UUID id) { return new CourtApplication.Builder() .withId(id) diff --git a/hearing-domain/hearing-domain-common/pom.xml b/hearing-domain/hearing-domain-common/pom.xml index 55ec78dcf2..efd9555b65 100644 --- a/hearing-domain/hearing-domain-common/pom.xml +++ b/hearing-domain/hearing-domain-common/pom.xml @@ -3,7 +3,7 @@ uk.gov.moj.cpp.hearing hearing-domain - 17.104.158-SNAPSHOT + 17.104.158-CCSPH2-SNAPSHOT hearing-domain-common diff --git a/hearing-domain/hearing-domain-event/pom.xml b/hearing-domain/hearing-domain-event/pom.xml index 57c6520660..9beb45f2c8 100644 --- a/hearing-domain/hearing-domain-event/pom.xml +++ b/hearing-domain/hearing-domain-event/pom.xml @@ -3,7 +3,7 @@ uk.gov.moj.cpp.hearing hearing-domain - 17.104.158-SNAPSHOT + 17.104.158-CCSPH2-SNAPSHOT hearing-domain-event diff --git a/hearing-domain/hearing-domain-event/src/main/java/uk/gov/moj/cpp/hearing/domain/event/result/ResultsValidationFailed.java b/hearing-domain/hearing-domain-event/src/main/java/uk/gov/moj/cpp/hearing/domain/event/result/ResultsValidationFailed.java new file mode 100644 index 0000000000..607f743f68 --- /dev/null +++ b/hearing-domain/hearing-domain-event/src/main/java/uk/gov/moj/cpp/hearing/domain/event/result/ResultsValidationFailed.java @@ -0,0 +1,144 @@ +package uk.gov.moj.cpp.hearing.domain.event.result; + +import uk.gov.justice.domain.annotation.Event; + +import java.io.Serializable; +import java.time.LocalDate; +import java.util.List; +import java.util.UUID; + +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonProperty; + +@SuppressWarnings({"squid:S2384", "PMD.BeanMembersShouldSerialize"}) +@Event("hearing.events.results-validation-failed") +public class ResultsValidationFailed implements Serializable { + + private static final long serialVersionUID = 1L; + + private UUID hearingId; + private LocalDate hearingDay; + private String userId; + private List errors; + private List warnings; + + @JsonCreator + private ResultsValidationFailed( + @JsonProperty("hearingId") final UUID hearingId, + @JsonProperty("hearingDay") final LocalDate hearingDay, + @JsonProperty("userId") final String userId, + @JsonProperty("errors") final List errors, + @JsonProperty("warnings") final List warnings) { + this.hearingId = hearingId; + this.hearingDay = hearingDay; + this.userId = userId; + this.errors = errors; + this.warnings = warnings; + } + + public ResultsValidationFailed() { + } + + public UUID getHearingId() { + return hearingId; + } + + public LocalDate getHearingDay() { + return hearingDay; + } + + public String getUserId() { + return userId; + } + + public List getErrors() { + return errors; + } + + public List getWarnings() { + return warnings; + } + + public static Builder builder() { + return new Builder(); + } + + public static final class ValidationError implements Serializable { + + private static final long serialVersionUID = 1L; + + private String ruleId; + private String severity; + private String message; + private List affectedOffences; + + @JsonCreator + public ValidationError( + @JsonProperty("ruleId") final String ruleId, + @JsonProperty("severity") final String severity, + @JsonProperty("message") final String message, + @JsonProperty("affectedOffences") final List affectedOffences) { + this.ruleId = ruleId; + this.severity = severity; + this.message = message; + this.affectedOffences = affectedOffences; + } + + public ValidationError() { + } + + public String getRuleId() { + return ruleId; + } + + public String getSeverity() { + return severity; + } + + public String getMessage() { + return message; + } + + public List getAffectedOffences() { + return affectedOffences; + } + } + + public static final class Builder { + + private UUID hearingId; + private LocalDate hearingDay; + private String userId; + private List errors; + private List warnings; + + public Builder withHearingId(final UUID hearingId) { + this.hearingId = hearingId; + return this; + } + + public Builder withHearingDay(final LocalDate hearingDay) { + this.hearingDay = hearingDay; + return this; + } + + public Builder withUserId(final String userId) { + this.userId = userId; + return this; + } + + public Builder withErrors(final List errors) { + this.errors = errors; + return this; + } + + public Builder withWarnings(final List warnings) { + this.warnings = warnings; + return this; + } + + public ResultsValidationFailed build() { + return new ResultsValidationFailed(hearingId, hearingDay, userId, errors, warnings); + } + } +} diff --git a/hearing-domain/hearing-domain-event/src/test/java/uk/gov/moj/cpp/hearing/domain/event/result/ResultsValidationFailedTest.java b/hearing-domain/hearing-domain-event/src/test/java/uk/gov/moj/cpp/hearing/domain/event/result/ResultsValidationFailedTest.java new file mode 100644 index 0000000000..0a2bc58e07 --- /dev/null +++ b/hearing-domain/hearing-domain-event/src/test/java/uk/gov/moj/cpp/hearing/domain/event/result/ResultsValidationFailedTest.java @@ -0,0 +1,107 @@ +package uk.gov.moj.cpp.hearing.domain.event.result; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.empty; +import static org.hamcrest.Matchers.hasSize; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.notNullValue; + +import uk.gov.justice.domain.annotation.Event; +import uk.gov.justice.services.common.converter.jackson.ObjectMapperProducer; + +import java.time.Instant; +import java.time.LocalDate; +import java.util.List; +import java.util.UUID; + +import com.fasterxml.jackson.databind.ObjectMapper; +import org.junit.jupiter.api.Test; + +class ResultsValidationFailedTest { + + private final ObjectMapper objectMapper = new ObjectMapperProducer().objectMapper(); + + @Test + void shouldHaveCorrectEventAnnotation() { + final Event event = ResultsValidationFailed.class.getAnnotation(Event.class); + assertThat(event, is(notNullValue())); + assertThat(event.value(), is("hearing.events.results-validation-failed")); + } + + @Test + void shouldBuildWithAllFields() { + final UUID hearingId = UUID.randomUUID(); + final LocalDate hearingDay = LocalDate.of(2026, 3, 16); + final String userId = UUID.randomUUID().toString(); + + final ResultsValidationFailed.ValidationError error = new ResultsValidationFailed.ValidationError( + "DR-SENT-002", "ERROR", "Offences 1, 2 missing concurrent/consecutive info", + List.of("offence-1", "offence-2")); + + final ResultsValidationFailed.ValidationError warning = new ResultsValidationFailed.ValidationError( + "DR-SENT-002", "WARNING", "Offences show both concurrent and consecutive", + List.of("offence-3")); + + final ResultsValidationFailed result = ResultsValidationFailed.builder() + .withHearingId(hearingId) + .withHearingDay(hearingDay) + .withUserId(userId) + .withErrors(List.of(error)) + .withWarnings(List.of(warning)) + .build(); + + assertThat(result.getHearingId(), is(hearingId)); + assertThat(result.getHearingDay(), is(hearingDay)); + assertThat(result.getUserId(), is(userId)); + assertThat(result.getErrors(), hasSize(1)); + assertThat(result.getErrors().get(0).getRuleId(), is("DR-SENT-002")); + assertThat(result.getErrors().get(0).getSeverity(), is("ERROR")); + assertThat(result.getErrors().get(0).getMessage(), is("Offences 1, 2 missing concurrent/consecutive info")); + assertThat(result.getErrors().get(0).getAffectedOffences(), hasSize(2)); + assertThat(result.getWarnings(), hasSize(1)); + assertThat(result.getWarnings().get(0).getSeverity(), is("WARNING")); + } + + @Test + void shouldBuildWithEmptyErrorsAndWarnings() { + final ResultsValidationFailed result = ResultsValidationFailed.builder() + .withHearingId(UUID.randomUUID()) + .withHearingDay(LocalDate.now()) + .withUserId(UUID.randomUUID().toString()) + .withErrors(List.of()) + .withWarnings(List.of()) + .build(); + + assertThat(result.getErrors(), is(empty())); + assertThat(result.getWarnings(), is(empty())); + } + + @Test + void shouldSerializeAndDeserialize() throws Exception { + final UUID hearingId = UUID.randomUUID(); + final LocalDate hearingDay = LocalDate.of(2026, 3, 16); + final String userId = UUID.randomUUID().toString(); + + final ResultsValidationFailed.ValidationError error = new ResultsValidationFailed.ValidationError( + "DR-SENT-002", "ERROR", "Test message", List.of("offence-1")); + + final ResultsValidationFailed original = ResultsValidationFailed.builder() + .withHearingId(hearingId) + .withHearingDay(hearingDay) + .withUserId(userId) + .withErrors(List.of(error)) + .withWarnings(List.of()) + .build(); + + final String json = objectMapper.writeValueAsString(original); + final ResultsValidationFailed deserialized = objectMapper.readValue(json, ResultsValidationFailed.class); + + assertThat(deserialized.getHearingId(), is(hearingId)); + assertThat(deserialized.getHearingDay(), is(hearingDay)); + assertThat(deserialized.getUserId(), is(userId)); + assertThat(deserialized.getErrors(), hasSize(1)); + assertThat(deserialized.getErrors().get(0).getRuleId(), is("DR-SENT-002")); + assertThat(deserialized.getErrors().get(0).getAffectedOffences(), hasSize(1)); + assertThat(deserialized.getWarnings(), is(empty())); + } +} diff --git a/hearing-domain/hearing-domain-xhibit/pom.xml b/hearing-domain/hearing-domain-xhibit/pom.xml index 8edf64bdbe..ae8ffdf9a4 100644 --- a/hearing-domain/hearing-domain-xhibit/pom.xml +++ b/hearing-domain/hearing-domain-xhibit/pom.xml @@ -3,7 +3,7 @@ uk.gov.moj.cpp.hearing hearing-domain - 17.104.158-SNAPSHOT + 17.104.158-CCSPH2-SNAPSHOT 4.0.0 diff --git a/hearing-domain/pom.xml b/hearing-domain/pom.xml index b027d027d1..66a54b7674 100644 --- a/hearing-domain/pom.xml +++ b/hearing-domain/pom.xml @@ -3,7 +3,7 @@ uk.gov.moj.cpp.hearing hearing-parent - 17.104.158-SNAPSHOT + 17.104.158-CCSPH2-SNAPSHOT hearing-domain pom diff --git a/hearing-event-sources/pom.xml b/hearing-event-sources/pom.xml index dfcefcb2db..e0614c7c44 100644 --- a/hearing-event-sources/pom.xml +++ b/hearing-event-sources/pom.xml @@ -3,7 +3,7 @@ hearing-parent uk.gov.moj.cpp.hearing - 17.104.158-SNAPSHOT + 17.104.158-CCSPH2-SNAPSHOT ../pom.xml 4.0.0 diff --git a/hearing-event/hearing-event-listener/pom.xml b/hearing-event/hearing-event-listener/pom.xml index fe781993b3..5e108b2b8d 100644 --- a/hearing-event/hearing-event-listener/pom.xml +++ b/hearing-event/hearing-event-listener/pom.xml @@ -3,7 +3,7 @@ uk.gov.moj.cpp.hearing hearing-event - 17.104.158-SNAPSHOT + 17.104.158-CCSPH2-SNAPSHOT hearing-event-listener war diff --git a/hearing-event/hearing-event-listener/src/main/java/uk/gov/moj/cpp/hearing/event/listener/AddDefendantEventListener.java b/hearing-event/hearing-event-listener/src/main/java/uk/gov/moj/cpp/hearing/event/listener/AddDefendantEventListener.java index f4ea5f46b9..2edc3905ea 100644 --- a/hearing-event/hearing-event-listener/src/main/java/uk/gov/moj/cpp/hearing/event/listener/AddDefendantEventListener.java +++ b/hearing-event/hearing-event-listener/src/main/java/uk/gov/moj/cpp/hearing/event/listener/AddDefendantEventListener.java @@ -45,7 +45,9 @@ public void caseDefendantAdded(final JsonEnvelope envelope) { return; } - hearingEntity.getProsecutionCases().forEach(prosecutionCase -> prosecutionCase.getDefendants().add(defendantJPAMapper.toJPA(hearingEntity, prosecutionCase, defendantIn))); + hearingEntity.getProsecutionCases() + .stream().filter(pCase -> pCase.getId().getId().equals(caseDefendantAdded.getDefendant().getProsecutionCaseId())) + .forEach(prosecutionCase -> prosecutionCase.getDefendants().add(defendantJPAMapper.toJPA(hearingEntity, prosecutionCase, defendantIn))); hearingRepository.save(hearingEntity); } diff --git a/hearing-event/hearing-event-listener/src/main/java/uk/gov/moj/cpp/hearing/event/listener/HearingDeletedEventListener.java b/hearing-event/hearing-event-listener/src/main/java/uk/gov/moj/cpp/hearing/event/listener/HearingDeletedEventListener.java index ca7bde007d..a745d19987 100644 --- a/hearing-event/hearing-event-listener/src/main/java/uk/gov/moj/cpp/hearing/event/listener/HearingDeletedEventListener.java +++ b/hearing-event/hearing-event-listener/src/main/java/uk/gov/moj/cpp/hearing/event/listener/HearingDeletedEventListener.java @@ -8,8 +8,11 @@ import uk.gov.justice.services.messaging.JsonEnvelope; import uk.gov.moj.cpp.hearing.domain.event.CourtApplicationHearingDeleted; import uk.gov.moj.cpp.hearing.persist.entity.ha.Hearing; +import uk.gov.moj.cpp.hearing.persist.entity.ha.ProsecutionCase; import uk.gov.moj.cpp.hearing.repository.HearingRepository; +import uk.gov.moj.cpp.hearing.repository.ProsecutionCaseRepository; +import java.util.List; import java.util.Objects; import java.util.UUID; import javax.inject.Inject; @@ -28,6 +31,9 @@ public class HearingDeletedEventListener { @Inject private HearingRepository hearingRepository; + @Inject + private ProsecutionCaseRepository pcRepository; + @Handles(HEARING_EVENT_HEARING_DELETED) public void hearingDeleted(final JsonEnvelope event) { @@ -50,6 +56,13 @@ public void hearingDeletedBdf(final JsonEnvelope event) { LOGGER.info("Received event '{}' hearingId: {}", HEARING_EVENT_HEARING_DELETED_BDF, hearingId); + final List prosecutionCases = hearingRepository.findProsecutionCasesByHearingId(hearingId); + + if(!prosecutionCases.isEmpty()) { + prosecutionCases.forEach(pcRepository::remove); + pcRepository.flush(); + } + final Hearing hearing = hearingRepository.findBy(hearingId); if (hearing != null) { diff --git a/hearing-event/hearing-event-listener/src/test/java/uk/gov/moj/cpp/hearing/event/listener/AddDefendantEventListenerTest.java b/hearing-event/hearing-event-listener/src/test/java/uk/gov/moj/cpp/hearing/event/listener/AddDefendantEventListenerTest.java index b168851639..d36b05a1d7 100644 --- a/hearing-event/hearing-event-listener/src/test/java/uk/gov/moj/cpp/hearing/event/listener/AddDefendantEventListenerTest.java +++ b/hearing-event/hearing-event-listener/src/test/java/uk/gov/moj/cpp/hearing/event/listener/AddDefendantEventListenerTest.java @@ -1,13 +1,16 @@ package uk.gov.moj.cpp.hearing.event.listener; + import static org.mockito.Mockito.never; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import static org.mockito.Mockito.any; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.test.utils.core.reflection.ReflectionUtil.setField; import static uk.gov.moj.cpp.hearing.test.TestTemplates.defendantTemplate; +import static uk.gov.moj.cpp.hearing.test.TestUtilities.asSet; import uk.gov.justice.services.common.converter.JsonObjectToObjectConverter; import uk.gov.justice.services.common.converter.ObjectToJsonObjectConverter; @@ -17,8 +20,11 @@ import uk.gov.moj.cpp.hearing.mapping.DefendantJPAMapper; import uk.gov.moj.cpp.hearing.mapping.HearingJPAMapper; import uk.gov.moj.cpp.hearing.persist.entity.ha.Hearing; +import uk.gov.moj.cpp.hearing.persist.entity.ha.HearingSnapshotKey; +import uk.gov.moj.cpp.hearing.persist.entity.ha.ProsecutionCase; import uk.gov.moj.cpp.hearing.repository.HearingRepository; +import java.util.HashSet; import java.util.UUID; @@ -75,6 +81,39 @@ public void shouldInsertNewDefendant() { verify(hearingRepository, times(1)).save(hearingExArgumentCaptor.capture()); } + @Test + void shouldInsertNewDefendantToOnlyOneCaseInMultiCaseHearing() { + final UUID arbitraryHearingId = UUID.randomUUID(); + final UUID caseId1 = UUID.randomUUID(); + final UUID caseId2 = UUID.randomUUID(); + + HearingSnapshotKey key1 = new HearingSnapshotKey(caseId1, arbitraryHearingId); + HearingSnapshotKey key2 = new HearingSnapshotKey(caseId2, arbitraryHearingId); + + ProsecutionCase pc1 = new ProsecutionCase(); + pc1.setId(key1); + pc1.setDefendants(new HashSet<>()); + + ProsecutionCase pc2 = new ProsecutionCase(); + pc2.setId(key2); + pc2.setDefendants(new HashSet<>()); + + final Hearing hearing = new Hearing(); + hearing.setProsecutionCases(asSet(pc1, pc2)); + + //given + when(hearingRepository.findBy(arbitraryHearingId)).thenReturn(hearing); + + //when + addCaseDefendantEventListener.caseDefendantAdded(getDefendantAddedJsonEnvelope(arbitraryHearingId, caseId1)); + + //then + final ArgumentCaptor hearingExArgumentCaptor = ArgumentCaptor.forClass(Hearing.class); + + verify(defendantJPAMapper).toJPA(any(Hearing.class), any(ProsecutionCase.class), any(uk.gov.justice.core.courts.Defendant.class)); + verify(hearingRepository, times(1)).save(hearingExArgumentCaptor.capture()); + } + @Test public void shouldNotInsertNewDefendantWhenThereIsNoHearing() { //given @@ -92,7 +131,11 @@ public void shouldNotInsertNewDefendantWhenThereIsNoHearing() { private JsonEnvelope getDefendantAddedJsonEnvelope(final UUID arbitraryHearingId) { - final uk.gov.moj.cpp.hearing.command.defendant.Defendant arbitraryDefendant = defendantTemplate(); + return getDefendantAddedJsonEnvelope(arbitraryHearingId, UUID.randomUUID()); + } + + private JsonEnvelope getDefendantAddedJsonEnvelope(final UUID arbitraryHearingId, final UUID caseId) { + final uk.gov.moj.cpp.hearing.command.defendant.Defendant arbitraryDefendant = defendantTemplate(caseId); JsonObject payload = createObjectBuilder() .add("hearingId", arbitraryHearingId.toString()) .add("defendant", objectToJsonObjectConverter.convert(arbitraryDefendant)) diff --git a/hearing-event/hearing-event-listener/src/test/java/uk/gov/moj/cpp/hearing/event/listener/HearingDeletedEventListenerTest.java b/hearing-event/hearing-event-listener/src/test/java/uk/gov/moj/cpp/hearing/event/listener/HearingDeletedEventListenerTest.java index 5f5c4266e1..1657e97123 100644 --- a/hearing-event/hearing-event-listener/src/test/java/uk/gov/moj/cpp/hearing/event/listener/HearingDeletedEventListenerTest.java +++ b/hearing-event/hearing-event-listener/src/test/java/uk/gov/moj/cpp/hearing/event/listener/HearingDeletedEventListenerTest.java @@ -1,12 +1,13 @@ package uk.gov.moj.cpp.hearing.event.listener; import static java.util.UUID.randomUUID; -import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; +import static javax.json.Json.createObjectBuilder; import static org.mockito.ArgumentMatchers.any; import static org.mockito.BDDMockito.given; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.verifyNoInteractions; import static org.mockito.Mockito.when; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; import static uk.gov.justice.services.test.utils.core.messaging.MetadataBuilderFactory.metadataWithDefaults; @@ -14,15 +15,18 @@ import uk.gov.justice.services.messaging.Envelope; import uk.gov.moj.cpp.hearing.domain.event.CourtApplicationHearingDeleted; import uk.gov.moj.cpp.hearing.persist.entity.ha.Hearing; +import uk.gov.moj.cpp.hearing.persist.entity.ha.ProsecutionCase; import uk.gov.moj.cpp.hearing.repository.HearingRepository; +import uk.gov.moj.cpp.hearing.repository.ProsecutionCaseRepository; +import java.util.Collections; +import java.util.List; import java.util.UUID; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InjectMocks; import org.mockito.Mock; - import org.mockito.junit.jupiter.MockitoExtension; @ExtendWith(MockitoExtension.class) @@ -31,6 +35,9 @@ public class HearingDeletedEventListenerTest { @Mock private HearingRepository hearingRepository; + @Mock + private ProsecutionCaseRepository pcRepository; + @InjectMocks private HearingDeletedEventListener hearingDeletedEventListener; @@ -67,6 +74,27 @@ public void shouldDeleteHearingBdfWhenExistsInViewStore() { final UUID hearingId = randomUUID(); final Hearing hearing = new Hearing(); + final ProsecutionCase pc = new ProsecutionCase(); + + when(hearingRepository.findProsecutionCasesByHearingId(hearingId)).thenReturn(List.of(pc)); + + when(hearingRepository.findBy(hearingId)).thenReturn(hearing); + + hearingDeletedEventListener.hearingDeletedBdf(envelopeFrom(metadataWithDefaults().build(), createObjectBuilder() + .add("hearingId", hearingId.toString()) + .build())); + + verify(hearingRepository).remove(hearing); + verify(pcRepository).remove(pc); + verify(pcRepository).flush(); + } + + @Test + public void shouldDeleteHearingBdfWhenPcDontExists() { + final UUID hearingId = randomUUID(); + final Hearing hearing = new Hearing(); + + when(hearingRepository.findProsecutionCasesByHearingId(hearingId)).thenReturn(Collections.emptyList()); when(hearingRepository.findBy(hearingId)).thenReturn(hearing); hearingDeletedEventListener.hearingDeletedBdf(envelopeFrom(metadataWithDefaults().build(), createObjectBuilder() @@ -74,6 +102,7 @@ public void shouldDeleteHearingBdfWhenExistsInViewStore() { .build())); verify(hearingRepository).remove(hearing); + verifyNoInteractions(pcRepository); } @Test diff --git a/hearing-event/hearing-event-listener/src/test/java/uk/gov/moj/cpp/hearing/event/listener/HearingEventListenerYamlConfigTest.java b/hearing-event/hearing-event-listener/src/test/java/uk/gov/moj/cpp/hearing/event/listener/HearingEventListenerYamlConfigTest.java index b23e669a5c..b683155379 100644 --- a/hearing-event/hearing-event-listener/src/test/java/uk/gov/moj/cpp/hearing/event/listener/HearingEventListenerYamlConfigTest.java +++ b/hearing-event/hearing-event-listener/src/test/java/uk/gov/moj/cpp/hearing/event/listener/HearingEventListenerYamlConfigTest.java @@ -83,6 +83,7 @@ import uk.gov.moj.cpp.hearing.domain.event.result.ReplicationOfShareResultsFailed; import uk.gov.moj.cpp.hearing.domain.event.result.ResultAmendmentsCancellationFailed; import uk.gov.moj.cpp.hearing.domain.event.result.ResultAmendmentsValidationFailed; +import uk.gov.moj.cpp.hearing.domain.event.result.ResultsValidationFailed; import uk.gov.moj.cpp.hearing.domain.event.result.ResultLinesStatusUpdated; import uk.gov.moj.cpp.hearing.domain.event.result.ResultsSharedSuccess; import uk.gov.moj.cpp.hearing.domain.event.result.ManageResultsFailed; @@ -195,7 +196,8 @@ public class HearingEventListenerYamlConfigTest { CaseRemovedFromGroupCases.class.getAnnotation(Event.class).value(), HearingBreachApplicationsAdded.class.getAnnotation(Event.class).value(), HearingBreachApplicationsToBeAddedReceived.class.getAnnotation(Event.class).value(), - MasterCaseUpdatedForHearing.class.getAnnotation(Event.class).value() + MasterCaseUpdatedForHearing.class.getAnnotation(Event.class).value(), + ResultsValidationFailed.class.getAnnotation(Event.class).value() ); diff --git a/hearing-event/hearing-event-processor/pom.xml b/hearing-event/hearing-event-processor/pom.xml index 02169aa9c8..58d30e4382 100644 --- a/hearing-event/hearing-event-processor/pom.xml +++ b/hearing-event/hearing-event-processor/pom.xml @@ -3,7 +3,7 @@ hearing-event uk.gov.moj.cpp.hearing - 17.104.158-SNAPSHOT + 17.104.158-CCSPH2-SNAPSHOT 4.0.0 war diff --git a/hearing-event/hearing-event-processor/src/main/java/uk/gov/moj/cpp/hearing/event/HearingEventProcessor.java b/hearing-event/hearing-event-processor/src/main/java/uk/gov/moj/cpp/hearing/event/HearingEventProcessor.java index 2bbfb175dc..42b78954b7 100644 --- a/hearing-event/hearing-event-processor/src/main/java/uk/gov/moj/cpp/hearing/event/HearingEventProcessor.java +++ b/hearing-event/hearing-event-processor/src/main/java/uk/gov/moj/cpp/hearing/event/HearingEventProcessor.java @@ -48,6 +48,7 @@ public class HearingEventProcessor { public static final String PUBLIC_HEARING_SAVE_DRAFT_RESULT_FAILED = "public.hearing.save-draft-result-failed"; public static final String PUBLIC_HEARING_MANAGE_RESULTS_FAILED = "public.hearing.manage-results-failed"; public static final String PUBLIC_HEARING_SHARE_RESULTS_FAILED = "public.hearing.share-results-failed"; + public static final String PUBLIC_HEARING_RESULTS_VALIDATION_FAILED = "public.hearing.results-validation-failed"; public static final String PUBLIC_HEARING_TRIAL_VACATED = "public.hearing.trial-vacated"; public static final String PUBLIC_LISTING_HEARING_RESCHEDULED = "public.listing.hearing-rescheduled"; public static final String PUBLIC_PROGRESSION_EVENTS_BREACH_APPLICATIONS_TO_BE_ADDED_TO_HEARING = "public.progression.breach-applications-to-be-added-to-hearing"; @@ -198,6 +199,16 @@ public void handleShareResultsFailedEvent(final JsonEnvelope event) { sender.send(envelopeFrom(metadata, publicEventPayload)); } + @Handles("hearing.events.results-validation-failed") + public void handleResultsValidationFailed(final JsonEnvelope event) { + if (LOGGER.isDebugEnabled()) { + LOGGER.debug("hearing.events.results-validation-failed event received {}", event.toObfuscatedDebugString()); + } + sender.send(envelopeFrom( + metadataFrom(event.metadata()).withName(PUBLIC_HEARING_RESULTS_VALIDATION_FAILED), + event.payloadAsJsonObject())); + } + @Handles("hearing.multiple-draft-results-saved") public void handleMultipleDraftResultFailedEvent(final JsonEnvelope event) { if (LOGGER.isDebugEnabled()) { diff --git a/hearing-event/hearing-event-processor/src/main/java/uk/gov/moj/cpp/hearing/event/InitiateHearingEventProcessor.java b/hearing-event/hearing-event-processor/src/main/java/uk/gov/moj/cpp/hearing/event/InitiateHearingEventProcessor.java index 4df30d66a5..eccb9d73bc 100644 --- a/hearing-event/hearing-event-processor/src/main/java/uk/gov/moj/cpp/hearing/event/InitiateHearingEventProcessor.java +++ b/hearing-event/hearing-event-processor/src/main/java/uk/gov/moj/cpp/hearing/event/InitiateHearingEventProcessor.java @@ -29,7 +29,6 @@ import uk.gov.moj.cpp.hearing.command.initiate.RegisterHearingAgainstOffenceCommand; import uk.gov.moj.cpp.hearing.event.service.ProgressionService; import uk.gov.moj.cpp.hearing.eventlog.PublicHearingInitiated; -import uk.gov.moj.cpp.hearing.repository.HearingRepository; import uk.gov.moj.cpp.util.HearingDetailUtil; import java.time.format.DateTimeFormatter; @@ -39,12 +38,8 @@ import java.util.Map; import java.util.Optional; import java.util.UUID; -import java.util.stream.Collectors; -import java.util.stream.Stream; import javax.inject.Inject; - -import javax.json.JsonArray; import javax.json.JsonArrayBuilder; import javax.json.JsonObject; @@ -143,21 +138,21 @@ public void hearingInitiated(final JsonEnvelope event) { final List courtApplications = initiateHearingCommand.getHearing().getCourtApplications(); - ofNullable(courtApplications).map(Collection::stream).orElseGet(Stream::empty) + ofNullable(courtApplications).stream().flatMap(Collection::stream) .filter(courtApplication -> ENFORCEMENT_NOTIFICATION_APPLICATION_TYPES.containsKey(courtApplication.getType().getCode())) .filter(courtApplication -> courtApplication.getSubject().getMasterDefendant() != null) .filter(courtApplication -> !isApplicationFinalisedOrListed(event, courtApplication.getId())) .forEach( - courtApplication -> { - this.sender.send(Enveloper.envelop(createObjectBuilder() - .add("applicationType", ENFORCEMENT_NOTIFICATION_APPLICATION_TYPES.get(courtApplication.getType().getCode())) - .add("masterDefendantId", courtApplication.getSubject().getMasterDefendant().getMasterDefendantId().toString()) - .add("listingDate", dateTimeFormatter.format(initiateHearingCommand.getHearing().getHearingDays().get(0).getSittingDay())) - .add("caseUrns", createCaseUrns(courtApplication).build()) - .add("hearingCourtCentreName", initiateHearingCommand.getHearing().getCourtCentre().getName()) - .add("caseOffenceIdList", createCaseOffenceIds(courtApplication.getCourtApplicationCases())) - .build()).withName("public.hearing.nces-email-notification-for-application").withMetadataFrom(event)); - }); + courtApplication -> this.sender.send(Enveloper.envelop(createObjectBuilder() + .add("applicationType", ENFORCEMENT_NOTIFICATION_APPLICATION_TYPES.get(courtApplication.getType().getCode())) + .add("masterDefendantId", courtApplication.getSubject().getMasterDefendant().getMasterDefendantId().toString()) + .add("listingDate", dateTimeFormatter.format(initiateHearingCommand.getHearing().getHearingDays().get(0).getSittingDay())) + .add("caseUrns", createCaseUrns(courtApplication).build()) + .add("caseIds", createCaseIds(courtApplication).build()) + .add("hearingCourtCentreName", initiateHearingCommand.getHearing().getCourtCentre().getName()) + .add("hearingCourtCentreId", initiateHearingCommand.getHearing().getCourtCentre().getId().toString()) + .add("caseOffenceIdList", createCaseOffenceIds(courtApplication.getCourtApplicationCases())) + .build()).withName("public.hearing.nces-email-notification-for-application").withMetadataFrom(event))); } @Handles("hearing.events.hearing-initiate-ignored") @@ -202,4 +197,12 @@ private JsonArrayBuilder createCaseOffenceIds(final List c return builder; } + private JsonArrayBuilder createCaseIds(final CourtApplication courtApplication) { + final JsonArrayBuilder builder = createArrayBuilder(); + courtApplication.getCourtApplicationCases().stream() + .map(cac -> cac.getProsecutionCaseId().toString()) + .forEach(builder::add); + return builder; + } + } diff --git a/hearing-event/hearing-event-processor/src/test/java/uk/gov/moj/cpp/hearing/event/HearingEventProcessorTest.java b/hearing-event/hearing-event-processor/src/test/java/uk/gov/moj/cpp/hearing/event/HearingEventProcessorTest.java index 6aac63472d..4a83972459 100644 --- a/hearing-event/hearing-event-processor/src/test/java/uk/gov/moj/cpp/hearing/event/HearingEventProcessorTest.java +++ b/hearing-event/hearing-event-processor/src/test/java/uk/gov/moj/cpp/hearing/event/HearingEventProcessorTest.java @@ -300,6 +300,32 @@ public void shouldHearingAmendedPublicEvent() { } + @Test + public void shouldForwardResultsValidationFailedToPublicTopic() { + final JsonObjectBuilder payload = createObjectBuilder() + .add(FIELD_HEARING_ID, HEARING_ID.toString()) + .add(FIELD_HEARING_DAY, "2026-05-08") + .add("userId", USER_ID.toString()); + final JsonEnvelope eventIn = envelopeFrom( + metadataWithRandomUUID("hearing.events.results-validation-failed"), + payload.build()); + + this.hearingEventProcessor.handleResultsValidationFailed(eventIn); + + verify(this.sender, times(1)).send(this.envelopeArgumentCaptor.capture()); + + final JsonEnvelope envelopeOut = this.envelopeArgumentCaptor.getValue(); + assertThat(envelopeOut.metadata().name(), + is(HearingEventProcessor.PUBLIC_HEARING_RESULTS_VALIDATION_FAILED)); + // The processor is a pure passthrough — payload preserved unchanged. + assertThat(envelopeOut.payloadAsJsonObject().getString(FIELD_HEARING_ID), + is(HEARING_ID.toString())); + assertThat(envelopeOut.payloadAsJsonObject().getString(FIELD_HEARING_DAY), + is("2026-05-08")); + assertThat(envelopeOut.payloadAsJsonObject().getString("userId"), + is(USER_ID.toString())); + } + @Test public void shouldPublishDraftResultDeletedV2PublicEvent() { diff --git a/hearing-event/hearing-event-processor/src/test/java/uk/gov/moj/cpp/hearing/event/InitiateHearingEventProcessorTest.java b/hearing-event/hearing-event-processor/src/test/java/uk/gov/moj/cpp/hearing/event/InitiateHearingEventProcessorTest.java index 887d68ff4c..9f37859368 100644 --- a/hearing-event/hearing-event-processor/src/test/java/uk/gov/moj/cpp/hearing/event/InitiateHearingEventProcessorTest.java +++ b/hearing-event/hearing-event-processor/src/test/java/uk/gov/moj/cpp/hearing/event/InitiateHearingEventProcessorTest.java @@ -14,10 +14,6 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import static uk.gov.justice.core.courts.CourtOrder.courtOrder; -import static uk.gov.justice.core.courts.CourtOrderOffence.courtOrderOffence; -import static uk.gov.justice.core.courts.Offence.offence; -import static org.mockito.Mockito.when; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; import static uk.gov.justice.services.test.utils.core.enveloper.EnveloperFactory.createEnveloper; import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeMatcher.jsonEnvelope; @@ -34,11 +30,7 @@ import uk.gov.justice.core.courts.CourtApplicationCase; import uk.gov.justice.core.courts.CourtApplicationParty; import uk.gov.justice.core.courts.CourtApplicationType; -import uk.gov.justice.core.courts.CourtOrder; -import uk.gov.justice.core.courts.CourtOrderOffence; -import uk.gov.justice.core.courts.JudicialResult; import uk.gov.justice.core.courts.MasterDefendant; -import uk.gov.justice.core.courts.Offence; import uk.gov.justice.core.courts.Person; import uk.gov.justice.core.courts.PersonDefendant; import uk.gov.justice.services.common.converter.JsonObjectToObjectConverter; @@ -58,7 +50,6 @@ import java.time.format.DateTimeFormatter; import java.util.ArrayList; - import java.util.Arrays; import java.util.List; import java.util.Optional; @@ -68,8 +59,8 @@ import javax.json.JsonArray; import javax.json.JsonObject; -import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; @@ -77,10 +68,11 @@ import org.mockito.Captor; import org.mockito.InjectMocks; import org.mockito.Mock; -import org.mockito.MockitoAnnotations; import org.mockito.Spy; +import org.mockito.junit.jupiter.MockitoExtension; -@SuppressWarnings({"unchecked", "unused"}) +@SuppressWarnings({"unused"}) +@ExtendWith(MockitoExtension.class) public class InitiateHearingEventProcessorTest { private static final String APPEARANCE_TO_MAKE_STATUTORY_DECLARATION_CODE = "MC80527"; private static final String APPEARANCE_TO_MAKE_STATUTORY_DECLARATION_SJP_CASE_CODE = "MC80528"; @@ -118,12 +110,6 @@ public class InitiateHearingEventProcessorTest { @Mock private ProgressionService progressionService; - - @BeforeEach - public void initMocks() { - MockitoAnnotations.initMocks(this); - } - public static Stream applicationTypes() { return Stream.of( Arguments.of(APPEARANCE_TO_MAKE_STATUTORY_DECLARATION_CODE, "STAT_DEC"), @@ -178,13 +164,16 @@ public void shouldRaiseEventForEmailWhenApplicationTypeMatches(final String appl .add("applicationStatus", "UN_ALLOCATED") .build()).build())); + final List courtApplicationCases = createCourtApplicationCases(); + final UUID caseId1 = courtApplicationCases.get(0).getProsecutionCaseId(); + final UUID caseId2 = courtApplicationCases.get(1).getProsecutionCaseId(); final InitiateHearingCommand initiateHearingCommand = standardInitiateHearingWithApplicationTemplate(singletonList(CourtApplication.courtApplication() .withType(CourtApplicationType.courtApplicationType() .withId(randomUUID()) .withCode(applicationTypeId) .build()) - .withCourtApplicationCases(createCourtApplicationCases()) + .withCourtApplicationCases(courtApplicationCases) .withId(applicationId) .withSubject(CourtApplicationParty.courtApplicationParty() .withMasterDefendant(MasterDefendant.masterDefendant() @@ -212,7 +201,10 @@ public void shouldRaiseEventForEmailWhenApplicationTypeMatches(final String appl withJsonPath("$.listingDate", is(dateTimeFormatter.format(initiateHearingCommand.getHearing().getHearingDays().get(0).getSittingDay()))), withJsonPath("$.caseUrns[0]", is("caseURN1")), withJsonPath("$.caseUrns[1]", is("caseURN2")), - withJsonPath("$.hearingCourtCentreName", is(notNullValue())) + withJsonPath("$.caseIds[0]", is(caseId1.toString())), + withJsonPath("$.caseIds[1]", is(caseId2.toString())), + withJsonPath("$.hearingCourtCentreName", is(notNullValue())), + withJsonPath("$.hearingCourtCentreId", is(notNullValue())) )))); } @@ -416,13 +408,16 @@ public void shouldRaiseEventForEmailWhenApplicationTypeMatch(final String applic .add("applicationStatus", "UN_ALLOCATED") .build()).build())); + final List courtApplicationCases = createCourtApplicationCases(); + final UUID caseId1 = courtApplicationCases.get(0).getProsecutionCaseId(); + final UUID caseId2 = courtApplicationCases.get(1).getProsecutionCaseId(); final InitiateHearingCommand initiateHearingCommand = standardInitiateHearingWithApplicationTemplate(singletonList(CourtApplication.courtApplication() .withType(CourtApplicationType.courtApplicationType() .withCode(applicationTypeId).build()) .withId(applicationId) .withApplicationStatus(ApplicationStatus.UN_ALLOCATED) - .withCourtApplicationCases(createCourtApplicationCases()) + .withCourtApplicationCases(courtApplicationCases) .withSubject(CourtApplicationParty.courtApplicationParty() .withMasterDefendant(MasterDefendant.masterDefendant() .withMasterDefendantId(masterDefendantId) @@ -449,7 +444,10 @@ public void shouldRaiseEventForEmailWhenApplicationTypeMatch(final String applic withJsonPath("$.listingDate", is(dateTimeFormatter.format(initiateHearingCommand.getHearing().getHearingDays().get(0).getSittingDay()))), withJsonPath("$.caseUrns[0]", is("caseURN1")), withJsonPath("$.caseUrns[1]", is("caseURN2")), + withJsonPath("$.caseIds[0]", is(caseId1.toString())), + withJsonPath("$.caseIds[1]", is(caseId2.toString())), withJsonPath("$.hearingCourtCentreName", is(notNullValue())), + withJsonPath("$.hearingCourtCentreId", is(notNullValue())), withJsonPath("$.caseOffenceIdList.size()", is(2)) )))); @@ -471,6 +469,8 @@ public void shouldRaiseEventForEmailWithCourtOrderOffencesWhenHearingInitiatedFo final List courtApplicationCases = createCourtApplicationCases(); final UUID offenceId1 = courtApplicationCases.get(0).getOffences().get(0).getId(); final UUID offenceId2 = courtApplicationCases.get(1).getOffences().get(0).getId(); + final UUID caseId1 = courtApplicationCases.get(0).getProsecutionCaseId(); + final UUID caseId2 = courtApplicationCases.get(1).getProsecutionCaseId(); final InitiateHearingCommand initiateHearingCommand = standardInitiateHearingWithApplicationTemplate(singletonList(CourtApplication.courtApplication() .withType(CourtApplicationType.courtApplicationType() .withCode(APPEARANCE_TO_MAKE_STATUTORY_DECLARATION_CODE).build()) @@ -503,7 +503,10 @@ public void shouldRaiseEventForEmailWithCourtOrderOffencesWhenHearingInitiatedFo withJsonPath("$.listingDate", is(dateTimeFormatter.format(initiateHearingCommand.getHearing().getHearingDays().get(0).getSittingDay()))), withJsonPath("$.caseUrns[0]", is("caseURN1")), withJsonPath("$.caseUrns[1]", is("caseURN2")), + withJsonPath("$.caseIds[0]", is(caseId1.toString())), + withJsonPath("$.caseIds[1]", is(caseId2.toString())), withJsonPath("$.hearingCourtCentreName", is(notNullValue())), + withJsonPath("$.hearingCourtCentreId", is(notNullValue())), withJsonPath("$.caseOffenceIdList[0]", is(offenceId1.toString())), withJsonPath("$.caseOffenceIdList[1]", is(offenceId2.toString())) )))); diff --git a/hearing-event/hearing-event-processor/src/test/java/uk/gov/moj/cpp/hearing/event/delegates/CustodyTimeLimitCalculatorTest.java b/hearing-event/hearing-event-processor/src/test/java/uk/gov/moj/cpp/hearing/event/delegates/CustodyTimeLimitCalculatorTest.java index 0ed2ad5fb2..e682670561 100644 --- a/hearing-event/hearing-event-processor/src/test/java/uk/gov/moj/cpp/hearing/event/delegates/CustodyTimeLimitCalculatorTest.java +++ b/hearing-event/hearing-event-processor/src/test/java/uk/gov/moj/cpp/hearing/event/delegates/CustodyTimeLimitCalculatorTest.java @@ -182,7 +182,7 @@ public void shouldCalculateHeldInCustodyWhenDefendantIsInCustodyFirstly() { public void shouldMaintainPreviousHeldInCustodyWhenDefendantWasInCustodyAndHasPreviousDaysAndStillCustody() { final UtcClock utcClock = new UtcClock(); final ZonedDateTime hearingDay = utcClock.now(); - final LocalDate dateHeldInCustodySince = LocalDate.now().minusDays(10); + final LocalDate dateHeldInCustodySince = utcClock.now().toLocalDate().minusDays(10); final Hearing hearing = Hearing.hearing() .withHearingDays(asList(HearingDay.hearingDay().withSittingDay(hearingDay).build())) .withProsecutionCases(asList(ProsecutionCase.prosecutionCase() @@ -212,7 +212,7 @@ public void shouldMaintainPreviousHeldInCustodyWhenDefendantWasInCustodyAndHasPr public void shouldMaintainPreviousHeldInCustodyWhenDefendantWasInCustodyAndStillCustody() { final UtcClock utcClock = new UtcClock(); final ZonedDateTime hearingDay = utcClock.now(); - final LocalDate dateHeldInCustodySince = LocalDate.now().minusDays(10); + final LocalDate dateHeldInCustodySince = utcClock.now().toLocalDate().minusDays(10); final Hearing hearing = Hearing.hearing() .withHearingDays(asList(HearingDay.hearingDay().withSittingDay(hearingDay).build())) .withProsecutionCases(asList(ProsecutionCase.prosecutionCase() @@ -241,7 +241,7 @@ public void shouldMaintainPreviousHeldInCustodyWhenDefendantWasInCustodyAndStill public void shouldCalculateHeldInCustodyWhenDefendantWasInCustodyButNowOnBail() { final UtcClock utcClock = new UtcClock(); final ZonedDateTime hearingDay = utcClock.now(); - final LocalDate dateHeldInCustodySince = LocalDate.now().minusDays(10); + final LocalDate dateHeldInCustodySince = utcClock.now().toLocalDate().minusDays(10); final Hearing hearing = Hearing.hearing() .withHearingDays(asList(HearingDay.hearingDay().withSittingDay(hearingDay).build())) .withProsecutionCases(asList(ProsecutionCase.prosecutionCase() diff --git a/hearing-event/hearing-event-processor/src/yaml/json/public.hearing.nces-email-notification-for-application.json b/hearing-event/hearing-event-processor/src/yaml/json/public.hearing.nces-email-notification-for-application.json index 1e8685d4cb..a1f8de709f 100644 --- a/hearing-event/hearing-event-processor/src/yaml/json/public.hearing.nces-email-notification-for-application.json +++ b/hearing-event/hearing-event-processor/src/yaml/json/public.hearing.nces-email-notification-for-application.json @@ -3,5 +3,6 @@ "masterDefendantId" : "16b09d9f-5f60-3ace-be27-a6efa7ab3907", "listingDate" : "2018-05-19T15:45:21.671Z", "caseUrns": ["REF1"], - "hearingCourtCentreName": "Croydon Crown Court" + "hearingCourtCentreName": "Croydon Crown Court", + "hearingCourtCentreId": "16b09d9f-5f60-3ace-be27-a6efa7ab3189" } \ No newline at end of file diff --git a/hearing-event/hearing-event-processor/src/yaml/json/schema/hearing.events.results-validation-failed.json b/hearing-event/hearing-event-processor/src/yaml/json/schema/hearing.events.results-validation-failed.json new file mode 100644 index 0000000000..4d679fcdf3 --- /dev/null +++ b/hearing-event/hearing-event-processor/src/yaml/json/schema/hearing.events.results-validation-failed.json @@ -0,0 +1,14 @@ +{ + "$schema": "http://json-schema.org/draft-04/schema#", + "id": "http://cpp.moj.gov.uk/hearing/json/schema/event/hearing.events.results-validation-failed.json", + "type": "object", + "properties": { + "hearingId": { + "$ref": "http://justice.gov.uk/core/courts/courtsDefinitions.json#/definitions/uuid" + } + }, + "required": [ + "hearingId" + ], + "additionalProperties": true +} diff --git a/hearing-event/hearing-event-processor/src/yaml/json/schema/public.hearing.nces-email-notification-for-application.json b/hearing-event/hearing-event-processor/src/yaml/json/schema/public.hearing.nces-email-notification-for-application.json index 4e520e2a7f..1d1fb98351 100644 --- a/hearing-event/hearing-event-processor/src/yaml/json/schema/public.hearing.nces-email-notification-for-application.json +++ b/hearing-event/hearing-event-processor/src/yaml/json/schema/public.hearing.nces-email-notification-for-application.json @@ -21,6 +21,9 @@ }, "hearingCourtCentreName": { "type": "string" + }, + "hearingCourtCentreId": { + "type": "string" } }, "required": [ diff --git a/hearing-event/hearing-event-processor/src/yaml/json/schema/public.hearing.results-validation-failed.json b/hearing-event/hearing-event-processor/src/yaml/json/schema/public.hearing.results-validation-failed.json new file mode 100644 index 0000000000..b455981ac7 --- /dev/null +++ b/hearing-event/hearing-event-processor/src/yaml/json/schema/public.hearing.results-validation-failed.json @@ -0,0 +1,14 @@ +{ + "$schema": "http://json-schema.org/draft-04/schema#", + "id": "http://cpp.moj.gov.uk/hearing/json/schema/event/public.hearing.results-validation-failed.json", + "type": "object", + "properties": { + "hearingId": { + "$ref": "http://justice.gov.uk/core/courts/courtsDefinitions.json#/definitions/uuid" + } + }, + "required": [ + "hearingId" + ], + "additionalProperties": true +} diff --git a/hearing-event/hearing-event-processor/src/yaml/public-publications-descriptor.yaml b/hearing-event/hearing-event-processor/src/yaml/public-publications-descriptor.yaml index c745ea3ce5..34f9f16e87 100644 --- a/hearing-event/hearing-event-processor/src/yaml/public-publications-descriptor.yaml +++ b/hearing-event/hearing-event-processor/src/yaml/public-publications-descriptor.yaml @@ -63,6 +63,9 @@ subscriptions_descriptor: - name: public.hearing.manage-results-failed schema_uri: http://cpp.moj.gov.uk/hearing/json/schema/event/public-manage-results-failed.json + - name: public.hearing.results-validation-failed + schema_uri: http://cpp.moj.gov.uk/hearing/json/schema/event/public.hearing.results-validation-failed.json + # Pleas - name: public.hearing.plea-updated schema_uri: http://cpp.moj.gov.uk/hearing/json/schema/event/public-plea-updated.json diff --git a/hearing-event/hearing-event-processor/src/yaml/subscriptions-descriptor.yaml b/hearing-event/hearing-event-processor/src/yaml/subscriptions-descriptor.yaml index f99c72e77f..6bf407c210 100644 --- a/hearing-event/hearing-event-processor/src/yaml/subscriptions-descriptor.yaml +++ b/hearing-event/hearing-event-processor/src/yaml/subscriptions-descriptor.yaml @@ -317,6 +317,10 @@ subscriptions_descriptor: - name: hearing.share-results-failed schema_uri: http://cpp.moj.gov.uk/hearing/json/schema/event/hearing.share-results-failed.json + # Results Validation Failed + - name: hearing.events.results-validation-failed + schema_uri: http://cpp.moj.gov.uk/hearing/json/schema/event/hearing.events.results-validation-failed.json + - name: hearing.event.approval-rejected schema_uri: http://cpp.moj.gov.uk/hearing/json/schema/event/hearing.event.approval-rejected.json diff --git a/hearing-event/pom.xml b/hearing-event/pom.xml index 2640c24ce6..9810657428 100644 --- a/hearing-event/pom.xml +++ b/hearing-event/pom.xml @@ -3,7 +3,7 @@ uk.gov.moj.cpp.hearing hearing-parent - 17.104.158-SNAPSHOT + 17.104.158-CCSPH2-SNAPSHOT hearing-event pom diff --git a/hearing-healthchecks/pom.xml b/hearing-healthchecks/pom.xml index 7e883a8aae..9250002052 100644 --- a/hearing-healthchecks/pom.xml +++ b/hearing-healthchecks/pom.xml @@ -3,7 +3,7 @@ hearing-parent uk.gov.moj.cpp.hearing - 17.104.158-SNAPSHOT + 17.104.158-CCSPH2-SNAPSHOT 4.0.0 diff --git a/hearing-integration-test/pom.xml b/hearing-integration-test/pom.xml index 9c4d7415d3..3677f40d76 100644 --- a/hearing-integration-test/pom.xml +++ b/hearing-integration-test/pom.xml @@ -5,7 +5,7 @@ uk.gov.moj.cpp.hearing hearing-parent - 17.104.158-SNAPSHOT + 17.104.158-CCSPH2-SNAPSHOT hearing-integration-test diff --git a/hearing-integration-test/src/test/java/uk/gov/moj/cpp/hearing/it/AbstractIT.java b/hearing-integration-test/src/test/java/uk/gov/moj/cpp/hearing/it/AbstractIT.java index 616ab69dc6..ec47431299 100644 --- a/hearing-integration-test/src/test/java/uk/gov/moj/cpp/hearing/it/AbstractIT.java +++ b/hearing-integration-test/src/test/java/uk/gov/moj/cpp/hearing/it/AbstractIT.java @@ -294,8 +294,8 @@ protected void stubProsecutionCases(final Hearing hearing) { hearing.getProsecutionCases().forEach(prosecutionCase -> stubGetProgressionProsecutionCases(prosecutionCase.getId())); } - protected void cleanDatabase(final String dbTableName) { + protected void cleanDatabase(final String dbTableName, final String... additionalTables) { final DatabaseCleaner databaseCleaner = new DatabaseCleaner(); - databaseCleaner.cleanViewStoreTables(CONTEXT_NAME, dbTableName); + databaseCleaner.cleanViewStoreTables(CONTEXT_NAME, dbTableName, additionalTables); } } diff --git a/hearing-integration-test/src/test/java/uk/gov/moj/cpp/hearing/it/CourtListRestrictionIT.java b/hearing-integration-test/src/test/java/uk/gov/moj/cpp/hearing/it/CourtListRestrictionIT.java index c3f66e811f..34217a8d09 100644 --- a/hearing-integration-test/src/test/java/uk/gov/moj/cpp/hearing/it/CourtListRestrictionIT.java +++ b/hearing-integration-test/src/test/java/uk/gov/moj/cpp/hearing/it/CourtListRestrictionIT.java @@ -1,5 +1,6 @@ package uk.gov.moj.cpp.hearing.it; +import static com.jayway.jsonpath.matchers.JsonPathMatchers.hasNoJsonPath; import static com.jayway.jsonpath.matchers.JsonPathMatchers.isJson; import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static java.util.Optional.of; @@ -11,6 +12,10 @@ import static org.hamcrest.Matchers.is; import static uk.gov.moj.cpp.hearing.it.PublishLatestCourtCentreHearingEventsIT.XHIBIT_GATEWAY_SEND_WEB_PAGE_TO_XHIBIT_FILE_NAME_26; import static uk.gov.moj.cpp.hearing.steps.HearingEventStepDefinitions.OPEN_CASE_PROSECUTION_EVENT_DEFINITION_ID; +import static uk.gov.moj.cpp.hearing.utils.WebDavStub.awaitNewFile; +import static uk.gov.moj.cpp.hearing.utils.WebDavStub.awaitNewSentXmlForPubDisplay; +import static uk.gov.moj.cpp.hearing.utils.WebDavStub.countFilesAt; +import static uk.gov.moj.cpp.hearing.utils.WebDavStub.countSentXmlForPubDisplay; import static uk.gov.moj.cpp.hearing.utils.WebDavStub.getFileForPath; import static uk.gov.moj.cpp.hearing.utils.WebDavStub.getSentXmlForPubDisplay; @@ -25,6 +30,7 @@ import javax.annotation.concurrent.NotThreadSafe; import javax.json.JsonObject; +import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -34,12 +40,49 @@ public class CourtListRestrictionIT extends AbstractPublishLatestCourtCentreHear private ZonedDateTime eventTime; + /** + * Clean every table that can carry state across tests in this class. All five tests bind + * their hearings to the SAME static {@code caseId} (see + * {@link AbstractPublishLatestCourtCentreHearingIT}), so residual + * {@code is_court_list_restricted=true} on {@code ha_case} (the {@code ProsecutionCase} + * entity's table — see its {@code @Table} annotation) or {@code ha_defendant} from one + * test poisons the next. The {@code court_list_publish_status} row is also dropped so the + * FIRST publish in this class cannot inherit {@code EXPORT_SUCCESSFUL} from a prior test + * class's publish — without this, + * {@code verifyCourtListPublishStatusReturnedWhenQueryingFromAPI} returns on the stale + * status before the current publish has produced a file. + */ + private void cleanRestrictionTables() { + cleanDatabase("ha_hearing", + "ha_case", + "ha_defendant", + "ha_hearing_day", + "ha_hearing_event", + "court_list_publish_status"); + } + @BeforeEach public void setUpTest() { - cleanDatabase("ha_hearing"); + cleanRestrictionTables(); eventTime = new UtcClock().now().minusMinutes(5L); } + /** + * Hearings created here use templates that explicitly set + * {@code reportingRestrictionReason=""} (the + * {@code initiateHearingTemplateWithParamNoReportingRestriction*} variants). + * They sit in the same {@code courtCentreId}/{@code courtRoom2Id} bucket + * as + * {@code PublishLatestCourtCentreHearingEventsIT.shouldRequestToPublishCourtListOpenCaseProsecution} + * and would otherwise leak into that test's PUB-DISPLAY XML, breaking its + * defendant-redaction assertion. Clean up after each method so nothing + * survives this class. + */ + @AfterEach + public void tearDownTest() { + cleanRestrictionTables(); + } + @Test public void shouldRequestToPublishCourtListWithCaseRestriction() throws Exception { final CourtListRestrictionSteps courtListRestrictionSteps = new CourtListRestrictionSteps(); @@ -54,6 +97,10 @@ public void shouldRequestToPublishCourtListWithCaseRestriction() throws Exceptio withJsonPath("$.caseIds", hasSize(1)), withJsonPath("$.restrictCourtList", is(true))))); + // Wait for the restriction projection to land before publishing + courtListRestrictionSteps.waitForRestrictionProjection(courtCentreId, eventTime.toLocalDate(), + withJsonPath("$.court.courtSites[0].courtRooms[0].cases.casesDetails", hasSize(0))); + JsonObject publishCourtListJsonObject = buildPublishCourtListJsonString(courtCentreId, "26"); final PublishCourtListSteps publishCourtListSteps = new PublishCourtListSteps(); @@ -79,11 +126,20 @@ public void shouldRequestToPublishCourtListWithCaseRestriction() throws Exceptio withJsonPath("$.caseIds", hasSize(1)), withJsonPath("$.restrictCourtList", is(false))))); + // Wait for the un-restriction projection to land before publishing + courtListRestrictionSteps.waitForRestrictionProjection(courtCentreId, eventTime.toLocalDate(), + withJsonPath("$.court.courtSites[0].courtRooms[0].cases.casesDetails", hasSize(1))); + publishCourtListJsonObject = buildPublishCourtListJsonString(courtCentreId, "26"); + final int webPageCountBeforeSecondPublish = countFilesAt(XHIBIT_GATEWAY_SEND_WEB_PAGE_TO_XHIBIT_FILE_NAME_26); + final int pubDisplayCountBeforeSecondPublish = countSentXmlForPubDisplay(); + courtCentreId = sendPublishCourtListCommand(publishCourtListJsonObject, courtCentreId); publishCourtListSteps.verifyCourtListPublishStatusReturnedWhenQueryingFromAPI(courtCentreId); + awaitNewFile(XHIBIT_GATEWAY_SEND_WEB_PAGE_TO_XHIBIT_FILE_NAME_26, webPageCountBeforeSecondPublish); + awaitNewSentXmlForPubDisplay(pubDisplayCountBeforeSecondPublish); filePayload = getFileForPath(XHIBIT_GATEWAY_SEND_WEB_PAGE_TO_XHIBIT_FILE_NAME_26); filePayloadForPubDisplay = getSentXmlForPubDisplay(); @@ -110,6 +166,10 @@ public void shouldRequestToPublishCourtListWithDefendantRestrictionOnOff() throw withJsonPath("$.defendantIds", hasSize(1)), withJsonPath("$.restrictCourtList", is(true))))); + // Wait for defendant restriction to land in the projection before publishing + courtListRestrictionSteps.waitForRestrictionProjection(courtCentreId, eventTime.toLocalDate(), + withJsonPath("$.court.courtSites[0].courtRooms[0].cases.casesDetails[0].defendants", hasSize(0))); + final JsonObject publishCourtListJsonObject = buildPublishCourtListJsonString(courtCentreId, "26"); final PublishCourtListSteps publishCourtListSteps = new PublishCourtListSteps(); @@ -138,8 +198,17 @@ public void shouldRequestToPublishCourtListWithDefendantRestrictionOnOff() throw withJsonPath("$.defendantIds", hasSize(1)), withJsonPath("$.restrictCourtList", is(false))))); + // Wait for defendant un-restriction to land in the projection before publishing + courtListRestrictionSteps.waitForRestrictionProjection(courtCentreId, eventTime.toLocalDate(), + withJsonPath("$.court.courtSites[0].courtRooms[0].cases.casesDetails[0].defendants", hasSize(1))); + + final int webPageCountBeforeSecondPublish = countFilesAt(XHIBIT_GATEWAY_SEND_WEB_PAGE_TO_XHIBIT_FILE_NAME_26); + final int pubDisplayCountBeforeSecondPublish = countSentXmlForPubDisplay(); + courtCentreId = sendPublishCourtListCommand(publishCourtListJsonObject, courtCentreId); publishCourtListSteps.verifyCourtListPublishStatusReturnedWhenQueryingFromAPI(courtCentreId); + awaitNewFile(XHIBIT_GATEWAY_SEND_WEB_PAGE_TO_XHIBIT_FILE_NAME_26, webPageCountBeforeSecondPublish); + awaitNewSentXmlForPubDisplay(pubDisplayCountBeforeSecondPublish); filePayload = getFileForPath(XHIBIT_GATEWAY_SEND_WEB_PAGE_TO_XHIBIT_FILE_NAME_26); filePayloadForPubDisplay = getSentXmlForPubDisplay(); @@ -174,6 +243,10 @@ public void shouldRequestToPublishCourtListForApplicationRestrictionOnOff() thro withJsonPath("$.courtApplicationIds", hasSize(1)), withJsonPath("$.restrictCourtList", is(true))))); + // Wait for application restriction to land in the projection before publishing + courtListRestrictionSteps.waitForRestrictionProjection(courtCentreId, eventTime.toLocalDate(), + withJsonPath("$.court.courtSites[0].courtRooms[0].cases.casesDetails", hasSize(0))); + JsonObject publishCourtListJsonObject = buildPublishCourtListJsonString(courtCentreId, "26"); final PublishCourtListSteps publishCourtListSteps = new PublishCourtListSteps(); @@ -199,11 +272,20 @@ public void shouldRequestToPublishCourtListForApplicationRestrictionOnOff() thro withJsonPath("$.courtApplicationIds", hasSize(1)), withJsonPath("$.restrictCourtList", is(false))))); + // Wait for application un-restriction to land in the projection before publishing + courtListRestrictionSteps.waitForRestrictionProjection(courtCentreId, eventTime.toLocalDate(), + withJsonPath("$.court.courtSites[0].courtRooms[0].cases.casesDetails", hasSize(1))); + publishCourtListJsonObject = buildPublishCourtListJsonString(courtCentreId, "26"); + final int webPageCountBeforeSecondPublish = countFilesAt(XHIBIT_GATEWAY_SEND_WEB_PAGE_TO_XHIBIT_FILE_NAME_26); + final int pubDisplayCountBeforeSecondPublish = countSentXmlForPubDisplay(); + courtCentreId = sendPublishCourtListCommand(publishCourtListJsonObject, courtCentreId); publishCourtListSteps.verifyCourtListPublishStatusReturnedWhenQueryingFromAPI(courtCentreId); + awaitNewFile(XHIBIT_GATEWAY_SEND_WEB_PAGE_TO_XHIBIT_FILE_NAME_26, webPageCountBeforeSecondPublish); + awaitNewSentXmlForPubDisplay(pubDisplayCountBeforeSecondPublish); filePayload = getFileForPath(XHIBIT_GATEWAY_SEND_WEB_PAGE_TO_XHIBIT_FILE_NAME_26); filePayloadForPubDisplay = getSentXmlForPubDisplay(); @@ -232,6 +314,10 @@ public void shouldRequestToPublishCourtListForApplicationApplicantRestrictionOnO withJsonPath("$.courtApplicationApplicantIds", hasSize(1)), withJsonPath("$.restrictCourtList", is(true))))); + // Wait for applicant restriction to land in the projection before publishing + courtListRestrictionSteps.waitForRestrictionProjection(courtCentreId, eventTime.toLocalDate(), + hasNoJsonPath("$.court.courtSites[0].courtRooms[0].cases.casesDetails[0].defendants[0].firstName")); + JsonObject publishCourtListJsonObject = buildPublishCourtListJsonString(courtCentreId, "26"); final PublishCourtListSteps publishCourtListSteps = new PublishCourtListSteps(); @@ -257,11 +343,20 @@ public void shouldRequestToPublishCourtListForApplicationApplicantRestrictionOnO withJsonPath("$.courtApplicationApplicantIds", hasSize(1)), withJsonPath("$.restrictCourtList", is(false))))); + // Wait for applicant un-restriction to land in the projection before publishing + courtListRestrictionSteps.waitForRestrictionProjection(courtCentreId, eventTime.toLocalDate(), + withJsonPath("$.court.courtSites[0].courtRooms[0].cases.casesDetails[0].defendants[0].firstName", org.hamcrest.CoreMatchers.notNullValue())); + publishCourtListJsonObject = buildPublishCourtListJsonString(courtCentreId, "26"); + final int webPageCountBeforeSecondPublish = countFilesAt(XHIBIT_GATEWAY_SEND_WEB_PAGE_TO_XHIBIT_FILE_NAME_26); + final int pubDisplayCountBeforeSecondPublish = countSentXmlForPubDisplay(); + courtCentreId = sendPublishCourtListCommand(publishCourtListJsonObject, courtCentreId); publishCourtListSteps.verifyCourtListPublishStatusReturnedWhenQueryingFromAPI(courtCentreId); + awaitNewFile(XHIBIT_GATEWAY_SEND_WEB_PAGE_TO_XHIBIT_FILE_NAME_26, webPageCountBeforeSecondPublish); + awaitNewSentXmlForPubDisplay(pubDisplayCountBeforeSecondPublish); filePayload = getFileForPath(XHIBIT_GATEWAY_SEND_WEB_PAGE_TO_XHIBIT_FILE_NAME_26); filePayloadForPubDisplay = getSentXmlForPubDisplay(); @@ -291,6 +386,10 @@ public void shouldRequestToPublishCourtListWhenYoungDefendantIsRestrictedOnIniti caseId, randomUUID(), courtRoom2Id, randomUUID().toString(), OPEN_CASE_PROSECUTION_EVENT_DEFINITION_ID, eventTime, of(hearingTypeId), courtCentreId, eventTime.toLocalDate()); + // Wait for the young-defendant restriction to land in the projection before publishing + courtListRestrictionSteps.waitForRestrictionProjection(courtCentreId, eventTime.toLocalDate(), + withJsonPath("$.court.courtSites[0].courtRooms[0].cases.casesDetails[0].defendants", hasSize(0))); + final JsonObject publishCourtListJsonObject = buildPublishCourtListJsonString(courtCentreId, "26"); final PublishCourtListSteps publishCourtListSteps = new PublishCourtListSteps(); diff --git a/hearing-integration-test/src/test/java/uk/gov/moj/cpp/hearing/it/InitiateHearingIT.java b/hearing-integration-test/src/test/java/uk/gov/moj/cpp/hearing/it/InitiateHearingIT.java index 78f970fc99..e701127129 100644 --- a/hearing-integration-test/src/test/java/uk/gov/moj/cpp/hearing/it/InitiateHearingIT.java +++ b/hearing-integration-test/src/test/java/uk/gov/moj/cpp/hearing/it/InitiateHearingIT.java @@ -21,6 +21,7 @@ import static uk.gov.justice.services.test.utils.core.matchers.ResponsePayloadMatcher.payload; import static uk.gov.justice.services.test.utils.core.matchers.ResponseStatusMatcher.status; import static uk.gov.justice.services.test.utils.core.messaging.MetadataBuilderFactory.metadataOf; +import static uk.gov.moj.cpp.hearing.it.Queries.getHearingForManageHearingPollForMatch; import static uk.gov.moj.cpp.hearing.it.Queries.getHearingPollForMatch; import static uk.gov.moj.cpp.hearing.it.Queries.getHearingsByDatePollForMatch; import static uk.gov.moj.cpp.hearing.it.UseCases.initiateHearing; @@ -326,6 +327,32 @@ public void initiateHearing_ApplicationOnly() { )) )) ); + + getHearingForManageHearingPollForMatch(hearing.getId(), DEFAULT_POLL_TIMEOUT_IN_SEC, isBean(HearingDetailsResponse.class) + .with(HearingDetailsResponse::getHearing, isBean(Hearing.class) + .with(Hearing::getId, is(hearing.getId())) + .with(Hearing::getType, isBean(HearingType.class) + .with(HearingType::getId, is(hearing.getType().getId()))) + .with(Hearing::getJurisdictionType, is(JurisdictionType.CROWN)) + .with(Hearing::getHearingLanguage, is(ENGLISH)) + .with(Hearing::getCourtCentre, isBean(CourtCentre.class) + .with(CourtCentre::getId, is(hearing.getCourtCentre().getId()))) + .with(Hearing::getHearingDays, first(isBean(HearingDay.class) + .with(HearingDay::getSittingDay, is(hearingDay.getSittingDay().withZoneSameLocal(ZoneId.of("UTC")))) + .with(HearingDay::getListingSequence, is(hearingDay.getListingSequence())) + .with(HearingDay::getListedDurationMinutes, is(hearingDay.getListedDurationMinutes())))) + .with(Hearing::getJudiciary, first(isBean(JudicialRole.class) + .with(JudicialRole::getJudicialId, is(judicialRole.getJudicialId())) + .withValue(jr -> judicialRole.getJudicialRoleType().getJudiciaryType(), judicialRole.getJudicialRoleType().getJudiciaryType()))) + .with(Hearing::getCourtApplications, first(isBean(CourtApplication.class) + .withValue(CourtApplication::getId, courtApplication.getId()) + .withValue(CourtApplication::getApplicationReference, courtApplication.getApplicationReference()) + )) + + ) + ); + + } @Test diff --git a/hearing-integration-test/src/test/java/uk/gov/moj/cpp/hearing/it/NCESApplicationJourneyIT.java b/hearing-integration-test/src/test/java/uk/gov/moj/cpp/hearing/it/NCESApplicationJourneyIT.java index 2577f2e687..ef9131797a 100644 --- a/hearing-integration-test/src/test/java/uk/gov/moj/cpp/hearing/it/NCESApplicationJourneyIT.java +++ b/hearing-integration-test/src/test/java/uk/gov/moj/cpp/hearing/it/NCESApplicationJourneyIT.java @@ -3,7 +3,6 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.isJson; import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static java.util.Collections.singletonList; -import static java.util.UUID.fromString; import static java.util.UUID.randomUUID; import static org.hamcrest.CoreMatchers.allOf; import static org.hamcrest.CoreMatchers.notNullValue; @@ -13,6 +12,7 @@ import static uk.gov.moj.cpp.hearing.test.CommandHelpers.h; import static uk.gov.moj.cpp.hearing.test.TestTemplates.InitiateHearingCommandTemplates.standardInitiateHearingWithApplicationTemplate; +import uk.gov.justice.core.courts.CourtApplication; import uk.gov.moj.cpp.hearing.test.HearingFactory; import java.util.UUID; @@ -29,18 +29,24 @@ public void shouldRaisePublicEventWhenApplicationTypeIsAppeal() { final HearingFactory hearingFactory = new HearingFactory(); final UUID masterDefendantId = randomUUID(); + final CourtApplication courtApplication = hearingFactory.courtApplicationForAppeal( + hearingFactory.courtApplicationDefendant(masterDefendantId, randomUUID()).build(), + APPEAL_AGAINST_CONVICTION_ID).build(); + final UUID caseId = courtApplication.getCourtApplicationCases().get(0).getProsecutionCaseId(); + final Utilities.EventListener publicEventTopic = listenFor("public.hearing.nces-email-notification-for-application") .withFilter(isJson(allOf( withJsonPath("$.applicationType", is("APPEAL")), withJsonPath("$.masterDefendantId", is(masterDefendantId.toString())), withJsonPath("$.listingDate", notNullValue()), withJsonPath("$.caseUrns[0]", is("prosecutionAuthorityReference")), - withJsonPath("$.hearingCourtCentreName", notNullValue()) + withJsonPath("$.caseIds[0]", is(caseId.toString())), + withJsonPath("$.hearingCourtCentreName", notNullValue()), + withJsonPath("$.hearingCourtCentreId", notNullValue()) ))); h(initiateHearing(getRequestSpec(), - standardInitiateHearingWithApplicationTemplate(singletonList( - hearingFactory.courtApplicationForAppeal(hearingFactory.courtApplicationDefendant(masterDefendantId, randomUUID()).build(), APPEAL_AGAINST_CONVICTION_ID).build())))); + standardInitiateHearingWithApplicationTemplate(singletonList(courtApplication)))); publicEventTopic.waitFor(); } diff --git a/hearing-integration-test/src/test/java/uk/gov/moj/cpp/hearing/it/PublishLatestCourtCentreHearingEventsIT.java b/hearing-integration-test/src/test/java/uk/gov/moj/cpp/hearing/it/PublishLatestCourtCentreHearingEventsIT.java index f3aedb7aff..1192b9d1e1 100644 --- a/hearing-integration-test/src/test/java/uk/gov/moj/cpp/hearing/it/PublishLatestCourtCentreHearingEventsIT.java +++ b/hearing-integration-test/src/test/java/uk/gov/moj/cpp/hearing/it/PublishLatestCourtCentreHearingEventsIT.java @@ -60,6 +60,14 @@ public void setUpTest() { @Test public void shouldRequestToPublishCourtListOpenCaseProsecution() throws NoSuchAlgorithmException { + // CourtListRestrictionIT (which runs alphabetically before this class) + // creates hearings in the same courtCentreId/courtRoom2Id with + // reportingRestrictionReason explicitly empty, and event-sourced inserts + // can land in ha_hearing after CourtListRestrictionIT's @AfterEach + // cleanup has run. Without clearing the table here, those leaked + // hearings appear in this test's PUB-DISPLAY query and break the + // empty-defendant assertion below. + cleanDatabase("ha_hearing"); stubOrganisationalUnit(fromString(courtCentreId), "OUCODE"); createHearingEvent(randomUUID(), courtRoom2Id, randomUUID().toString(), OPEN_CASE_PROSECUTION_EVENT_DEFINITION_ID, eventTime, of(hearingTypeId), courtCentreId); diff --git a/hearing-integration-test/src/test/java/uk/gov/moj/cpp/hearing/it/Queries.java b/hearing-integration-test/src/test/java/uk/gov/moj/cpp/hearing/it/Queries.java index fad1c95788..4e4f664d29 100644 --- a/hearing-integration-test/src/test/java/uk/gov/moj/cpp/hearing/it/Queries.java +++ b/hearing-integration-test/src/test/java/uk/gov/moj/cpp/hearing/it/Queries.java @@ -68,6 +68,14 @@ public static void getHearingPollForMatch(final UUID hearingId, final long timeo pollQueryEndpoint(jsonPayloadMatchesBean(HearingDetailsResponse.class, resultMatcher), timeout, requestParams); } + public static void getHearingForManageHearingPollForMatch(final UUID hearingId, final long timeout, final BeanMatcher resultMatcher) { + final RequestParams requestParams = requestParams(getURL("hearing.get.hearing-for-manage-hearing", hearingId), "application/vnd.hearing.get.hearing-for-manage-hearing+json") + .withHeader(HeaderConstants.USER_ID, getLoggedInUser()) + .build(); + + pollQueryEndpoint(jsonPayloadMatchesBean(HearingDetailsResponse.class, resultMatcher), timeout, requestParams); + } + public static void getHearingsByDatePollForMatch(final UUID courtCentreId, final UUID roomId, final String date, final String startTime, final String endTime, final BeanMatcher resultMatcher) { final RequestParams requestParams = requestParams(getURL("hearing.get.hearings", date, startTime, endTime, courtCentreId, roomId), "application/vnd.hearing.get.hearings+json") diff --git a/hearing-integration-test/src/test/java/uk/gov/moj/cpp/hearing/steps/CourtListRestrictionSteps.java b/hearing-integration-test/src/test/java/uk/gov/moj/cpp/hearing/steps/CourtListRestrictionSteps.java index 65423c2edd..cf1ddea89d 100644 --- a/hearing-integration-test/src/test/java/uk/gov/moj/cpp/hearing/steps/CourtListRestrictionSteps.java +++ b/hearing-integration-test/src/test/java/uk/gov/moj/cpp/hearing/steps/CourtListRestrictionSteps.java @@ -3,11 +3,22 @@ import static com.google.common.collect.Lists.newArrayList; import static com.jayway.jsonpath.matchers.JsonPathMatchers.isJson; import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; +import static java.text.MessageFormat.format; import static java.util.UUID.fromString; import static java.util.UUID.randomUUID; +import static java.util.concurrent.TimeUnit.SECONDS; +import static javax.ws.rs.core.Response.Status.OK; import static org.hamcrest.Matchers.allOf; import static org.hamcrest.Matchers.hasSize; import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.notNullValue; +import static uk.gov.justice.services.common.http.HeaderConstants.USER_ID; +import static uk.gov.justice.services.test.utils.core.http.BaseUriProvider.getBaseUri; +import static uk.gov.justice.services.test.utils.core.http.RequestParamsBuilder.requestParams; +import static uk.gov.justice.services.test.utils.core.http.RestPoller.poll; +import static uk.gov.justice.services.test.utils.core.matchers.ResponsePayloadMatcher.payload; +import static uk.gov.justice.services.test.utils.core.matchers.ResponseStatusMatcher.status; +import static uk.gov.moj.cpp.hearing.utils.WireMockStubUtils.setupAsAuthorizedAndSystemUser; import static uk.gov.justice.hearing.courts.CourtListRestricted.courtListRestricted; import static uk.gov.justice.services.test.utils.core.messaging.MetadataBuilderFactory.metadataWithRandomUUID; import static uk.gov.moj.cpp.hearing.it.UseCases.asDefault; @@ -32,6 +43,10 @@ import uk.gov.moj.cpp.hearing.test.CommandHelpers; import java.security.NoSuchAlgorithmException; +import java.sql.Connection; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Statement; import java.time.LocalDate; import java.time.ZonedDateTime; import java.util.Optional; @@ -42,8 +57,11 @@ import io.restassured.path.json.JsonPath; import com.fasterxml.jackson.databind.ObjectMapper; +import org.awaitility.Awaitility; import org.hamcrest.Matcher; import org.junit.jupiter.api.BeforeEach; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class CourtListRestrictionSteps extends AbstractIT { @@ -87,6 +105,103 @@ public JsonPath hearingEventsCourtListRestrictedReceived(final Matcher matche } } + /** + * Polls the publish-side query {@code hearing.latest-hearings-by-court-centres} until the + * restriction projection has reached the expected state. The publish flow internally consumes + * the same query — once it reflects the toggle, the next {@code publish-court-list} command is + * guaranteed to see the same state. + *

+ * Required because {@link #hearingEventsCourtListRestrictedReceived(Matcher)} only confirms the + * hearing event was emitted; the listener that projects it into the JPA entity runs in a + * separate transaction and may lag behind the publish command if not waited for. + *

+ * A hearing-visibility precondition ({@code courtRoomId notNullValue}) is prepended to the + * caller's matcher to prevent the poll from short-circuiting on the empty/not-yet-projected + * state — without this, lenient matchers such as {@code hasNoJsonPath(...)} or + * {@code withJsonPath(..., hasSize(0))} would match an empty {@code {}} response and return + * before the restriction event has actually been processed. + */ + public void waitForRestrictionProjection(final String courtCentreId, + final LocalDate hearingDate, + final Matcher expectedPayload) { + setupAsAuthorizedAndSystemUser(USER_ID_VALUE_AS_ADMIN); + final String queryPart = format(ENDPOINT_PROPERTIES.getProperty("hearing.latest-hearings-by-court-centres"), courtCentreId, hearingDate); + final String searchCourtListUrl = String.format("%s/%s", getBaseUri(), queryPart); + + poll(requestParams(searchCourtListUrl, "application/vnd.hearing.latest-hearings-by-court-centres+json") + .withHeader(USER_ID, getLoggedInSystemUserHeader())) + .timeout(60, SECONDS) + .pollInterval(1, SECONDS) + .until(status().is(OK), payload().isJson(allOf( + withJsonPath("$.court.courtSites[0].courtRooms[0].courtRoomId", notNullValue()), + expectedPayload))); + } + + /** + * Polls the view-store DB directly until the just-created hearing has BOTH + * {@code ha_hearing} AND {@code ha_hearing_day} rows for the given courtCentreId/date. + * MUST be called after {@code createHearingEvent*} and BEFORE any {@code hide*FromXhibit} + * call or any {@code sendPublishCourtListCommand}. + * + *

Two races this closes

+ * + *

1. The listener silent-drop race. + * Without this wait, the {@code public.listing.court-list-restricted} → ... → + * {@code hearing.event.court-list-restricted} chain can reach + * {@link uk.gov.moj.cpp.hearing.event.listener.CourtListRestrictionEventListener} before the + * hearing-creation projection has committed to {@code ha_hearing}. The listener does + * {@code hearingRepository.findOptionalBy(hearingId)} and, if the row is missing, silently + * returns — the message is consumed and never replayed, the restriction is lost, the + * subsequent publish reads the un-restricted hearing, and the assertion on the redacted XML + * fails. + * + *

2. The pub-display empty-XML race. + * Even when {@code ha_hearing} is populated, the publish's pub-display query + * ({@code findHearingsByDateAndCourtCentreList}) INNER-JOINs {@code ha_hearing.hearingDays} + * filtered by date. If {@code ha_hearing_day} hasn't been projected yet when the publish + * runs, the pub-display query returns thin/empty data and the publish writes an XML with + * empty fields (empty courtname, cppurn, defendant fields, no {@code currentstatus} block). + * The web-page publish (which goes via {@code ha_hearing_event}) is unaffected and writes + * correct XML, so the test sees a mismatch where the same publish call produces correct + * web-page XML but stub pub-display XML. + * + *

Polling JDBC directly is more robust than polling either REST endpoint because both + * publish-side queries are gated on the same two tables; once both are populated, both + * publishes will see fresh data. + */ + public void waitForHearingVisible(final String courtCentreId, final LocalDate hearingDate) { + Awaitility.await() + .atMost(60, SECONDS) + .pollInterval(500, java.util.concurrent.TimeUnit.MILLISECONDS) + .until(() -> hearingProjectedFor(courtCentreId, hearingDate)); + } + + private boolean hearingProjectedFor(final String courtCentreId, final LocalDate hearingDate) { + // Both publish paths need all three tables. Web-page goes via ha_hearing_event; + // pub-display additionally INNER-JOINs ha_hearing_day. + final String sql = String.format( + "SELECT count(1) FROM ha_hearing h " + + "INNER JOIN ha_hearing_day day ON day.hearing_id = h.id " + + "INNER JOIN ha_hearing_event ev ON ev.hearing_id = h.id " + + "WHERE h.court_centre_id = '%s' " + + "AND day.date = '%s' " + + "AND ev.event_date = '%s' " + + "AND ev.deleted = false", + courtCentreId, hearingDate, hearingDate); + try (final Connection connection = testJdbcConnectionProvider.getViewStoreConnection("hearing"); + final Statement statement = connection.createStatement(); + final ResultSet resultSet = statement.executeQuery(sql)) { + if (resultSet.next()) { + return resultSet.getInt(1) > 0; + } + } catch (final SQLException e) { + HEARING_VISIBILITY_LOGGER.warn("Failed to query view store for visibility check: {}", e.getMessage()); + } + return false; + } + + private static final Logger HEARING_VISIBILITY_LOGGER = LoggerFactory.getLogger(CourtListRestrictionSteps.class); + private void sendListingPublicEvent(final JsonObject restrictCourtListDataObject) { sendMessage( getPublicTopicInstance().createProducer(), @@ -99,11 +214,12 @@ public CommandHelpers.InitiateHearingCommandHelper createHearingEvent(final UUID final UUID eventDefinitionId, final ZonedDateTime eventTime, final Optional hearingTypeId, String courtCenter, LocalDate localDate) throws NoSuchAlgorithmException { final CommandHelpers.InitiateHearingCommandHelper hearing = h(UseCases.initiateHearingWithNsp(getRequestSpec(), initiateHearingTemplateWithParamNoReportingRestriction(fromString(courtCenter), fromString(courtRoomId), "CourtRoom 1", localDate, fromString(defenceCounselId), caseId, hearingTypeId))); logEvent(hearingEventId, getRequestSpec(), asDefault(), hearing.it(), eventDefinitionId, false, fromString(defenceCounselId), eventTime, null); + waitForHearingVisible(courtCenter, eventTime.toLocalDate()); return hearing; } public CommandHelpers.InitiateHearingCommandHelper createHearingEventWithYoungDefendant(final UUID caseId, final UUID hearingEventId, final String courtRoomId, final String defenceCounselId, - final UUID eventDefinitionId, final ZonedDateTime eventTime, final Optional hearingTypeId, final String courtCenter, final LocalDate localDate) throws NoSuchAlgorithmException { + final UUID eventDefinitionId, final ZonedDateTime eventTime, final Optional hearingTypeId, final String courtCenter, final LocalDate localDate) throws NoSuchAlgorithmException { try (final Utilities.EventListener eventListener = listenFor(HEARING_EVENTS_COURT_LIST_RESTRICTED, HEARING_EVENT) .withFilter(isJson(allOf( withJsonPath("$.defendantIds", hasSize(1)), @@ -112,6 +228,7 @@ public CommandHelpers.InitiateHearingCommandHelper createHearingEventWithYoungDe initiateHearingTemplateWithParamNoReportingRestrictionYoungDefendant(fromString(courtCenter), fromString(courtRoomId), "CourtRoom 1", localDate, fromString(defenceCounselId), caseId, hearingTypeId))); logEvent(hearingEventId, getRequestSpec(), asDefault(), hearing.it(), eventDefinitionId, false, fromString(defenceCounselId), eventTime, null); eventListener.waitFor(); + waitForHearingVisible(courtCenter, eventTime.toLocalDate()); return hearing; } } @@ -121,6 +238,7 @@ public CommandHelpers.InitiateHearingCommandHelper createHearingEventForApplicat final CommandHelpers.InitiateHearingCommandHelper hearing = h(initiateHearingForApplication(getRequestSpec(), initiateHearingTemplateForApplicationNoReportingRestriction(fromString(courtCenter), fromString(courtRoomId), "CourtRoom 1", localDate, fromString(defenceCounselId), caseId, hearingTypeId))); givenAUserHasLoggedInAsACourtClerk(randomUUID()); logEvent(hearingEventId, getRequestSpec(), asDefault(), hearing.it(), eventDefinitionId, false, fromString(defenceCounselId), eventTime, null); + waitForHearingVisible(courtCenter, eventTime.toLocalDate()); return hearing; } diff --git a/hearing-integration-test/src/test/java/uk/gov/moj/cpp/hearing/utils/WebDavStub.java b/hearing-integration-test/src/test/java/uk/gov/moj/cpp/hearing/utils/WebDavStub.java index 7c30374ed5..8411194ead 100644 --- a/hearing-integration-test/src/test/java/uk/gov/moj/cpp/hearing/utils/WebDavStub.java +++ b/hearing-integration-test/src/test/java/uk/gov/moj/cpp/hearing/utils/WebDavStub.java @@ -7,11 +7,13 @@ import static com.github.tomakehurst.wiremock.client.WireMock.stubFor; import static com.github.tomakehurst.wiremock.client.WireMock.urlPathMatching; import static javax.ws.rs.core.Response.Status.OK; +import static org.awaitility.Durations.ONE_MINUTE; import java.util.List; import java.util.UUID; import com.github.tomakehurst.wiremock.verification.LoggedRequest; +import org.awaitility.Awaitility; public class WebDavStub { @@ -35,4 +37,22 @@ public static String getFileForPath(final String filePath) { return loggedRequest.getBodyAsString(); } + + public static int countFilesAt(final String filePath) { + return findAll(putRequestedFor(urlPathMatching(filePath))).size(); + } + + public static int countSentXmlForPubDisplay() { + return countFilesAt(XHIBIT_GATEWAY_SEND_PUB_DISP_TO_XHIBIT_FILE_PATH_REG_EX); + } + + public static void awaitNewFile(final String filePath, final int previousCount) { + Awaitility.await() + .atMost(ONE_MINUTE) + .until(() -> countFilesAt(filePath) > previousCount); + } + + public static void awaitNewSentXmlForPubDisplay(final int previousCount) { + awaitNewFile(XHIBIT_GATEWAY_SEND_PUB_DISP_TO_XHIBIT_FILE_PATH_REG_EX, previousCount); + } } diff --git a/hearing-integration-test/src/test/resources/endpoint.properties b/hearing-integration-test/src/test/resources/endpoint.properties index eb624b352c..410331f61f 100644 --- a/hearing-integration-test/src/test/resources/endpoint.properties +++ b/hearing-integration-test/src/test/resources/endpoint.properties @@ -3,6 +3,7 @@ hearing.initiate=hearing-service/command/api/rest/hearing/hearings hearing.update-related-hearing=hearing-service/command/api/rest/hearing/hearings/{0} hearing.update-hearing=hearing-service/command/api/rest/hearing/hearings/{0} hearing.get.hearing=/hearing-service/query/api/rest/hearing/hearings/{0} +hearing.get.hearing-for-manage-hearing=/hearing-service/query/api/rest/hearing/hearings/{0} hearing.get.hearings=/hearing-service/query/api/rest/hearing/hearings?date={0}&startTime={1}&endTime={2}&courtCentreId={3}&roomId={4} hearing.get.hearings-for-today=/hearing-service/query/api/rest/hearing/hearings-for-today hearing.get-draft-result=hearing-service/query/api/rest/hearing/hearings/{0}/draft-result diff --git a/hearing-json/pom.xml b/hearing-json/pom.xml index 1feabf0587..a7b2b9b3b8 100644 --- a/hearing-json/pom.xml +++ b/hearing-json/pom.xml @@ -3,7 +3,7 @@ hearing-parent uk.gov.moj.cpp.hearing - 17.104.158-SNAPSHOT + 17.104.158-CCSPH2-SNAPSHOT 4.0.0 diff --git a/hearing-query/hearing-query-api/pom.xml b/hearing-query/hearing-query-api/pom.xml index 5dcaac0dc2..83a856feed 100644 --- a/hearing-query/hearing-query-api/pom.xml +++ b/hearing-query/hearing-query-api/pom.xml @@ -3,7 +3,7 @@ uk.gov.moj.cpp.hearing hearing-query - 17.104.158-SNAPSHOT + 17.104.158-CCSPH2-SNAPSHOT hearing-query-api war diff --git a/hearing-query/hearing-query-api/src/main/java/uk/gov/moj/cpp/hearing/query/api/HearingQueryApi.java b/hearing-query/hearing-query-api/src/main/java/uk/gov/moj/cpp/hearing/query/api/HearingQueryApi.java index a4d5db4690..bb5ee59152 100644 --- a/hearing-query/hearing-query-api/src/main/java/uk/gov/moj/cpp/hearing/query/api/HearingQueryApi.java +++ b/hearing-query/hearing-query-api/src/main/java/uk/gov/moj/cpp/hearing/query/api/HearingQueryApi.java @@ -12,6 +12,7 @@ import uk.gov.justice.core.courts.CrackedIneffectiveTrial; import uk.gov.justice.hearing.courts.GetHearings; import uk.gov.justice.services.common.converter.JsonObjectToObjectConverter; +import uk.gov.justice.services.common.converter.ObjectToJsonObjectConverter; import uk.gov.justice.services.core.annotation.Component; import uk.gov.justice.services.core.annotation.Handles; import uk.gov.justice.services.core.annotation.ServiceComponent; @@ -136,6 +137,8 @@ public class HearingQueryApi { @Inject private HearingService hearingService; + @Inject + private ObjectToJsonObjectConverter objectToJsonObjectConverter; @Handles("hearing.get.hearings") public JsonEnvelope findHearings(final JsonEnvelope query) { @@ -184,6 +187,16 @@ public JsonEnvelope findHearing(final JsonEnvelope query) { return getJsonEnvelope(envelope); } + @Handles("hearing.get.hearing-for-manage-hearing") + public JsonEnvelope findHearingForManageHearing(final JsonEnvelope query) { + final JsonEnvelope jsonEnvelope = findHearing(query); + + final HearingDetailsResponse hearingDetailsResponse = jsonObjectToObjectConverter.convert(jsonEnvelope.payloadAsJsonObject(), HearingDetailsResponse.class); + + return envelopeFrom(metadataFrom(jsonEnvelope.metadata()),objectToJsonObjectConverter.convert(hearingService.filterOutProsecutionCases(hearingDetailsResponse))); + } + + @Handles("hearing.get-hearing-event-definitions") public JsonEnvelope getHearingEventDefinitionsVersionTwo(final JsonEnvelope query) { final Envelope envelope = this.hearingEventQueryView.getHearingEventDefinitions(query); diff --git a/hearing-query/hearing-query-api/src/main/resources/uk/gov/moj/cpp/hearing/query/api/accesscontrol/hearing-query-api.drl b/hearing-query/hearing-query-api/src/main/resources/uk/gov/moj/cpp/hearing/query/api/accesscontrol/hearing-query-api.drl index 7c6888da25..a16f6df75f 100644 --- a/hearing-query/hearing-query-api/src/main/resources/uk/gov/moj/cpp/hearing/query/api/accesscontrol/hearing-query-api.drl +++ b/hearing-query/hearing-query-api/src/main/resources/uk/gov/moj/cpp/hearing/query/api/accesscontrol/hearing-query-api.drl @@ -42,6 +42,15 @@ rule "Query - API - hearing.get.hearing" $outcome.setSuccess(true); end +rule "Query - API - hearing.get.hearing-for-manage-hearing" + when + $outcome: Outcome(); + $action: Action(name == "hearing.get.hearing-for-manage-hearing"); + eval(userAndGroupProvider.isMemberOfAnyOfTheSuppliedGroups($action, "Listing Officers", "Court Clerks", "Legal Advisers", "System Users", "Judiciary", "Court Associate", "Deputies", "DJMC", "Judge", "Recorders", "Court Administrators")); + then + $outcome.setSuccess(true); +end + rule "Query - API - hearing.get-hearing-event-definitions" when $outcome: Outcome(); diff --git a/hearing-query/hearing-query-api/src/raml/hearing-query-api.raml b/hearing-query/hearing-query-api/src/raml/hearing-query-api.raml index 7f0bcd40fa..5088a6237a 100644 --- a/hearing-query/hearing-query-api/src/raml/hearing-query-api.raml +++ b/hearing-query/hearing-query-api/src/raml/hearing-query-api.raml @@ -191,6 +191,9 @@ protocols: [ HTTP, HTTPS ] (mapping): responseType: application/vnd.hearing.get.hearing+json name: hearing.get.hearing + (mapping): + responseType: application/vnd.hearing.get.hearing-for-manage-hearing+json + name: hearing.get.hearing-for-manage-hearing ... responses: 200: @@ -199,6 +202,9 @@ protocols: [ HTTP, HTTPS ] application/vnd.hearing.get.hearing+json: example: !include json/hearing.get.hearing.json schema: !include json/schema/hearing.get.hearing.json + application/vnd.hearing.get.hearing-for-manage-hearing+json: + example: !include json/hearing.get.hearing.json + schema: !include json/schema/hearing.get.hearing.json /hearings: get: diff --git a/hearing-query/hearing-query-api/src/test/java/uk/gov/moj/cpp/hearing/query/api/FindHearingQueryApiTest.java b/hearing-query/hearing-query-api/src/test/java/uk/gov/moj/cpp/hearing/query/api/FindHearingQueryApiTest.java index ef3ef09e8a..1a6e781a98 100644 --- a/hearing-query/hearing-query-api/src/test/java/uk/gov/moj/cpp/hearing/query/api/FindHearingQueryApiTest.java +++ b/hearing-query/hearing-query-api/src/test/java/uk/gov/moj/cpp/hearing/query/api/FindHearingQueryApiTest.java @@ -7,6 +7,7 @@ import static org.mockito.Mockito.when; import static uk.gov.justice.services.test.utils.core.enveloper.EnveloperFactory.createEnveloper; +import uk.gov.justice.services.common.converter.JsonObjectToObjectConverter; import uk.gov.justice.services.core.dispatcher.EnvelopePayloadTypeConverter; import uk.gov.justice.services.core.dispatcher.JsonEnvelopeRepacker; import uk.gov.justice.services.core.enveloper.Enveloper; @@ -85,6 +86,9 @@ public class FindHearingQueryApiTest { @Mock private EnvelopePayloadTypeConverter envelopePayloadTypeConverter; + @Mock + private JsonObjectToObjectConverter jsonObjectToObjectConverter; + @Spy private Enveloper enveloper = createEnveloper(); @@ -166,8 +170,16 @@ public void should_return_hearing_for_recorder() { } + @Test + public void should_throw_bad_request_when_user_id_is_missing_ForManageHearing() { + when(jsonInputEnvelope.metadata()).thenReturn(metadata); + when(metadata.userId()).thenReturn(Optional.empty()); + + assertThrows(BadRequestException.class, () -> hearingQueryApi.findHearingForManageHearing(jsonInputEnvelope)); + } + private CrackedIneffectiveVacatedTrialTypes getCrackedIneffectiveVacatedTrialTypes() { - final CrackedIneffectiveVacatedTrialType crackedIneffectiveVacatedTrialType = new CrackedIneffectiveVacatedTrialType(randomUUID(), "", "", "","", LocalDate.now()); + final CrackedIneffectiveVacatedTrialType crackedIneffectiveVacatedTrialType = new CrackedIneffectiveVacatedTrialType(randomUUID(), "", "", "", "", LocalDate.now()); final List crackedIneffectiveVacatedTrialTypes = new ArrayList(); crackedIneffectiveVacatedTrialTypes.add(crackedIneffectiveVacatedTrialType); diff --git a/hearing-query/hearing-query-api/src/test/java/uk/gov/moj/cpp/hearing/query/api/HearingQueryApiTest.java b/hearing-query/hearing-query-api/src/test/java/uk/gov/moj/cpp/hearing/query/api/HearingQueryApiTest.java index 35f63d2620..699faebfca 100644 --- a/hearing-query/hearing-query-api/src/test/java/uk/gov/moj/cpp/hearing/query/api/HearingQueryApiTest.java +++ b/hearing-query/hearing-query-api/src/test/java/uk/gov/moj/cpp/hearing/query/api/HearingQueryApiTest.java @@ -9,8 +9,12 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsInAnyOrder; import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.notNullValue; import static org.mockito.Answers.RETURNS_DEEP_STUBS; import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyBoolean; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -18,6 +22,8 @@ import uk.gov.justice.core.courts.CrackedIneffectiveTrial; import uk.gov.justice.hearing.courts.GetHearings; +import uk.gov.justice.services.common.converter.JsonObjectToObjectConverter; +import uk.gov.justice.services.common.converter.ObjectToJsonObjectConverter; import uk.gov.justice.services.core.annotation.Handles; import uk.gov.justice.services.core.dispatcher.EnvelopePayloadTypeConverter; import uk.gov.justice.services.core.dispatcher.JsonEnvelopeRepacker; @@ -29,6 +35,12 @@ import uk.gov.moj.cpp.external.domain.progression.prosecutioncases.ProsecutionCase; import uk.gov.moj.cpp.hearing.event.nowsdomain.referencedata.nows.CrackedIneffectiveVacatedTrialTypes; import uk.gov.moj.cpp.hearing.event.nowsdomain.referencedata.resultdefinition.Prompt; +import uk.gov.moj.cpp.hearing.query.api.service.accessfilter.AccessibleApplications; +import uk.gov.moj.cpp.hearing.query.api.service.accessfilter.AccessibleCases; +import uk.gov.moj.cpp.hearing.query.api.service.accessfilter.DDJChecker; +import uk.gov.moj.cpp.hearing.query.api.service.accessfilter.RecorderChecker; +import uk.gov.moj.cpp.hearing.query.api.service.accessfilter.UsersAndGroupsService; +import uk.gov.moj.cpp.hearing.query.api.service.accessfilter.vo.Permissions; import uk.gov.moj.cpp.hearing.query.api.service.progression.ProgressionService; import uk.gov.moj.cpp.hearing.query.api.service.referencedata.PIEventMapperCache; import uk.gov.moj.cpp.hearing.query.api.service.referencedata.ReferenceDataService; @@ -41,9 +53,11 @@ import uk.gov.moj.cpp.hearing.query.view.response.Timeline; import uk.gov.moj.cpp.hearing.query.view.response.TimelineHearingSummary; import uk.gov.moj.cpp.hearing.query.view.response.hearingresponse.GetShareResultsV2Response; +import uk.gov.moj.cpp.hearing.query.view.response.hearingresponse.HearingDetailsResponse; import uk.gov.moj.cpp.hearing.query.view.response.hearingresponse.NowListResponse; import uk.gov.moj.cpp.hearing.query.view.response.hearingresponse.ProsecutionCaseResponse; import uk.gov.moj.cpp.hearing.query.view.response.hearingresponse.TargetListResponse; +import uk.gov.moj.cpp.hearing.query.view.service.HearingService; import java.io.File; import java.lang.reflect.Method; @@ -52,6 +66,7 @@ import java.util.HashSet; import java.util.List; import java.util.Map; +import java.util.Optional; import java.util.Set; import java.util.UUID; import java.util.stream.Collectors; @@ -165,6 +180,36 @@ public class HearingQueryApiTest { @Mock private UserGroupQueryService userGroupQueryService; + @Mock + private UsersAndGroupsService usersAndGroupsService; + + @Mock + private DDJChecker ddjChecker; + + @Mock + private RecorderChecker recorderChecker; + + @Mock + private AccessibleCases accessibleCases; + + @Mock + private AccessibleApplications accessibleApplications; + + @Mock + private HearingService hearingService; + + @Mock + private JsonObjectToObjectConverter jsonObjectToObjectConverter; + + @Mock + private ObjectToJsonObjectConverter objectToJsonObjectConverter; + + @Mock + private Permissions mockPermissions; + + @Mock + private Envelope mockHearingDetailsResponseEnvelope; + private Map apiMethodsToHandlerNames; @BeforeEach @@ -440,6 +485,41 @@ public void shouldNotProcessGetHearingEventLogCountForNonHMCTSUser() { verify(hearingEventQueryView, times(0)).getHearingEventLogCount(any(JsonEnvelope.class)); } + @Test + public void shouldFindHearingForManageHearing() { + final UUID userId = randomUUID(); + final UUID hearingId = randomUUID(); + + final JsonEnvelope query = mock(JsonEnvelope.class, RETURNS_DEEP_STUBS); + when(query.metadata().userId()).thenReturn(Optional.of(userId.toString())); + when(query.payloadAsJsonObject()).thenReturn(createObjectBuilder().add("hearingId", hearingId.toString()).build()); + + when(referenceDataService.listAllCrackedIneffectiveVacatedTrialTypes()).thenReturn(crackedIneffectiveVacatedTrialTypes); + when(usersAndGroupsService.permissions(userId.toString())).thenReturn(mockPermissions); + when(ddjChecker.isDDJ(mockPermissions)).thenReturn(false); + when(recorderChecker.isRecorder(mockPermissions)).thenReturn(false); + when(hearingQueryView.findHearing(any(), any(), any(), anyBoolean())).thenReturn(mockHearingDetailsResponseEnvelope); + when(mockEnvelopePayloadTypeConverter.convert(any(), any(Class.class))).thenReturn(mockJsonValueEnvelope); + + final JsonEnvelope repackedEnvelope = EnvelopeFactory.createEnvelope("hearing.get.hearing", createObjectBuilder().add("hearingId", hearingId.toString()).build()); + when(mockJsonEnvelopeRepacker.repack(mockJsonValueEnvelope)).thenReturn(repackedEnvelope); + + final HearingDetailsResponse hearingDetailsResponse = mock(HearingDetailsResponse.class); + final HearingDetailsResponse filteredResponse = mock(HearingDetailsResponse.class); + final javax.json.JsonObject filteredJsonObject = createObjectBuilder().add("hearingId", hearingId.toString()).build(); + + when(jsonObjectToObjectConverter.convert(any(javax.json.JsonObject.class), eq(HearingDetailsResponse.class))).thenReturn(hearingDetailsResponse); + when(hearingService.filterOutProsecutionCases(hearingDetailsResponse)).thenReturn(filteredResponse); + when(objectToJsonObjectConverter.convert(filteredResponse)).thenReturn(filteredJsonObject); + + final JsonEnvelope result = hearingQueryApi.findHearingForManageHearing(query); + + verify(hearingService).validateUserPermissionForApplicationType(query); + verify(hearingService).filterOutProsecutionCases(hearingDetailsResponse); + verify(objectToJsonObjectConverter).convert(filteredResponse); + assertThat(result, is(notNullValue())); + } + private Set buildPIEventCache() { final UUID cpHearingEventId_1 = randomUUID(); final UUID cpHearingEventId_2 = UUID.fromString("abdaeb88-8952-4c07-99c4-d27c39d4e63a"); diff --git a/hearing-query/hearing-query-view/pom.xml b/hearing-query/hearing-query-view/pom.xml index 0251488a09..08f486c18b 100644 --- a/hearing-query/hearing-query-view/pom.xml +++ b/hearing-query/hearing-query-view/pom.xml @@ -3,7 +3,7 @@ uk.gov.moj.cpp.hearing hearing-query - 17.104.158-SNAPSHOT + 17.104.158-CCSPH2-SNAPSHOT hearing-query-view jar diff --git a/hearing-query/hearing-query-view/src/main/java/uk/gov/moj/cpp/hearing/query/view/HearingEventQueryView.java b/hearing-query/hearing-query-view/src/main/java/uk/gov/moj/cpp/hearing/query/view/HearingEventQueryView.java index 01001161e0..67db383ab8 100644 --- a/hearing-query/hearing-query-view/src/main/java/uk/gov/moj/cpp/hearing/query/view/HearingEventQueryView.java +++ b/hearing-query/hearing-query-view/src/main/java/uk/gov/moj/cpp/hearing/query/view/HearingEventQueryView.java @@ -26,6 +26,7 @@ import uk.gov.moj.cpp.hearing.mapping.CourtApplicationsSerializer; import uk.gov.moj.cpp.hearing.persist.entity.ha.CourtCentre; import uk.gov.moj.cpp.hearing.persist.entity.ha.Hearing; +import uk.gov.moj.cpp.hearing.persist.entity.ha.HearingDay; import uk.gov.moj.cpp.hearing.persist.entity.ha.HearingDefenceCounsel; import uk.gov.moj.cpp.hearing.persist.entity.ha.HearingEvent; import uk.gov.moj.cpp.hearing.persist.entity.ha.HearingProsecutionCounsel; @@ -555,13 +556,14 @@ private List getActiveHearingsForCourtRoom(final UUID hearingId, final Loc return Collections.emptyList(); } - final CourtCentre courtCentre = optionalCourtCentre.get(); + final CourtCentre topLevel = optionalCourtCentre.get(); + final Optional matchedDay = hearingService.getHearingDayByHearingIdAndDate(hearingId, date); + + final UUID centreId = matchedDay.map(HearingDay::getCourtCentreId).filter(java.util.Objects::nonNull).orElse(topLevel.getId()); + final UUID roomId = matchedDay.map(HearingDay::getCourtRoomId).filter(java.util.Objects::nonNull).orElse(topLevel.getRoomId()); + final List hearingEvents = - hearingService - .getHearingEvents( - courtCentre.getId(), - courtCentre.getRoomId(), - date); + hearingService.getHearingEvents(centreId, roomId, date); return getActiveHearingIdsByHearingEvents(hearingEvents); } diff --git a/hearing-query/hearing-query-view/src/main/java/uk/gov/moj/cpp/hearing/query/view/service/HearingListXhibitResponseTransformer.java b/hearing-query/hearing-query-view/src/main/java/uk/gov/moj/cpp/hearing/query/view/service/HearingListXhibitResponseTransformer.java index 11a1aab736..20129223ee 100644 --- a/hearing-query/hearing-query-view/src/main/java/uk/gov/moj/cpp/hearing/query/view/service/HearingListXhibitResponseTransformer.java +++ b/hearing-query/hearing-query-view/src/main/java/uk/gov/moj/cpp/hearing/query/view/service/HearingListXhibitResponseTransformer.java @@ -41,6 +41,7 @@ import uk.gov.moj.cpp.listing.domain.referencedata.CourtRoomMapping; import java.math.BigInteger; +import java.time.LocalDate; import java.time.format.DateTimeFormatter; import java.util.ArrayList; import java.util.Collection; @@ -74,30 +75,35 @@ public class HearingListXhibitResponseTransformer { private static final DateTimeFormatter dateTimeFormatter = ofPattern("yyyy-MM-dd'T'HH:mm'Z'"); public CurrentCourtStatus transformFrom(final HearingEventsToHearingMapper hearingEventsToHearingMapper) { + return transformFrom(hearingEventsToHearingMapper, null); + } + + public CurrentCourtStatus transformFrom(final HearingEventsToHearingMapper hearingEventsToHearingMapper, final LocalDate publishDate) { return currentCourtStatus() - .withCourt(getCourt(hearingEventsToHearingMapper)) + .withCourt(getCourt(hearingEventsToHearingMapper, publishDate)) .build(); } - private Court getCourt(final HearingEventsToHearingMapper hearingEventsToHearingMapper) { + private Court getCourt(final HearingEventsToHearingMapper hearingEventsToHearingMapper, final LocalDate publishDate) { final Map courtSiteMap = new HashMap<>(); return court() //Logically all hearings will belong to single court centre, therefore we pick up the first one .withCourtName(hearingEventsToHearingMapper.getHearingList().get(0).getCourtCentre().getName()) - .withCourtSites(getCourtSites(hearingEventsToHearingMapper, courtSiteMap)) + .withCourtSites(getCourtSites(hearingEventsToHearingMapper, courtSiteMap, publishDate)) .build(); } - private List getCourtSites(final HearingEventsToHearingMapper hearingEventsToHearingMapper, final Map courtSiteMap) { + private List getCourtSites(final HearingEventsToHearingMapper hearingEventsToHearingMapper, final Map courtSiteMap, final LocalDate publishDate) { return hearingEventsToHearingMapper.getHearingList() .stream() - .map(hearing -> getCourtSite(hearingEventsToHearingMapper, hearing, courtSiteMap)) + .map(hearing -> getCourtSite(hearingEventsToHearingMapper, hearing, courtSiteMap, publishDate)) .distinct() .collect(toList()); } - private CourtSite getCourtSite(final HearingEventsToHearingMapper hearingEventsToHearingMapper, final Hearing hearing, final Map courtSiteMap) { - final CourtRoomMapping courtRoomMapping = commonXhibitReferenceDataService.getCourtRoomMappingBy(hearing.getCourtCentre().getId(), hearing.getCourtCentre().getRoomId()); + private CourtSite getCourtSite(final HearingEventsToHearingMapper hearingEventsToHearingMapper, final Hearing hearing, final Map courtSiteMap, final LocalDate publishDate) { + final ResolvedRoom resolved = resolveCentreAndRoom(hearing, publishDate); + final CourtRoomMapping courtRoomMapping = commonXhibitReferenceDataService.getCourtRoomMappingBy(resolved.centreId, resolved.roomId); CourtSite courtSite = courtSiteMap.get(courtRoomMapping.getCrestCourtSiteUUID()); if (courtSite == null) { courtSite = courtSite() @@ -106,31 +112,34 @@ private CourtSite getCourtSite(final HearingEventsToHearingMapper hearingEventsT .withCourtRooms(new ArrayList<>()) .build(); } - courtSite.getCourtRooms().addAll(getCourtRoomsForCourtSite(hearingEventsToHearingMapper, courtRoomMapping.getCrestCourtSiteUUID())); + courtSite.getCourtRooms().addAll(getCourtRoomsForCourtSite(hearingEventsToHearingMapper, courtRoomMapping.getCrestCourtSiteUUID(), publishDate)); return courtSite; } - private List getCourtRoomsForCourtSite(final HearingEventsToHearingMapper hearingEventsToHearingMapper, final UUID crestCourtSiteId) { + private List getCourtRoomsForCourtSite(final HearingEventsToHearingMapper hearingEventsToHearingMapper, final UUID crestCourtSiteId, final LocalDate publishDate) { final Map courtRoomMap = new HashMap<>(); return hearingEventsToHearingMapper.getHearingList() .stream() - .filter(hearing -> isHearingForCourtSite(crestCourtSiteId, hearing)) - .map(hearing -> getCourtRoom(hearingEventsToHearingMapper, hearing, courtRoomMap)) + .filter(hearing -> isHearingForCourtSite(crestCourtSiteId, hearing, publishDate)) + .map(hearing -> getCourtRoom(hearingEventsToHearingMapper, hearing, courtRoomMap, publishDate)) .distinct() .collect(toList()); } - private boolean isHearingForCourtSite(final UUID crestCourtSiteId, final Hearing hearing) { - final CourtRoomMapping mapping = commonXhibitReferenceDataService.getCourtRoomMappingBy(hearing.getCourtCentre().getId(), hearing.getCourtCentre().getRoomId()); + private boolean isHearingForCourtSite(final UUID crestCourtSiteId, final Hearing hearing, final LocalDate publishDate) { + final ResolvedRoom resolved = resolveCentreAndRoom(hearing, publishDate); + final CourtRoomMapping mapping = commonXhibitReferenceDataService.getCourtRoomMappingBy(resolved.centreId, resolved.roomId); final UUID siteId = mapping.getCrestCourtSiteUUID(); return crestCourtSiteId != null && crestCourtSiteId.equals(siteId); } private CourtRoom getCourtRoom(final HearingEventsToHearingMapper hearingEventsToHearingMapper, final Hearing hearing, - final Map courtRoomMap) { - final UUID courtRoomKey = hearing.getCourtCentre().getRoomId(); - final CourtRoomMapping courtRoomMapping = commonXhibitReferenceDataService.getCourtRoomMappingBy(hearing.getCourtCentre().getId(), hearing.getCourtCentre().getRoomId()); + final Map courtRoomMap, + final LocalDate publishDate) { + final ResolvedRoom resolved = resolveCentreAndRoom(hearing, publishDate); + final UUID courtRoomKey = resolved.roomId; + final CourtRoomMapping courtRoomMapping = commonXhibitReferenceDataService.getCourtRoomMappingBy(resolved.centreId, resolved.roomId); CourtRoom courtRoom = courtRoomMap.get(courtRoomKey); final Set activeHearingIds = hearingEventsToHearingMapper.getActiveHearingIds(); @@ -364,4 +373,30 @@ private Set getReportingRestrictionLabel(final Offence offence, final Se ofNullable(reportingRestriction).ifPresent(restriction -> publicNoticesValue.add(restriction.getLabel()))); return publicNoticesValue; } + + private ResolvedRoom resolveCentreAndRoom(final Hearing hearing, final LocalDate publishDate) { + final UUID topCentreId = hearing.getCourtCentre().getId(); + final UUID topRoomId = hearing.getCourtCentre().getRoomId(); + if (publishDate == null || hearing.getHearingDays() == null) { + return new ResolvedRoom(topCentreId, topRoomId); + } + return hearing.getHearingDays().stream() + .filter(day -> nonNull(day.getSittingDay()) + && day.getSittingDay().toLocalDate().equals(publishDate)) + .findFirst() + .map(day -> new ResolvedRoom( + nonNull(day.getCourtCentreId()) ? day.getCourtCentreId() : topCentreId, + nonNull(day.getCourtRoomId()) ? day.getCourtRoomId() : topRoomId)) + .orElse(new ResolvedRoom(topCentreId, topRoomId)); + } + + private static final class ResolvedRoom { + private final UUID centreId; + private final UUID roomId; + + ResolvedRoom(final UUID centreId, final UUID roomId) { + this.centreId = centreId; + this.roomId = roomId; + } + } } diff --git a/hearing-query/hearing-query-view/src/main/java/uk/gov/moj/cpp/hearing/query/view/service/HearingService.java b/hearing-query/hearing-query-view/src/main/java/uk/gov/moj/cpp/hearing/query/view/service/HearingService.java index dcc68fc1fc..465a73674f 100644 --- a/hearing-query/hearing-query-view/src/main/java/uk/gov/moj/cpp/hearing/query/view/service/HearingService.java +++ b/hearing-query/hearing-query-view/src/main/java/uk/gov/moj/cpp/hearing/query/view/service/HearingService.java @@ -13,6 +13,7 @@ import static java.util.Optional.ofNullable; import static java.util.UUID.fromString; import static java.util.stream.Collectors.toList; +import static org.apache.commons.collections.CollectionUtils.isEmpty; import static org.apache.commons.collections.CollectionUtils.isNotEmpty; import static uk.gov.justice.core.courts.ApplicationStatus.EJECTED; import static uk.gov.justice.core.courts.JurisdictionType.CROWN; @@ -30,7 +31,6 @@ import uk.gov.justice.hearing.courts.HearingSummaries; import uk.gov.justice.services.common.converter.JsonObjectToObjectConverter; import uk.gov.justice.services.common.converter.ObjectToJsonObjectConverter; -import uk.gov.justice.services.common.converter.StringToJsonObjectConverter; import uk.gov.justice.services.common.exception.ForbiddenRequestException; import uk.gov.justice.services.common.util.UtcClock; import uk.gov.justice.services.core.annotation.ServiceComponent; @@ -48,7 +48,6 @@ import uk.gov.moj.cpp.hearing.event.nowsdomain.referencedata.nows.CrackedIneffectiveVacatedTrialType; import uk.gov.moj.cpp.hearing.event.nowsdomain.referencedata.nows.CrackedIneffectiveVacatedTrialTypes; import uk.gov.moj.cpp.hearing.mapping.CourtApplicationsSerializer; -import uk.gov.moj.cpp.hearing.mapping.DraftResultJPAMapper; import uk.gov.moj.cpp.hearing.mapping.HearingJPAMapper; import uk.gov.moj.cpp.hearing.mapping.ProsecutionCaseJPAMapper; import uk.gov.moj.cpp.hearing.mapping.ResultLineJPAMapper; @@ -133,7 +132,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -@SuppressWarnings("squid:S1612") +@SuppressWarnings({"squid:S1612", "squid:S1168"}) public class HearingService { private static final Logger LOGGER = LoggerFactory.getLogger(HearingService.class); @@ -141,9 +140,6 @@ public class HearingService { private static final ZoneId ZONE_ID = ZoneId.of(ZoneOffset.UTC.getId()); private static final UtcClock UTC_CLOCK = new UtcClock(); - static final String COURT_APPLICATIONS = "courtApplications"; - static final String ID = "id"; - static final String APPLICATION_STATUS = "applicationStatus"; @Inject private HearingRepository hearingRepository; @@ -162,8 +158,6 @@ public class HearingService { @Inject private ObjectToJsonObjectConverter objectToJsonObjectConverter; @Inject - private StringToJsonObjectConverter stringToJsonObjectConverter; - @Inject private HearingJPAMapper hearingJPAMapper; @Inject private ProsecutionCaseJPAMapper prosecutionCaseJPAMapper; @@ -172,8 +166,6 @@ public class HearingService { @Inject private ResultLineJPAMapper resultLineJPAMapper; @Inject - private DraftResultJPAMapper draftResultJPAMapper; - @Inject private GetHearingsTransformer getHearingTransformer; @Inject private TimelineHearingSummaryHelper timelineHearingSummaryHelper; @@ -233,7 +225,7 @@ public Optional getHearingsForWebPage(final List court if (!hearingList.isEmpty()) { final HearingEventsToHearingMapper hearingEventsToHearingMapper = new HearingEventsToHearingMapper(activeHearingEventList, hearingList, activeHearingEventList); - return Optional.of(hearingListXhibitResponseTransformer.transformFrom(hearingEventsToHearingMapper)); + return Optional.of(hearingListXhibitResponseTransformer.transformFrom(hearingEventsToHearingMapper, localDate)); } return empty(); } @@ -316,7 +308,7 @@ public Optional getHearingsByDate(final List courtCent final LocalDate localDate, final Set cppHearingEventIds) { LOGGER.info("courtCentreList: {}, localDate: {}, cppHearingEventIds: {}", courtCentreList, localDate, cppHearingEventIds); - if(courtCentreList.isEmpty()){ + if (courtCentreList.isEmpty()) { return empty(); } final List results = hearingEventRepository.findLatestHearingsForThatDayByCourts(courtCentreList, localDate, cppHearingEventIds); @@ -338,7 +330,7 @@ public Optional getHearingsByDate(final List courtCent if (!hearingList.isEmpty()) { final HearingEventsToHearingMapper hearingEventsToHearingMapper = new HearingEventsToHearingMapper(activeHearingEventList, hearingList, allHearingEvents); - final CurrentCourtStatus currentCourtStatus = hearingListXhibitResponseTransformer.transformFrom(hearingEventsToHearingMapper); + final CurrentCourtStatus currentCourtStatus = hearingListXhibitResponseTransformer.transformFrom(hearingEventsToHearingMapper, localDate); return Optional.of(currentCourtStatus); } return empty(); @@ -366,7 +358,7 @@ public GetHearings getHearings(final LocalDate date, final String startTime, source = filterHearingsBasedOnPermissions.filterHearings(source, accessibleCasesAndApplicationIds); } - if (CollectionUtils.isEmpty(source)) { + if (isEmpty(source)) { return new GetHearings(null); } @@ -406,7 +398,7 @@ public GetHearings getHearingsForToday(final LocalDate date, final UUID userId) } final List filteredHearings = getAndInitializeHearings(date, userId); filterForShadowListedOffencesAndCases(filteredHearings); - if (CollectionUtils.isEmpty(filteredHearings)) { + if (isEmpty(filteredHearings)) { return new GetHearings(null); } filteredHearings.sort(Comparator.nullsFirst(Comparator.comparing(o -> sortListingSequence(date, o)))); @@ -426,7 +418,7 @@ public GetHearings getHearingsForFuture(final LocalDate date, final UUID userId, } List filteredHearings = hearingRepository.findByDefendantAndHearingType(date, userId); filteredHearings = filterForTrial(filteredHearings, hearingTypeList); - if (CollectionUtils.isEmpty(filteredHearings)) { + if (isEmpty(filteredHearings)) { return new GetHearings(null); } @@ -464,7 +456,7 @@ public DefendantInfoQueryResult getHearingsByCourtRoomList(final LocalDate date, return new DefendantInfoQueryResult(null); } final List hearings = hearingRepository.findByFilters(date, courtCentreId, roomId); - if (CollectionUtils.isEmpty(hearings)) { + if (isEmpty(hearings)) { return new DefendantInfoQueryResult(null); } @@ -602,6 +594,11 @@ public Optional getCourtCenterByHearingId(UUID hearingId) { return Optional.ofNullable(hearingRepository.findCourtCenterByHearingId(hearingId)); } + @Transactional + public Optional getHearingDayByHearingIdAndDate(final UUID hearingId, final LocalDate date) { + return Optional.ofNullable(hearingRepository.findHearingDayByHearingIdAndDate(hearingId, date)); + } + @Transactional public Optional getHearingEventDefinition(UUID definitionId) { final HearingEventDefinition hearingEventDefinition = hearingEventDefinitionRepository.findBy(definitionId); @@ -673,7 +670,7 @@ public HearingDetailsResponse getHearingDetailsResponseById(final JsonEnvelope e hearingDetailsResponse.getHearing().getCourtApplications().stream() .filter(ca -> !EJECTED.equals(ca.getApplicationStatus())) .forEach(courtApplication -> { - final List applicationHearings = hearingApplicationRepository.findByApplicationId(courtApplication.getId()); + final List applicationHearings = hearingApplicationRepository.findByApplicationId(courtApplication.getId()); hearingDetailsResponse.getCourtApplicationAdditionalFields() .put(courtApplication.getId(), new CourtApplicationAdditionalFields(isAmendmentAllowed(finalHearingEntity.getId(), applicationHearings))); } @@ -804,7 +801,7 @@ public NowListResponse getNows(final UUID hearingId) { final List nows = nowRepository.findByHearingId(hearingId); final NowListResponse.Builder builder = NowListResponse.builder(); - if (!CollectionUtils.isEmpty(nows)) { + if (!isEmpty(nows)) { final List nowResponses = nows .stream() .map(now -> new NowResponse(now.getId(), now.getHearingId())) @@ -1082,7 +1079,7 @@ public GetHearings getFutureHearingsByCaseIds(final List caseIdList) { final List filteredHearings = hearingRepository.findHearingsByCaseIdsLaterThan(caseIdList, UTC_CLOCK.now().toLocalDate()); - if (CollectionUtils.isEmpty(filteredHearings)) { + if (isEmpty(filteredHearings)) { return new GetHearings(null); } @@ -1137,4 +1134,34 @@ public static boolean isUserHasPermissionForApplicationTypeCode(final Metadata m } return response.payload().getBoolean("hasPermission"); } + + public HearingDetailsResponse filterOutProsecutionCases(final HearingDetailsResponse payload) { + if (isNotApplicationHearing(payload.getHearing()) || isApplicationHasNoOffences(payload.getHearing())) { + return payload; + } + + payload.setHearing(buildHearingWithoutProsecutionCases(payload.getHearing())); + + return payload; + } + + private uk.gov.justice.core.courts.Hearing buildHearingWithoutProsecutionCases(final uk.gov.justice.core.courts.Hearing hearing) { + return uk.gov.justice.core.courts.Hearing.hearing() + .withValuesFrom(hearing) + .withProsecutionCases(null) + .build(); + } + + private boolean isApplicationHasNoOffences(final uk.gov.justice.core.courts.Hearing hearing) { + if (isNull(hearing.getCourtApplications())) { + return true; + } + return hearing.getCourtApplications().stream() + .noneMatch(application -> nonNull(application.getCourtApplicationCases()) && application.getCourtApplicationCases().stream() + .anyMatch(courtApplicationCase -> isNotEmpty(courtApplicationCase.getOffences()))); + } + + private boolean isNotApplicationHearing(final uk.gov.justice.core.courts.Hearing hearing) { + return isEmpty(hearing.getCourtApplications()); + } } diff --git a/hearing-query/hearing-query-view/src/test/java/uk/gov/moj/cpp/hearing/query/view/HearingEventQueryViewTest.java b/hearing-query/hearing-query-view/src/test/java/uk/gov/moj/cpp/hearing/query/view/HearingEventQueryViewTest.java index 09549b5d4a..14833c9620 100644 --- a/hearing-query/hearing-query-view/src/test/java/uk/gov/moj/cpp/hearing/query/view/HearingEventQueryViewTest.java +++ b/hearing-query/hearing-query-view/src/test/java/uk/gov/moj/cpp/hearing/query/view/HearingEventQueryViewTest.java @@ -433,6 +433,38 @@ public void shouldGetActiveHearingIdsWhenAnotherHearingIsActiveInTheSameCourtRoo ))); } + @Test + public void shouldUsePerDayCourtRoom_whenHearingDayHasOverrideRoom() { + final UUID dayCentreId = randomUUID(); + final UUID dayRoomId = randomUUID(); + + final HearingDay matchedDay = new HearingDay(); + matchedDay.setCourtCentreId(dayCentreId); + matchedDay.setCourtRoomId(dayRoomId); + + when(hearingService.getCourtCenterByHearingId(HEARING_ID_1)).thenReturn(Optional.of(mockHearing().getCourtCentre())); + when(hearingService.getHearingDayByHearingIdAndDate(HEARING_ID_1, EVENT_TIME.toLocalDate())) + .thenReturn(Optional.of(matchedDay)); + when(hearingService.getHearingEvents(dayCentreId, dayRoomId, EVENT_TIME.toLocalDate())) + .thenReturn(mockActiveHearingEvents(HEARING_ID_2)); + + final JsonEnvelope query = envelopeFrom( + metadataWithRandomUUIDAndName(), + createObjectBuilder() + .add(FIELD_HEARING_ID, HEARING_ID_1.toString()) + .add(FIELD_EVENT_DATE, EVENT_TIME.toLocalDate().toString()) + .build()); + + final Envelope actualActiveHearingIdsForCourtRoom = target.getActiveHearingsForCourtRoom(query); + + verify(hearingService).getHearingDayByHearingIdAndDate(HEARING_ID_1, EVENT_TIME.toLocalDate()); + verify(hearingService).getHearingEvents(dayCentreId, dayRoomId, EVENT_TIME.toLocalDate()); + assertThat(actualActiveHearingIdsForCourtRoom.payload().toString(), allOf( + hasJsonPath(format("$.%s", FIELD_ACTIVE_HEARINGS), hasSize(1)), + hasJsonPath(format("$.%s[0]", FIELD_ACTIVE_HEARINGS), equalTo(HEARING_ID_2.toString())) + )); + } + @Test public void shouldGetActiveHearingIdsInCaseOfSamePauseAndResumeEventsRecorded() { when(hearingService.getCourtCenterByHearingId(HEARING_ID_1)).thenReturn(Optional.of(mockHearing().getCourtCentre())); diff --git a/hearing-query/hearing-query-view/src/test/java/uk/gov/moj/cpp/hearing/query/view/service/HearingListXhibitResponseTransformerTest.java b/hearing-query/hearing-query-view/src/test/java/uk/gov/moj/cpp/hearing/query/view/service/HearingListXhibitResponseTransformerTest.java index 043c2b759f..5991c4e129 100644 --- a/hearing-query/hearing-query-view/src/test/java/uk/gov/moj/cpp/hearing/query/view/service/HearingListXhibitResponseTransformerTest.java +++ b/hearing-query/hearing-query-view/src/test/java/uk/gov/moj/cpp/hearing/query/view/service/HearingListXhibitResponseTransformerTest.java @@ -8,6 +8,8 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.Answers.RETURNS_DEEP_STUBS; import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.atLeastOnce; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import static uk.gov.justice.services.test.utils.core.reflection.ReflectionUtil.setField; @@ -45,6 +47,7 @@ import uk.gov.moj.cpp.listing.domain.referencedata.CourtRoomMapping; import java.math.BigInteger; +import java.time.LocalDate; import java.time.ZonedDateTime; import java.util.Arrays; import java.util.Collections; @@ -176,6 +179,60 @@ public void shouldTransformFrom() { } + @Test + public void shouldUseDayCourtCentreAndRoom_whenHearingDayHasOverrideRoom() { + final UUID topCentreId = randomUUID(); + final UUID topRoomId = randomUUID(); + final UUID dayCentreId = randomUUID(); + final UUID dayRoomId = randomUUID(); + final UUID hearingId = randomUUID(); + final LocalDate publishDate = LocalDate.now(); + final ZonedDateTime sittingDay = publishDate.atStartOfDay(ZonedDateTime.now().getZone()); + + final HearingEvent hearingEvent = HearingEvent.hearingEvent().build(); + final List hearingList = asList(hearing); + final List prosecutionCases = asList(prosecutionCase); + final List defendantList = asList(defendant); + final List hearingDays = asList(hearingDay); + final ProsecutionCaseIdentifier prosecutionCaseIdentifier = ProsecutionCaseIdentifier + .prosecutionCaseIdentifier().withCaseURN("caseURN").build(); + + when(hearingEventsToHearingMapper.getActiveHearingIds()).thenReturn(new HashSet<>()); + when(prosecutionCase.getProsecutionCaseIdentifier()).thenReturn(prosecutionCaseIdentifier); + when(prosecutionCase.getDefendants()).thenReturn(defendantList); + when(defendant.getPersonDefendant()).thenReturn(personDefendant); + when(personDefendant.getPersonDetails()).thenReturn(person); + when(person.getFirstName()).thenReturn("firstName"); + when(person.getMiddleName()).thenReturn("middleName"); + when(person.getLastName()).thenReturn("lastName"); + + when(hearing.getHearingDays()).thenReturn(hearingDays); + when(hearingDay.getSittingDay()).thenReturn(sittingDay); + when(hearingDay.getCourtCentreId()).thenReturn(dayCentreId); + when(hearingDay.getCourtRoomId()).thenReturn(dayRoomId); + + when(hearing.getId()).thenReturn(hearingId); + when(hearing.getType()).thenReturn(HearingType.hearingType().withDescription("hearingTypeDescription").build()); + when(hearing.getProsecutionCases()).thenReturn(prosecutionCases); + when(hearing.getCourtCentre()).thenReturn(CourtCentre.courtCentre().withName(COURT_NAME).withRoomId(topRoomId).withId(topCentreId).build()); + when(hearingEventsToHearingMapper.getHearingList()).thenReturn(hearingList); + when(hearingEventsToHearingMapper.getAllHearingEventBy(hearingId)).thenReturn(Optional.of(hearingEvent)); + + when(commonXhibitReferenceDataService.getCourtRoomMappingBy(eq(dayCentreId), eq(dayRoomId))).thenReturn(courtRoomMapping); + when(courtRoomMapping.getCrestCourtRoomName()).thenReturn("Day room name"); + when(courtRoomMapping.getCrestCourtSiteUUID()).thenReturn(randomUUID()); + + mockHearingTypeId(); + when(commonXhibitReferenceDataService.getXhibitHearingType(hearingTypeId).getExhibitHearingDescription()).thenReturn("Plea"); + + final CurrentCourtStatus currentCourtStatus = hearingListXhibitResponseTransformer.transformFrom(hearingEventsToHearingMapper, publishDate); + + verify(commonXhibitReferenceDataService, atLeastOnce()).getCourtRoomMappingBy(eq(dayCentreId), eq(dayRoomId)); + final CourtRoom courtRoom = currentCourtStatus.getCourt().getCourtSites().get(0).getCourtRooms().get(0); + assertThat(courtRoom.getCourtRoomName(), is("Day room name")); + assertThat(courtRoom.getCourtRoomId(), is(dayRoomId)); + } + @Test public void shouldTransformFromWithInProgressEventAndActiveCase() { final UUID courtCentreId = randomUUID(); diff --git a/hearing-query/hearing-query-view/src/test/java/uk/gov/moj/cpp/hearing/query/view/service/HearingServiceTest.java b/hearing-query/hearing-query-view/src/test/java/uk/gov/moj/cpp/hearing/query/view/service/HearingServiceTest.java index aec2e5c32b..6bc2ff7efc 100644 --- a/hearing-query/hearing-query-view/src/test/java/uk/gov/moj/cpp/hearing/query/view/service/HearingServiceTest.java +++ b/hearing-query/hearing-query-view/src/test/java/uk/gov/moj/cpp/hearing/query/view/service/HearingServiceTest.java @@ -6,6 +6,7 @@ import static java.nio.charset.Charset.defaultCharset; import static java.util.Collections.emptyList; import static java.util.Collections.singletonList; +import static java.util.Objects.isNull; import static java.util.UUID.randomUUID; import static java.util.stream.Collectors.toList; import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; @@ -32,6 +33,7 @@ import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import static uk.gov.justice.core.courts.ApplicationStatus.FINALISED; @@ -70,7 +72,9 @@ import static uk.gov.moj.cpp.hearing.test.matchers.ElementAtListMatcher.first; import uk.gov.justice.core.courts.Address; +import uk.gov.justice.core.courts.CrackedIneffectiveTrial; import uk.gov.justice.core.courts.CourtApplication; +import uk.gov.justice.core.courts.CourtApplicationCase; import uk.gov.justice.core.courts.CourtApplicationParty; import uk.gov.justice.core.courts.CourtApplicationType; import uk.gov.justice.core.courts.DefendantCase; @@ -79,6 +83,7 @@ import uk.gov.justice.core.courts.Gender; import uk.gov.justice.core.courts.Level; import uk.gov.justice.core.courts.MasterDefendant; +import uk.gov.justice.core.courts.Offence; import uk.gov.justice.core.courts.Organisation; import uk.gov.justice.core.courts.Person; import uk.gov.justice.core.courts.PersonDefendant; @@ -115,6 +120,8 @@ import uk.gov.moj.cpp.hearing.persist.NowsRepository; import uk.gov.moj.cpp.hearing.persist.entity.application.ApplicationDraftResult; import uk.gov.moj.cpp.hearing.persist.entity.ha.CourtCentre; +import uk.gov.moj.cpp.hearing.persist.entity.ha.DraftResult; +import uk.gov.moj.cpp.hearing.persist.entity.ha.Now; import uk.gov.moj.cpp.hearing.persist.entity.ha.Defendant; import uk.gov.moj.cpp.hearing.persist.entity.ha.Hearing; import uk.gov.moj.cpp.hearing.persist.entity.ha.HearingApplication; @@ -136,8 +143,11 @@ import uk.gov.moj.cpp.hearing.query.view.response.TimelineHearingSummary; import uk.gov.moj.cpp.hearing.query.view.response.hearingresponse.ApplicationTarget; import uk.gov.moj.cpp.hearing.query.view.response.hearingresponse.ApplicationTargetListResponse; +import uk.gov.moj.cpp.hearing.query.view.response.hearingresponse.DraftResultResponse; import uk.gov.moj.cpp.hearing.query.view.response.hearingresponse.GetShareResultsV2Response; import uk.gov.moj.cpp.hearing.query.view.response.hearingresponse.HearingDetailsResponse; +import uk.gov.moj.cpp.hearing.query.view.response.hearingresponse.NowListResponse; +import uk.gov.moj.cpp.hearing.query.view.response.hearingresponse.NowResponse; import uk.gov.moj.cpp.hearing.query.view.response.hearingresponse.ProsecutionCaseResponse; import uk.gov.moj.cpp.hearing.query.view.response.hearingresponse.TargetListResponse; import uk.gov.moj.cpp.hearing.query.view.response.hearingresponse.xhibit.CaseDetail; @@ -148,12 +158,14 @@ import uk.gov.moj.cpp.hearing.query.view.service.userdata.UserDataService; import uk.gov.moj.cpp.hearing.query.view.service.ctl.ReferenceDataService; import uk.gov.moj.cpp.hearing.repository.DocumentRepository; +import uk.gov.moj.cpp.hearing.repository.DraftResultRepository; import uk.gov.moj.cpp.hearing.repository.HearingApplicationRepository; import uk.gov.moj.cpp.hearing.repository.HearingEventDefinitionRepository; import uk.gov.moj.cpp.hearing.repository.HearingEventPojo; import uk.gov.moj.cpp.hearing.repository.HearingEventRepository; import uk.gov.moj.cpp.hearing.repository.HearingRepository; import uk.gov.moj.cpp.hearing.repository.HearingYouthCourtDefendantsRepository; +import uk.gov.moj.cpp.hearing.repository.NowRepository; import uk.gov.moj.cpp.hearing.repository.NowsMaterialRepository; import java.io.IOException; @@ -184,7 +196,6 @@ import com.google.common.io.Resources; import org.hamcrest.CoreMatchers; import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InjectMocks; @@ -262,6 +273,12 @@ public class HearingServiceTest { @Mock private ProgressionService progressionService; + @Mock + private NowRepository nowRepository; + + @Mock + private DraftResultRepository draftResultRepository; + protected static String getStringFromResource(final String path) throws IOException { return Resources.toString(getResource(path), defaultCharset()); } @@ -1257,7 +1274,7 @@ void shouldUpdateCourtApplicationStatusFromProgressionInTheHearing() { when(hearingApplicationRepository.findByApplicationId(applicationId2)).thenReturn(List.of(hearingApplication)); final UUID trialTypeId = randomUUID(); - final HearingDetailsResponse response = hearingService.getHearingDetailsResponseById(null,hearingId, buildCrackedIneffectiveVacatedTrialTypes(trialTypeId), prosecutionCasesIdsWithAccess, false); + final HearingDetailsResponse response = hearingService.getHearingDetailsResponseById(null, hearingId, buildCrackedIneffectiveVacatedTrialTypes(trialTypeId), prosecutionCasesIdsWithAccess, false); final List courtApplicationsActual = response.getHearing().getCourtApplications(); @@ -1511,7 +1528,7 @@ public void shouldReturnLatestHearingByCourtCentreIdsAndLatestModifiedTime() { when(hearingEventRepository.findLatestHearingsForThatDayByCourt(courtCentreIds.get(0), now, hearingEventRequiredDefinitionsIds)).thenReturn(hearingEventResult); when(hearingRepository.findBy(hearingEvent.getHearingId())).thenReturn(hearing); when(hearingJPAMapper.fromJPAWithCourtListRestrictions(hearing)).thenReturn(hearinPojo); - when(hearingListXhibitResponseTransformer.transformFrom(any(HearingEventsToHearingMapper.class))).thenReturn(expectedCurrentCourtStatus); + when(hearingListXhibitResponseTransformer.transformFrom(any(HearingEventsToHearingMapper.class), any(LocalDate.class))).thenReturn(expectedCurrentCourtStatus); final Optional response = hearingService.getHearingsForWebPage(courtCentreIds, now, hearingEventRequiredDefinitionsIds); @@ -1523,7 +1540,7 @@ private List getHearingEventRawResult(final List hea List list = new ArrayList<>(); HearingEventPojo pojo = hearingEventList.get(0); // Add arrays to the list - list.add(new Object[]{pojo.getDefenceCounselId(), false, LocalDate.now(), ZonedDateTime.now(), randomUUID(), }); + list.add(new Object[]{pojo.getDefenceCounselId(), false, LocalDate.now(), ZonedDateTime.now(), randomUUID(),}); return list; } @@ -1554,7 +1571,7 @@ public void shouldReturnHearingsByCounrtCentreIdsAndDate() { when(hearingEventRepository.findLatestHearingsForThatDayByCourts(courtCentreIds, now, hearingEventRequiredDefinitionsIds)).thenReturn(hearingEventResult); final CurrentCourtStatus expectedCurrentCourtStatus = getCurrentCourtStatusWithMultipleCases(hearingEvent); - when(hearingListXhibitResponseTransformer.transformFrom(any(HearingEventsToHearingMapper.class))).thenReturn(expectedCurrentCourtStatus); + when(hearingListXhibitResponseTransformer.transformFrom(any(HearingEventsToHearingMapper.class), any(LocalDate.class))).thenReturn(expectedCurrentCourtStatus); final Optional response = hearingService.getHearingsByDate(courtCentreIds, now, hearingEventRequiredDefinitionsIds); assertCurrentCourtStatus(response.get(), expectedCurrentCourtStatus); @@ -1667,6 +1684,29 @@ public void shouldNotGetCourtCenterByNonExistingHearingId() { assertThat(optionalCourtCentre.isPresent(), is(false)); } + @Test + public void shouldGetHearingDayByHearingIdAndDate() { + final UUID hearingId = randomUUID(); + final LocalDate date = LocalDate.now(); + final HearingDay dayStub = new HearingDay(); + when(hearingRepository.findHearingDayByHearingIdAndDate(hearingId, date)).thenReturn(dayStub); + + final Optional result = hearingService.getHearingDayByHearingIdAndDate(hearingId, date); + + verify(hearingRepository).findHearingDayByHearingIdAndDate(hearingId, date); + assertTrue(result.isPresent()); + assertThat(dayStub, is(result.get())); + } + + @Test + public void shouldReturnEmpty_whenHearingDayNotFound() { + when(hearingRepository.findHearingDayByHearingIdAndDate(Mockito.any(UUID.class), Mockito.any(LocalDate.class))).thenReturn(null); + + final Optional result = hearingService.getHearingDayByHearingIdAndDate(randomUUID(), LocalDate.now()); + + assertThat(result.isPresent(), is(false)); + } + @Test public void shouldGetFutureHearingsByCaseIds() { final UUID caseId = randomUUID(); @@ -1705,7 +1745,7 @@ public void shouldNotGetFutureHearingsByCaseIdsNoDBRecord() { final List caseIdList = new ArrayList<>(); caseIdList.add(caseId); - when(hearingRepository.findHearingsByCaseIdsLaterThan(caseIdList, LocalDate.now())).thenReturn(emptyList()); + when(hearingRepository.findHearingsByCaseIdsLaterThan(caseIdList, new UtcClock().now().toLocalDate())).thenReturn(emptyList()); final GetHearings response = hearingService.getFutureHearingsByCaseIds(caseIdList); @@ -2189,7 +2229,7 @@ private Optional getProsecutionCaseResponse() { .withArrestSummonsNumber("") .withPersonDetails(Person.person() .withAddress(address) - .withDateOfBirth(date("12/11/1978")) + .withDateOfBirth(toDate("12/11/1978")) .withFirstName("First Name") .withGender(Gender.MALE) .withLastName("Last Name").build()) @@ -2212,7 +2252,7 @@ private List getProsec address.setPostCode("AA1 1AA"); uk.gov.moj.cpp.hearing.persist.entity.ha.Person person = new uk.gov.moj.cpp.hearing.persist.entity.ha.Person(); person.setAddress(address); - person.setDateOfBirth(date("12/11/1978")); + person.setDateOfBirth(toDate("12/11/1978")); person.setFirstName("First Name"); person.setGender(Gender.MALE); person.setLastName("Last Name"); @@ -2246,7 +2286,406 @@ private List getProsec return prosecutionCases; } - private LocalDate date(String strDate) { + private LocalDate toDate(String strDate) { return LocalDate.parse(strDate, dateTimeFormatter); } + + @Test + public void shouldReturnUnmodifiedPayloadWhenNotApplicationHearing() { + final uk.gov.justice.core.courts.Hearing hearing = hearing() + .withCourtApplications(null) + .withProsecutionCases(singletonList(ProsecutionCase.prosecutionCase() + .withId(randomUUID()) + .withDefendants(singletonList(uk.gov.justice.core.courts.Defendant.defendant() + .withId(randomUUID()) + .withOffences(singletonList(Offence.offence() + .withId(randomUUID()) + .build())) + .build())) + .build())) + .build(); + final HearingDetailsResponse payload = new HearingDetailsResponse(); + payload.setHearing(hearing); + + final HearingDetailsResponse result = hearingService.filterOutProsecutionCases(payload); + + assertThat(result, is(payload)); + assertThat(result.getHearing(), is(hearing)); + } + + @Test + public void shouldFilterOutProsecutionCasesWhenApplicationHasOffences() { + + final uk.gov.justice.core.courts.Hearing hearing = hearing() + .withCourtApplications(singletonList(CourtApplication.courtApplication() + .withCourtApplicationCases(singletonList(CourtApplicationCase.courtApplicationCase() + .withOffences(singletonList(Offence.offence() + .withId(randomUUID()) + .build())) + .build())) + .build())) + .withProsecutionCases(singletonList(uk.gov.justice.core.courts.ProsecutionCase.prosecutionCase() + .withDefendants(singletonList(uk.gov.justice.core.courts.Defendant.defendant() + .withId(randomUUID()) + .withOffences(singletonList(Offence.offence() + .withId(randomUUID()) + .build())) + .build())) + .build())) + .build(); + + final HearingDetailsResponse payload = new HearingDetailsResponse(); + payload.setHearing(hearing); + + final HearingDetailsResponse result = hearingService.filterOutProsecutionCases(payload); + + assertThat(result, is(payload)); + assertThat(result.getHearing().getProsecutionCases(), nullValue()); + } + + @Test + public void shouldKeepProsecutionCasesWhenApplicationHasNoOffences() { + final uk.gov.justice.core.courts.Hearing hearing = hearing() + .withCourtApplications(singletonList(CourtApplication.courtApplication() + .withId(randomUUID()) + .build())) + .withProsecutionCases(singletonList(uk.gov.justice.core.courts.ProsecutionCase.prosecutionCase() + .withDefendants(singletonList(uk.gov.justice.core.courts.Defendant.defendant() + .withId(randomUUID()) + .withOffences(singletonList(Offence.offence() + .withId(randomUUID()) + .build())) + .build())) + .build())) + .build(); + + final HearingDetailsResponse payload = new HearingDetailsResponse(); + payload.setHearing(hearing); + + final HearingDetailsResponse result = hearingService.filterOutProsecutionCases(payload); + + assertThat(result, is(payload)); + assertThat(isNull(result.getHearing().getProsecutionCases()), is(false)); + assertThat(result.getHearing().getProsecutionCases(), hasSize(1)); + assertThat(result.getHearing().getProsecutionCases().get(0).getDefendants().get(0).getOffences().size(), is(1)); + } + + // ── toBoolean ────────────────────────────────────────────────────────── + + @Test + public void toBoolean_shouldReturnFalse_whenNull() { + assertFalse(HearingService.toBoolean(null)); + } + + @Test + public void toBoolean_shouldReturnTrue_whenBooleanTrue() { + assertTrue(HearingService.toBoolean(Boolean.TRUE)); + } + + @Test + public void toBoolean_shouldReturnFalse_whenBooleanFalse() { + assertFalse(HearingService.toBoolean(Boolean.FALSE)); + } + + @Test + public void toBoolean_shouldReturnFalse_whenNumberZero() { + assertFalse(HearingService.toBoolean(0)); + } + + @Test + public void toBoolean_shouldReturnTrue_whenNumberNonZero() { + assertTrue(HearingService.toBoolean(1)); + assertTrue(HearingService.toBoolean(-5)); + } + + @Test + public void toBoolean_shouldReturnTrue_whenStringTrueVariants() { + assertTrue(HearingService.toBoolean("true")); + assertTrue(HearingService.toBoolean("t")); + assertTrue(HearingService.toBoolean("yes")); + assertTrue(HearingService.toBoolean("y")); + assertTrue(HearingService.toBoolean("1")); + assertTrue(HearingService.toBoolean(" TRUE ")); + } + + @Test + public void toBoolean_shouldReturnFalse_whenStringFalseVariants() { + assertFalse(HearingService.toBoolean("false")); + assertFalse(HearingService.toBoolean("no")); + assertFalse(HearingService.toBoolean("0")); + } + + @Test + public void toBoolean_shouldReturnFalse_whenUnrecognisedType() { + assertFalse(HearingService.toBoolean(new Object())); + } + + // ── getHearingDomainById ─────────────────────────────────────────────── + + @Test + public void shouldReturnMappedDomainHearing_whenHearingFound() { + final UUID hearingId = randomUUID(); + final Hearing hearingEntity = new Hearing(); + final uk.gov.justice.core.courts.Hearing domainHearing = hearing().build(); + when(hearingRepository.findBy(hearingId)).thenReturn(hearingEntity); + when(hearingJPAMapper.fromJPA(hearingEntity)).thenReturn(domainHearing); + + final Optional result = hearingService.getHearingDomainById(hearingId); + + assertTrue(result.isPresent()); + assertThat(result.get(), is(domainHearing)); + } + + @Test + public void shouldReturnEmpty_whenHearingNotFound_getHearingDomainById() { + final UUID hearingId = randomUUID(); + when(hearingRepository.findBy(hearingId)).thenReturn(null); + + final Optional result = hearingService.getHearingDomainById(hearingId); + + assertFalse(result.isPresent()); + } + + // ── fetchCrackedIneffectiveTrial ─────────────────────────────────────── + + @Test + public void shouldReturnNull_whenTrialTypeIdIsNull() { + assertNull(hearingService.fetchCrackedIneffectiveTrial(null, buildCrackedIneffectiveVacatedTrialTypes(randomUUID()))); + } + + @Test + public void shouldReturnNull_whenTrialTypeListIsEmpty() { + final CrackedIneffectiveVacatedTrialTypes emptyTypes = new CrackedIneffectiveVacatedTrialTypes() + .setCrackedIneffectiveVacatedTrialTypes(Collections.emptyList()); + + assertNull(hearingService.fetchCrackedIneffectiveTrial(randomUUID(), emptyTypes)); + } + + @Test + public void shouldReturnNull_whenNoMatchingTrialTypeFound() { + final CrackedIneffectiveVacatedTrialTypes types = buildCrackedIneffectiveVacatedTrialTypes(randomUUID()); + + assertNull(hearingService.fetchCrackedIneffectiveTrial(randomUUID(), types)); + } + + @Test + public void shouldReturnCrackedIneffectiveTrial_whenMatchingTrialTypeFound() { + final UUID trialTypeId = randomUUID(); + final CrackedIneffectiveVacatedTrialTypes types = buildCrackedIneffectiveVacatedTrialTypes(trialTypeId); + + final CrackedIneffectiveTrial result = hearingService.fetchCrackedIneffectiveTrial(trialTypeId, types); + + assertNotNull(result); + assertThat(result.getCode(), is("code")); + assertThat(result.getType(), is("InEffective")); + } + + // ── getNows ──────────────────────────────────────────────────────────── + + @Test + public void shouldReturnEmptyNowListResponse_whenNoNowsFound() { + final UUID hearingId = randomUUID(); + when(nowRepository.findByHearingId(hearingId)).thenReturn(Collections.emptyList()); + + final NowListResponse result = hearingService.getNows(hearingId); + + assertNotNull(result); + assertNull(result.getNows()); + } + + @Test + public void shouldReturnNowListResponse_withMappedNows() { + final UUID hearingId = randomUUID(); + final UUID nowId = randomUUID(); + final Now now = new Now(); + now.setId(nowId); + now.setHearingId(hearingId); + when(nowRepository.findByHearingId(hearingId)).thenReturn(singletonList(now)); + + final NowListResponse result = hearingService.getNows(hearingId); + + assertThat(result.getNows(), hasSize(1)); + assertThat(result.getNows().get(0).getId(), is(nowId)); + assertThat(result.getNows().get(0).getHearingId(), is(hearingId)); + } + + // ── getDraftResult ───────────────────────────────────────────────────── + + @Test + public void shouldReturnDraftResultFromTargets_whenNoDraftResultInRepository() { + final UUID hearingId = randomUUID(); + final String hearingDay = "1"; + when(draftResultRepository.findDraftResultByFilter(hearingId, hearingDay)).thenReturn(Collections.emptyList()); + when(hearingRepository.findTargetsByFilters(hearingId, hearingDay)).thenReturn(Collections.emptyList()); + when(hearingRepository.findProsecutionCasesByHearingId(hearingId)).thenReturn(Collections.emptyList()); + when(targetJPAMapper.fromJPA(anySet(), anySet())).thenReturn(Collections.emptyList()); + + final DraftResultResponse result = hearingService.getDraftResult(hearingId, hearingDay); + + assertNotNull(result); + assertTrue(result.isTarget()); + verify(draftResultRepository).findDraftResultByFilter(hearingId, hearingDay); + verify(hearingRepository).findTargetsByFilters(hearingId, hearingDay); + } + + @Test + public void shouldReturnDraftResultFromRepository_whenDraftResultExists() { + final UUID hearingId = randomUUID(); + final String hearingDay = "1"; + final DraftResult draftResult = mock(DraftResult.class); + when(draftResult.getDraftResultPayload()).thenReturn(objectMapper.createObjectNode().put("key", "value")); + when(draftResultRepository.findDraftResultByFilter(hearingId, hearingDay)).thenReturn(singletonList(draftResult)); + + final DraftResultResponse result = hearingService.getDraftResult(hearingId, hearingDay); + + assertNotNull(result); + assertTrue(result.isTarget()); + verify(draftResultRepository).findDraftResultByFilter(hearingId, hearingDay); + verify(hearingRepository, never()).findTargetsByFilters(any(), any()); + } + + // ── isUserHasPermissionForApplicationTypeCode ────────────────────────── + + @Test + public void shouldReturnTrue_whenPermissionResponsePayloadIsEmpty() { + final Metadata metadata = DefaultJsonMetadata.metadataBuilder() + .withId(randomUUID()).withName("hearing.get.hearing").build(); + when(requester.request(any(), any())).thenReturn( + Envelope.envelopeFrom(Envelope.metadataBuilder().withId(randomUUID()).withName("test").build(), + createObjectBuilder().build())); + + assertTrue(HearingService.isUserHasPermissionForApplicationTypeCode(metadata, requester, "PL302487")); + } + + @Test + public void shouldReturnTrue_whenHasPermissionIsTrue() { + final Metadata metadata = DefaultJsonMetadata.metadataBuilder() + .withId(randomUUID()).withName("hearing.get.hearing").build(); + when(requester.request(any(), any())).thenReturn( + Envelope.envelopeFrom(Envelope.metadataBuilder().withId(randomUUID()).withName("test").build(), + createObjectBuilder().add("hasPermission", true).build())); + + assertTrue(HearingService.isUserHasPermissionForApplicationTypeCode(metadata, requester, "PL302487")); + } + + @Test + public void shouldReturnFalse_whenHasPermissionIsFalse() { + final Metadata metadata = DefaultJsonMetadata.metadataBuilder() + .withId(randomUUID()).withName("hearing.get.hearing").build(); + when(requester.request(any(), any())).thenReturn( + Envelope.envelopeFrom(Envelope.metadataBuilder().withId(randomUUID()).withName("test").build(), + createObjectBuilder().add("hasPermission", false).build())); + + assertFalse(HearingService.isUserHasPermissionForApplicationTypeCode(metadata, requester, "PL302487")); + } + + // ── validateUserPermissionForApplicationType – missing branches ───────── + + @Test + public void shouldNotThrow_whenHearingIdIsAbsentFromPayload() { + final JsonEnvelope envelope = envelopeFrom( + metadataBuilder().withId(randomUUID()).withName("hearing.get.hearing").build(), + createObjectBuilder().build()); + + assertDoesNotThrow(() -> hearingService.validateUserPermissionForApplicationType(envelope)); + verify(hearingRepository, never()).findBy(any(UUID.class)); + } + + @Test + public void shouldNotThrow_whenHearingIsNull() { + final UUID hearingId = randomUUID(); + final JsonEnvelope envelope = envelopeFrom( + metadataBuilder().withId(randomUUID()).withName("hearing.get.hearing").build(), + createObjectBuilder().add("hearingId", hearingId.toString()).build()); + when(hearingRepository.findBy(hearingId)).thenReturn(null); + + assertDoesNotThrow(() -> hearingService.validateUserPermissionForApplicationType(envelope)); + verify(courtApplicationsSerializer, never()).courtApplications(anyString()); + } + + // ── getHearingsByDate – missing branches ─────────────────────────────── + + @Test + public void shouldReturnEmpty_whenCourtCentreListIsEmpty_getHearingsByDate() { + final Optional result = hearingService.getHearingsByDate( + Collections.emptyList(), LocalDate.now(), Collections.emptySet()); + + assertFalse(result.isPresent()); + } + + @Test + public void shouldReturnEmpty_whenHearingListIsEmpty_getHearingsByDate() { + final UUID courtCentreId = randomUUID(); + final LocalDate date = LocalDate.now(); + when(hearingEventRepository.findLatestHearingsForThatDayByCourts(any(), any(), any())) + .thenReturn(Collections.emptyList()); + when(hearingRepository.findHearingsByDateAndCourtCentreList(any(), any())) + .thenReturn(Collections.emptyList()); + when(hearingEventRepository.findBy(any(List.class), any(), anySet())) + .thenReturn(Collections.emptyList()); + + final Optional result = hearingService.getHearingsByDate( + singletonList(courtCentreId), date, Collections.singleton(randomUUID())); + + assertFalse(result.isPresent()); + } + + // ── getHearingsForWebPage – missing branches ─────────────────────────── + + @Test + public void shouldReturnEmpty_whenCourtCentreListIsEmpty_getHearingsForWebPage() { + final Optional result = hearingService.getHearingsForWebPage( + Collections.emptyList(), LocalDate.now(), Collections.emptySet()); + + assertFalse(result.isPresent()); + } + + @Test + public void shouldReturnEmpty_whenNoActiveHearings_getHearingsForWebPage() { + final UUID courtCentreId = randomUUID(); + when(hearingEventRepository.findLatestHearingsForThatDayByCourt(any(), any(), any())) + .thenReturn(Collections.emptyList()); + + final Optional result = hearingService.getHearingsForWebPage( + singletonList(courtCentreId), LocalDate.now(), Collections.singleton(randomUUID())); + + assertFalse(result.isPresent()); + } + + // ── filterOutProsecutionCases – empty offences branch ────────────────── + + @Test + public void shouldKeepProsecutionCases_whenApplicationHasCourtApplicationCasesWithNoOffences() { + final uk.gov.justice.core.courts.Hearing hearing = hearing() + .withCourtApplications(singletonList(CourtApplication.courtApplication() + .withCourtApplicationCases(singletonList(CourtApplicationCase.courtApplicationCase() + .withOffences(Collections.emptyList()) + .build())) + .build())) + .withProsecutionCases(singletonList(ProsecutionCase.prosecutionCase() + .withId(randomUUID()) + .build())) + .build(); + final HearingDetailsResponse payload = new HearingDetailsResponse(); + payload.setHearing(hearing); + + final HearingDetailsResponse result = hearingService.filterOutProsecutionCases(payload); + + assertThat(result, is(payload)); + assertThat(result.getHearing().getProsecutionCases(), hasSize(1)); + } + + // ── getTimelineHearingSummariesByApplicationId ────────────────────────── + + @Test + public void shouldReturnEmptyList_whenNoHearingsFoundForApplication() { + final UUID applicationId = randomUUID(); + when(hearingRepository.findAllHearingsByApplicationId(applicationId)).thenReturn(Collections.emptyList()); + + final List result = hearingService.getTimelineHearingSummariesByApplicationId( + applicationId, buildCrackedIneffectiveVacatedTrialTypes(randomUUID()), createObjectBuilder().build()); + + assertNotNull(result); + assertTrue(result.isEmpty()); + } } diff --git a/hearing-query/pom.xml b/hearing-query/pom.xml index 163d3b426f..917c8139fc 100644 --- a/hearing-query/pom.xml +++ b/hearing-query/pom.xml @@ -3,7 +3,7 @@ uk.gov.moj.cpp.hearing hearing-parent - 17.104.158-SNAPSHOT + 17.104.158-CCSPH2-SNAPSHOT hearing-query pom diff --git a/hearing-service/pom.xml b/hearing-service/pom.xml index 9cae9a5840..61c7912338 100644 --- a/hearing-service/pom.xml +++ b/hearing-service/pom.xml @@ -3,7 +3,7 @@ uk.gov.moj.cpp.hearing hearing-parent - 17.104.158-SNAPSHOT + 17.104.158-CCSPH2-SNAPSHOT 4.0.0 diff --git a/hearing-viewstore/hearing-viewstore-liquibase/pom.xml b/hearing-viewstore/hearing-viewstore-liquibase/pom.xml index a3cd37211b..b316c7e403 100644 --- a/hearing-viewstore/hearing-viewstore-liquibase/pom.xml +++ b/hearing-viewstore/hearing-viewstore-liquibase/pom.xml @@ -3,7 +3,7 @@ uk.gov.moj.cpp.hearing hearing-viewstore - 17.104.158-SNAPSHOT + 17.104.158-CCSPH2-SNAPSHOT hearing-viewstore-liquibase diff --git a/hearing-viewstore/hearing-viewstore-persistence/pom.xml b/hearing-viewstore/hearing-viewstore-persistence/pom.xml index 6c4e8c7f23..e94ea5f9be 100644 --- a/hearing-viewstore/hearing-viewstore-persistence/pom.xml +++ b/hearing-viewstore/hearing-viewstore-persistence/pom.xml @@ -3,7 +3,7 @@ uk.gov.moj.cpp.hearing hearing-viewstore - 17.104.158-SNAPSHOT + 17.104.158-CCSPH2-SNAPSHOT hearing-viewstore-persistence diff --git a/hearing-viewstore/hearing-viewstore-persistence/src/main/java/uk/gov/moj/cpp/hearing/mapping/DefendantJPAMapper.java b/hearing-viewstore/hearing-viewstore-persistence/src/main/java/uk/gov/moj/cpp/hearing/mapping/DefendantJPAMapper.java index 6b7fddf052..911c1e0c11 100644 --- a/hearing-viewstore/hearing-viewstore-persistence/src/main/java/uk/gov/moj/cpp/hearing/mapping/DefendantJPAMapper.java +++ b/hearing-viewstore/hearing-viewstore-persistence/src/main/java/uk/gov/moj/cpp/hearing/mapping/DefendantJPAMapper.java @@ -102,7 +102,9 @@ public Set toJPA(Hearing hearing, final ProsecutionCase prosecutionCa if (null == pojos) { return new HashSet<>(); } - return pojos.stream().map(pojo -> toJPA(hearing, prosecutionCase, pojo)).collect(Collectors.toSet()); + return pojos.stream().filter(p -> prosecutionCase.getId().getId().equals(p.getProsecutionCaseId())) + .map(pojo -> toJPA(hearing, prosecutionCase, pojo)) + .collect(Collectors.toSet()); } uk.gov.justice.core.courts.Defendant fromJPA(final Defendant pojo) { diff --git a/hearing-viewstore/hearing-viewstore-persistence/src/main/java/uk/gov/moj/cpp/hearing/mapping/HearingJPAMapper.java b/hearing-viewstore/hearing-viewstore-persistence/src/main/java/uk/gov/moj/cpp/hearing/mapping/HearingJPAMapper.java index 6240912288..570950f3df 100644 --- a/hearing-viewstore/hearing-viewstore-persistence/src/main/java/uk/gov/moj/cpp/hearing/mapping/HearingJPAMapper.java +++ b/hearing-viewstore/hearing-viewstore-persistence/src/main/java/uk/gov/moj/cpp/hearing/mapping/HearingJPAMapper.java @@ -257,6 +257,10 @@ public String updateLinkedApplicationStatus(final String courtApplicationsJson, if (courtApplications == null) { courtApplications = emptyList(); } + courtApplications.stream() + .filter(ca -> ofNullable(ca.getCourtApplicationCases()).orElse(emptyList()).stream() + .anyMatch(cac -> prosecutionCaseId.equals(cac.getProsecutionCaseId()))) + .forEach(ca -> ca.setApplicationStatus(status)); return courtApplicationsSerializer.json(courtApplications); } diff --git a/hearing-viewstore/hearing-viewstore-persistence/src/main/java/uk/gov/moj/cpp/hearing/repository/HearingEventRepository.java b/hearing-viewstore/hearing-viewstore-persistence/src/main/java/uk/gov/moj/cpp/hearing/repository/HearingEventRepository.java index a2ff2d4a44..554e0f306a 100644 --- a/hearing-viewstore/hearing-viewstore-persistence/src/main/java/uk/gov/moj/cpp/hearing/repository/HearingEventRepository.java +++ b/hearing-viewstore/hearing-viewstore-persistence/src/main/java/uk/gov/moj/cpp/hearing/repository/HearingEventRepository.java @@ -38,9 +38,10 @@ public abstract class HearingEventRepository extends AbstractEntityRepository findByFilters(@QueryParam("date") final LocalDate "WHERE hearing.id = :hearingId", singleResult = OPTIONAL) public abstract CourtCentre findCourtCenterByHearingId(@QueryParam("hearingId") final UUID hearingId); + @Query(value = "SELECT day FROM Hearing hearing INNER JOIN hearing.hearingDays day " + + "WHERE hearing.id = :hearingId AND day.date = :date", singleResult = OPTIONAL) + public abstract HearingDay findHearingDayByHearingIdAndDate(@QueryParam("hearingId") final UUID hearingId, + @QueryParam("date") final LocalDate date); + @Query(value = "SELECT target FROM Target target " + "WHERE target.hearing.id = :hearingId") public abstract List findTargetsByHearingId(@QueryParam("hearingId") final UUID hearingId); diff --git a/hearing-viewstore/hearing-viewstore-persistence/src/test/java/uk/gov/moj/cpp/hearing/mapping/DefendantJPAMapperTest.java b/hearing-viewstore/hearing-viewstore-persistence/src/test/java/uk/gov/moj/cpp/hearing/mapping/DefendantJPAMapperTest.java index 139ae41214..be91823738 100644 --- a/hearing-viewstore/hearing-viewstore-persistence/src/test/java/uk/gov/moj/cpp/hearing/mapping/DefendantJPAMapperTest.java +++ b/hearing-viewstore/hearing-viewstore-persistence/src/test/java/uk/gov/moj/cpp/hearing/mapping/DefendantJPAMapperTest.java @@ -1,5 +1,6 @@ package uk.gov.moj.cpp.hearing.mapping; +import static java.util.Arrays.asList; import static org.apache.deltaspike.core.util.ArraysUtils.asSet; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; @@ -58,6 +59,20 @@ public void testToJPA() { assertThat(defendantJPAMapper.toJPA(hearingEntity, prosecutionCaseEntity, defendantPojo), whenDefendant(isBean(uk.gov.moj.cpp.hearing.persist.entity.ha.Defendant.class), defendantPojo)); } + @Test + void testToJPAWithMultipleCaseAndDefendants() { + final uk.gov.moj.cpp.hearing.persist.entity.ha.Hearing hearingEntity = aNewHearingJPADataTemplate(2).getHearing(); + final List prosecutionCaseList = hearingEntity.getProsecutionCases().stream().toList(); + final uk.gov.moj.cpp.hearing.persist.entity.ha.Defendant defendantEntity = prosecutionCaseList.get(0).getDefendants().iterator().next(); + final Defendant defendantPojo = defendantJPAMapper.fromJPA(defendantEntity); + final Defendant defendant2 = Defendant.defendant().withValuesFrom(defendantPojo).withId(UUID.randomUUID()).withProsecutionCaseId(prosecutionCaseList.get(1).getId().getId()).build(); + + final List defendants = defendantJPAMapper.toJPA(hearingEntity, prosecutionCaseList.get(1), asList(defendantPojo, defendant2)).stream().toList(); + + assertThat(defendants.size(), is(1)); + assertThat(defendants.get(0).getProsecutionCaseId(), is(prosecutionCaseList.get(1).getId().getId())); + } + @SuppressWarnings("unchecked") public static ElementAtListMatcher whenFirstDefendant(final BeanMatcher m, final uk.gov.moj.cpp.hearing.persist.entity.ha.Defendant entity) { return ElementAtListMatcher.first(whenDefendant((BeanMatcher) m, entity)); diff --git a/hearing-viewstore/hearing-viewstore-persistence/src/test/java/uk/gov/moj/cpp/hearing/mapping/HearingJPAMapperTest.java b/hearing-viewstore/hearing-viewstore-persistence/src/test/java/uk/gov/moj/cpp/hearing/mapping/HearingJPAMapperTest.java index 527313647b..33be3dd1ee 100644 --- a/hearing-viewstore/hearing-viewstore-persistence/src/test/java/uk/gov/moj/cpp/hearing/mapping/HearingJPAMapperTest.java +++ b/hearing-viewstore/hearing-viewstore-persistence/src/test/java/uk/gov/moj/cpp/hearing/mapping/HearingJPAMapperTest.java @@ -1031,4 +1031,97 @@ public void givenApplicationFinalisedWhenGetHearingShouldReturnIsAmendmentAllowe assertThat(actualHearing.getCourtApplications().size(), is(1)); assertThat(actualHearing.getCourtApplications().get(0).getId(), is(applicationId)); } + + @Test + public void shouldMarkLinkedApplicationAsEjectedWhenProsecutionCaseMatches() { + final UUID prosecutionCaseId = randomUUID(); + final UUID linkedAppId = randomUUID(); + final UUID unlinkedAppId = randomUUID(); + + final List courtApplications = new ArrayList<>(); + courtApplications.add(CourtApplication.courtApplication() + .withId(linkedAppId) + .withApplicationStatus(uk.gov.justice.core.courts.ApplicationStatus.UN_ALLOCATED) + .withCourtApplicationCases(singletonList(CourtApplicationCase.courtApplicationCase() + .withProsecutionCaseId(prosecutionCaseId) + .build())) + .build()); + courtApplications.add(CourtApplication.courtApplication() + .withId(unlinkedAppId) + .withApplicationStatus(uk.gov.justice.core.courts.ApplicationStatus.UN_ALLOCATED) + .withCourtApplicationCases(singletonList(CourtApplicationCase.courtApplicationCase() + .withProsecutionCaseId(randomUUID()) + .build())) + .build()); + + when(courtApplicationsSerializer.courtApplications(any(String.class))).thenReturn(courtApplications); + when(courtApplicationsSerializer.json(any())).thenReturn("result"); + + hearingJPAMapper.updateLinkedApplicationStatus("json", prosecutionCaseId, uk.gov.justice.core.courts.ApplicationStatus.EJECTED); + + verify(courtApplicationsSerializer).json(courtApplicationCaptor.capture()); + final List captured = courtApplicationCaptor.getValue(); + + assertThat(captured.stream().filter(ca -> ca.getId().equals(linkedAppId)).findFirst().get().getApplicationStatus(), + is(uk.gov.justice.core.courts.ApplicationStatus.EJECTED)); + assertThat(captured.stream().filter(ca -> ca.getId().equals(unlinkedAppId)).findFirst().get().getApplicationStatus(), + is(uk.gov.justice.core.courts.ApplicationStatus.UN_ALLOCATED)); + } + + @Test + public void shouldNotMarkApplicationWhenNoProsecutionCaseMatches() { + final UUID prosecutionCaseId = randomUUID(); + final UUID appId = randomUUID(); + + final List courtApplications = new ArrayList<>(); + courtApplications.add(CourtApplication.courtApplication() + .withId(appId) + .withApplicationStatus(uk.gov.justice.core.courts.ApplicationStatus.UN_ALLOCATED) + .withCourtApplicationCases(singletonList(CourtApplicationCase.courtApplicationCase() + .withProsecutionCaseId(randomUUID()) + .build())) + .build()); + + when(courtApplicationsSerializer.courtApplications(any(String.class))).thenReturn(courtApplications); + when(courtApplicationsSerializer.json(any())).thenReturn("result"); + + hearingJPAMapper.updateLinkedApplicationStatus("json", prosecutionCaseId, uk.gov.justice.core.courts.ApplicationStatus.EJECTED); + + verify(courtApplicationsSerializer).json(courtApplicationCaptor.capture()); + assertThat(courtApplicationCaptor.getValue().get(0).getApplicationStatus(), + is(uk.gov.justice.core.courts.ApplicationStatus.UN_ALLOCATED)); + } + + @Test + public void shouldNotThrowWhenCourtApplicationCasesIsNull() { + final UUID prosecutionCaseId = randomUUID(); + + final List courtApplications = new ArrayList<>(); + courtApplications.add(CourtApplication.courtApplication() + .withId(randomUUID()) + .withApplicationStatus(uk.gov.justice.core.courts.ApplicationStatus.UN_ALLOCATED) + .withCourtApplicationCases(null) + .build()); + + when(courtApplicationsSerializer.courtApplications(any(String.class))).thenReturn(courtApplications); + when(courtApplicationsSerializer.json(any())).thenReturn("result"); + + hearingJPAMapper.updateLinkedApplicationStatus("json", prosecutionCaseId, uk.gov.justice.core.courts.ApplicationStatus.EJECTED); + + verify(courtApplicationsSerializer).json(courtApplicationCaptor.capture()); + assertThat(courtApplicationCaptor.getValue().get(0).getApplicationStatus(), + is(uk.gov.justice.core.courts.ApplicationStatus.UN_ALLOCATED)); + } + + @Test + public void shouldReturnEmptyJsonWhenCourtApplicationsIsNull() { + when(courtApplicationsSerializer.courtApplications(any(String.class))).thenReturn(null); + when(courtApplicationsSerializer.json(any())).thenReturn("[]"); + + final String result = hearingJPAMapper.updateLinkedApplicationStatus("json", randomUUID(), uk.gov.justice.core.courts.ApplicationStatus.EJECTED); + + assertThat(result, is("[]")); + verify(courtApplicationsSerializer).json(courtApplicationCaptor.capture()); + assertThat(courtApplicationCaptor.getValue().isEmpty(), is(true)); + } } diff --git a/hearing-viewstore/hearing-viewstore-persistence/src/test/java/uk/gov/moj/cpp/hearing/repository/HearingEventRepositoryTest.java b/hearing-viewstore/hearing-viewstore-persistence/src/test/java/uk/gov/moj/cpp/hearing/repository/HearingEventRepositoryTest.java index 975e96331f..278650fca0 100644 --- a/hearing-viewstore/hearing-viewstore-persistence/src/test/java/uk/gov/moj/cpp/hearing/repository/HearingEventRepositoryTest.java +++ b/hearing-viewstore/hearing-viewstore-persistence/src/test/java/uk/gov/moj/cpp/hearing/repository/HearingEventRepositoryTest.java @@ -17,7 +17,9 @@ import uk.gov.justice.services.test.utils.persistence.BaseTransactionalTest; import uk.gov.moj.cpp.hearing.persist.entity.ha.CourtCentre; import uk.gov.moj.cpp.hearing.persist.entity.ha.Hearing; +import uk.gov.moj.cpp.hearing.persist.entity.ha.HearingDay; import uk.gov.moj.cpp.hearing.persist.entity.ha.HearingEvent; +import uk.gov.moj.cpp.hearing.persist.entity.ha.HearingSnapshotKey; import java.time.LocalDate; import java.time.ZonedDateTime; @@ -247,6 +249,33 @@ public void shouldReturnEmptyListForHearingEvents_AsNoHearingEventsRecodedForThe assertThat(hearingEvents.size(), is(0)); } + @Test + public void shouldFindHearingEvents_byPerDayCourtRoom_whenHearingDayOverridesTopLevelRoom() { + final UUID dayRoomId = randomUUID(); + givenHearingExistsWithCourtCentreAndDayOverride(EVENT_TIME.toLocalDate(), COURT_CENTRE_ID, dayRoomId); + givenSingleAlterableFalseHearingEvent(HEARING_EVENT_ID_1, HEARING_ID_1, EVENT_TIME); + + final List matchedByDayRoom = hearingEventRepository + .findHearingEvents(COURT_CENTRE_ID, dayRoomId, EVENT_TIME.toLocalDate()); + assertThat(matchedByDayRoom.size(), is(1)); + assertThat(matchedByDayRoom.get(0).getHearingId(), is(HEARING_ID_1)); + + final List matchedByTopLevelRoom = hearingEventRepository + .findHearingEvents(COURT_CENTRE_ID, COURT_ROOM_ID, EVENT_TIME.toLocalDate()); + assertThat(matchedByTopLevelRoom.size(), is(0)); + } + + @Test + public void shouldFindHearingEvents_byTopLevelRoom_whenHearingDayHasNullCourtRoomId() { + givenHearingExistsWithCourtCentreAndDayOverride(EVENT_TIME.toLocalDate(), COURT_CENTRE_ID, null); + givenSingleAlterableFalseHearingEvent(HEARING_EVENT_ID_1, HEARING_ID_1, EVENT_TIME); + + final List hearingEvents = hearingEventRepository + .findHearingEvents(COURT_CENTRE_ID, COURT_ROOM_ID, EVENT_TIME.toLocalDate()); + assertThat(hearingEvents.size(), is(1)); + assertThat(hearingEvents.get(0).getHearingId(), is(HEARING_ID_1)); + } + @Test public void shouldFindHearingEventByCourCentreId() { givenHearingExistsWithCourtCentre(); @@ -518,6 +547,39 @@ private void givenHearingExistsWithCourtCentre() { hearingRepository.save(hearing); } + private void givenHearingExistsWithCourtCentreAndDayOverride(final LocalDate date, final UUID dayCentreId, final UUID dayRoomId) { + final Hearing hearing = new Hearing(); + final CourtCentre courtCentre = new CourtCentre(); + courtCentre.setId(COURT_CENTRE_ID); + courtCentre.setRoomId(COURT_ROOM_ID); + hearing.setId(HEARING_ID_1); + hearing.setCourtCentre(courtCentre); + + final HearingDay hearingDay = new HearingDay(); + hearingDay.setId(new HearingSnapshotKey(randomUUID(), HEARING_ID_1)); + hearingDay.setHearing(hearing); + hearingDay.setDate(date); + hearingDay.setCourtCentreId(dayCentreId); + hearingDay.setCourtRoomId(dayRoomId); + hearing.getHearingDays().add(hearingDay); + + hearingRepository.save(hearing); + } + + private void givenSingleAlterableFalseHearingEvent(final UUID hearingEventId, final UUID hearingId, final ZonedDateTime eventTime) { + hearingEventRepository.save( + HearingEvent.hearingEvent() + .setId(hearingEventId) + .setHearingId(hearingId) + .setHearingEventDefinitionId(HEARING_EVENT_DEFINITION_ID_1) + .setRecordedLabel(RECORDED_LABEL) + .setEventDate(eventTime.toLocalDate()) + .setEventTime(eventTime) + .setLastModifiedTime(LAST_MODIFIED_TIME) + .setDeleted(false) + .setAlterable(false)); + } + private void givenHearingEventsForDifferentHearings() { final List hearingEvents = newArrayList( HearingEvent.hearingEvent() diff --git a/hearing-viewstore/hearing-viewstore-persistence/src/test/java/uk/gov/moj/cpp/hearing/repository/HearingRepositoryTest.java b/hearing-viewstore/hearing-viewstore-persistence/src/test/java/uk/gov/moj/cpp/hearing/repository/HearingRepositoryTest.java index 20a39aa401..0534eaa9fb 100644 --- a/hearing-viewstore/hearing-viewstore-persistence/src/test/java/uk/gov/moj/cpp/hearing/repository/HearingRepositoryTest.java +++ b/hearing-viewstore/hearing-viewstore-persistence/src/test/java/uk/gov/moj/cpp/hearing/repository/HearingRepositoryTest.java @@ -211,6 +211,32 @@ public void shouldReturnNullWhenHearingIdIsAbsent() { assertNull(courtCenter); } + @Test + public void shouldFindHearingDayByHearingIdAndDate() { + final uk.gov.justice.core.courts.Hearing hearing = hearings.get(0); + final UUID hearingId = hearing.getId(); + final LocalDate date = hearing.getHearingDays().get(0).getSittingDay().toLocalDate(); + + final HearingDay matched = hearingRepository.findHearingDayByHearingIdAndDate(hearingId, date); + + assertNotNull(matched); + assertEquals(date, matched.getDate()); + } + + @Test + public void shouldReturnNullForFindHearingDayByHearingIdAndDate_whenNoDayMatchesDate() { + final UUID hearingId = hearings.get(0).getId(); + final LocalDate unknownDate = LocalDate.of(1999, 1, 1); + + assertNull(hearingRepository.findHearingDayByHearingIdAndDate(hearingId, unknownDate)); + } + + @Test + public void shouldReturnNullForFindHearingDayByHearingIdAndDate_whenHearingIdIsUnknown() { + final LocalDate anyDate = hearings.get(0).getHearingDays().get(0).getSittingDay().toLocalDate(); + assertNull(hearingRepository.findHearingDayByHearingIdAndDate(randomUUID(), anyDate)); + } + @Test public void shouldFindTargetsByHearingId() { final UUID hearingId = hearings.get(0).getId(); diff --git a/hearing-viewstore/hearing-viewstore-persistence/src/test/java/uk/gov/moj/cpp/hearing/utils/HearingJPADataTemplate.java b/hearing-viewstore/hearing-viewstore-persistence/src/test/java/uk/gov/moj/cpp/hearing/utils/HearingJPADataTemplate.java index 4fad541894..7d0e6a3cfe 100644 --- a/hearing-viewstore/hearing-viewstore-persistence/src/test/java/uk/gov/moj/cpp/hearing/utils/HearingJPADataTemplate.java +++ b/hearing-viewstore/hearing-viewstore-persistence/src/test/java/uk/gov/moj/cpp/hearing/utils/HearingJPADataTemplate.java @@ -35,6 +35,10 @@ private HearingJPADataTemplate() { } private HearingJPADataTemplate(final boolean sysoutPrint) { + this(sysoutPrint, 1); + } + + private HearingJPADataTemplate(final boolean sysoutPrint, final int cases) { // final uk.gov.moj.cpp.hearing.persist.entity.ha.Hearing hearingEntity = aNewEnhancedRandom().nextObject(uk.gov.moj.cpp.hearing.persist.entity.ha.Hearing.class); hearingEntity.setHearingLanguage(RandomGenerator.values(HearingLanguage.values()).next()); @@ -55,7 +59,7 @@ private HearingJPADataTemplate(final boolean sysoutPrint) { }); // - randomStreamOf(1, uk.gov.moj.cpp.hearing.persist.entity.ha.ProsecutionCase.class) + randomStreamOf(cases, uk.gov.moj.cpp.hearing.persist.entity.ha.ProsecutionCase.class) .forEach(prosecutionCase -> { prosecutionCase.setId(aNewHearingSnapshotKey(hearingEntity.getId())); prosecutionCase.setHearing(hearingEntity); @@ -196,6 +200,10 @@ public static HearingJPADataTemplate aNewHearingJPADataTemplate() { return new HearingJPADataTemplate(); } + public static HearingJPADataTemplate aNewHearingJPADataTemplate(final int cases) { + return new HearingJPADataTemplate(false, cases); + } + public static HearingJPADataTemplate aNewHearingJPADataTemplate(final boolean sysoutPrint) { return new HearingJPADataTemplate(sysoutPrint); } diff --git a/hearing-viewstore/pom.xml b/hearing-viewstore/pom.xml index 90e348f267..5248c91573 100644 --- a/hearing-viewstore/pom.xml +++ b/hearing-viewstore/pom.xml @@ -3,7 +3,7 @@ uk.gov.moj.cpp.hearing hearing-parent - 17.104.158-SNAPSHOT + 17.104.158-CCSPH2-SNAPSHOT hearing-viewstore pom diff --git a/pojo-plugin/pom.xml b/pojo-plugin/pom.xml index ec0773b858..050e9d6673 100644 --- a/pojo-plugin/pom.xml +++ b/pojo-plugin/pom.xml @@ -3,7 +3,7 @@ uk.gov.moj.cpp.hearing hearing-parent - 17.104.158-SNAPSHOT + 17.104.158-CCSPH2-SNAPSHOT pojo-plugin diff --git a/pom.xml b/pom.xml index d5c44807bf..d7edfeab5c 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ uk.gov.moj.cpp.hearing hearing-parent - 17.104.158-SNAPSHOT + 17.104.158-CCSPH2-SNAPSHOT pom Hearing Context - Parent Module @@ -25,10 +25,10 @@ 0.8 1.3.3 0.1.96 - 17.104.3 + 17.104.4 17.103.131 - 17.0.57 - 17.0.58 + 17.0.75 + 17.103.95 17.0.1 17.104.81 17.0.262 @@ -38,7 +38,7 @@ 2.0.0 0.2.0 17.104.49 - 17.0.116 + 17.103.137 5.2.1.RELEASE 17.0.96 diff --git a/test-utilities/pom.xml b/test-utilities/pom.xml index 4cb6856b5f..00b7cb5f50 100644 --- a/test-utilities/pom.xml +++ b/test-utilities/pom.xml @@ -7,7 +7,7 @@ uk.gov.moj.cpp.hearing hearing-parent - 17.104.158-SNAPSHOT + 17.104.158-CCSPH2-SNAPSHOT diff --git a/test-utilities/src/main/java/uk/gov/moj/cpp/hearing/test/TestTemplates.java b/test-utilities/src/main/java/uk/gov/moj/cpp/hearing/test/TestTemplates.java index 86377e5b2e..c30d23effb 100644 --- a/test-utilities/src/main/java/uk/gov/moj/cpp/hearing/test/TestTemplates.java +++ b/test-utilities/src/main/java/uk/gov/moj/cpp/hearing/test/TestTemplates.java @@ -284,7 +284,11 @@ public static CaseDefendantDetailsWithHearingCommand initiateDefendantCommandTem .setDefendant(defendantTemplate()); } + public static uk.gov.moj.cpp.hearing.command.defendant.Defendant defendantTemplate() { + return defendantTemplate(randomUUID()); + } + public static uk.gov.moj.cpp.hearing.command.defendant.Defendant defendantTemplate(final UUID caseId) { final Defendant defendant = new Defendant(); @@ -292,7 +296,7 @@ public static uk.gov.moj.cpp.hearing.command.defendant.Defendant defendantTempla defendant.setMasterDefendantId(randomUUID()); - defendant.setProsecutionCaseId(randomUUID()); + defendant.setProsecutionCaseId(caseId); defendant.setNumberOfPreviousConvictionsCited(INTEGER.next());