From 19aa9c8b6bb5a7d1fdbd23c986255fe00b71a4ad Mon Sep 17 00:00:00 2001 From: Swordsteel Date: Sun, 17 Aug 2025 22:28:37 +0200 Subject: [PATCH] Extract default page and size --- src/main/kotlin/ltd/hlaeja/controller/DevicesController.kt | 7 ++----- src/main/kotlin/ltd/hlaeja/controller/TypesController.kt | 6 ++---- src/main/kotlin/ltd/hlaeja/util/Pagination.kt | 6 ++++++ 3 files changed, 10 insertions(+), 9 deletions(-) create mode 100644 src/main/kotlin/ltd/hlaeja/util/Pagination.kt diff --git a/src/main/kotlin/ltd/hlaeja/controller/DevicesController.kt b/src/main/kotlin/ltd/hlaeja/controller/DevicesController.kt index e460655..30079c4 100644 --- a/src/main/kotlin/ltd/hlaeja/controller/DevicesController.kt +++ b/src/main/kotlin/ltd/hlaeja/controller/DevicesController.kt @@ -6,6 +6,8 @@ import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.map import ltd.hlaeja.library.deviceRegistry.Devices import ltd.hlaeja.service.DeviceService +import ltd.hlaeja.util.Pagination.DEFAULT_PAGE +import ltd.hlaeja.util.Pagination.DEFAULT_SIZE import ltd.hlaeja.util.toDevicesResponse import org.springframework.web.bind.annotation.GetMapping import org.springframework.web.bind.annotation.PathVariable @@ -16,11 +18,6 @@ class DevicesController( private val deviceService: DeviceService, ) { - companion object { - const val DEFAULT_PAGE: Int = 1 - const val DEFAULT_SIZE: Int = 25 - } - @GetMapping( "/devices", "/devices/page-{page}", diff --git a/src/main/kotlin/ltd/hlaeja/controller/TypesController.kt b/src/main/kotlin/ltd/hlaeja/controller/TypesController.kt index d9b1072..6ab577b 100644 --- a/src/main/kotlin/ltd/hlaeja/controller/TypesController.kt +++ b/src/main/kotlin/ltd/hlaeja/controller/TypesController.kt @@ -5,6 +5,8 @@ import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.map import ltd.hlaeja.library.deviceRegistry.Types import ltd.hlaeja.service.TypeService +import ltd.hlaeja.util.Pagination.DEFAULT_PAGE +import ltd.hlaeja.util.Pagination.DEFAULT_SIZE import ltd.hlaeja.util.toTypesResponse import org.springframework.web.bind.annotation.GetMapping import org.springframework.web.bind.annotation.PathVariable @@ -14,10 +16,6 @@ import org.springframework.web.bind.annotation.RestController class TypesController( private val service: TypeService, ) { - companion object { - const val DEFAULT_PAGE: Int = 1 - const val DEFAULT_SIZE: Int = 25 - } @GetMapping( "/types", diff --git a/src/main/kotlin/ltd/hlaeja/util/Pagination.kt b/src/main/kotlin/ltd/hlaeja/util/Pagination.kt new file mode 100644 index 0000000..3d3c0c2 --- /dev/null +++ b/src/main/kotlin/ltd/hlaeja/util/Pagination.kt @@ -0,0 +1,6 @@ +package ltd.hlaeja.util + +object Pagination { + const val DEFAULT_PAGE: Int = 1 + const val DEFAULT_SIZE: Int = 25 +}