Endpoint for calendar overview

Author: rokeppen

src/main/kotlin/be/sgl/backend/controller/CalendarController.kt

@@ -3,10 +3,7 @@ package be.sgl.backend.controller
 import be.sgl.backend.config.security.OnlyAdmin
 import be.sgl.backend.config.security.OnlyStaff
 import be.sgl.backend.config.security.Public
-import be.sgl.backend.dto.CalendarDTO
-import be.sgl.backend.dto.CalendarItemWithCalendarsDTO
-import be.sgl.backend.dto.CalendarPeriodDTO
-import be.sgl.backend.dto.CalendarUpdateDTO
+import be.sgl.backend.dto.*
 import be.sgl.backend.service.CalendarService
 import io.github.wimdeblauwe.errorhandlingspringbootstarter.ApiErrorResponse
 import io.swagger.v3.oas.annotations.Operation
@@ -20,6 +17,7 @@ import org.springframework.http.HttpStatus
 import org.springframework.http.MediaType.APPLICATION_JSON_VALUE
 import org.springframework.http.ResponseEntity
 import org.springframework.web.bind.annotation.*
+import java.time.LocalDate
 
 @RestController
 @RequestMapping("/calendars")
@@ -156,6 +154,12 @@ class CalendarController {
         return ResponseEntity.ok(calendarService.mergeCalendarDTOChanges(id, calendarDTO))
     }
 
+    @GetMapping("/items")
+    @Public
+    fun getCalendarOverview(@RequestParam from: LocalDate, @RequestParam to: LocalDate): ResponseEntity<Map<String, List<CalendarItemDTO>>> {
+        return ResponseEntity.ok(calendarService.getCalendarItemOverviewBetween(from, to))
+    }
+
     @GetMapping("/items/{id}")
     @Public
     @Operation(

src/main/kotlin/be/sgl/backend/repository/calendar/CalendarItemRepository.kt

@@ -3,6 +3,9 @@ package be.sgl.backend.repository.calendar
 import be.sgl.backend.entity.calendar.CalendarItem
 import org.springframework.data.jpa.repository.JpaRepository
 import org.springframework.stereotype.Repository
+import java.time.LocalDateTime
 
 @Repository
-interface CalendarItemRepository : JpaRepository<CalendarItem, Int>
+interface CalendarItemRepository : JpaRepository<CalendarItem, Int> {
+    fun findByClosedFalseAndStartAfterAndEndBefore(from: LocalDateTime, to: LocalDateTime): List<CalendarItem>
+}

src/main/kotlin/be/sgl/backend/service/CalendarService.kt

@@ -1,9 +1,6 @@
 package be.sgl.backend.service
 
-import be.sgl.backend.dto.CalendarDTO
-import be.sgl.backend.dto.CalendarItemWithCalendarsDTO
-import be.sgl.backend.dto.CalendarPeriodDTO
-import be.sgl.backend.dto.CalendarUpdateDTO
+import be.sgl.backend.dto.*
 import be.sgl.backend.entity.calendar.Calendar
 import be.sgl.backend.entity.calendar.CalendarItem
 import be.sgl.backend.entity.calendar.CalendarPeriod
@@ -24,6 +21,8 @@ import org.springframework.data.repository.findByIdOrNull
 import org.springframework.stereotype.Service
 import java.time.DayOfWeek
 import java.time.LocalDate
+import java.time.LocalTime
+import java.time.format.DateTimeFormatter
 
 @Service
 @Transactional
@@ -138,6 +137,15 @@ class CalendarService {
         deleteCalendar(getCalendarById(id))
     }
 
+    fun getCalendarItemOverviewBetween(from: LocalDate, to: LocalDate): Map<String, List<CalendarItemWithCalendarsDTO>> {
+        val formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm")
+        return itemRepository.findByClosedFalseAndStartAfterAndEndBefore(from.atStartOfDay(), to.atTime(LocalTime.MAX))
+            .map(mapper::toDtoWithCalendars)
+            .groupBy { item ->
+                "${formatter.format(item.start)} - ${formatter.format(item.end)}"
+            }
+    }
+
     fun getCalendarItemDTOById(id: Int): CalendarItemWithCalendarsDTO {
         return mapper.toDtoWithCalendars(getItemById(id))
     }