diff --git a/src/integration-test/java/uk/gov/hmcts/juror/api/moj/controller/CompleteServiceControllerITest.java b/src/integration-test/java/uk/gov/hmcts/juror/api/moj/controller/CompleteServiceControllerITest.java index 7477b394b..e2d10c736 100644 --- a/src/integration-test/java/uk/gov/hmcts/juror/api/moj/controller/CompleteServiceControllerITest.java +++ b/src/integration-test/java/uk/gov/hmcts/juror/api/moj/controller/CompleteServiceControllerITest.java @@ -43,6 +43,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; @@ -74,8 +75,7 @@ private void validateJurorWasCompleted(LocalDate completionTime, String jurorNum JurorPool jurorPool = jurorPoolRepository.findByJurorJurorNumberAndPoolPoolNumber(jurorNumber, poolNumber); assertEquals(true, jurorPool.getIsActive(), "Juror pool should be active"); - assertEquals(false, jurorPool.getOnCall(), - "Juror pool should not be on call"); + assertFalse(jurorPool.isOnCall(), "Juror pool should not be on call"); assertEquals(IJurorStatus.COMPLETED, jurorPool.getStatus().getStatus(), "Juror pool status should be completed"); Juror juror = jurorPool.getJuror(); @@ -85,7 +85,7 @@ private void validateJurorWasCompleted(LocalDate completionTime, String jurorNum if (isDismissal) { assertThat(jurorPool.getNextDate()).isNull(); - assertThat(jurorPool.getOnCall()).isFalse(); + assertThat(jurorPool.isOnCall()).isFalse(); } List jurorHistories = jurorHistoryRepository.findByJurorNumberOrderById(jurorNumber); assertEquals(1, jurorHistories.size(), "Should only be one history entry"); diff --git a/src/integration-test/java/uk/gov/hmcts/juror/api/moj/controller/JurorManagementControllerITest.java b/src/integration-test/java/uk/gov/hmcts/juror/api/moj/controller/JurorManagementControllerITest.java index 065df049d..851552e44 100644 --- a/src/integration-test/java/uk/gov/hmcts/juror/api/moj/controller/JurorManagementControllerITest.java +++ b/src/integration-test/java/uk/gov/hmcts/juror/api/moj/controller/JurorManagementControllerITest.java @@ -1282,7 +1282,7 @@ void updateAttendanceDateOnCallFlagUpdated() { // check the on-call flag before invoking the api Boolean onCallFlagBefore = - jurorPoolRepository.findByJurorJurorNumberAndPoolPoolNumber(JUROR6, POOL_NUMBER_415230101).getOnCall(); + jurorPoolRepository.findByJurorJurorNumberAndPoolPoolNumber(JUROR6, POOL_NUMBER_415230101).isOnCall(); assertThat(onCallFlagBefore).as("On-call flag should be True").isEqualTo(Boolean.TRUE); ResponseEntity responseEntity = @@ -1296,7 +1296,7 @@ void updateAttendanceDateOnCallFlagUpdated() { // verify the on-call flag was updated successfully Boolean onCallFlagAfter = - jurorPoolRepository.findByJurorJurorNumberAndPoolPoolNumber(JUROR6, POOL_NUMBER_415230101).getOnCall(); + jurorPoolRepository.findByJurorJurorNumberAndPoolPoolNumber(JUROR6, POOL_NUMBER_415230101).isOnCall(); assertThat(onCallFlagAfter).as("On-call flag should be False").isEqualTo(Boolean.FALSE); } diff --git a/src/integration-test/java/uk/gov/hmcts/juror/api/moj/controller/ManagePoolControllerITest.java b/src/integration-test/java/uk/gov/hmcts/juror/api/moj/controller/ManagePoolControllerITest.java index 4b14b9255..75aba4561 100644 --- a/src/integration-test/java/uk/gov/hmcts/juror/api/moj/controller/ManagePoolControllerITest.java +++ b/src/integration-test/java/uk/gov/hmcts/juror/api/moj/controller/ManagePoolControllerITest.java @@ -2147,7 +2147,7 @@ private void transferJurorPoolValidateNewlyCreatedJurorPool(String jurorNumber, assertThat(targetJurorPool.getEditTag()) .as(EXPECT_PROPERTY_TO_BE_USE_A_DEFAULT_VALUE) .isNull(); - assertThat(targetJurorPool.getOnCall()) + assertThat(targetJurorPool.isOnCall()) .as(EXPECT_PROPERTY_TO_BE_USE_A_DEFAULT_VALUE) .isFalse(); assertThat(targetJurorPool.getSmartCard()) diff --git a/src/integration-test/resources/db/CompleteServiceController_InitPoolsAtCourt.sql b/src/integration-test/resources/db/CompleteServiceController_InitPoolsAtCourt.sql index 6b710503e..1195d3d14 100644 --- a/src/integration-test/resources/db/CompleteServiceController_InitPoolsAtCourt.sql +++ b/src/integration-test/resources/db/CompleteServiceController_InitPoolsAtCourt.sql @@ -105,18 +105,18 @@ INSERT INTO juror_mod.juror (juror_number, last_name, first_name, dob, address_l ('641800002', 'PERSON', 'TEST', '1990-05-16', '542 STREET NAME', 'ANYTOWN', 'CH1 2AN', true, null), ('641800003', 'PERSON', 'TEST', '1990-05-16', '542 STREET NAME', 'ANYTOWN', 'CH1 2AN', true, '2023-10-24'); -INSERT INTO juror_mod.juror_pool (owner, juror_number, pool_number, is_active, next_date, status, on_call) VALUES -('400', '641600001', '416230101', true, '2023-01-23', 2, null), -('416', '641600002', '416230103', true, '2023-01-23', 13, null), -('417', '641700001', '417230101', true, '2023-01-09', 13, null), -('417', '641700002', '417230101', true, '2023-01-09', 7, null), -('417', '641700003', '417230101', true, '2023-01-09', 2, null), -('417', '641700004', '417230101', true, '2023-01-09', 2, true), -('417', '641700005', '417230101', true, '2023-01-09', 4, null), -('417', '641700006', '417230101', true, '2023-01-09', 2, null), -('418', '641800001', '418230101', true, '2023-10-25', 2, null), -('418', '641800002', '418230102', true, '2023-10-23', 2, null), -('418', '641800003', '418230103', true, '2023-10-23', 13, null); +INSERT INTO juror_mod.juror_pool (owner, juror_number, pool_number, is_active, next_date, status) VALUES +('400', '641600001', '416230101', true, '2023-01-23', 2), +('416', '641600002', '416230103', true, '2023-01-23', 13), +('417', '641700001', '417230101', true, '2023-01-09', 13), +('417', '641700002', '417230101', true, '2023-01-09', 7), +('417', '641700003', '417230101', true, '2023-01-09', 2), +('417', '641700004', '417230101', true, '2023-01-09', 2), +('417', '641700005', '417230101', true, '2023-01-09', 4), +('417', '641700006', '417230101', true, '2023-01-09', 2), +('418', '641800001', '418230101', true, '2023-10-25', 2), +('418', '641800002', '418230102', true, '2023-10-23', 2), +('418', '641800003', '418230103', true, '2023-10-23', 13); INSERT INTO juror_mod.appearance (attendance_date,juror_number,pool_number,loc_code,f_audit,time_in,time_out,travel_time,appearance_stage,non_attendance) VALUES diff --git a/src/integration-test/resources/db/JurorManagementController_poolsAtCourtLocation.sql b/src/integration-test/resources/db/JurorManagementController_poolsAtCourtLocation.sql index 42acc10dd..a48472d56 100644 --- a/src/integration-test/resources/db/JurorManagementController_poolsAtCourtLocation.sql +++ b/src/integration-test/resources/db/JurorManagementController_poolsAtCourtLocation.sql @@ -112,18 +112,18 @@ INSERT INTO juror_mod.juror (juror_number, last_name, first_name, dob, address_l ('641800003', 'PERSON', 'TEST', '1990-05-16', '542 STREET NAME', 'ANYTOWN', 'CH1 2AN', true, '2023-10-24'); INSERT INTO juror_mod.juror_pool (owner, juror_number, pool_number, is_active, next_date, status, on_call) VALUES -('400', '641600001', '416230101', true, '2023-01-23', 2, null), -('416', '641600002', '416230103', true, '2023-01-23', 13, null), -('415', '641500001', '415230101', true, current_date - 10, 13, null), -('415', '641500002', '415230101', true, current_date - 10, 7, null), -('415', '641500003', '415230101', true, current_date - 10, 2, null), +('400', '641600001', '416230101', true, '2023-01-23', 2, false), +('416', '641600002', '416230103', true, '2023-01-23', 13, false), +('415', '641500001', '415230101', true, current_date - 10, 13, false), +('415', '641500002', '415230101', true, current_date - 10, 7, false), +('415', '641500003', '415230101', true, current_date - 10, 2, false), ('415', '641500004', '415230101', true, current_date - 10, 2, true), -('415', '641500005', '415230101', true, current_date - 10, 4, null), -('415', '641500006', '415230101', true, current_date - 10, 2, null), -('415', '641500007', '415230101', true, current_date - 10, 2, null), -('418', '641800001', '418230101', true, '2023-10-25', 2, null), -('418', '641800002', '418230102', true, '2023-10-23', 2, null), -('418', '641800003', '418230103', true, '2023-10-23', 13, null); +('415', '641500005', '415230101', true, current_date - 10, 4, false), +('415', '641500006', '415230101', true, current_date - 10, 2, false), +('415', '641500007', '415230101', true, current_date - 10, 2, false), +('418', '641800001', '418230101', true, '2023-10-25', 2, false), +('418', '641800002', '418230102', true, '2023-10-23', 2, false), +('418', '641800003', '418230103', true, '2023-10-23', 13, false); INSERT INTO juror_mod.appearance (attendance_date,juror_number,pool_number,loc_code,f_audit,time_in,time_out,travel_time,appearance_stage,non_attendance) VALUES (current_date,'641500003','415230101','415',123456789,'09:30:00',null,'01:12','CHECKED_IN',false); diff --git a/src/integration-test/resources/db/JurorPaperResponse_initPaperResponse.sql b/src/integration-test/resources/db/JurorPaperResponse_initPaperResponse.sql index 2ddb8b748..15d913dd8 100644 --- a/src/integration-test/resources/db/JurorPaperResponse_initPaperResponse.sql +++ b/src/integration-test/resources/db/JurorPaperResponse_initPaperResponse.sql @@ -50,7 +50,7 @@ VALUES ('415', '111111111', '415220502', true, CURRENT_DATE + interval '6 weeks' ('400', '121314151', '415220502', true, CURRENT_DATE + interval '6 weeks', 2); INSERT INTO juror_mod.juror_pool(juror_number, pool_number, "owner", user_edtq, is_active, status, times_sel, def_date, "location", no_attendances, no_attended, no_fta, no_awol, pool_seq, edit_tag, next_date, on_call, smart_card, was_deferred, deferral_code, id_checked, postpone, paid_cash, scan_code, last_update, reminder_sent, transfer_date, date_created) VALUES -('641500001', '415240601', '415', 'court-southwark', true, 10, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '0002', NULL, '2024-06-11', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2024-04-09 15:07:32.570', NULL, NULL, '2024-04-09 15:06:58.069'); +('641500001', '415240601', '415', 'court-southwark', true, 10, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '0002', NULL, '2024-06-11', false, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2024-04-09 15:07:32.570', NULL, NULL, '2024-04-09 15:06:58.069'); INSERT INTO juror_mod.juror_pool(juror_number, pool_number, "owner", user_edtq, is_active, status, times_sel, def_date, "location", no_attendances, no_attended, no_fta, no_awol, pool_seq, edit_tag, next_date, on_call, smart_card, was_deferred, deferral_code, id_checked, postpone, paid_cash, scan_code, last_update, reminder_sent, transfer_date, date_created) VALUES ('641500001', '471240401', '471', 'court-southwark', true, 2, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '0001', NULL, '2024-04-29', false, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2024-04-09 15:12:48.674', NULL, NULL, '2024-04-09 15:12:48.674'); diff --git a/src/integration-test/resources/db/JurorRecordController_bureauDigitalDetail.sql b/src/integration-test/resources/db/JurorRecordController_bureauDigitalDetail.sql index f896adb92..1498d7fbb 100644 --- a/src/integration-test/resources/db/JurorRecordController_bureauDigitalDetail.sql +++ b/src/integration-test/resources/db/JurorRecordController_bureauDigitalDetail.sql @@ -56,7 +56,7 @@ INSERT INTO juror_mod.juror_pool (owner, juror_number, pool_number, is_active, n ('400', '555555555', '457230801', true, '2022-05-03', 2); INSERT INTO juror_mod.juror_pool(juror_number, pool_number, "owner", user_edtq, is_active, status, times_sel, def_date, "location", no_attendances, no_attended, no_fta, no_awol, pool_seq, edit_tag, next_date, on_call, smart_card, was_deferred, deferral_code, id_checked, postpone, paid_cash, scan_code, last_update, reminder_sent, transfer_date, date_created) VALUES -('641500001', '415240601', '415', 'court-southwark', true, 10, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '0002', NULL, '2024-06-11', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2024-04-09 15:07:32.570', NULL, NULL, '2024-04-09 15:06:58.069'); +('641500001', '415240601', '415', 'court-southwark', true, 10, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '0002', NULL, '2024-06-11', false, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2024-04-09 15:07:32.570', NULL, NULL, '2024-04-09 15:06:58.069'); INSERT INTO juror_mod.juror_pool(juror_number, pool_number, "owner", user_edtq, is_active, status, times_sel, def_date, "location", no_attendances, no_attended, no_fta, no_awol, pool_seq, edit_tag, next_date, on_call, smart_card, was_deferred, deferral_code, id_checked, postpone, paid_cash, scan_code, last_update, reminder_sent, transfer_date, date_created) VALUES ('641500001', '471240401', '471', 'court-southwark', true, 2, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '0001', NULL, '2024-04-29', false, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2024-04-09 15:12:48.674', NULL, NULL, '2024-04-09 15:12:48.674'); diff --git a/src/integration-test/resources/db/RequestPoolController_poolsAtCourtLocation.sql b/src/integration-test/resources/db/RequestPoolController_poolsAtCourtLocation.sql index 8ed90e210..48fbae21e 100644 --- a/src/integration-test/resources/db/RequestPoolController_poolsAtCourtLocation.sql +++ b/src/integration-test/resources/db/RequestPoolController_poolsAtCourtLocation.sql @@ -98,27 +98,27 @@ INSERT INTO juror_mod.juror (juror_number, last_name, first_name, dob, address_l ('641900001', 'PERSON1', 'TEST', '1990-05-16', '542 STREET NAME', 'ANYTOWN', 'CH1 2AN', true, null); INSERT INTO juror_mod.juror_pool (owner, juror_number, pool_number, is_active, next_date, status, on_call) VALUES -('400', '641600001', '416230101', true, '2023-01-23', 2, null), -('416', '641600002', '416230103', true, '2023-01-23', 13, null), -('417', '641700001', '417230101', true, '2023-01-09', 13, null), -('417', '641700002', '417230101', true, '2023-01-09', 7, null), -('417', '641700003', '417230101', true, '2023-01-09', 2, null), +('400', '641600001', '416230101', true, '2023-01-23', 2, false), +('416', '641600002', '416230103', true, '2023-01-23', 13, false), +('417', '641700001', '417230101', true, '2023-01-09', 13, false), +('417', '641700002', '417230101', true, '2023-01-09', 7, false), +('417', '641700003', '417230101', true, '2023-01-09', 2, false), ('417', '641700004', '417230101', true, '2023-01-09', 2, true), -('417', '641700005', '417230101', true, '2023-01-09', 4, null), -('417', '641700006', '417230101', true, '2023-01-09', 2, null), -('417', '641700007', '417230101', true, '2023-01-09', 2, null), -('417', '641700008', '417230101', true, '2023-01-09', 2, null), -('417', '641700009', '417230101', true, '2023-01-09', 3, null), -('417', '641700010', '417230101', true, '2023-01-09', 3, null), -('417', '641700011', '417230101', true, '2023-01-09', 4, null), -('417', '641700012', '417230101', true, '2023-01-09', 4, null), -('417', '641700013', '417230101', true, '2023-01-09', 4, null), -('417', '641700014', '417230101', true, '2023-01-09', 3, null), -('418', '641800001', '418230101', true, '2023-10-25', 2, null), -('418', '641800002', '418230102', true, '2023-10-23', 2, null), -('418', '641800003', '418230103', true, '2023-10-23', 2, null), -('418', '641800004', '418230102', true, '2023-10-23', 3, null), -('418', '641800005', '418230103', true, '2023-10-23', 4, null), +('417', '641700005', '417230101', true, '2023-01-09', 4, false), +('417', '641700006', '417230101', true, '2023-01-09', 2, false), +('417', '641700007', '417230101', true, '2023-01-09', 2, false), +('417', '641700008', '417230101', true, '2023-01-09', 2, false), +('417', '641700009', '417230101', true, '2023-01-09', 3, false), +('417', '641700010', '417230101', true, '2023-01-09', 3, false), +('417', '641700011', '417230101', true, '2023-01-09', 4, false), +('417', '641700012', '417230101', true, '2023-01-09', 4, false), +('417', '641700013', '417230101', true, '2023-01-09', 4, false), +('417', '641700014', '417230101', true, '2023-01-09', 3, false), +('418', '641800001', '418230101', true, '2023-10-25', 2, false), +('418', '641800002', '418230102', true, '2023-10-23', 2, false), +('418', '641800003', '418230103', true, '2023-10-23', 2, false), +('418', '641800004', '418230102', true, '2023-10-23', 3, false), +('418', '641800005', '418230103', true, '2023-10-23', 4, false), ('419', '641900001', '419230101', true, '2023-10-23', 2, true); INSERT INTO juror_mod.appearance (attendance_date,juror_number,pool_number,loc_code,f_audit,time_in,time_out,travel_time,appearance_stage,non_attendance) VALUES diff --git a/src/integration-test/resources/db/letter/LetterController_initInformationRequestLetter.sql b/src/integration-test/resources/db/letter/LetterController_initInformationRequestLetter.sql index 0bffccdea..8705226aa 100644 --- a/src/integration-test/resources/db/letter/LetterController_initInformationRequestLetter.sql +++ b/src/integration-test/resources/db/letter/LetterController_initInformationRequestLetter.sql @@ -21,13 +21,13 @@ INSERT INTO juror_mod.juror (juror_number,poll_number,title,last_name,first_name ('641500216','216',NULL,'LNAMEONESIXT','FNAMEONESIX',NULL,'16 STREET NAME','ANYTOWN',NULL,NULL,NULL,'CH1 2AN',NULL,NULL,NULL,false,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,false,'NOT_CHECKED','2024-06-11 13:57:15',NULL,NULL,NULL,NULL,0,'2024-06-03 15:33:11.314842',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,false,NULL,0,false,NULL); INSERT INTO juror_mod.juror_pool (juror_number,pool_number,"owner",user_edtq,is_active,status,times_sel,def_date,"location",no_attendances,no_attended,no_fta,no_awol,pool_seq,edit_tag,next_date,on_call,smart_card,was_deferred,deferral_code,id_checked,postpone,paid_cash,scan_code,last_update,reminder_sent,transfer_date,date_created) VALUES - ('641500017','415240801','400','ADMINUSER',true,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0015',NULL,'2024-08-05',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-04 11:14:27.130294',true,NULL,'2024-06-03 12:00:23.127317'), - ('641500212','415240801','400','ADMINUSER',true,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0019',NULL,'2024-08-05',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-03 15:33:11.348805',NULL,NULL,'2024-06-03 15:33:11.348805'), - ('641500211','415240801','400','ADMINUSER',true,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0023',NULL,'2024-08-05',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-03 15:33:11.357346',NULL,NULL,'2024-06-03 15:33:11.357346'), - ('641500216','415240801','400','ADMINUSER',true,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0025',NULL,'2024-08-05',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-03 15:33:11.361174',NULL,NULL,'2024-06-03 15:33:11.361174'), - ('641500316','415240801','400','ADMINUSER',true,2,NULL,'2024-08-20',NULL,NULL,NULL,NULL,NULL,'0005',NULL,NULL,NULL,NULL,true,NULL,NULL,NULL,NULL,NULL,'2024-06-03 15:57:45.605066',true,NULL,'2024-06-03 12:00:23.10279'), - ('641500316','415240804','400','ADMINUSER',false,7,NULL,'2024-08-20',NULL,NULL,NULL,NULL,NULL,'0005',NULL,NULL,NULL,NULL,NULL,'M',NULL,NULL,NULL,NULL,'2024-06-03 15:57:45.605066',NULL,NULL,'2024-06-03 12:00:23.10279'), - ('641500223','415240802','400','ADMINUSER',true,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0020',NULL,'2024-08-05',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-11 13:55:51.432707',true,NULL,'2024-06-03 15:33:11.351721'); + ('641500017','415240801','400','ADMINUSER',true,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0015',NULL,'2024-08-05',false,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-04 11:14:27.130294',true,NULL,'2024-06-03 12:00:23.127317'), + ('641500212','415240801','400','ADMINUSER',true,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0019',NULL,'2024-08-05',false,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-03 15:33:11.348805',NULL,NULL,'2024-06-03 15:33:11.348805'), + ('641500211','415240801','400','ADMINUSER',true,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0023',NULL,'2024-08-05',false,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-03 15:33:11.357346',NULL,NULL,'2024-06-03 15:33:11.357346'), + ('641500216','415240801','400','ADMINUSER',true,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0025',NULL,'2024-08-05',false,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-03 15:33:11.361174',NULL,NULL,'2024-06-03 15:33:11.361174'), + ('641500316','415240801','400','ADMINUSER',true,2,NULL,'2024-08-20',NULL,NULL,NULL,NULL,NULL,'0005',NULL,NULL,false,NULL,true,NULL,NULL,NULL,NULL,NULL,'2024-06-03 15:57:45.605066',true,NULL,'2024-06-03 12:00:23.10279'), + ('641500316','415240804','400','ADMINUSER',false,7,NULL,'2024-08-20',NULL,NULL,NULL,NULL,NULL,'0005',NULL,NULL,false,NULL,NULL,'M',NULL,NULL,NULL,NULL,'2024-06-03 15:57:45.605066',NULL,NULL,'2024-06-03 12:00:23.10279'), + ('641500223','415240802','400','ADMINUSER',true,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0020',NULL,'2024-08-05',false,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-11 13:55:51.432707',true,NULL,'2024-06-03 15:33:11.351721'); INSERT INTO juror_mod.bulk_print_data (juror_no,creation_date,form_type,detail_rec,extracted_flag,digital_comms) VALUES ('641500017',current_date - 1,'5227','14 JUNE 2024 THE CROWN COURT AT CHESTER JURY CENTRAL SUMMONING BUREAU THE COURT SERVICE FREEPOST LON 19669 POCOCK STREET LONDON SE1 0YG 0845 3555567 PART 2 SECTION D FNAMEONESEVEN LNAMEONESEVEN 17 STREET NAME ANYTOWN CH3 2AR 641500017JURY MANAGER ',false,false), diff --git a/src/integration-test/resources/db/mod/reports/AbsencesReportITest.sql b/src/integration-test/resources/db/mod/reports/AbsencesReportITest.sql index 40d333fd1..190c7f8c5 100644 --- a/src/integration-test/resources/db/mod/reports/AbsencesReportITest.sql +++ b/src/integration-test/resources/db/mod/reports/AbsencesReportITest.sql @@ -19,17 +19,17 @@ INSERT INTO juror_mod.juror (juror_number,poll_number,title,last_name,first_name -- create juror_pool associative records INSERT INTO juror_mod.juror_pool (juror_number,pool_number,"owner",user_edtq,is_active,status,times_sel,def_date,"location",no_attendances,no_attended,no_fta,no_awol,pool_seq,edit_tag,next_date,on_call,smart_card,was_deferred,deferral_code,id_checked,postpone,paid_cash,scan_code,last_update,reminder_sent,transfer_date,date_created) VALUES ('641500021','415240601','415','MODTESTBUREAU',true,4,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0001',NULL, - current_date+1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-04-22 12:26:40.702989',NULL,NULL,'2024-04-22 12:26:40.702987'), + current_date+1,false,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-04-22 12:26:40.702989',NULL,NULL,'2024-04-22 12:26:40.702987'), ('641500011','415240601','415','MODTESTBUREAU',true,3,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0002',NULL, - current_date+1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-04-22 12:26:40.757378',NULL,NULL,'2024-04-22 12:26:40.757376'), + current_date+1,false,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-04-22 12:26:40.757378',NULL,NULL,'2024-04-22 12:26:40.757376'), ('641500003','415240601','415','MODTESTCOURT',true,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0003',NULL, - current_date+1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-04-22 12:29:18.125891',NULL,NULL,'2024-04-22 12:26:40.788798'), + current_date+1,false,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-04-22 12:29:18.125891',NULL,NULL,'2024-04-22 12:26:40.788798'), ('641500009','415240602','415','MODTESTCOURT',true,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0003',NULL, - current_date+1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-04-22 12:29:18.125891',NULL,NULL,'2024-04-22 12:26:40.788798'), + current_date+1,false,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-04-22 12:29:18.125891',NULL,NULL,'2024-04-22 12:26:40.788798'), ('641500004','417240601','417','MODTESTCOURT',true,1,NULL,current_date+30,NULL,NULL,NULL,NULL,NULL,'0004',NULL, - current_date+2,NULL,NULL,NULL,'DC',NULL,NULL,NULL,NULL,'2024-04-22 12:30:25.628652',NULL,NULL,'2024-04-22 12:26:40.819485'), + current_date+2,false,NULL,NULL,'DC',NULL,NULL,NULL,NULL,'2024-04-22 12:30:25.628652',NULL,NULL,'2024-04-22 12:26:40.819485'), ('641500007','415240601','415','MODTESTCOURT',true,4,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0005',NULL, - current_date+2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-04-22 15:14:10.871528',NULL,NULL,'2024-04-22 12:26:40.848865'); + current_date+2,false,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-04-22 15:14:10.871528',NULL,NULL,'2024-04-22 12:26:40.848865'); INSERT INTO juror_mod.appearance (attendance_date,juror_number,pool_number,loc_code,f_audit,time_in,time_out,travel_time,appearance_stage,non_attendance,no_show,attendance_type) VALUES diff --git a/src/integration-test/resources/db/mod/reports/DailyUtilisationReportsITest_typical.sql b/src/integration-test/resources/db/mod/reports/DailyUtilisationReportsITest_typical.sql index 30dfb012b..385143e53 100644 --- a/src/integration-test/resources/db/mod/reports/DailyUtilisationReportsITest_typical.sql +++ b/src/integration-test/resources/db/mod/reports/DailyUtilisationReportsITest_typical.sql @@ -46,38 +46,38 @@ INSERT INTO juror_mod.juror (juror_number,poll_number,title,last_name,first_name ('415000032',NULL,NULL,'LNAME32','FNAME32',NULL,'ADDRESS LINE 1',NULL,NULL,'ADDRESS LINE 4',NULL,'CH1 2AB',NULL,NULL,NULL,true,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'NOT_CHECKED',NULL,NULL,NULL,NULL,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,false,NULL,0,false); -INSERT INTO juror_mod.juror_pool (juror_number,pool_number,"owner",user_edtq,is_active,status,times_sel,def_date,"location",no_attendances,no_attended,no_fta,no_awol,pool_seq,edit_tag,next_date,on_call,smart_card,was_deferred,deferral_code,id_checked,postpone,paid_cash,scan_code,last_update,reminder_sent,transfer_date,date_created) VALUES - ('415000001','415231101','415',NULL,true,3,NULL,NULL,'415',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), - ('415000002','415231101','415',NULL,true,3,NULL,NULL,'415',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), - ('415000003','415231101','415',NULL,true,3,NULL,NULL,'415',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), - ('415000004','415231102','415',NULL,true,3,NULL,NULL,'415',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), - ('415000005','415231102','415',NULL,true,3,NULL,NULL,'415',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), - ('415000006','415231102','415',NULL,true,3,NULL,NULL,'415',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), - ('415000007','415231102','415',NULL,true,3,NULL,NULL,'415',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), - ('415000008','415231102','415',NULL,true,3,NULL,NULL,'415',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), - ('415000009','415231103','415',NULL,true,3,NULL,NULL,'415',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), - ('415000010','415231103','415',NULL,true,3,NULL,NULL,'415',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), - ('415000011','415231103','415',NULL,true,3,NULL,NULL,'415',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), - ('415000012','415231103','415',NULL,true,3,NULL,NULL,'415',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), - ('415000013','415231103','415',NULL,true,3,NULL,NULL,'415',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), - ('415000014','415231104','415',NULL,true,4,NULL,NULL,'415',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), - ('415000015','415231104','415',NULL,true,4,NULL,NULL,'415',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), - ('415000016','415231104','415',NULL,true,4,NULL,NULL,'415',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), - ('415000017','415231104','415',NULL,true,4,NULL,NULL,'415',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), - ('415000018','415231104','415',NULL,true,1,NULL,NULL,'415',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), - ('415000020','415231105','415',NULL,true,4,NULL,NULL,'415',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), - ('415000021','415231105','415',NULL,true,4,NULL,NULL,'415',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), - ('415000022','415231106','415',NULL,true,2,NULL,NULL,'415',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), - ('415000023','415231106','415',NULL,true,2,NULL,NULL,'415',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), - ('415000024','415231105','415',NULL,true,5,NULL,NULL,'415',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), - ('415000025','415231105','415',NULL,true,6,NULL,NULL,'415',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), - ('415000026','415231106','415',NULL,true,7,NULL,NULL,'415',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), - ('415000027','415231106','415',NULL,true,8,NULL,NULL,'415',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), - ('415000028','415231106','415',NULL,true,9,NULL,NULL,'415',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), - ('415000029','415231106','415',NULL,true,10,NULL,NULL,'415',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), - ('415000030','415231106','415',NULL,true,11,NULL,NULL,'415',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), - ('415000031','415231106','415',NULL,true,12,NULL,NULL,'415',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), - ('415000032','415231106','415',NULL,true,13,NULL,NULL,'415',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL); +INSERT INTO juror_mod.juror_pool (juror_number,pool_number,"owner",user_edtq,is_active,status,times_sel,def_date,"location") VALUES + ('415000001','415231101','415',NULL,true,3,NULL,NULL,'415'), + ('415000002','415231101','415',NULL,true,3,NULL,NULL,'415'), + ('415000003','415231101','415',NULL,true,3,NULL,NULL,'415'), + ('415000004','415231102','415',NULL,true,3,NULL,NULL,'415'), + ('415000005','415231102','415',NULL,true,3,NULL,NULL,'415'), + ('415000006','415231102','415',NULL,true,3,NULL,NULL,'415'), + ('415000007','415231102','415',NULL,true,3,NULL,NULL,'415'), + ('415000008','415231102','415',NULL,true,3,NULL,NULL,'415'), + ('415000009','415231103','415',NULL,true,3,NULL,NULL,'415'), + ('415000010','415231103','415',NULL,true,3,NULL,NULL,'415'), + ('415000011','415231103','415',NULL,true,3,NULL,NULL,'415'), + ('415000012','415231103','415',NULL,true,3,NULL,NULL,'415'), + ('415000013','415231103','415',NULL,true,3,NULL,NULL,'415'), + ('415000014','415231104','415',NULL,true,4,NULL,NULL,'415'), + ('415000015','415231104','415',NULL,true,4,NULL,NULL,'415'), + ('415000016','415231104','415',NULL,true,4,NULL,NULL,'415'), + ('415000017','415231104','415',NULL,true,4,NULL,NULL,'415'), + ('415000018','415231104','415',NULL,true,1,NULL,NULL,'415'), + ('415000020','415231105','415',NULL,true,4,NULL,NULL,'415'), + ('415000021','415231105','415',NULL,true,4,NULL,NULL,'415'), + ('415000022','415231106','415',NULL,true,2,NULL,NULL,'415'), + ('415000023','415231106','415',NULL,true,2,NULL,NULL,'415'), + ('415000024','415231105','415',NULL,true,5,NULL,NULL,'415'), + ('415000025','415231105','415',NULL,true,6,NULL,NULL,'415'), + ('415000026','415231106','415',NULL,true,7,NULL,NULL,'415'), + ('415000027','415231106','415',NULL,true,8,NULL,NULL,'415'), + ('415000028','415231106','415',NULL,true,9,NULL,NULL,'415'), + ('415000029','415231106','415',NULL,true,10,NULL,NULL,'415'), + ('415000030','415231106','415',NULL,true,11,NULL,NULL,'415'), + ('415000031','415231106','415',NULL,true,12,NULL,NULL,'415'), + ('415000032','415231106','415',NULL,true,13,NULL,NULL,'415'); INSERT INTO juror_mod.appearance (attendance_date,juror_number,loc_code,time_in,time_out,trial_number,non_attendance,no_show,misc_description,pay_cash,last_updated_by,created_by,public_transport_total_due,public_transport_total_paid,hired_vehicle_total_due,hired_vehicle_total_paid,motorcycle_total_due,motorcycle_total_paid,car_total_due,car_total_paid,pedal_cycle_total_due,pedal_cycle_total_paid,childcare_total_due,childcare_total_paid,parking_total_due,parking_total_paid,misc_total_due,misc_total_paid,smart_card_due,is_draft_expense,f_audit,sat_on_jury,pool_number,appearance_stage,loss_of_earnings_due,loss_of_earnings_paid,subsistence_due,subsistence_paid,attendance_type,smart_card_paid,travel_time,travel_jurors_taken_by_car,travel_by_car,travel_jurors_taken_by_motorcycle,travel_by_motorcycle,travel_by_bicycle,miles_traveled,food_and_drink_claim_type,"version",expense_rates_id,attendance_audit_number) VALUES diff --git a/src/integration-test/resources/db/mod/reports/IncompleteServiceReportITest_typical.sql b/src/integration-test/resources/db/mod/reports/IncompleteServiceReportITest_typical.sql index 496704db3..4db81340d 100644 --- a/src/integration-test/resources/db/mod/reports/IncompleteServiceReportITest_typical.sql +++ b/src/integration-test/resources/db/mod/reports/IncompleteServiceReportITest_typical.sql @@ -14,15 +14,15 @@ INSERT INTO juror_mod.juror (juror_number,poll_number,title,last_name,first_name -- create juror_pool associative records INSERT INTO juror_mod.juror_pool (juror_number,pool_number,"owner",user_edtq,is_active,status,times_sel,def_date,"location",no_attendances,no_attended,no_fta,no_awol,pool_seq,edit_tag,next_date,on_call,smart_card,was_deferred,deferral_code,id_checked,postpone,paid_cash,scan_code,last_update,reminder_sent,transfer_date,date_created) VALUES ('641500021','415240601','415','MODTESTBUREAU',true,4,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0001',NULL, - current_date+1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-04-22 12:26:40.702989',NULL,NULL,'2024-04-22 12:26:40.702987'), + current_date+1,false,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-04-22 12:26:40.702989',NULL,NULL,'2024-04-22 12:26:40.702987'), ('641500011','415240601','415','MODTESTBUREAU',true,3,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0002',NULL, - current_date+1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-04-22 12:26:40.757378',NULL,NULL,'2024-04-22 12:26:40.757376'), + current_date+1,false,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-04-22 12:26:40.757378',NULL,NULL,'2024-04-22 12:26:40.757376'), ('641500003','415240601','415','MODTESTCOURT',true,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0003',NULL, - current_date+1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-04-22 12:29:18.125891',NULL,NULL,'2024-04-22 12:26:40.788798'), + current_date+1,false,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-04-22 12:29:18.125891',NULL,NULL,'2024-04-22 12:26:40.788798'), ('641500004','415240601','415','MODTESTCOURT',true,7,NULL,current_date+30,NULL,NULL,NULL,NULL,NULL,'0004',NULL, - NULL,NULL,NULL,NULL,'DC',NULL,NULL,NULL,NULL,'2024-04-22 12:30:25.628652',NULL,NULL,'2024-04-22 12:26:40.819485'), + NULL,false,NULL,NULL,'DC',NULL,NULL,NULL,NULL,'2024-04-22 12:30:25.628652',NULL,NULL,'2024-04-22 12:26:40.819485'), ('641500007','415240601','415','MODTESTCOURT',true,13,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0005',NULL, - current_date-1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-04-22 15:14:10.871528',NULL,NULL,'2024-04-22 12:26:40.848865'); + current_date-1,false,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-04-22 15:14:10.871528',NULL,NULL,'2024-04-22 12:26:40.848865'); insert into juror_mod.appearance (attendance_date,juror_number,pool_number,loc_code,time_in,time_out,non_attendance,appearance_stage,attendance_type) values (current_date - interval '1 day','641500021','415240601','415',null,null,false,null,'ABSENT'), diff --git a/src/integration-test/resources/db/mod/reports/JurySummoningMonitor_typical.sql b/src/integration-test/resources/db/mod/reports/JurySummoningMonitor_typical.sql index 60b868a11..61c9e5961 100644 --- a/src/integration-test/resources/db/mod/reports/JurySummoningMonitor_typical.sql +++ b/src/integration-test/resources/db/mod/reports/JurySummoningMonitor_typical.sql @@ -59,53 +59,53 @@ INSERT INTO juror_mod.juror (juror_number,poll_number,title,last_name,first_name INSERT INTO juror_mod.juror_pool (juror_number,pool_number,"owner",user_edtq,is_active,status,times_sel,def_date,"location",no_attendances,no_attended,no_fta,no_awol,pool_seq,edit_tag,next_date,on_call,smart_card,was_deferred,deferral_code,id_checked,postpone,paid_cash,scan_code,last_update,reminder_sent,transfer_date,date_created) VALUES - ('641500001','415240801','400','ADMINUSER',true,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0004',NULL,'2024-08-05',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-03 12:03:06.182449',NULL,NULL,'2024-06-03 12:00:23.099129'), - ('641500002','415240801','400','ADMINUSER',true,6,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0008',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-03 12:04:02.042',NULL,NULL,'2024-06-03 12:00:23.112002'), - ('641500003','415240801','400','ADMINUSER',true,6,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0007',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-03 13:43:17.407033',NULL,NULL,'2024-06-03 12:00:23.109013'), - ('641500004','415240801','400','ADMINUSER',true,5,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0011',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-03 13:48:07.182596',NULL,NULL,'2024-06-03 12:00:23.120384'), - ('641500006','415240801','400','ADMINUSER',false,7,NULL,'2024-08-27',NULL,NULL,NULL,NULL,NULL,'0014',NULL,NULL,NULL,NULL,NULL,'A',NULL,NULL,NULL,NULL,'2024-06-03 15:06:26.990034',NULL,NULL,'2024-06-03 12:00:23.125644'), - ('641500006','415240803','400','ADMINUSER',true,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0002',NULL,'2024-08-27',NULL,NULL,true,NULL,NULL,NULL,NULL,NULL,'2024-06-03 15:06:26.990177',NULL,NULL,'2024-06-03 12:00:23.125644'), - ('641500007','415240801','400','ADMINUSER',true,7,NULL,'2024-10-29',NULL,NULL,NULL,NULL,NULL,'0012',NULL,NULL,NULL,NULL,NULL,'P',NULL,true,NULL,NULL,'2024-06-03 15:16:19.119732',NULL,NULL,'2024-06-03 12:00:23.122108'), - ('641500008','415240803','400','ADMINUSER',true,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0001',NULL,'2024-08-27',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-03 12:02:08.187452',NULL,NULL,'2024-06-03 12:02:08.187451'), - ('641500010','415240801','400','ADMINUSER',true,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0001',NULL,'2024-08-05',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-03 12:00:23.08775',NULL,NULL,'2024-06-03 12:00:23.087748'), - ('641500011','415240801','400','ADMINUSER',true,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0006',NULL,'2024-08-05',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-03 15:50:04.734274',NULL,NULL,'2024-06-03 12:00:23.105914'); + ('641500001','415240801','400','ADMINUSER',true,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0004',NULL,'2024-08-05',false,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-03 12:03:06.182449',NULL,NULL,'2024-06-03 12:00:23.099129'), + ('641500002','415240801','400','ADMINUSER',true,6,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0008',NULL,NULL,false,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-03 12:04:02.042',NULL,NULL,'2024-06-03 12:00:23.112002'), + ('641500003','415240801','400','ADMINUSER',true,6,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0007',NULL,NULL,false,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-03 13:43:17.407033',NULL,NULL,'2024-06-03 12:00:23.109013'), + ('641500004','415240801','400','ADMINUSER',true,5,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0011',NULL,NULL,false,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-03 13:48:07.182596',NULL,NULL,'2024-06-03 12:00:23.120384'), + ('641500006','415240801','400','ADMINUSER',false,7,NULL,'2024-08-27',NULL,NULL,NULL,NULL,NULL,'0014',NULL,NULL,false,NULL,NULL,'A',NULL,NULL,NULL,NULL,'2024-06-03 15:06:26.990034',NULL,NULL,'2024-06-03 12:00:23.125644'), + ('641500006','415240803','400','ADMINUSER',true,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0002',NULL,'2024-08-27',false,NULL,true,NULL,NULL,NULL,NULL,NULL,'2024-06-03 15:06:26.990177',NULL,NULL,'2024-06-03 12:00:23.125644'), + ('641500007','415240801','400','ADMINUSER',true,7,NULL,'2024-10-29',NULL,NULL,NULL,NULL,NULL,'0012',NULL,NULL,false,NULL,NULL,'P',NULL,true,NULL,NULL,'2024-06-03 15:16:19.119732',NULL,NULL,'2024-06-03 12:00:23.122108'), + ('641500008','415240803','400','ADMINUSER',true,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0001',NULL,'2024-08-27',false,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-03 12:02:08.187452',NULL,NULL,'2024-06-03 12:02:08.187451'), + ('641500010','415240801','400','ADMINUSER',true,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0001',NULL,'2024-08-05',false,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-03 12:00:23.08775',NULL,NULL,'2024-06-03 12:00:23.087748'), + ('641500011','415240801','400','ADMINUSER',true,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0006',NULL,'2024-08-05',false,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-03 15:50:04.734274',NULL,NULL,'2024-06-03 12:00:23.105914'); INSERT INTO juror_mod.juror_pool (juror_number,pool_number,"owner",user_edtq,is_active,status,times_sel,def_date,"location",no_attendances,no_attended,no_fta,no_awol,pool_seq,edit_tag,next_date,on_call,smart_card,was_deferred,deferral_code,id_checked,postpone,paid_cash,scan_code,last_update,reminder_sent,transfer_date,date_created) VALUES - ('641500012','415240801','400','ADMINUSER',true,7,NULL,'2024-08-20',NULL,NULL,NULL,NULL,NULL,'0005',NULL,NULL,NULL,NULL,NULL,'M',NULL,NULL,NULL,NULL,'2024-06-03 15:57:45.605066',NULL,NULL,'2024-06-03 12:00:23.10279'), - ('641500013','415240801','400','ADMINUSER',true,9,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0009',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-04 10:32:33.668674',NULL,NULL,'2024-06-03 12:00:23.115231'), - ('641500016','415240801','400','ADMINUSER',true,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0010',NULL,'2024-08-05',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-03 12:00:23.118577',NULL,NULL,'2024-06-03 12:00:23.118576'), - ('641500017','415240801','400','ADMINUSER',true,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0015',NULL,'2024-08-05',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-04 11:14:27.130294',true,NULL,'2024-06-03 12:00:23.127317'), - ('641500018','415240801','400','MODTESTBUREAU',true,5,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0013',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-04 11:16:26.744714',NULL,NULL,'2024-06-03 12:00:23.123845'), - ('641500019','415240801','400','ADMINUSER',true,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0016',NULL,'2024-08-05',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-03 12:00:23.129403',NULL,NULL,'2024-06-03 12:00:23.129402'), - ('641500021','415240801','400','ADMINUSER',true,5,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0002',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-04 11:17:15.312749',NULL,NULL,'2024-06-03 12:00:23.091738'), - ('641500023','415240801','400','ADMINUSER',true,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0003',NULL,'2024-08-05',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-03 12:00:23.095433',NULL,NULL,'2024-06-03 12:00:23.095431'), - ('641500201','415240801','400','MODTESTBUREAU',true,6,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0018',NULL,'2024-08-05',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-04 11:29:39.953446',NULL,NULL,'2024-06-03 15:33:11.346417'), - ('641500202','415240801','400','MODTESTBUREAU',true,2,NULL,'2024-08-19',NULL,NULL,NULL,NULL,NULL,'0024',NULL,NULL,NULL,NULL,NULL,'B',NULL,NULL,NULL,NULL,'2024-06-04 11:34:46.391861',NULL,NULL,'2024-06-03 15:33:11.359236'); + ('641500012','415240801','400','ADMINUSER',true,7,NULL,'2024-08-20',NULL,NULL,NULL,NULL,NULL,'0005',NULL,NULL,false,NULL,NULL,'M',NULL,NULL,NULL,NULL,'2024-06-03 15:57:45.605066',NULL,NULL,'2024-06-03 12:00:23.10279'), + ('641500013','415240801','400','ADMINUSER',true,9,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0009',NULL,NULL,false,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-04 10:32:33.668674',NULL,NULL,'2024-06-03 12:00:23.115231'), + ('641500016','415240801','400','ADMINUSER',true,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0010',NULL,'2024-08-05',false,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-03 12:00:23.118577',NULL,NULL,'2024-06-03 12:00:23.118576'), + ('641500017','415240801','400','ADMINUSER',true,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0015',NULL,'2024-08-05',false,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-04 11:14:27.130294',true,NULL,'2024-06-03 12:00:23.127317'), + ('641500018','415240801','400','MODTESTBUREAU',true,5,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0013',NULL,NULL,false,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-04 11:16:26.744714',NULL,NULL,'2024-06-03 12:00:23.123845'), + ('641500019','415240801','400','ADMINUSER',true,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0016',NULL,'2024-08-05',false,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-03 12:00:23.129403',NULL,NULL,'2024-06-03 12:00:23.129402'), + ('641500021','415240801','400','ADMINUSER',true,5,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0002',NULL,NULL,false,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-04 11:17:15.312749',NULL,NULL,'2024-06-03 12:00:23.091738'), + ('641500023','415240801','400','ADMINUSER',true,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0003',NULL,'2024-08-05',false,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-03 12:00:23.095433',NULL,NULL,'2024-06-03 12:00:23.095431'), + ('641500201','415240801','400','MODTESTBUREAU',true,6,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0018',NULL,'2024-08-05',false,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-04 11:29:39.953446',NULL,NULL,'2024-06-03 15:33:11.346417'), + ('641500202','415240801','400','MODTESTBUREAU',true,2,NULL,'2024-08-19',NULL,NULL,NULL,NULL,NULL,'0024',NULL,NULL,false,NULL,NULL,'B',NULL,NULL,NULL,NULL,'2024-06-04 11:34:46.391861',NULL,NULL,'2024-06-03 15:33:11.359236'); INSERT INTO juror_mod.juror_pool (juror_number,pool_number,"owner",user_edtq,is_active,status,times_sel,def_date,"location",no_attendances,no_attended,no_fta,no_awol,pool_seq,edit_tag,next_date,on_call,smart_card,was_deferred,deferral_code,id_checked,postpone,paid_cash,scan_code,last_update,reminder_sent,transfer_date,date_created) VALUES - ('641500203','415240801','400','ADMINUSER',true,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0022',NULL,'2024-08-05',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-03 15:33:11.35552',NULL,NULL,'2024-06-03 15:33:11.35552'), - ('641500204','415240801','400','ADMINUSER',true,6,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0026',NULL,'2024-08-05',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-03 15:33:11.362183',NULL,NULL,'2024-06-03 15:33:11.362182'), - ('641500210','415240801','400','ADMINUSER',true,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0017',NULL,'2024-08-05',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-03 15:33:11.343885',NULL,NULL,'2024-06-03 15:33:11.343885'), - ('641500211','415240801','400','ADMINUSER',true,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0021',NULL,'2024-08-05',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-03 15:33:11.353662',NULL,NULL,'2024-06-03 15:33:11.353662'), - ('641500212','415240801','400','ADMINUSER',true,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0019',NULL,'2024-08-05',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-03 15:33:11.348805',NULL,NULL,'2024-06-03 15:33:11.348805'), - ('641500213','415240801','400','ADMINUSER',true,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0023',NULL,'2024-08-05',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-03 15:33:11.357346',NULL,NULL,'2024-06-03 15:33:11.357346'), - ('641500216','415240801','400','ADMINUSER',true,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0025',NULL,'2024-08-05',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-03 15:33:11.361174',NULL,NULL,'2024-06-03 15:33:11.361174'), - ('641500223','415240801','400','ADMINUSER',true,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0020',NULL,'2024-08-05',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-03 15:33:11.351721',NULL,NULL,'2024-06-03 15:33:11.351721'), - ('641500316','415240801','400','ADMINUSER',true,2,NULL,'2024-08-20',NULL,NULL,NULL,NULL,NULL,'0005',NULL,NULL,NULL,NULL,true,NULL,NULL,NULL,NULL,NULL,'2024-06-03 15:57:45.605066',true,NULL,'2024-06-03 12:00:23.10279'), - ('641500316','415240804','400','ADMINUSER',false,7,NULL,'2024-08-20',NULL,NULL,NULL,NULL,NULL,'0005',NULL,NULL,NULL,NULL,NULL,'M',NULL,NULL,NULL,NULL,'2024-06-03 15:57:45.605066',NULL,NULL,'2024-06-03 12:00:23.10279'); + ('641500203','415240801','400','ADMINUSER',true,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0022',NULL,'2024-08-05',false,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-03 15:33:11.35552',NULL,NULL,'2024-06-03 15:33:11.35552'), + ('641500204','415240801','400','ADMINUSER',true,6,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0026',NULL,'2024-08-05',false,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-03 15:33:11.362183',NULL,NULL,'2024-06-03 15:33:11.362182'), + ('641500210','415240801','400','ADMINUSER',true,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0017',NULL,'2024-08-05',false,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-03 15:33:11.343885',NULL,NULL,'2024-06-03 15:33:11.343885'), + ('641500211','415240801','400','ADMINUSER',true,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0021',NULL,'2024-08-05',false,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-03 15:33:11.353662',NULL,NULL,'2024-06-03 15:33:11.353662'), + ('641500212','415240801','400','ADMINUSER',true,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0019',NULL,'2024-08-05',false,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-03 15:33:11.348805',NULL,NULL,'2024-06-03 15:33:11.348805'), + ('641500213','415240801','400','ADMINUSER',true,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0023',NULL,'2024-08-05',false,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-03 15:33:11.357346',NULL,NULL,'2024-06-03 15:33:11.357346'), + ('641500216','415240801','400','ADMINUSER',true,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0025',NULL,'2024-08-05',false,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-03 15:33:11.361174',NULL,NULL,'2024-06-03 15:33:11.361174'), + ('641500223','415240801','400','ADMINUSER',true,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0020',NULL,'2024-08-05',false,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-03 15:33:11.351721',NULL,NULL,'2024-06-03 15:33:11.351721'), + ('641500316','415240801','400','ADMINUSER',true,2,NULL,'2024-08-20',NULL,NULL,NULL,NULL,NULL,'0005',NULL,NULL,false,NULL,true,NULL,NULL,NULL,NULL,NULL,'2024-06-03 15:57:45.605066',true,NULL,'2024-06-03 12:00:23.10279'), + ('641500316','415240804','400','ADMINUSER',false,7,NULL,'2024-08-20',NULL,NULL,NULL,NULL,NULL,'0005',NULL,NULL,false,NULL,NULL,'M',NULL,NULL,NULL,NULL,'2024-06-03 15:57:45.605066',NULL,NULL,'2024-06-03 12:00:23.10279'); INSERT INTO juror_mod.juror_pool (juror_number,pool_number,"owner",user_edtq,is_active,status,times_sel,def_date,"location",no_attendances,no_attended,no_fta,no_awol,pool_seq,edit_tag,next_date,on_call,smart_card,was_deferred,deferral_code,id_checked,postpone,paid_cash,scan_code,last_update,reminder_sent,transfer_date,date_created) VALUES - ('641600045','416240801','416','MODTESTBUREAU',true,2,NULL,'2024-08-19',NULL,NULL,NULL,NULL,NULL,'0001',NULL,NULL,NULL,NULL,NULL,'B',NULL,NULL,NULL,NULL,'2024-06-04 11:43:59.388',NULL,'2024-06-04','2024-06-04 11:42:42.328'), - ('641600050','416240801','416','MODTESTBUREAU',true,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0006',NULL,'2024-08-06',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-04 11:44:53.178',NULL,'2024-06-04','2024-06-04 11:42:42.343'), - ('641600051','416240801','416','MODTESTBUREAU',true,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0007',NULL,'2024-08-06',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-04 11:49:15.104',true,'2024-06-04','2024-06-04 11:42:42.346'), - ('641600054','416240801','416','MODTESTBUREAU',true,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0003',NULL,'2024-08-06',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-04 11:57:37.158',NULL,'2024-06-04','2024-06-04 11:42:42.334'), - ('641600057','416240801','400','MODTESTBUREAU',true,5,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0002',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-04 11:58:18.554',NULL,'2024-06-04','2024-06-04 11:42:42.331'), - ('641600058','416240801','400','MODTESTBUREAU',true,7,NULL,'2024-09-16',NULL,NULL,NULL,NULL,NULL,'0010',NULL,NULL,NULL,NULL,NULL,'A',NULL,NULL,NULL,NULL,'2024-06-04 11:59:20.157',NULL,'2024-06-04','2024-06-04 11:42:42.354'), - ('641600062','416240801','400','MODTESTBUREAU',true,6,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0008',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-04 11:59:44.483',NULL,'2024-06-04','2024-06-04 11:42:42.349'), - ('641600065','416240801','416','MODTESTBUREAU',true,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0004',NULL,'2024-08-06',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-04 11:42:42.337',NULL,'2024-06-04','2024-06-04 11:42:42.337'), - ('641600066','416240801','416','MODTESTBUREAU',true,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0005',NULL,'2024-08-06',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-04 11:42:42.341',NULL,'2024-06-04','2024-06-04 11:42:42.341'), - ('641600070','416240801','416','MODTESTBUREAU',true,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0009',NULL,'2024-08-06',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-04 11:42:42.351',NULL,'2024-06-04','2024-06-04 11:42:42.351'); + ('641600045','416240801','416','MODTESTBUREAU',true,2,NULL,'2024-08-19',NULL,NULL,NULL,NULL,NULL,'0001',NULL,NULL,false,NULL,NULL,'B',NULL,NULL,NULL,NULL,'2024-06-04 11:43:59.388',NULL,'2024-06-04','2024-06-04 11:42:42.328'), + ('641600050','416240801','416','MODTESTBUREAU',true,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0006',NULL,'2024-08-06',false,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-04 11:44:53.178',NULL,'2024-06-04','2024-06-04 11:42:42.343'), + ('641600051','416240801','416','MODTESTBUREAU',true,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0007',NULL,'2024-08-06',false,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-04 11:49:15.104',true,'2024-06-04','2024-06-04 11:42:42.346'), + ('641600054','416240801','416','MODTESTBUREAU',true,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0003',NULL,'2024-08-06',false,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-04 11:57:37.158',NULL,'2024-06-04','2024-06-04 11:42:42.334'), + ('641600057','416240801','400','MODTESTBUREAU',true,5,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0002',NULL,NULL,false,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-04 11:58:18.554',NULL,'2024-06-04','2024-06-04 11:42:42.331'), + ('641600058','416240801','400','MODTESTBUREAU',true,7,NULL,'2024-09-16',NULL,NULL,NULL,NULL,NULL,'0010',NULL,NULL,false,NULL,NULL,'A',NULL,NULL,NULL,NULL,'2024-06-04 11:59:20.157',NULL,'2024-06-04','2024-06-04 11:42:42.354'), + ('641600062','416240801','400','MODTESTBUREAU',true,6,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0008',NULL,NULL,false,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-04 11:59:44.483',NULL,'2024-06-04','2024-06-04 11:42:42.349'), + ('641600065','416240801','416','MODTESTBUREAU',true,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0004',NULL,'2024-08-06',false,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-04 11:42:42.337',NULL,'2024-06-04','2024-06-04 11:42:42.337'), + ('641600066','416240801','416','MODTESTBUREAU',true,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0005',NULL,'2024-08-06',false,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-04 11:42:42.341',NULL,'2024-06-04','2024-06-04 11:42:42.341'), + ('641600070','416240801','416','MODTESTBUREAU',true,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0009',NULL,'2024-08-06',false,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-04 11:42:42.351',NULL,'2024-06-04','2024-06-04 11:42:42.351'); INSERT INTO juror_mod.juror_pool (juror_number,pool_number,"owner",user_edtq,is_active,status,times_sel,def_date,"location",no_attendances,no_attended,no_fta,no_awol,pool_seq,edit_tag,next_date,on_call,smart_card,was_deferred,deferral_code,id_checked,postpone,paid_cash,scan_code,last_update,reminder_sent,transfer_date,date_created) VALUES - ('677400941','774240802','400','ADMINUSER',true,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0002',NULL,'2024-08-08',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-06 12:07:51.647878',NULL,NULL,'2024-06-06 12:07:51.647877'), - ('677400928','774240802','400','ADMINUSER',true,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0003',NULL,'2024-08-08',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-06 12:07:51.652351',NULL,NULL,'2024-06-06 12:07:51.65235'), - ('677400923','774240802','400','ADMINUSER',true,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0001',NULL,'2024-08-08',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-06 12:08:33.268403',NULL,NULL,'2024-06-06 12:07:51.640718'); + ('677400941','774240802','400','ADMINUSER',true,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0002',NULL,'2024-08-08',false,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-06 12:07:51.647878',NULL,NULL,'2024-06-06 12:07:51.647877'), + ('677400928','774240802','400','ADMINUSER',true,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0003',NULL,'2024-08-08',false,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-06 12:07:51.652351',NULL,NULL,'2024-06-06 12:07:51.65235'), + ('677400923','774240802','400','ADMINUSER',true,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0001',NULL,'2024-08-08',false,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-06 12:08:33.268403',NULL,NULL,'2024-06-06 12:07:51.640718'); insert into juror_mod.bureau_snapshot (juror_number,pool_number,"owner",user_edtq,is_active,status,def_date,pool_seq,edit_tag,next_date,was_deferred,deferral_code,postpone,scan_code,last_update,reminder_sent,transfer_date,date_created,excusal_code,acc_exc,police_check) VALUES diff --git a/src/integration-test/resources/db/mod/reports/PersonAttendingSummaryReportITest_typical.sql b/src/integration-test/resources/db/mod/reports/PersonAttendingSummaryReportITest_typical.sql index 306326e8e..46cfaefe1 100644 --- a/src/integration-test/resources/db/mod/reports/PersonAttendingSummaryReportITest_typical.sql +++ b/src/integration-test/resources/db/mod/reports/PersonAttendingSummaryReportITest_typical.sql @@ -14,12 +14,12 @@ INSERT INTO juror_mod.juror (juror_number,poll_number,title,last_name,first_name -- create juror_pool associative records INSERT INTO juror_mod.juror_pool (juror_number,pool_number,"owner",user_edtq,is_active,status,times_sel,def_date,"location",no_attendances,no_attended,no_fta,no_awol,pool_seq,edit_tag,next_date,on_call,smart_card,was_deferred,deferral_code,id_checked,postpone,paid_cash,scan_code,last_update,reminder_sent,transfer_date,date_created) VALUES ('641500021','415240601','415','MODTESTBUREAU',true,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0001',NULL, - current_date+1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-04-22 12:26:40.702989',NULL,NULL,'2024-04-22 12:26:40.702987'), + current_date+1,false,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-04-22 12:26:40.702989',NULL,NULL,'2024-04-22 12:26:40.702987'), ('641500011','415240601','415','MODTESTBUREAU',true,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0002',NULL, - current_date+1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-04-22 12:26:40.757378',NULL,NULL,'2024-04-22 12:26:40.757376'), + current_date+1,false,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-04-22 12:26:40.757378',NULL,NULL,'2024-04-22 12:26:40.757376'), ('641500003','415240601','415','MODTESTCOURT',true,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0003',NULL, - current_date+1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-04-22 12:29:18.125891',NULL,NULL,'2024-04-22 12:26:40.788798'), + current_date+1,false,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-04-22 12:29:18.125891',NULL,NULL,'2024-04-22 12:26:40.788798'), ('641500004','415240601','415','MODTESTCOURT',true,1,NULL,current_date+30,NULL,NULL,NULL,NULL,NULL,'0004',NULL, - current_date+2,NULL,NULL,NULL,'DC',NULL,NULL,NULL,NULL,'2024-04-22 12:30:25.628652',NULL,NULL,'2024-04-22 12:26:40.819485'), + current_date+2,false,NULL,NULL,'DC',NULL,NULL,NULL,NULL,'2024-04-22 12:30:25.628652',NULL,NULL,'2024-04-22 12:26:40.819485'), ('641500007','415240601','415','MODTESTCOURT',true,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0005',NULL, - current_date+2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-04-22 15:14:10.871528',NULL,NULL,'2024-04-22 12:26:40.848865'); \ No newline at end of file + current_date+2,false,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-04-22 15:14:10.871528',NULL,NULL,'2024-04-22 12:26:40.848865'); \ No newline at end of file diff --git a/src/integration-test/resources/db/mod/reports/YieldPerformanceReportITest_typical.sql b/src/integration-test/resources/db/mod/reports/YieldPerformanceReportITest_typical.sql index 68e4036ec..4ee515d96 100644 --- a/src/integration-test/resources/db/mod/reports/YieldPerformanceReportITest_typical.sql +++ b/src/integration-test/resources/db/mod/reports/YieldPerformanceReportITest_typical.sql @@ -69,62 +69,62 @@ INSERT INTO juror_mod.juror (juror_number,poll_number,title,last_name,first_name INSERT INTO juror_mod.juror_pool (juror_number,pool_number,"owner",user_edtq,is_active,status,times_sel,def_date,"location",no_attendances,no_attended,no_fta,no_awol,pool_seq,edit_tag,next_date,on_call,smart_card,was_deferred,deferral_code,id_checked,postpone,paid_cash,scan_code,last_update,reminder_sent,transfer_date,date_created) VALUES - ('641500001','415240801','400','ADMINUSER',true,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0004',NULL,'2024-08-05',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-03 12:03:06.182449',NULL,NULL,'2024-06-03 12:00:23.099129'), - ('641500002','415240801','400','ADMINUSER',true,6,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0008',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-03 12:04:02.042',NULL,NULL,'2024-06-03 12:00:23.112002'), - ('641500003','415240801','400','ADMINUSER',true,6,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0007',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-03 13:43:17.407033',NULL,NULL,'2024-06-03 12:00:23.109013'), - ('641500004','415240801','400','ADMINUSER',true,5,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0011',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-03 13:48:07.182596',NULL,NULL,'2024-06-03 12:00:23.120384'), - ('641500006','415240801','400','ADMINUSER',false,7,NULL,'2024-08-27',NULL,NULL,NULL,NULL,NULL,'0014',NULL,NULL,NULL,NULL,NULL,'A',NULL,NULL,NULL,NULL,'2024-06-03 15:06:26.990034',NULL,NULL,'2024-06-03 12:00:23.125644'), - ('641500006','415240803','400','ADMINUSER',true,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0002',NULL,'2024-08-27',NULL,NULL,true,NULL,NULL,NULL,NULL,NULL,'2024-06-03 15:06:26.990177',NULL,NULL,'2024-06-03 12:00:23.125644'), - ('641500007','415240801','400','ADMINUSER',true,7,NULL,'2024-10-29',NULL,NULL,NULL,NULL,NULL,'0012',NULL,NULL,NULL,NULL,NULL,'P',NULL,true,NULL,NULL,'2024-06-03 15:16:19.119732',NULL,NULL,'2024-06-03 12:00:23.122108'), - ('641500008','415240803','400','ADMINUSER',true,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0001',NULL,'2024-08-27',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-03 12:02:08.187452',NULL,NULL,'2024-06-03 12:02:08.187451'), - ('641500010','415240801','400','ADMINUSER',true,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0001',NULL,'2024-08-05',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-03 12:00:23.08775',NULL,NULL,'2024-06-03 12:00:23.087748'), - ('641500011','415240801','400','ADMINUSER',true,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0006',NULL,'2024-08-05',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-03 15:50:04.734274',NULL,NULL,'2024-06-03 12:00:23.105914'); + ('641500001','415240801','400','ADMINUSER',true,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0004',NULL,'2024-08-05',false,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-03 12:03:06.182449',NULL,NULL,'2024-06-03 12:00:23.099129'), + ('641500002','415240801','400','ADMINUSER',true,6,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0008',NULL,NULL,false,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-03 12:04:02.042',NULL,NULL,'2024-06-03 12:00:23.112002'), + ('641500003','415240801','400','ADMINUSER',true,6,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0007',NULL,NULL,false,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-03 13:43:17.407033',NULL,NULL,'2024-06-03 12:00:23.109013'), + ('641500004','415240801','400','ADMINUSER',true,5,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0011',NULL,NULL,false,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-03 13:48:07.182596',NULL,NULL,'2024-06-03 12:00:23.120384'), + ('641500006','415240801','400','ADMINUSER',false,7,NULL,'2024-08-27',NULL,NULL,NULL,NULL,NULL,'0014',NULL,NULL,false,NULL,NULL,'A',NULL,NULL,NULL,NULL,'2024-06-03 15:06:26.990034',NULL,NULL,'2024-06-03 12:00:23.125644'), + ('641500006','415240803','400','ADMINUSER',true,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0002',NULL,'2024-08-27',false,NULL,true,NULL,NULL,NULL,NULL,NULL,'2024-06-03 15:06:26.990177',NULL,NULL,'2024-06-03 12:00:23.125644'), + ('641500007','415240801','400','ADMINUSER',true,7,NULL,'2024-10-29',NULL,NULL,NULL,NULL,NULL,'0012',NULL,NULL,false,NULL,NULL,'P',NULL,true,NULL,NULL,'2024-06-03 15:16:19.119732',NULL,NULL,'2024-06-03 12:00:23.122108'), + ('641500008','415240803','400','ADMINUSER',true,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0001',NULL,'2024-08-27',false,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-03 12:02:08.187452',NULL,NULL,'2024-06-03 12:02:08.187451'), + ('641500010','415240801','400','ADMINUSER',true,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0001',NULL,'2024-08-05',false,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-03 12:00:23.08775',NULL,NULL,'2024-06-03 12:00:23.087748'), + ('641500011','415240801','400','ADMINUSER',true,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0006',NULL,'2024-08-05',false,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-03 15:50:04.734274',NULL,NULL,'2024-06-03 12:00:23.105914'); INSERT INTO juror_mod.juror_pool (juror_number,pool_number,"owner",user_edtq,is_active,status,times_sel,def_date,"location",no_attendances,no_attended,no_fta,no_awol,pool_seq,edit_tag,next_date,on_call,smart_card,was_deferred,deferral_code,id_checked,postpone,paid_cash,scan_code,last_update,reminder_sent,transfer_date,date_created) VALUES - ('641500012','415240801','400','ADMINUSER',true,7,NULL,'2024-08-20',NULL,NULL,NULL,NULL,NULL,'0005',NULL,NULL,NULL,NULL,NULL,'M',NULL,NULL,NULL,NULL,'2024-06-03 15:57:45.605066',NULL,NULL,'2024-06-03 12:00:23.10279'), - ('641500013','415240801','400','ADMINUSER',true,9,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0009',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-04 10:32:33.668674',NULL,NULL,'2024-06-03 12:00:23.115231'), - ('641500016','415240801','400','ADMINUSER',true,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0010',NULL,'2024-08-05',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-03 12:00:23.118577',NULL,NULL,'2024-06-03 12:00:23.118576'), - ('641500017','415240801','400','ADMINUSER',true,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0015',NULL,'2024-08-05',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-04 11:14:27.130294',true,NULL,'2024-06-03 12:00:23.127317'), - ('641500018','415240801','400','MODTESTBUREAU',true,5,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0013',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-04 11:16:26.744714',NULL,NULL,'2024-06-03 12:00:23.123845'), - ('641500019','415240801','400','ADMINUSER',true,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0016',NULL,'2024-08-05',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-03 12:00:23.129403',NULL,NULL,'2024-06-03 12:00:23.129402'), - ('641500021','415240801','400','ADMINUSER',true,5,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0002',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-04 11:17:15.312749',NULL,NULL,'2024-06-03 12:00:23.091738'), - ('641500023','415240801','400','ADMINUSER',true,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0003',NULL,'2024-08-05',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-03 12:00:23.095433',NULL,NULL,'2024-06-03 12:00:23.095431'), - ('641500201','415240801','400','MODTESTBUREAU',true,6,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0018',NULL,'2024-08-05',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-04 11:29:39.953446',NULL,NULL,'2024-06-03 15:33:11.346417'), - ('641500202','415240801','400','MODTESTBUREAU',true,2,NULL,'2024-08-19',NULL,NULL,NULL,NULL,NULL,'0024',NULL,NULL,NULL,NULL,NULL,'B',NULL,NULL,NULL,NULL,'2024-06-04 11:34:46.391861',NULL,NULL,'2024-06-03 15:33:11.359236'); + ('641500012','415240801','400','ADMINUSER',true,7,NULL,'2024-08-20',NULL,NULL,NULL,NULL,NULL,'0005',NULL,NULL,false,NULL,NULL,'M',NULL,NULL,NULL,NULL,'2024-06-03 15:57:45.605066',NULL,NULL,'2024-06-03 12:00:23.10279'), + ('641500013','415240801','400','ADMINUSER',true,9,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0009',NULL,NULL,false,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-04 10:32:33.668674',NULL,NULL,'2024-06-03 12:00:23.115231'), + ('641500016','415240801','400','ADMINUSER',true,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0010',NULL,'2024-08-05',false,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-03 12:00:23.118577',NULL,NULL,'2024-06-03 12:00:23.118576'), + ('641500017','415240801','400','ADMINUSER',true,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0015',NULL,'2024-08-05',false,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-04 11:14:27.130294',true,NULL,'2024-06-03 12:00:23.127317'), + ('641500018','415240801','400','MODTESTBUREAU',true,5,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0013',NULL,NULL,false,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-04 11:16:26.744714',NULL,NULL,'2024-06-03 12:00:23.123845'), + ('641500019','415240801','400','ADMINUSER',true,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0016',NULL,'2024-08-05',false,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-03 12:00:23.129403',NULL,NULL,'2024-06-03 12:00:23.129402'), + ('641500021','415240801','400','ADMINUSER',true,5,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0002',NULL,NULL,false,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-04 11:17:15.312749',NULL,NULL,'2024-06-03 12:00:23.091738'), + ('641500023','415240801','400','ADMINUSER',true,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0003',NULL,'2024-08-05',false,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-03 12:00:23.095433',NULL,NULL,'2024-06-03 12:00:23.095431'), + ('641500201','415240801','400','MODTESTBUREAU',true,6,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0018',NULL,'2024-08-05',false,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-04 11:29:39.953446',NULL,NULL,'2024-06-03 15:33:11.346417'), + ('641500202','415240801','400','MODTESTBUREAU',true,2,NULL,'2024-08-19',NULL,NULL,NULL,NULL,NULL,'0024',NULL,NULL,false,NULL,NULL,'B',NULL,NULL,NULL,NULL,'2024-06-04 11:34:46.391861',NULL,NULL,'2024-06-03 15:33:11.359236'); INSERT INTO juror_mod.juror_pool (juror_number,pool_number,"owner",user_edtq,is_active,status,times_sel,def_date,"location",no_attendances,no_attended,no_fta,no_awol,pool_seq,edit_tag,next_date,on_call,smart_card,was_deferred,deferral_code,id_checked,postpone,paid_cash,scan_code,last_update,reminder_sent,transfer_date,date_created) VALUES - ('641500203','415240801','400','ADMINUSER',true,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0022',NULL,'2024-08-05',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-03 15:33:11.35552',NULL,NULL,'2024-06-03 15:33:11.35552'), - ('641500204','415240801','400','ADMINUSER',true,6,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0026',NULL,'2024-08-05',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-03 15:33:11.362183',NULL,NULL,'2024-06-03 15:33:11.362182'), - ('641500210','415240801','400','ADMINUSER',true,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0017',NULL,'2024-08-05',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-03 15:33:11.343885',NULL,NULL,'2024-06-03 15:33:11.343885'), - ('641500211','415240801','400','ADMINUSER',true,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0021',NULL,'2024-08-05',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-03 15:33:11.353662',NULL,NULL,'2024-06-03 15:33:11.353662'), - ('641500212','415240801','400','ADMINUSER',true,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0019',NULL,'2024-08-05',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-03 15:33:11.348805',NULL,NULL,'2024-06-03 15:33:11.348805'), - ('641500213','415240801','400','ADMINUSER',true,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0023',NULL,'2024-08-05',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-03 15:33:11.357346',NULL,NULL,'2024-06-03 15:33:11.357346'), - ('641500216','415240801','400','ADMINUSER',true,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0025',NULL,'2024-08-05',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-03 15:33:11.361174',NULL,NULL,'2024-06-03 15:33:11.361174'), - ('641500223','415240801','400','ADMINUSER',true,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0020',NULL,'2024-08-05',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-03 15:33:11.351721',NULL,NULL,'2024-06-03 15:33:11.351721'), - ('641500316','415240801','400','ADMINUSER',true,2,NULL,'2024-08-20',NULL,NULL,NULL,NULL,NULL,'0005',NULL,NULL,NULL,NULL,true,NULL,NULL,NULL,NULL,NULL,'2024-06-03 15:57:45.605066',true,NULL,'2024-06-03 12:00:23.10279'), - ('641500316','415240804','400','ADMINUSER',false,7,NULL,'2024-08-20',NULL,NULL,NULL,NULL,NULL,'0005',NULL,NULL,NULL,NULL,NULL,'M',NULL,NULL,NULL,NULL,'2024-06-03 15:57:45.605066',NULL,NULL,'2024-06-03 12:00:23.10279'); + ('641500203','415240801','400','ADMINUSER',true,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0022',NULL,'2024-08-05',false,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-03 15:33:11.35552',NULL,NULL,'2024-06-03 15:33:11.35552'), + ('641500204','415240801','400','ADMINUSER',true,6,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0026',NULL,'2024-08-05',false,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-03 15:33:11.362183',NULL,NULL,'2024-06-03 15:33:11.362182'), + ('641500210','415240801','400','ADMINUSER',true,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0017',NULL,'2024-08-05',false,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-03 15:33:11.343885',NULL,NULL,'2024-06-03 15:33:11.343885'), + ('641500211','415240801','400','ADMINUSER',true,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0021',NULL,'2024-08-05',false,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-03 15:33:11.353662',NULL,NULL,'2024-06-03 15:33:11.353662'), + ('641500212','415240801','400','ADMINUSER',true,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0019',NULL,'2024-08-05',false,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-03 15:33:11.348805',NULL,NULL,'2024-06-03 15:33:11.348805'), + ('641500213','415240801','400','ADMINUSER',true,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0023',NULL,'2024-08-05',false,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-03 15:33:11.357346',NULL,NULL,'2024-06-03 15:33:11.357346'), + ('641500216','415240801','400','ADMINUSER',true,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0025',NULL,'2024-08-05',false,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-03 15:33:11.361174',NULL,NULL,'2024-06-03 15:33:11.361174'), + ('641500223','415240801','400','ADMINUSER',true,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0020',NULL,'2024-08-05',false,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-03 15:33:11.351721',NULL,NULL,'2024-06-03 15:33:11.351721'), + ('641500316','415240801','400','ADMINUSER',true,2,NULL,'2024-08-20',NULL,NULL,NULL,NULL,NULL,'0005',NULL,NULL,false,NULL,true,NULL,NULL,NULL,NULL,NULL,'2024-06-03 15:57:45.605066',true,NULL,'2024-06-03 12:00:23.10279'), + ('641500316','415240804','400','ADMINUSER',false,7,NULL,'2024-08-20',NULL,NULL,NULL,NULL,NULL,'0005',NULL,NULL,false,NULL,NULL,'M',NULL,NULL,NULL,NULL,'2024-06-03 15:57:45.605066',NULL,NULL,'2024-06-03 12:00:23.10279'); INSERT INTO juror_mod.juror_pool (juror_number,pool_number,"owner",user_edtq,is_active,status,times_sel,def_date,"location",no_attendances,no_attended,no_fta,no_awol,pool_seq,edit_tag,next_date,on_call,smart_card,was_deferred,deferral_code,id_checked,postpone,paid_cash,scan_code,last_update,reminder_sent,transfer_date,date_created) VALUES - ('641600045','416240801','416','MODTESTBUREAU',true,2,NULL,'2024-08-19',NULL,NULL,NULL,NULL,NULL,'0001',NULL,NULL,NULL,NULL,NULL,'B',NULL,NULL,NULL,NULL,'2024-06-04 11:43:59.388',NULL,'2024-06-04','2024-06-04 11:42:42.328'), - ('641600050','416240801','416','MODTESTBUREAU',true,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0006',NULL,'2024-08-06',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-04 11:44:53.178',NULL,'2024-06-04','2024-06-04 11:42:42.343'), - ('641600051','416240801','416','MODTESTBUREAU',true,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0007',NULL,'2024-08-06',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-04 11:49:15.104',true,'2024-06-04','2024-06-04 11:42:42.346'), - ('641600054','416240801','416','MODTESTBUREAU',true,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0003',NULL,'2024-08-06',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-04 11:57:37.158',NULL,'2024-06-04','2024-06-04 11:42:42.334'), - ('641600057','416240801','400','MODTESTBUREAU',true,5,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0002',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-04 11:58:18.554',NULL,'2024-06-04','2024-06-04 11:42:42.331'), - ('641600058','416240801','400','MODTESTBUREAU',true,7,NULL,'2024-09-16',NULL,NULL,NULL,NULL,NULL,'0010',NULL,NULL,NULL,NULL,NULL,'A',NULL,NULL,NULL,NULL,'2024-06-04 11:59:20.157',NULL,'2024-06-04','2024-06-04 11:42:42.354'), - ('641600062','416240801','400','MODTESTBUREAU',true,6,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0008',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-04 11:59:44.483',NULL,'2024-06-04','2024-06-04 11:42:42.349'), - ('641600065','416240801','416','MODTESTBUREAU',true,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0004',NULL,'2024-08-06',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-04 11:42:42.337',NULL,'2024-06-04','2024-06-04 11:42:42.337'), - ('641600066','416240801','416','MODTESTBUREAU',true,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0005',NULL,'2024-08-06',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-04 11:42:42.341',NULL,'2024-06-04','2024-06-04 11:42:42.341'), - ('641600070','416240801','416','MODTESTBUREAU',true,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0009',NULL,'2024-08-06',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-04 11:42:42.351',NULL,'2024-06-04','2024-06-04 11:42:42.351'); + ('641600045','416240801','416','MODTESTBUREAU',true,2,NULL,'2024-08-19',NULL,NULL,NULL,NULL,NULL,'0001',NULL,NULL,false,NULL,NULL,'B',NULL,NULL,NULL,NULL,'2024-06-04 11:43:59.388',NULL,'2024-06-04','2024-06-04 11:42:42.328'), + ('641600050','416240801','416','MODTESTBUREAU',true,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0006',NULL,'2024-08-06',false,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-04 11:44:53.178',NULL,'2024-06-04','2024-06-04 11:42:42.343'), + ('641600051','416240801','416','MODTESTBUREAU',true,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0007',NULL,'2024-08-06',false,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-04 11:49:15.104',true,'2024-06-04','2024-06-04 11:42:42.346'), + ('641600054','416240801','416','MODTESTBUREAU',true,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0003',NULL,'2024-08-06',false,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-04 11:57:37.158',NULL,'2024-06-04','2024-06-04 11:42:42.334'), + ('641600057','416240801','400','MODTESTBUREAU',true,5,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0002',NULL,NULL,false,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-04 11:58:18.554',NULL,'2024-06-04','2024-06-04 11:42:42.331'), + ('641600058','416240801','400','MODTESTBUREAU',true,7,NULL,'2024-09-16',NULL,NULL,NULL,NULL,NULL,'0010',NULL,NULL,false,NULL,NULL,'A',NULL,NULL,NULL,NULL,'2024-06-04 11:59:20.157',NULL,'2024-06-04','2024-06-04 11:42:42.354'), + ('641600062','416240801','400','MODTESTBUREAU',true,6,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0008',NULL,NULL,false,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-04 11:59:44.483',NULL,'2024-06-04','2024-06-04 11:42:42.349'), + ('641600065','416240801','416','MODTESTBUREAU',true,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0004',NULL,'2024-08-06',false,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-04 11:42:42.337',NULL,'2024-06-04','2024-06-04 11:42:42.337'), + ('641600066','416240801','416','MODTESTBUREAU',true,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0005',NULL,'2024-08-06',false,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-04 11:42:42.341',NULL,'2024-06-04','2024-06-04 11:42:42.341'), + ('641600070','416240801','416','MODTESTBUREAU',true,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0009',NULL,'2024-08-06',false,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-04 11:42:42.351',NULL,'2024-06-04','2024-06-04 11:42:42.351'); INSERT INTO juror_mod.juror_pool (juror_number,pool_number,"owner",user_edtq,is_active,status,times_sel,def_date,"location",no_attendances,no_attended,no_fta,no_awol,pool_seq,edit_tag,next_date,on_call,smart_card,was_deferred,deferral_code,id_checked,postpone,paid_cash,scan_code,last_update,reminder_sent,transfer_date,date_created) VALUES - ('677400941','774240802','400','ADMINUSER',true,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0002',NULL,'2024-08-08',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-06 12:07:51.647878',NULL,NULL,'2024-06-06 12:07:51.647877'), - ('677400928','774240802','400','ADMINUSER',true,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0003',NULL,'2024-08-08',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-06 12:07:51.652351',NULL,NULL,'2024-06-06 12:07:51.65235'), - ('677400923','774240802','400','ADMINUSER',true,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0001',NULL,'2024-08-08',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-06 12:08:33.268403',NULL,NULL,'2024-06-06 12:07:51.640718'), - ('641700050','417240801','400','MODTESTBUREAU',true,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0006',NULL,'2024-08-06',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-04 11:44:53.178',NULL,'2024-06-04','2024-06-04 11:42:42.343'), - ('641700051','417240801','400','MODTESTBUREAU',true,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0007',NULL,'2024-08-06',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-04 11:49:15.104',true,'2024-06-04','2024-06-04 11:42:42.346'), - ('641700052','417240801','400','MODTESTBUREAU',true,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0003',NULL,'2024-08-06',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-04 11:57:37.158',NULL,'2024-06-04','2024-06-04 11:42:42.334'), - ('641700053','417240801','400','MODTESTBUREAU',true,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0006',NULL,'2024-08-06',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-04 11:44:53.178',NULL,'2024-06-04','2024-06-04 11:42:42.343'), - ('641700054','417240801','400','MODTESTBUREAU',true,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0007',NULL,'2024-08-06',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-04 11:49:15.104',true,'2024-06-04','2024-06-04 11:42:42.346'), - ('641700055','417240801','400','MODTESTBUREAU',true,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0003',NULL,'2024-08-06',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-04 11:57:37.158',NULL,'2024-06-04','2024-06-04 11:42:42.334'), - ('641700056','417240801','400','MODTESTBUREAU',true,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0006',NULL,'2024-08-06',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-04 11:44:53.178',NULL,'2024-06-04','2024-06-04 11:42:42.343'), - ('641700057','417240801','400','MODTESTBUREAU',true,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0007',NULL,'2024-08-06',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-04 11:49:15.104',true,'2024-06-04','2024-06-04 11:42:42.346'), - ('641700058','417240801','400','MODTESTBUREAU',true,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0003',NULL,'2024-08-06',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-04 11:57:37.158',NULL,'2024-06-04','2024-06-04 11:42:42.334'); + ('677400941','774240802','400','ADMINUSER',true,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0002',NULL,'2024-08-08',false,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-06 12:07:51.647878',NULL,NULL,'2024-06-06 12:07:51.647877'), + ('677400928','774240802','400','ADMINUSER',true,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0003',NULL,'2024-08-08',false,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-06 12:07:51.652351',NULL,NULL,'2024-06-06 12:07:51.65235'), + ('677400923','774240802','400','ADMINUSER',true,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0001',NULL,'2024-08-08',false,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-06 12:08:33.268403',NULL,NULL,'2024-06-06 12:07:51.640718'), + ('641700050','417240801','400','MODTESTBUREAU',true,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0006',NULL,'2024-08-06',false,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-04 11:44:53.178',NULL,'2024-06-04','2024-06-04 11:42:42.343'), + ('641700051','417240801','400','MODTESTBUREAU',true,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0007',NULL,'2024-08-06',false,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-04 11:49:15.104',true,'2024-06-04','2024-06-04 11:42:42.346'), + ('641700052','417240801','400','MODTESTBUREAU',true,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0003',NULL,'2024-08-06',false,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-04 11:57:37.158',NULL,'2024-06-04','2024-06-04 11:42:42.334'), + ('641700053','417240801','400','MODTESTBUREAU',true,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0006',NULL,'2024-08-06',false,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-04 11:44:53.178',NULL,'2024-06-04','2024-06-04 11:42:42.343'), + ('641700054','417240801','400','MODTESTBUREAU',true,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0007',NULL,'2024-08-06',false,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-04 11:49:15.104',true,'2024-06-04','2024-06-04 11:42:42.346'), + ('641700055','417240801','400','MODTESTBUREAU',true,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0003',NULL,'2024-08-06',false,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-04 11:57:37.158',NULL,'2024-06-04','2024-06-04 11:42:42.334'), + ('641700056','417240801','400','MODTESTBUREAU',true,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0006',NULL,'2024-08-06',false,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-04 11:44:53.178',NULL,'2024-06-04','2024-06-04 11:42:42.343'), + ('641700057','417240801','400','MODTESTBUREAU',true,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0007',NULL,'2024-08-06',false,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-04 11:49:15.104',true,'2024-06-04','2024-06-04 11:42:42.346'), + ('641700058','417240801','400','MODTESTBUREAU',true,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0003',NULL,'2024-08-06',false,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-06-04 11:57:37.158',NULL,'2024-06-04','2024-06-04 11:42:42.334'); insert into juror_mod.bureau_snapshot (juror_number,pool_number,"owner",user_edtq,is_active,status,def_date,pool_seq,edit_tag,next_date,was_deferred,deferral_code,postpone,scan_code,last_update,reminder_sent,transfer_date,date_created,excusal_code,acc_exc,police_check) VALUES diff --git a/src/main/java/uk/gov/hmcts/juror/api/moj/domain/JurorPool.java b/src/main/java/uk/gov/hmcts/juror/api/moj/domain/JurorPool.java index f2b7be85b..f7931fb30 100644 --- a/src/main/java/uk/gov/hmcts/juror/api/moj/domain/JurorPool.java +++ b/src/main/java/uk/gov/hmcts/juror/api/moj/domain/JurorPool.java @@ -98,7 +98,7 @@ public class JurorPool implements Serializable { private LocalDate nextDate; @Column(name = "on_call") - private Boolean onCall; + private boolean onCall; @Length(max = 20) @Column(name = "smart_card") diff --git a/src/main/java/uk/gov/hmcts/juror/api/moj/service/JurorRecordServiceImpl.java b/src/main/java/uk/gov/hmcts/juror/api/moj/service/JurorRecordServiceImpl.java index d4f717687..1528729b2 100644 --- a/src/main/java/uk/gov/hmcts/juror/api/moj/service/JurorRecordServiceImpl.java +++ b/src/main/java/uk/gov/hmcts/juror/api/moj/service/JurorRecordServiceImpl.java @@ -5,7 +5,6 @@ import lombok.NoArgsConstructor; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.text.WordUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.history.Revision; @@ -602,7 +601,7 @@ public void updateAttendance(UpdateAttendanceRequestDto dto) { private void validateOnCall(JurorPool jurorPool) { - if (jurorPool.getOnCall() != null && jurorPool.getOnCall().equals(true)) { + if (jurorPool.isOnCall()) { throw new MojException.BadRequest("Juror status is already on call", null); } } @@ -1197,7 +1196,7 @@ public JurorAttendanceDetailsResponseDto getJurorAttendanceDetails(String locCod responseDto.setNonAttendances((int) jurorAttendanceDetails.stream() .filter(p -> AttendanceType.NON_ATTENDANCE.equals(p.getAttendanceType())).count()); - responseDto.setOnCall(ObjectUtils.defaultIfNull(jurorPool.getOnCall(), false)); + responseDto.setOnCall(jurorPool.isOnCall()); responseDto.setNextDate(jurorPool.getNextDate()); return responseDto; diff --git a/src/main/resources/db/migrationv2/V2_29__on_call_updates.sql b/src/main/resources/db/migrationv2/V2_29__on_call_updates.sql new file mode 100644 index 000000000..ee1002833 --- /dev/null +++ b/src/main/resources/db/migrationv2/V2_29__on_call_updates.sql @@ -0,0 +1,7 @@ +update juror_mod.juror_pool jp +set on_call = false +where jp.on_call is null; + +alter table juror_mod.juror_pool + ALTER COLUMN on_call SET DEFAULT false, + ALTER COLUMN on_call SET NOT NULL; \ No newline at end of file diff --git a/src/test/java/uk/gov/hmcts/juror/api/moj/service/JurorRecordServiceTest.java b/src/test/java/uk/gov/hmcts/juror/api/moj/service/JurorRecordServiceTest.java index d28840f9c..d3a763345 100644 --- a/src/test/java/uk/gov/hmcts/juror/api/moj/service/JurorRecordServiceTest.java +++ b/src/test/java/uk/gov/hmcts/juror/api/moj/service/JurorRecordServiceTest.java @@ -2276,7 +2276,7 @@ void updateAttendanceHappyPathOnCall() { verify(jurorPoolRepository, times(1)).save(jurorPool); - assertThat(jurorPool.getOnCall()).isTrue(); + assertThat(jurorPool.isOnCall()).isTrue(); assertThat(jurorPool.getNextDate()).isNull(); } @@ -2303,7 +2303,7 @@ void updateAttendanceHappyPathChangeNextDate() { verify(jurorPoolRepository, times(1)).save(jurorPool); assertThat(jurorPool.getNextDate()).isEqualTo(dto.getNextDate()); - assertThat(jurorPool.getOnCall()).isFalse(); + assertThat(jurorPool.isOnCall()).isFalse(); }