Skip to content

fixing end point issue for alphetical #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ertugrulduran wants to merge 1 commit into
base: team/cct-1981
Choose a base branch
from
+83 −2
Open

fixing end point issue for alphetical #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions ...ery/listing-query-api/src/main/java/uk/gov/moj/cpp/listing/query/api/HearingQueryApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import static uk.gov.justice.services.messaging.Envelope.metadataFrom;
import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom;
import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilderWithFilter;
import static uk.gov.moj.cpp.listing.domain.CourtListType.ALPHABETICAL;
import static uk.gov.moj.cpp.listing.domain.CourtListType.ONLINE_PUBLIC;
import static uk.gov.moj.cpp.listing.domain.CourtListType.PUBLIC;

Expand All @@ -25,6 +26,7 @@
import uk.gov.moj.cpp.listing.common.xhibit.ReferenceDataLoader;
import uk.gov.moj.cpp.listing.domain.CourtListType;
import uk.gov.moj.cpp.listing.domain.referencedata.OrganisationUnit;
import uk.gov.moj.cpp.listing.query.api.service.AlphabeticalCourtListService;
import uk.gov.moj.cpp.listing.query.api.service.ReferenceDataService;
import uk.gov.moj.cpp.listing.query.document.generator.JudiciaryNameMapper;
import uk.gov.moj.cpp.listing.query.document.generator.StandardPublicCourtListTemplateAssembler;
Expand Down Expand Up @@ -103,6 +105,9 @@ public class HearingQueryApi {
@Inject
private StandardPublicCourtListTemplateAssembler standardPublicCourtListAssembler;

@Inject
private AlphabeticalCourtListService alphabeticalCourtListService;

@Inject
private ReferenceDataService referenceDataService;

Expand Down Expand Up @@ -192,7 +197,9 @@ public JsonEnvelope searchHearingsForCourtListPayload(final JsonEnvelope query)

if(courtListType.isPresent()) {
final JsonEnvelope queryResponse = hearingQueryView.getCourtListContent(query);
final Optional<JsonObject> courtListData = standardPublicCourtListAssembler.assemble(queryResponse, courtCentreId, courtRoomId, courtListType.get(), restricted, includeApplications);
final Optional<JsonObject> courtListData = ALPHABETICAL.equals(courtListType.get())
? alphabeticalCourtListService.buildAlphabeticalCourtListData(queryResponse, courtCentreId)
: standardPublicCourtListAssembler.assemble(queryResponse, courtCentreId, courtRoomId, courtListType.get(), restricted, includeApplications);
if (courtListData.isPresent()) {
final JsonObject courtListPayload = courtListData.get();
final boolean isWelsh = referenceDataService.isHearingLanguageWelsh(queryResponse, courtCentreId).orElse(false);
Expand Down Expand Up @@ -519,7 +526,7 @@ private JsonEnvelope processGetCaseByDefendant(final JsonObject payload, final S
}

private String getTemplateName(final CourtListType courtListType, boolean welsh) {
if ((PUBLIC.equals(courtListType) || ONLINE_PUBLIC.equals(courtListType)) && welsh) {
if ((ALPHABETICAL.equals(courtListType) || PUBLIC.equals(courtListType) || ONLINE_PUBLIC.equals(courtListType)) && welsh) {
return courtListType.getWelshTemplateName();
}
return courtListType.getTemplateName();
Expand Down
74 changes: 74 additions & 0 deletions ...listing-query-api/src/test/java/uk/gov/moj/cpp/listing/query/api/HearingQueryApiTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import static org.mockito.ArgumentMatchers.any;
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.services.messaging.JsonEnvelope.envelopeFrom;
Expand All @@ -31,6 +32,7 @@
import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeMatcher.jsonEnvelope;
import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeMetadataMatcher.metadata;
import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopePayloadMatcher.payloadIsJson;
import static uk.gov.moj.cpp.listing.domain.CourtListType.ALPHABETICAL;
import static uk.gov.moj.cpp.listing.domain.CourtListType.ONLINE_PUBLIC;
import static uk.gov.moj.cpp.listing.domain.CourtListType.PRISON;
import static uk.gov.moj.cpp.listing.domain.CourtListType.PUBLIC;
Expand All @@ -49,6 +51,7 @@
import uk.gov.moj.cpp.listing.common.xhibit.ReferenceDataLoader;
import uk.gov.moj.cpp.listing.domain.CourtListType;
import uk.gov.moj.cpp.listing.domain.referencedata.OrganisationUnit;
import uk.gov.moj.cpp.listing.query.api.service.AlphabeticalCourtListService;
import uk.gov.moj.cpp.listing.query.api.service.ReferenceDataService;
import uk.gov.moj.cpp.listing.query.api.util.FileUtil;
import uk.gov.moj.cpp.listing.query.document.generator.JudiciaryNameMapper;
Expand Down Expand Up @@ -118,6 +121,9 @@ public class HearingQueryApiTest {
@Mock
private StandardPublicCourtListTemplateAssembler standardPublicCourtListAssembler;

@Mock
private AlphabeticalCourtListService alphabeticalCourtListService;

@Mock
private ReferenceDataService referenceDataService;

Expand Down Expand Up @@ -1435,6 +1441,74 @@ void shouldReturnWelshTemplateForOnlinePublicCourtListWhenWelsh() {
assertThat(returnedEnvelope.payloadAsJsonObject().getString("templateName"), is("OnlinePublicCourtListEnglishWelsh"));
}

@Test
void shouldReturnAlphabeticalCourtListPayloadUsingAlphabeticalCourtListService() {
final JsonEnvelope query = envelopeFrom(
metadataBuilder()
.withId(fromString("6d4ced64-b058-4bd4-a652-98d8230b92a5"))
.withName("listing.search.court.list.payload"),
createObjectBuilder()
.add(COURT_CENTRE_ID, randomUUID().toString())
.add(COURT_ROOM_ID, randomUUID().toString())
.add(LIST_ID, ALPHABETICAL.toString())
.build());

final JsonEnvelope courtListContent = mock(JsonEnvelope.class);
when(hearingQueryView.getCourtListContent(query)).thenReturn(courtListContent);
when(alphabeticalCourtListService.buildAlphabeticalCourtListData(eq(courtListContent), any(String.class)))
.thenReturn(Optional.of(createObjectBuilder().add("id", "id1").build()));
when(referenceDataService.isHearingLanguageWelsh(any(JsonEnvelope.class), any(String.class))).thenReturn(Optional.of(false));

final JsonEnvelope returnedEnvelope = hearingQueryApi.searchHearingsForCourtListPayload(query);

assertThat(returnedEnvelope.payloadAsJsonObject().getString("id"), is("id1"));
assertThat(returnedEnvelope.payloadAsJsonObject().getString("templateName"), is("CourtList"));
verify(standardPublicCourtListAssembler, never()).assemble(any(), any(), any(), any(), any(boolean.class), any(boolean.class));
}

@Test
void shouldReturnWelshTemplateForAlphabeticalCourtListWhenWelsh() {
final JsonEnvelope query = envelopeFrom(
metadataBuilder()
.withId(fromString("6d4ced64-b058-4bd4-a652-98d8230b92a5"))
.withName("listing.search.court.list.payload"),
createObjectBuilder()
.add(COURT_CENTRE_ID, randomUUID().toString())
.add(COURT_ROOM_ID, randomUUID().toString())
.add(LIST_ID, ALPHABETICAL.toString())
.build());

when(hearingQueryView.getCourtListContent(query)).thenReturn(mock(JsonEnvelope.class));
when(alphabeticalCourtListService.buildAlphabeticalCourtListData(any(JsonEnvelope.class), any(String.class)))
.thenReturn(Optional.of(createObjectBuilder().add("id", "id1").build()));
when(referenceDataService.isHearingLanguageWelsh(any(JsonEnvelope.class), any(String.class))).thenReturn(Optional.of(true));

final JsonEnvelope returnedEnvelope = hearingQueryApi.searchHearingsForCourtListPayload(query);

assertThat(returnedEnvelope.payloadAsJsonObject().getString("templateName"), is("CourtListEnglishWelsh"));
}

@Test
void shouldReturnEmptyResponseWhenAlphabeticalCourtListServiceReturnsEmpty() {
final JsonEnvelope query = envelopeFrom(
metadataBuilder()
.withId(fromString("6d4ced64-b058-4bd4-a652-98d8230b92a5"))
.withName("listing.search.court.list.payload"),
createObjectBuilder()
.add(COURT_CENTRE_ID, randomUUID().toString())
.add(COURT_ROOM_ID, randomUUID().toString())
.add(LIST_ID, ALPHABETICAL.toString())
.build());

when(hearingQueryView.getCourtListContent(query)).thenReturn(mock(JsonEnvelope.class));
when(alphabeticalCourtListService.buildAlphabeticalCourtListData(any(JsonEnvelope.class), any(String.class)))
.thenReturn(Optional.empty());

final JsonEnvelope returnedEnvelope = hearingQueryApi.searchHearingsForCourtListPayload(query);

assertThat(returnedEnvelope.payloadAsJsonObject().size(), is(0));
}

@Test
void shouldNotEnrichApplicationWhenDetailsNotFound() {
final String applicationId = "7ab2ed6a-bf9a-4539-848b-48012032c97c";
Expand Down
Loading