Skip to content

Add include deleted to bookings #876

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Open
AmandaRichards wants to merge 13 commits into
base: master
Choose a base branch
from
Open

Add include deleted to bookings #876

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
5686617
Add include deleted to bookings
AmandaRichards Jan 7, 2025
438b638
Update Swagger v2 Spec Bump APIm revision to 94
pre-devops Jan 7, 2025
072d423
Merge branch 'master' into S28-3597/includeDeleted
jasonpaige Aug 1, 2025
a0c3429
fix tests
jasonpaige Oct 10, 2025
e5b7715
Merge branch 'master' into S28-3597/includeDeleted
jasonpaige Oct 10, 2025
3c1192a
fix
jasonpaige Oct 10, 2025
553d75b
Bumped APIm revision to 126
pre-devops Oct 10, 2025
73d527e
Merge branch 'master' into S28-3597/includeDeleted
jasonpaige Oct 17, 2025
1c26a84
Merge branch 'master' into S28-3597/includeDeleted
lydiaralphgov Nov 14, 2025
7e6b1d2
Bumped APIm revision to 127
pre-devops Nov 14, 2025
d2bf1d2
Merge branch 'master' into S28-3597/includeDeleted
lydiaralphgov Nov 14, 2025
1529753
Merge branch 'master' into S28-3597/includeDeleted
lydiaralphgov Nov 19, 2025
2cf078d
Bumped APIm revision to 129
pre-devops Nov 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion infrastructure/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ locals {
env_to_deploy = 1
env_long_name = var.env == "sbox" ? "sandbox" : var.env == "stg" ? "staging" : var.env
apim_service_url = var.env == "prod" ? "https://pre-api.platform.hmcts.net" : "https://pre-api.${local.env_long_name}.platform.hmcts.net"
api_revision = "126"
api_revision = "127"
}

data "azurerm_client_config" "current" {}
Expand Down
4 changes: 4 additions & 0 deletions pre-api-stg.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2654,6 +2654,10 @@ paths:
in: query
name: hasRecordings
type: boolean
- description: Include bookings marked as deleted
in: query
name: includeDeleted
type: boolean
- description: >-
Search bookings with at least one associated capture session with
one of the statuses listed
Expand Down
17 changes: 17 additions & 0 deletions src/integrationTest/java/uk/gov/hmcts/reform/preapi/services/BookingServiceIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ public void testSearchBookingsNotSuperUser() {
null,
null,
null,
null,
Pageable.unpaged(Sort.by(Sort.Order.asc("scheduledFor")))
);
assertEquals(1, findAllSharedWithUser.toList().size(), "Should find 1 booking");
Expand Down Expand Up @@ -197,6 +198,7 @@ public void testSearchBookings() {
null,
null,
null,
null,
Pageable.unpaged(Sort.by(Sort.Order.asc("scheduledFor")))
);
assertEquals(2, findByCaseReferenceResult.getContent().size(), "Should find 2 bookings");
Expand All @@ -212,6 +214,7 @@ public void testSearchBookings() {
null,
null,
null,
null,
Pageable.unpaged(Sort.by(Sort.Order.asc("scheduledFor")))
);
assertEquals(1, findByScheduledForResult.getContent().size(), "Should find 1 bookings");
Expand All @@ -229,6 +232,7 @@ public void testSearchBookings() {
null,
null,
null,
null,
null);
assertEquals(1, findByParticipantResult.getContent().size());
assertEquals(
Expand All @@ -245,6 +249,7 @@ public void testSearchBookings() {
null,
null,
null,
null,
null).toList();
assertEquals(1, findByCourtIdResult.size());
assertEquals(
Expand All @@ -262,6 +267,7 @@ public void testSearchBookings() {
false,
null,
null,
null,
Pageable.unpaged(Sort.by(Sort.Order.asc("scheduledFor")))
).toList();
assertEquals(findByHasRecordingsFalse.size(), 1);
Expand All @@ -279,6 +285,7 @@ public void testSearchBookings() {
true,
null,
null,
null,
Pageable.unpaged(Sort.by(Sort.Order.asc("scheduledFor")))
).toList();
assertEquals(findByHasRecordingsTrue.size(), 1);
Expand Down Expand Up @@ -366,6 +373,7 @@ void testSearchByCaptureSessionStatus() {
Optional.empty(),
null,
null,
null,
List.of(RecordingStatus.STANDBY),
null,
null).getContent();
Expand All @@ -378,6 +386,7 @@ void testSearchByCaptureSessionStatus() {
Optional.empty(),
null,
null,
null,
List.of(RecordingStatus.PROCESSING),
null,
null).getContent();
Expand All @@ -390,6 +399,7 @@ void testSearchByCaptureSessionStatus() {
Optional.empty(),
null,
null,
null,
List.of(
RecordingStatus.STANDBY,
RecordingStatus.PROCESSING
Expand All @@ -408,6 +418,7 @@ void testSearchByCaptureSessionStatus() {
Optional.empty(),
null,
null,
null,
List.of(RecordingStatus.NO_RECORDING),
null,
null).getContent();
Expand All @@ -420,6 +431,7 @@ void testSearchByCaptureSessionStatus() {
null,
null,
null,
null,
List.of(RecordingStatus.STANDBY),
null).getContent();
assertThat(findOnlyWithProcessing).hasSize(1);
Expand All @@ -432,6 +444,7 @@ void testSearchByCaptureSessionStatus() {
null,
null,
null,
null,
List.of(
RecordingStatus.STANDBY,
RecordingStatus.PROCESSING
Expand Down Expand Up @@ -661,6 +674,7 @@ void searchBookingsEnableMigratedDataToggleNonSuperUser() {
null,
null,
null,
null,
null
);

Expand Down Expand Up @@ -698,6 +712,7 @@ void searchBookingsEnableMigratedDataToggleSuperUser() {
null,
null,
null,
null,
null
);

Expand Down Expand Up @@ -759,6 +774,7 @@ void searchBookingsEnableMigratedDataToggleNonSuperUser() {
null,
null,
null,
null,
null
);

Expand Down Expand Up @@ -799,6 +815,7 @@ void searchBookingsEnableMigratedDataToggleSuperUser() {
null,
null,
null,
null,
null
);

Expand Down
8 changes: 8 additions & 0 deletions src/main/java/uk/gov/hmcts/reform/preapi/controllers/BookingController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,12 @@ public BookingController(final BookingService bookingService, final ShareBooking
description = "If the booking has any recordings",
schema = @Schema(implementation = Boolean.class)
)

@Parameter(
name = "includeDeleted",
description = "Include bookings marked as deleted",
schema = @Schema(implementation = Boolean.class)
)
@Parameter(
name = "captureSessionStatusIn",
description = "Search bookings with at least one associated capture session with one of the statuses listed",
Expand Down Expand Up @@ -144,12 +150,14 @@ public HttpEntity<PagedModel<EntityModel<BookingDTO>>> searchByCaseId(
: Optional.empty(),
params.getParticipantId(),
params.getHasRecordings(),
params.getIncludeDeleted() != null && params.getIncludeDeleted(),
params.getCaptureSessionStatusIn() == null || params.getCaptureSessionStatusIn().isEmpty()
? null
: params.getCaptureSessionStatusIn(),
params.getCaptureSessionStatusNotIn() == null || params.getCaptureSessionStatusNotIn().isEmpty()
? null
: params.getCaptureSessionStatusNotIn(),

pageable
);
if (pageable.getPageNumber() > resultPage.getTotalPages()) {
Expand Down
1 change: 1 addition & 0 deletions src/main/java/uk/gov/hmcts/reform/preapi/controllers/params/SearchBookings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ public class SearchBookings {
private LocalDate scheduledFor;
private UUID participantId;
private Boolean hasRecordings;
private Boolean includeDeleted;
private List<RecordingStatus> captureSessionStatusIn;
private List<RecordingStatus> captureSessionStatusNotIn;

Expand Down
2 changes: 2 additions & 0 deletions src/main/java/uk/gov/hmcts/reform/preapi/repositories/BookingRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ public interface BookingRepository extends JpaRepository<Booking, UUID> {
(:reference IS NULL OR b.caseId.reference ILIKE %:reference%)
AND (CAST(:caseId as uuid) IS NULL OR b.caseId.id = :caseId)
AND (CAST(:courtId as uuid) IS NULL OR b.caseId.court.id = :courtId)
AND (:includeDeleted = TRUE OR b.deletedAt IS NULL)
AND (CAST(:scheduledForFrom as Timestamp) IS NULL OR
CAST(:scheduledForUntil as Timestamp) IS NULL OR
CAST(FUNCTION('TIMEZONE', 'Europe/London', b.scheduledFor) as Timestamp)
Expand Down Expand Up @@ -79,6 +80,7 @@ Page<Booking> searchBookingsBy(
@Param("authorisedBookings") List<UUID> authorisedBookings,
@Param("authCourtId") UUID authCourtId,
@Param("hasRecordings") Boolean hasRecordings,
@Param("includeDeleted") Boolean includeDeleted,
@Param("statuses") List<RecordingStatus> statuses,
@Param("notStatuses") List<RecordingStatus> notStatuses,
@Param("includeVodafone") boolean includeVodafone,
Expand Down
3 changes: 3 additions & 0 deletions src/main/java/uk/gov/hmcts/reform/preapi/services/BookingService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ public Page<BookingDTO> searchBy(
Optional<Timestamp> scheduledFor,
UUID participantId,
Boolean hasRecordings,
Boolean includeDeleted,
List<RecordingStatus> statuses,
List<RecordingStatus> notStatuses,
Pageable pageable
Expand All @@ -114,6 +115,7 @@ public Page<BookingDTO> searchBy(
authorisedBookings,
authorisedCourt,
hasRecordings,
includeDeleted,
statuses,
notStatuses,
enableMigratedData || auth.hasRole("ROLE_SUPER_USER"),
Expand Down Expand Up @@ -252,6 +254,7 @@ public List<BookingDTO> findAllBookingsForToday() {
null,
null,
null,
null,
Pageable.unpaged()
)
.toList();
Expand Down
Loading
Loading