diff --git a/backend/app/src/main/resources/application.yml b/backend/app/src/main/resources/application.yml index 7118e605678f1351b82550b176457170c3e18204..260b0e787aa4c80e50256b7bd9df6efa1c57e3e4 100644 --- a/backend/app/src/main/resources/application.yml +++ b/backend/app/src/main/resources/application.yml @@ -1,7 +1,7 @@ server: port: 8080 address: 0.0.0.0 - + forward-headers-strategy: FRAMEWORK servlet: context-path: /api diff --git a/backend/feature/booking/core/src/main/kotlin/band/effective/office/backend/feature/booking/core/controller/BookingController.kt b/backend/feature/booking/core/src/main/kotlin/band/effective/office/backend/feature/booking/core/controller/BookingController.kt index 19ce8b9fd9c227414ef6cb01860650e2a0ebd3a1..63cac639ccdb1959b1942a0ad804df862e475d4d 100644 --- a/backend/feature/booking/core/src/main/kotlin/band/effective/office/backend/feature/booking/core/controller/BookingController.kt +++ b/backend/feature/booking/core/src/main/kotlin/band/effective/office/backend/feature/booking/core/controller/BookingController.kt @@ -99,9 +99,9 @@ class BookingController( @RequestParam(required = false) userId: String?, @Parameter(description = "Filter by workspace ID") @RequestParam(required = false) workspaceId: String?, - @Parameter(description = "Start of the time range in milliseconds since epoch", example = "1672531200000") + @Parameter(description = "Start of the time range in milliseconds since epoch", example = "1755734400000") @RequestParam(required = false) from: Long? = null, - @Parameter(description = "End of the time range in milliseconds since epoch", example = "1675209599000") + @Parameter(description = "End of the time range in milliseconds since epoch", example = "1761091199000") @RequestParam(required = false) to: Long? = null, @Parameter(description = "Whether to return recurring bookings as non-recurrent instances", example = "true") @RequestParam(required = false, defaultValue = "true") returnInstances: Boolean diff --git a/backend/feature/booking/core/src/main/kotlin/band/effective/office/backend/feature/booking/core/dto/BookingDto.kt b/backend/feature/booking/core/src/main/kotlin/band/effective/office/backend/feature/booking/core/dto/BookingDto.kt index ecfe3b5dbb59324ae661c9a24749a4e32b83c15a..2104977029fcf236f3ea18834c3b88959a752b4f 100644 --- a/backend/feature/booking/core/src/main/kotlin/band/effective/office/backend/feature/booking/core/dto/BookingDto.kt +++ b/backend/feature/booking/core/src/main/kotlin/band/effective/office/backend/feature/booking/core/dto/BookingDto.kt @@ -31,10 +31,10 @@ data class BookingDto( @Schema(description = "Booking ID", example = "123e4567-e89b-12d3-a456-426614174000") val id: String, - @Schema(description = "Start time of the booking in milliseconds since epoch", example = "1672531200000") + @Schema(description = "Start time of the booking in milliseconds since epoch", example = "1755734400000") val beginBooking: Long, - @Schema(description = "End time of the booking in milliseconds since epoch", example = "1672534800000") + @Schema(description = "End time of the booking in milliseconds since epoch", example = "1761091199000") val endBooking: Long, @Schema(description = "Recurrence pattern for the booking") diff --git a/backend/feature/booking/core/src/main/kotlin/band/effective/office/backend/feature/booking/core/dto/CreateUpdateBookingDto.kt b/backend/feature/booking/core/src/main/kotlin/band/effective/office/backend/feature/booking/core/dto/CreateUpdateBookingDto.kt index 0184d564c9178be5b6e49634f9dc621b8fad8851..e964fc83a4037be0ec912c200a0510924ca1ba9e 100644 --- a/backend/feature/booking/core/src/main/kotlin/band/effective/office/backend/feature/booking/core/dto/CreateUpdateBookingDto.kt +++ b/backend/feature/booking/core/src/main/kotlin/band/effective/office/backend/feature/booking/core/dto/CreateUpdateBookingDto.kt @@ -24,15 +24,15 @@ data class CreateBookingDto( val workspaceId: String, @field:NotNull(message = "Begin booking time is required") - @Schema(description = "Start time of the booking in milliseconds since epoch", example = "1672531200000") + @Schema(description = "Start time of the booking in milliseconds since epoch", example = "1755823500000") val beginBooking: Long, @field:NotNull(message = "End booking time is required") - @Schema(description = "End time of the booking in milliseconds since epoch", example = "1672534800000") + @Schema(description = "End time of the booking in milliseconds since epoch", example = "1758499500000") val endBooking: Long, @Valid - @Schema(description = "Recurrence pattern for the booking") + @Schema(description = "Recurrence pattern for the booking", example = "null") val recurrence: RecurrenceDto? = null ) { /** @@ -71,14 +71,14 @@ data class UpdateBookingDto( @Schema(description = "Emails of users participating in the booking", example = "[\"jane.doe@example.com\"]") val participantEmails: List = emptyList(), - @Schema(description = "Start time of the booking in milliseconds since epoch", example = "1672531200000") + @Schema(description = "Start time of the booking in milliseconds since epoch", example = "1755734400000") val beginBooking: Long? = null, - @Schema(description = "End time of the booking in milliseconds since epoch", example = "1672534800000") + @Schema(description = "End time of the booking in milliseconds since epoch", example = "1756734400000") val endBooking: Long? = null, @Valid - @Schema(description = "Recurrence pattern for the booking") + @Schema(description = "Recurrence pattern for the booking", example = "null") val recurrence: RecurrenceDto? = null ) { /** diff --git a/backend/feature/workspace/src/main/kotlin/band/effective/office/backend/feature/workspace/core/controller/WorkspaceController.kt b/backend/feature/workspace/src/main/kotlin/band/effective/office/backend/feature/workspace/core/controller/WorkspaceController.kt index 06dfe4a960b8c9e6c39a9d8376ab2ed927e1392e..1be3f0f6cf6b9f1bde59758e265099fc9b9d04fd 100644 --- a/backend/feature/workspace/src/main/kotlin/band/effective/office/backend/feature/workspace/core/controller/WorkspaceController.kt +++ b/backend/feature/workspace/src/main/kotlin/band/effective/office/backend/feature/workspace/core/controller/WorkspaceController.kt @@ -76,10 +76,10 @@ class WorkspaceController( @Parameter(description = "Workspace tag", required = true, example = "meeting") @RequestParam(name = "workspace_tag") tag: String, - @Parameter(description = "Start of the time range for workspaces with bookings", example = "1751565600000") + @Parameter(description = "Start of the time range for workspaces with bookings", example = "1755734400000") @RequestParam(name = "with_bookings_from", required = false) withBookingsFrom: Long?, - @Parameter(description = "End of the time range for workspaces with bookings", example = "1752824530612") + @Parameter(description = "End of the time range for workspaces with bookings", example = "1761091199000") @RequestParam(name = "with_bookings_until", required = false) withBookingsUntil: Long? ): ResponseEntity> { val workspaces = workspaceService.findAllByTag(tag)