Skip to content

Commit

Permalink
Interim 6 (#825)
Browse files Browse the repository at this point in the history 
* task/JS-170 Jury attendance audit number is incorrect (#823)

* Task/JS-158 Confirmed attendances go missing (#822)

* task/JS-158 Cannot update confirmed attendance

* Update JurorAppearanceServiceImpl.java

* updating tests

need to check if we want to apply the check for confirmed jurors as an exception or just skip them

* Update JurorManagementControllerITest.java

* task/JS-167 Failing to resend Initial Summons Letters (#821)

* Update MojException.java

* task/JS-171 (#826)
  • Loading branch information
@akikrahman1
akikrahman1 authored Dec 13, 2024
1 parent 62f3ec4 commit 46ed6a5
Show file tree
Hide file tree
Showing 10 changed files with 160 additions and 20 deletions.
58 changes: 57 additions & 1 deletion ...ation-test/java/uk/gov/hmcts/juror/api/moj/controller/JurorManagementControllerITest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ class JurorManagementControllerITest extends AbstractIntegrationTest {
private static final String JUROR7 = "777777777";
private static final String JUROR8 = "888888888";
private static final String JUROR9 = "999999999";
private static final String JUROR10 = "101010101";

private static final String URL_ATTENDANCE = "/api/v1/moj/juror-management/attendance";
private static final String HTTP_STATUS_OK_MESSAGE = "Expect the HTTP status to be OK";
Expand Down Expand Up @@ -720,6 +721,24 @@ void updateAttendanceCheckOutSingleJuror() {
}
}


@Test
@DisplayName("PATCH Update attendance - check out single juror but already confirmed - unhappy path")
@Sql({"/db/mod/truncate.sql", "/db/jurormanagement/UpdateAttendanceDetails.sql"})
void updateAttendanceCheckOutSingleJurorAlreadyConfirmed() {
List<String> jurors = new ArrayList<>();
jurors.add(JUROR10);
UpdateAttendanceDto request = buildUpdateAttendanceDto(jurors);
request.getCommonData().setSingleJuror(Boolean.TRUE);

ResponseEntity<AttendanceDetailsResponse> response =
restTemplate.exchange(new RequestEntity<>(request, httpHeaders, PATCH,
URI.create(URL_ATTENDANCE)), AttendanceDetailsResponse.class);

assertThat(response.getStatusCode()).as("Unprocessable Entity").isEqualTo(UNPROCESSABLE_ENTITY);

}

@Test
@DisplayName("PATCH Update attendance - checkout multiple jurors in list")
@Sql({"/db/mod/truncate.sql", "/db/jurormanagement/UpdateAttendanceDetails.sql"})
Expand Down Expand Up @@ -915,7 +934,7 @@ void updateAttendanceCheckOutAllPanelledJurorsInList() {

@Test
@DisplayName("PATCH Update attendance - check in all jurors updated ")
@Sql({"/db/mod/truncate.sql", "/db/jurormanagement/UpdateAttendanceDetails.sql"})
@Sql({"/db/mod/truncate.sql", "/db/jurormanagement/UpdateAttendanceDetailsCheckInAll.sql"})
void updateAttendanceCheckIn() {
UpdateAttendanceDto request = buildUpdateAttendanceDto(null);
request.getCommonData().setStatus(UpdateAttendanceStatus.CHECK_IN);
Expand Down Expand Up @@ -974,6 +993,22 @@ void updateAttendanceCheckIn() {
}
}

@Test
@DisplayName("PATCH Update attendance - check in all jurors updated one already confirmed - unhappy path")
@Sql({"/db/mod/truncate.sql", "/db/jurormanagement/UpdateAttendanceDetails.sql"})
void updateAttendanceCheckInAlreadyConfirmed() {
UpdateAttendanceDto request = buildUpdateAttendanceDto(null);
request.getCommonData().setStatus(UpdateAttendanceStatus.CHECK_IN);
request.getCommonData().setCheckOutTime(null);

ResponseEntity<AttendanceDetailsResponse> response =
restTemplate.exchange(new RequestEntity<>(request, httpHeaders, PATCH,
URI.create(URL_ATTENDANCE)), AttendanceDetailsResponse.class);

assertThat(response.getStatusCode()).as("Unprocessable entity").isEqualTo(UNPROCESSABLE_ENTITY);

}

@Test
@DisplayName("PATCH Update attendance - check in and out of juror updated")
@Sql({"/db/mod/truncate.sql", "/db/jurormanagement/UpdateAttendanceDetails.sql"})
Expand Down Expand Up @@ -1026,6 +1061,27 @@ void updateAttendanceCheckInAndOut() {
}
}

@Test
@DisplayName("PATCH Update attendance - check in and out of juror confirmed juror - unhappy path")
@Sql({"/db/mod/truncate.sql", "/db/jurormanagement/UpdateAttendanceDetails.sql"})
void updateAttendanceCheckInAndOutAlreadyConfirmed() {
List<String> jurors = new ArrayList<>();
jurors.add(JUROR10);
UpdateAttendanceDto request = buildUpdateAttendanceDto(jurors);
request.getCommonData().setStatus(UpdateAttendanceStatus.CHECK_IN_AND_OUT);
request.getCommonData().setCheckInTime(LocalTime.of(9, 30));
request.getCommonData().setCheckOutTime(LocalTime.of(17, 30));
request.getCommonData().setSingleJuror(Boolean.TRUE);

ResponseEntity<AttendanceDetailsResponse> response =
restTemplate.exchange(new RequestEntity<>(request, httpHeaders, PATCH,
URI.create(URL_ATTENDANCE)), AttendanceDetailsResponse.class);

assertThat(response.getStatusCode()).as("Unprocessable entity").isEqualTo(UNPROCESSABLE_ENTITY);

}


@Test
@DisplayName("PATCH Update attendance - confirm attendance (no shows)")
@Sql({"/db/mod/truncate.sql", "/db/jurormanagement/UpdateAttendanceDetails.sql",
Expand Down
18 changes: 9 additions & 9 deletions src/integration-test/java/uk/gov/hmcts/juror/api/moj/controller/LetterControllerITest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2711,9 +2711,9 @@ private void verifyHeadingsAndTypesSummons(ReissueLetterListResponseDto reissueL
List<String> headings = reissueLetterListResponseDto.getHeadings();
assertThat(headings).isNotNull();
assertThat(headings.size()).as("Expect there to be 9 headings").isEqualTo(9);
assertThat(headings.get(0)).isEqualTo("Pool Number");
assertThat(headings.get(1)).isEqualTo("Summons date");
assertThat(headings.get(2)).isEqualTo("Juror number");
assertThat(headings.get(0)).isEqualTo("Juror number");
assertThat(headings.get(1)).isEqualTo("Pool Number");
assertThat(headings.get(2)).isEqualTo("Summons date");
assertThat(headings.get(3)).isEqualTo("First name");
assertThat(headings.get(4)).isEqualTo("Last name");
assertThat(headings.get(5)).isEqualTo("Postcode");
Expand Down Expand Up @@ -2768,10 +2768,10 @@ void reissueInitialSummonsLetterListByJurorNumber() throws Exception {
List<List<Object>> data = reissueLetterListResponseDto.getData();
assertThat(data).isNotNull();
assertThat(data.size()).isEqualTo(1);
assertThat(data.get(0).get(0)).isEqualTo("555555561");
assertThat(data.get(0).size()).isEqualTo(9);
assertThat(data.get(0).get(0)).isEqualTo("415241001");
assertThat(data.get(0).get(1)).isEqualTo("TUESDAY 8 OCTOBER, 2024");
assertThat(data.get(0).get(2)).isEqualTo("555555561");
assertThat(data.get(0).get(1)).isEqualTo("415241001");
assertThat(data.get(0).get(2)).isEqualTo("TUESDAY 8 OCTOBER, 2024");
assertThat(data.get(0).get(3)).isEqualTo("FNAMEFIVEFOURZERO");
assertThat(data.get(0).get(4)).isEqualTo("LNAMEFIVEFOURZERO");
assertThat(data.get(0).get(5)).isEqualTo("CH1 2AN");
Expand Down Expand Up @@ -2847,9 +2847,9 @@ void reissueInitialSummonsLetterListByJurorNumberWelsh() throws Exception {
assertThat(data).isNotNull();
assertThat(data.size()).isEqualTo(1);
assertThat(data.get(0).size()).isEqualTo(9);
assertThat(data.get(0).get(0)).isEqualTo("415241001");
assertThat(data.get(0).get(1)).isEqualTo("TUESDAY 8 OCTOBER, 2024");
assertThat(data.get(0).get(2)).isEqualTo("555555562");
assertThat(data.get(0).get(0)).isEqualTo("555555562");
assertThat(data.get(0).get(1)).isEqualTo("415241001");
assertThat(data.get(0).get(2)).isEqualTo("TUESDAY 8 OCTOBER, 2024");
assertThat(data.get(0).get(3)).isEqualTo("FNAMEFIVEFOURZERO");
assertThat(data.get(0).get(4)).isEqualTo("LNAMEFIVEFOURZERO");
assertThat(data.get(0).get(5)).isEqualTo("CH1 2AN");
Expand Down
9 changes: 6 additions & 3 deletions src/integration-test/resources/db/jurormanagement/UpdateAttendanceDetails.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@ insert into juror_mod.juror (juror_number, last_name, first_name, dob, addre
('666666666', 'SIX', 'TEST', NULL, '540 STREET NAME', 'ANYTOWN', 'CH1 2AN', TRUE),
('777777777', 'SEVEN', 'TEST', NULL, '540 STREET NAME', 'ANYTOWN', 'CH1 2AN', TRUE),
('888888888', 'EIGHT', 'TEST', NULL, '540 STREET NAME', 'ANYTOWN', 'CH1 2AN', TRUE),
('999999999', 'NINE', 'TEST', NULL, '540 STREET NAME', 'ANYTOWN', 'CH1 2AN', TRUE);
('999999999', 'NINE', 'TEST', NULL, '540 STREET NAME', 'ANYTOWN', 'CH1 2AN', TRUE),
('101010101', 'TEN', 'TEST', NULL, '540 STREET NAME', 'ANYTOWN', 'CH1 2AN', TRUE);

--JUROR_MOD.JUROR_POOL
insert into juror_mod.juror_pool (owner, juror_number, pool_number, next_date, def_date, status, is_active, was_deferred) values
Expand All @@ -40,7 +41,8 @@ insert into juror_mod.juror_pool (owner, juror_number, pool_number, next_date, d
('415', '666666666', '415230101', current_date - interval '2 weeks', NULL, 2, TRUE, FALSE),
('415', '777777777', '415230101', current_date - interval '2 weeks', NULL, 2, TRUE, FALSE),
('415', '888888888', '415230101', current_date - interval '2 days', NULL, 2, TRUE, FALSE),
('415', '999999999', '415230101', current_date - interval '2 days', NULL, 2, TRUE, FALSE);
('415', '999999999', '415230101', current_date - interval '2 days', NULL, 2, TRUE, FALSE),
('415', '101010101', '415230101', current_date - interval '2 days', NULL, 2, TRUE, FALSE);

--JUROR_MOD.APPEARANCE
insert into juror_mod.appearance (attendance_date,juror_number,loc_code,time_in,time_out,non_attendance,appearance_stage,attendance_type, trial_number) values
Expand All @@ -50,7 +52,8 @@ insert into juror_mod.appearance (attendance_date,juror_number,loc_code,time_in,
(current_date - interval '2 days','333333333','415','09:30:00',null,false,'CHECKED_IN','FULL_DAY','T10000000'),
(current_date - interval '2 days','555555555','415','06:30:00',null,false,'CHECKED_IN','FULL_DAY',null),
(current_date - interval '2 days','666666666','415','09:30:00',null,false,'CHECKED_IN','FULL_DAY',null),
(current_date - interval '2 days','777777777','415','12:30','15:50',false,'CHECKED_IN','FULL_DAY',null);
(current_date - interval '2 days','777777777','415','12:30','15:50',false,'CHECKED_IN','FULL_DAY',null),
(current_date - interval '2 days','101010101','415','09:31:00','16:00',false,'EXPENSE_ENTERED','FULL_DAY',null);

INSERT INTO juror_mod.juror_trial (loc_code, juror_number, trial_number, rand_number, date_selected, "result",completed, empanelled_date) values
('415', '222222222', 'T10000000', 10,current_date - interval '2 days' + time '09:00:00', 'J', null, current_date - interval '2 days'),
Expand Down
57 changes: 57 additions & 0 deletions src/integration-test/resources/db/jurormanagement/UpdateAttendanceDetailsCheckInAll.sql
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
alter sequence attendance_audit_seq restart with 10000000;
ALTER SEQUENCE juror_mod.judge_id_seq
RESTART WITH 1;
ALTER SEQUENCE juror_mod.courtroom_id_seq
RESTART WITH 1;

insert into juror_mod.judge (owner, code, description) values
('415', '9999', 'judge jose');

insert into juror_mod.courtroom (loc_code, room_number, description) values
('415', '99995', 'big room');

insert into juror_mod.trial (trial_number, loc_code, description, judge, trial_type, trial_start_date, anonymous,courtroom)
values ('T10000000', '415', 'TEST DEFENDANT', 1, 'CIV', current_date - 2, false, 1);

--JUROR_MOD.POOL
insert into juror_mod.pool (owner, pool_no, return_date, total_no_required, no_requested, pool_type,loc_code, new_request, last_update) values
('415', '415230101', current_date - interval '2 weeks', 10, 10, 'CRO','415', 'N', TIMESTAMP'2022-02-02 09:22:09.0'),
('415', '415230102', current_date - interval '2 weeks', 10, 10, 'CRO','415', 'N', TIMESTAMP'2022-02-02 09:22:09.0');

--JUROR_MOD.JUROR
insert into juror_mod.juror (juror_number, last_name, first_name, dob, address_line_1, address_line_4, postcode, responded) values
('111111111', 'LASTNAME', 'TEST', NULL, '540 STREET NAME', 'ANYTOWN', 'CH1 2AN', TRUE),
('222222222', 'TWO', 'TEST', NULL, '540 STREET NAME', 'ANYTOWN', 'CH1 2AN', TRUE),
('333333333', 'THREE', 'TEST', NULL, '540 STREET NAME', 'ANYTOWN', 'CH1 2AN', TRUE),
('444444444', 'FOUR', 'TEST', NULL, '540 STREET NAME', 'ANYTOWN', 'CH1 2AN', TRUE),
('555555555', 'FIVE', 'TEST', NULL, '540 STREET NAME', 'ANYTOWN', 'CH1 2AN', TRUE),
('666666666', 'SIX', 'TEST', NULL, '540 STREET NAME', 'ANYTOWN', 'CH1 2AN', TRUE),
('777777777', 'SEVEN', 'TEST', NULL, '540 STREET NAME', 'ANYTOWN', 'CH1 2AN', TRUE),
('888888888', 'EIGHT', 'TEST', NULL, '540 STREET NAME', 'ANYTOWN', 'CH1 2AN', TRUE),
('999999999', 'NINE', 'TEST', NULL, '540 STREET NAME', 'ANYTOWN', 'CH1 2AN', TRUE);

--JUROR_MOD.JUROR_POOL
insert into juror_mod.juror_pool (owner, juror_number, pool_number, next_date, def_date, status, is_active, was_deferred) values
('415', '111111111', '415230101', current_date - interval '2 weeks', NULL, 2, TRUE, FALSE),
('415', '222222222', '415230101', current_date - interval '2 weeks', NULL, 4, TRUE, TRUE),
('415', '333333333', '415230101', current_date - interval '2 weeks', NULL, 3, TRUE, TRUE),
('415', '444444444', '415230101', current_date - interval '2 weeks', NULL, 1, TRUE, FALSE),
('415', '555555555', '415230101', current_date - interval '2 weeks', NULL, 2, TRUE, FALSE),
('415', '666666666', '415230101', current_date - interval '2 weeks', NULL, 2, TRUE, FALSE),
('415', '777777777', '415230101', current_date - interval '2 weeks', NULL, 2, TRUE, FALSE),
('415', '888888888', '415230101', current_date - interval '2 days', NULL, 2, TRUE, FALSE),
('415', '999999999', '415230101', current_date - interval '2 days', NULL, 2, TRUE, FALSE);

--JUROR_MOD.APPEARANCE
insert into juror_mod.appearance (attendance_date,juror_number,loc_code,time_in,time_out,non_attendance,appearance_stage,attendance_type, trial_number) values
(current_date - interval '1 day','111111111','415','09:31:00',null,false,'CHECKED_IN','FULL_DAY',null),
(current_date - interval '2 days','111111111','415','09:30:00',null,false,'CHECKED_IN','FULL_DAY',null),
(current_date - interval '2 days','222222222','415','09:30:00',null,false,'CHECKED_IN','FULL_DAY','T10000000'),
(current_date - interval '2 days','333333333','415','09:30:00',null,false,'CHECKED_IN','FULL_DAY','T10000000'),
(current_date - interval '2 days','555555555','415','06:30:00',null,false,'CHECKED_IN','FULL_DAY',null),
(current_date - interval '2 days','666666666','415','09:30:00',null,false,'CHECKED_IN','FULL_DAY',null),
(current_date - interval '2 days','777777777','415','12:30','15:50',false,'CHECKED_IN','FULL_DAY',null);

INSERT INTO juror_mod.juror_trial (loc_code, juror_number, trial_number, rand_number, date_selected, "result",completed, empanelled_date) values
('415', '222222222', 'T10000000', 10,current_date - interval '2 days' + time '09:00:00', 'J', null, current_date - interval '2 days'),
('415', '333333333', 'T10000000', 10,current_date - interval '2 days' + time '09:00:00', null, null, null);
2 changes: 1 addition & 1 deletion src/main/java/uk/gov/hmcts/juror/api/moj/enumeration/letter/LetterType.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@
public enum LetterType {

SUMMONS(List.of(FormCode.ENG_SUMMONS, FormCode.BI_SUMMONS), List.of(
ReissueLetterService.DataType.JUROR_NUMBER,
ReissueLetterService.DataType.SUMMONS_POOL_NUMBER,
ReissueLetterService.DataType.SUMMONS_DATE,
ReissueLetterService.DataType.JUROR_NUMBER,
ReissueLetterService.DataType.JUROR_FIRST_NAME,
ReissueLetterService.DataType.JUROR_LAST_NAME,
ReissueLetterService.DataType.JUROR_POSTCODE,
Expand Down
4 changes: 3 additions & 1 deletion src/main/java/uk/gov/hmcts/juror/api/moj/exception/MojException.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,10 @@ public enum ErrorCode {
CANNOT_DEFER_TO_EXISTING_POOL,
CANNOT_DEFER_JUROR_WITH_APPEARANCE,
CANNOT_PROCESS_EMPANELLED_JUROR,
CANNOT_UPDATE_CONFIRMED_ATTENDANCE,
CANNOT_RE_ADD_JUROR_TO_PANEL,
UNCONFIRMED_ATTENDANCE_EXISTS
UNCONFIRMED_ATTENDANCE_EXISTS,
INVALID_JUROR_STATUS
}
}

Expand Down
3 changes: 2 additions & 1 deletion src/main/java/uk/gov/hmcts/juror/api/moj/service/PoolRequestServiceImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,8 @@ public PoolsAtCourtLocationListDto getAllActivePoolsAtCourtLocation(String locCo
return new PoolsAtCourtLocationListDto(data);
}

private static void populatePoolsListing(List<String> poolsListing, List<PoolsAtCourtLocationListDto.PoolsAtCourtLocationDataDto> data) {
private static void populatePoolsListing(List<String> poolsListing,
List<PoolsAtCourtLocationListDto.PoolsAtCourtLocationDataDto> data) {
poolsListing.forEach(pool -> {
List<String> poolDetails = Arrays.asList(pool.split(","));

Expand Down
Loading

0 comments on commit 46ed6a5

Please sign in to comment.