From e5e31cacc594062b2d578c9fcb94b68632dc3215 Mon Sep 17 00:00:00 2001 From: exijn Date: Thu, 12 Nov 2026 11:36:28 +0900 Subject: [PATCH] =?UTF-8?q?feat(arena):=20=EC=B2=B4=ED=97=98=20=EA=B3=B5?= =?UTF-8?q?=EA=B0=84=20=EC=84=A4=EC=A0=95=20=EC=A0=80=EC=9E=A5=C2=B7?= =?UTF-8?q?=EC=A1=B0=ED=9A=8C=20API=EC=99=80=20=EB=B8=94=EB=A1=9D=20?= =?UTF-8?q?=EA=B2=80=EC=A6=9D=20=EC=97=B0=EB=8F=99=20(#159)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 가로·세로·벽 여유·출발점·방향 저장, 프리셋 6x6-박람회/3x3-부스, 변경 이력 - 공간에서 1회 이동 한도·기본 이동 거리를 계산해 #118 검증·블록 카탈로그·AI 초안 검증에 반영 - 설정이 없으면 6x6 기본값(기존 동작) Co-Authored-By: Claude Sonnet 5.5 --- docs/arena-settings.md | 33 ++++ .../ai/application/AiDraftStepValidator.kt | 9 +- .../application/ArenaSettingsProvider.kt | 13 ++ .../application/ArenaSettingsRepository.kt | 20 +++ .../arena/application/ArenaSettingsService.kt | 89 +++++++++++ .../infrastructure/ArenaSettingsEntity.kt | 72 +++++++++ .../ArenaSettingsJpaRepositories.kt | 11 ++ .../ArenaSettingsPersistenceAdapter.kt | 76 ++++++++++ .../domain/arena/model/ArenaSettings.kt | 117 +++++++++++++++ .../presentation/ArenaSettingsController.kt | 115 ++++++++++++++ .../application/BlockDefinitionCatalog.kt | 15 +- .../application/BlockProgramLimitValidator.kt | 18 ++- .../poppyserver/global/error/ErrorCode.kt | 1 + .../V20__create_experience_arena_settings.sql | 24 +++ .../domain/arena/model/ArenaSettingsTest.kt | 65 ++++++++ .../ArenaSettingsAdminBoundaryTest.kt | 31 ++++ .../ArenaSettingsIntegrationTest.kt | 141 ++++++++++++++++++ .../BlockProgramLimitValidatorTest.kt | 39 +++++ 18 files changed, 875 insertions(+), 14 deletions(-) create mode 100644 docs/arena-settings.md create mode 100644 src/main/kotlin/team/inreok/poppyserver/domain/arena/application/ArenaSettingsProvider.kt create mode 100644 src/main/kotlin/team/inreok/poppyserver/domain/arena/application/ArenaSettingsRepository.kt create mode 100644 src/main/kotlin/team/inreok/poppyserver/domain/arena/application/ArenaSettingsService.kt create mode 100644 src/main/kotlin/team/inreok/poppyserver/domain/arena/infrastructure/ArenaSettingsEntity.kt create mode 100644 src/main/kotlin/team/inreok/poppyserver/domain/arena/infrastructure/ArenaSettingsJpaRepositories.kt create mode 100644 src/main/kotlin/team/inreok/poppyserver/domain/arena/infrastructure/ArenaSettingsPersistenceAdapter.kt create mode 100644 src/main/kotlin/team/inreok/poppyserver/domain/arena/model/ArenaSettings.kt create mode 100644 src/main/kotlin/team/inreok/poppyserver/domain/arena/presentation/ArenaSettingsController.kt create mode 100644 src/main/resources/db/migration/V20__create_experience_arena_settings.sql create mode 100644 src/test/kotlin/team/inreok/poppyserver/domain/arena/model/ArenaSettingsTest.kt create mode 100644 src/test/kotlin/team/inreok/poppyserver/domain/arena/presentation/ArenaSettingsAdminBoundaryTest.kt create mode 100644 src/test/kotlin/team/inreok/poppyserver/domain/arena/presentation/ArenaSettingsIntegrationTest.kt diff --git a/docs/arena-settings.md b/docs/arena-settings.md new file mode 100644 index 0000000..cf24ce1 --- /dev/null +++ b/docs/arena-settings.md @@ -0,0 +1,33 @@ +# 체험 공간 설정 API + +체험 공간(가로·세로·벽 여유·출발점)은 **Server 가 단일 출처**다. Client 는 조회해서 미리보기·시뮬레이션에, Agent 는 조회해서 위치 안전 검사에 쓴다. +설정이 한 번도 저장되지 않았으면 `6x6-박람회`(지금까지의 값)를 돌려준다 → 설정을 쓰지 않으면 동작이 이전과 같다. + +## API +| 메서드·경로 | 권한 | 설명 | +|---|---|---| +| `GET /api/v1/arena-settings` | 공개 | 현재 설정 + `limits`(가용 영역·1회 이동 한도·기본 이동 거리) + `updatedAt`(저장된 적 없으면 null) | +| `GET /api/v1/arena-settings/presets` | 공개 | 프리셋 2종 | +| `PUT /api/v1/admin/arena-settings` | 관리자 세션 + CSRF | `{"presetCode":"3x3-부스"}` 또는 개별 값 6개(`widthM, depthM, marginM, startXM, startYM, startHeading`). 둘을 섞으면 400 | +| `GET /api/v1/admin/arena-settings/history` | 관리자 세션 | 변경 이력(최근 50건): 누가(`admin-session:`)·언제·이전 값 → 새 값 | + +## 프리셋 +| 코드 | 크기 | 벽 여유 | 출발점 | 가용 영역 | 1회 최대 이동 | 이동 블록 기본값 | +|---|---|---|---|---|---|---| +| `6x6-박람회` | 6×6 m | 0.4 m | (5.6, 0.4) +Y | 5.2×5.2 m | 3.0 m | 1.0 m | +| `3x3-부스` | 3×3 m | 0.5 m | (2.5, 0.5) +Y | 2.0×2.0 m | 1.2 m | 0.5 m | + +## 값 검증 +- 한 변 2.0~6.0 m, 벽 여유 0.4~1.0 m(Agent 하드 상한: 한 변 6 m·벽 여유 0.4 m 이상보다 넓지 않다), 가용 영역(변 − 2×여유) ≥ 1.3 m. +- 출발점은 벽 여유 안쪽. 방향은 `+Y|+X|-Y|-X`. + +## 파생 값(자동 계산) +- `maxMovePerCommandM = min(3.0, 0.1 단위 내림(가용 영역의 짧은 변 − 0.8))` — 한 번 이동한 뒤에도 제자리 회전 지름 0.8 m 가 남아야 한다. +- `defaultMoveDistanceM = clamp(0.5 단위 내림(maxMove / 2), 0.5, 1.0)`. +- 블록 검증(#118)의 이동 블록 최대 거리, `GET /api/v1/blocks` 의 이동 블록 `max`, AI 초안 검증의 이동 거리 상한이 이 값을 따른다. 총 이동 4 m·총 시간 120 s 상한은 공간과 무관하게 그대로다. +- 회전 각도(1~360°)·대기·반복 범위는 바뀌지 않는다. + +## 운영 시 주의 +- 마이그레이션 `V20` 이 테이블 2개를 만든다(행이 없으면 기본값). 이 PR 을 develop 에 머지하면 CD 가 돈다. +- 공간을 바꿔도 이미 저장된 프로그램을 다시 검증하지 않는다. 실행 시점 검증과 Agent 위치 검사가 최종이다. +- **Agent 는 설정으로 안전을 넓힐 수 없다**(자체 하드 상한이 항상 우선). Server 값이 더 넓어도 Agent 는 거부한다. diff --git a/src/main/kotlin/team/inreok/poppyserver/domain/ai/application/AiDraftStepValidator.kt b/src/main/kotlin/team/inreok/poppyserver/domain/ai/application/AiDraftStepValidator.kt index a2398e5..fd892ce 100644 --- a/src/main/kotlin/team/inreok/poppyserver/domain/ai/application/AiDraftStepValidator.kt +++ b/src/main/kotlin/team/inreok/poppyserver/domain/ai/application/AiDraftStepValidator.kt @@ -1,12 +1,16 @@ package team.inreok.poppyserver.domain.ai.application import org.springframework.stereotype.Component +import team.inreok.poppyserver.domain.arena.application.ArenaSettingsProvider +import team.inreok.poppyserver.domain.arena.application.DefaultArenaSettingsProvider import tools.jackson.databind.JsonNode import kotlin.math.abs import kotlin.math.roundToLong @Component -class AiDraftStepValidator { +class AiDraftStepValidator( + private val arenaSettingsProvider: ArenaSettingsProvider = DefaultArenaSettingsProvider, +) { fun validate(steps: JsonNode?): List> { if (steps == null || !steps.isArray || steps.isEmpty) { throw InvalidAiDraftException("steps must be a non-empty array") @@ -23,7 +27,7 @@ class AiDraftStepValidator { val kind = node.get("kind")?.takeIf { it.isString }?.asString() ?: throw InvalidAiDraftException("kind is required") return when (kind) { - "moveForward", "move" -> mapOf("kind" to kind, "distanceM" to decimal(node.get("distanceM"), MIN_DISTANCE, MAX_DISTANCE)) + "moveForward", "move" -> mapOf("kind" to kind, "distanceM" to decimal(node.get("distanceM"), MIN_DISTANCE, arenaSettingsProvider.current().maxMovePerCommandM)) "rotateLeft", "rotateRight" -> mapOf("kind" to kind, "degrees" to integer(node.get("degrees"), 1, 360)) "wait" -> mapOf("kind" to kind, "seconds" to integer(node.get("seconds"), 1, 10)) in SIMPLE_KINDS -> mapOf("kind" to kind) @@ -69,7 +73,6 @@ class AiDraftStepValidator { private companion object { const val MAX_BLOCKS = 12 const val MIN_DISTANCE = 0.1 - const val MAX_DISTANCE = 3.0 const val EPSILON = 1e-6 val SIMPLE_KINDS = setOf("stop", "standUp", "greet", "heart", "dance") } diff --git a/src/main/kotlin/team/inreok/poppyserver/domain/arena/application/ArenaSettingsProvider.kt b/src/main/kotlin/team/inreok/poppyserver/domain/arena/application/ArenaSettingsProvider.kt new file mode 100644 index 0000000..d4aee73 --- /dev/null +++ b/src/main/kotlin/team/inreok/poppyserver/domain/arena/application/ArenaSettingsProvider.kt @@ -0,0 +1,13 @@ +package team.inreok.poppyserver.domain.arena.application + +import team.inreok.poppyserver.domain.arena.model.ArenaPresets +import team.inreok.poppyserver.domain.arena.model.ArenaSettings + +/** 현재 체험 공간. DB 가 없는 구성(테스트 등)에서는 기본값(6×6)을 쓴다. */ +fun interface ArenaSettingsProvider { + fun current(): ArenaSettings +} + +object DefaultArenaSettingsProvider : ArenaSettingsProvider { + override fun current(): ArenaSettings = ArenaPresets.DEFAULT +} diff --git a/src/main/kotlin/team/inreok/poppyserver/domain/arena/application/ArenaSettingsRepository.kt b/src/main/kotlin/team/inreok/poppyserver/domain/arena/application/ArenaSettingsRepository.kt new file mode 100644 index 0000000..507399f --- /dev/null +++ b/src/main/kotlin/team/inreok/poppyserver/domain/arena/application/ArenaSettingsRepository.kt @@ -0,0 +1,20 @@ +package team.inreok.poppyserver.domain.arena.application + +import java.time.Instant +import team.inreok.poppyserver.domain.arena.model.ArenaSettings + +data class ArenaSettingsChange( + val changedAt: Instant, + val changedBy: String, + val previous: ArenaSettings, + val next: ArenaSettings, +) + +interface ArenaSettingsRepository { + fun find(): Pair? + + /** 설정을 저장하고 변경 이력을 같은 트랜잭션에 남긴다. */ + fun saveWithHistory(change: ArenaSettingsChange) + + fun history(limit: Int): List +} diff --git a/src/main/kotlin/team/inreok/poppyserver/domain/arena/application/ArenaSettingsService.kt b/src/main/kotlin/team/inreok/poppyserver/domain/arena/application/ArenaSettingsService.kt new file mode 100644 index 0000000..bb45151 --- /dev/null +++ b/src/main/kotlin/team/inreok/poppyserver/domain/arena/application/ArenaSettingsService.kt @@ -0,0 +1,89 @@ +package team.inreok.poppyserver.domain.arena.application + +import java.time.Instant +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty +import org.springframework.stereotype.Service +import team.inreok.poppyserver.domain.arena.model.ArenaPresets +import team.inreok.poppyserver.domain.arena.model.ArenaSettings +import team.inreok.poppyserver.domain.arena.model.StartHeading +import team.inreok.poppyserver.global.error.ApplicationException +import team.inreok.poppyserver.global.error.ErrorCode +import team.inreok.poppyserver.global.response.FieldErrorItem + +data class ArenaSettingsUpdate( + val presetCode: String? = null, + val widthM: Double? = null, + val depthM: Double? = null, + val marginM: Double? = null, + val startXM: Double? = null, + val startYM: Double? = null, + val startHeading: String? = null, +) + +data class CurrentArenaSettings(val settings: ArenaSettings, val updatedAt: Instant?) + +@Service +@ConditionalOnProperty(prefix = "spring.datasource", name = ["url"]) +class ArenaSettingsService( + private val repository: ArenaSettingsRepository, +) : ArenaSettingsProvider { + override fun current(): ArenaSettings = repository.find()?.first ?: ArenaPresets.DEFAULT + + fun currentWithTimestamp(): CurrentArenaSettings { + val stored = repository.find() + return CurrentArenaSettings(stored?.first ?: ArenaPresets.DEFAULT, stored?.second) + } + + fun update(request: ArenaSettingsUpdate, changedBy: String, now: Instant = Instant.now()): CurrentArenaSettings { + val next = resolve(request) + val violations = next.violations() + if (violations.isNotEmpty()) { + throw ApplicationException( + ErrorCode.ARENA_SETTINGS_INVALID, + fieldErrors = violations.map { FieldErrorItem(it.key, it.value) }, + ) + } + val previous = current() + repository.saveWithHistory(ArenaSettingsChange(now, changedBy, previous, next)) + return CurrentArenaSettings(next, now) + } + + fun history(limit: Int = 50): List = repository.history(limit.coerceIn(1, 200)) + + private fun resolve(request: ArenaSettingsUpdate): ArenaSettings { + val custom = listOf( + request.widthM, request.depthM, request.marginM, request.startXM, request.startYM, request.startHeading, + ) + if (request.presetCode != null) { + if (custom.any { it != null }) { + throw invalid("presetCode", "preset 과 개별 값을 함께 보낼 수 없습니다") + } + return ArenaPresets.ALL[request.presetCode] + ?: throw invalid("presetCode", "must be one of ${ArenaPresets.ALL.keys}") + } + val missing = listOf( + "widthM" to request.widthM, "depthM" to request.depthM, "marginM" to request.marginM, + "startXM" to request.startXM, "startYM" to request.startYM, "startHeading" to request.startHeading, + ).filter { it.second == null }.map { it.first } + if (missing.isNotEmpty()) { + throw ApplicationException( + ErrorCode.ARENA_SETTINGS_INVALID, + fieldErrors = missing.map { FieldErrorItem(it, "is required") }, + ) + } + val heading = StartHeading.fromCode(requireNotNull(request.startHeading)) + ?: throw invalid("startHeading", "must be one of ${StartHeading.entries.map { it.code }}") + return ArenaSettings( + presetCode = null, + widthM = requireNotNull(request.widthM), + depthM = requireNotNull(request.depthM), + marginM = requireNotNull(request.marginM), + startXM = requireNotNull(request.startXM), + startYM = requireNotNull(request.startYM), + startHeading = heading, + ) + } + + private fun invalid(field: String, reason: String) = + ApplicationException(ErrorCode.ARENA_SETTINGS_INVALID, fieldErrors = listOf(FieldErrorItem(field, reason))) +} diff --git a/src/main/kotlin/team/inreok/poppyserver/domain/arena/infrastructure/ArenaSettingsEntity.kt b/src/main/kotlin/team/inreok/poppyserver/domain/arena/infrastructure/ArenaSettingsEntity.kt new file mode 100644 index 0000000..24f941d --- /dev/null +++ b/src/main/kotlin/team/inreok/poppyserver/domain/arena/infrastructure/ArenaSettingsEntity.kt @@ -0,0 +1,72 @@ +package team.inreok.poppyserver.domain.arena.infrastructure + +import jakarta.persistence.Column +import jakarta.persistence.Entity +import jakarta.persistence.Id +import jakarta.persistence.Table +import java.time.Instant +import java.util.UUID +import team.inreok.poppyserver.domain.arena.model.ArenaSettings +import team.inreok.poppyserver.domain.arena.model.StartHeading + +@Entity +@Table(name = "experience_arena_settings") +class ArenaSettingsEntity( + @Id + var id: Short = 1, + @Column(name = "preset_code") + var presetCode: String? = null, + @Column(name = "width_m", nullable = false) + var widthM: Double = 0.0, + @Column(name = "depth_m", nullable = false) + var depthM: Double = 0.0, + @Column(name = "margin_m", nullable = false) + var marginM: Double = 0.0, + @Column(name = "start_x_m", nullable = false) + var startXM: Double = 0.0, + @Column(name = "start_y_m", nullable = false) + var startYM: Double = 0.0, + @Column(name = "start_heading", nullable = false) + var startHeading: String = "+Y", + @Column(name = "updated_at", nullable = false) + var updatedAt: Instant = Instant.EPOCH, + @Column(name = "updated_by", nullable = false) + var updatedBy: String = "", +) { + fun toDomain(): ArenaSettings = ArenaSettings( + presetCode = presetCode, + widthM = widthM, + depthM = depthM, + marginM = marginM, + startXM = startXM, + startYM = startYM, + startHeading = requireNotNull(StartHeading.fromCode(startHeading)) { "unknown start heading" }, + ) + + fun apply(settings: ArenaSettings, at: Instant, by: String) { + presetCode = settings.presetCode + widthM = settings.widthM + depthM = settings.depthM + marginM = settings.marginM + startXM = settings.startXM + startYM = settings.startYM + startHeading = settings.startHeading.code + updatedAt = at + updatedBy = by + } +} + +@Entity +@Table(name = "experience_arena_setting_changes") +class ArenaSettingChangeEntity( + @Id + var id: UUID? = null, + @Column(name = "changed_at", nullable = false) + var changedAt: Instant = Instant.EPOCH, + @Column(name = "changed_by", nullable = false) + var changedBy: String = "", + @Column(name = "previous_settings", nullable = false) + var previousSettings: String = "", + @Column(name = "new_settings", nullable = false) + var newSettings: String = "", +) diff --git a/src/main/kotlin/team/inreok/poppyserver/domain/arena/infrastructure/ArenaSettingsJpaRepositories.kt b/src/main/kotlin/team/inreok/poppyserver/domain/arena/infrastructure/ArenaSettingsJpaRepositories.kt new file mode 100644 index 0000000..5c454fe --- /dev/null +++ b/src/main/kotlin/team/inreok/poppyserver/domain/arena/infrastructure/ArenaSettingsJpaRepositories.kt @@ -0,0 +1,11 @@ +package team.inreok.poppyserver.domain.arena.infrastructure + +import java.util.UUID +import org.springframework.data.domain.Pageable +import org.springframework.data.jpa.repository.JpaRepository + +interface ArenaSettingsJpaRepository : JpaRepository + +interface ArenaSettingChangeJpaRepository : JpaRepository { + fun findAllByOrderByChangedAtDesc(pageable: Pageable): List +} diff --git a/src/main/kotlin/team/inreok/poppyserver/domain/arena/infrastructure/ArenaSettingsPersistenceAdapter.kt b/src/main/kotlin/team/inreok/poppyserver/domain/arena/infrastructure/ArenaSettingsPersistenceAdapter.kt new file mode 100644 index 0000000..f4789d6 --- /dev/null +++ b/src/main/kotlin/team/inreok/poppyserver/domain/arena/infrastructure/ArenaSettingsPersistenceAdapter.kt @@ -0,0 +1,76 @@ +package team.inreok.poppyserver.domain.arena.infrastructure + +import java.time.Instant +import java.util.UUID +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty +import org.springframework.data.domain.PageRequest +import org.springframework.stereotype.Repository +import org.springframework.transaction.annotation.Transactional +import team.inreok.poppyserver.domain.arena.application.ArenaSettingsChange +import team.inreok.poppyserver.domain.arena.application.ArenaSettingsRepository +import team.inreok.poppyserver.domain.arena.model.ArenaSettings +import team.inreok.poppyserver.domain.arena.model.StartHeading +import tools.jackson.databind.ObjectMapper + +@Repository +@ConditionalOnProperty(prefix = "spring.datasource", name = ["url"]) +class ArenaSettingsPersistenceAdapter( + private val settingsRepository: ArenaSettingsJpaRepository, + private val changeRepository: ArenaSettingChangeJpaRepository, + private val objectMapper: ObjectMapper, +) : ArenaSettingsRepository { + @Transactional(readOnly = true) + override fun find(): Pair? = + settingsRepository.findById(SINGLETON_ID).orElse(null)?.let { it.toDomain() to it.updatedAt } + + @Transactional + override fun saveWithHistory(change: ArenaSettingsChange) { + val entity = settingsRepository.findById(SINGLETON_ID).orElseGet { ArenaSettingsEntity(id = SINGLETON_ID) } + entity.apply(change.next, change.changedAt, change.changedBy) + settingsRepository.save(entity) + changeRepository.save( + ArenaSettingChangeEntity( + id = UUID.randomUUID(), + changedAt = change.changedAt, + changedBy = change.changedBy, + previousSettings = objectMapper.writeValueAsString(change.previous.toSnapshot()), + newSettings = objectMapper.writeValueAsString(change.next.toSnapshot()), + ), + ) + } + + @Transactional(readOnly = true) + override fun history(limit: Int): List = + changeRepository.findAllByOrderByChangedAtDesc(PageRequest.of(0, limit)).map { + ArenaSettingsChange( + changedAt = it.changedAt, + changedBy = it.changedBy, + previous = objectMapper.readValue(it.previousSettings, ArenaSnapshot::class.java).toDomain(), + next = objectMapper.readValue(it.newSettings, ArenaSnapshot::class.java).toDomain(), + ) + } + + private companion object { + const val SINGLETON_ID: Short = 1 + } +} + +/** 이력에 JSON 으로 남기는 값. 필드 이름은 API 와 같다. */ +data class ArenaSnapshot( + val presetCode: String? = null, + val widthM: Double = 0.0, + val depthM: Double = 0.0, + val marginM: Double = 0.0, + val startXM: Double = 0.0, + val startYM: Double = 0.0, + val startHeading: String = "+Y", +) { + fun toDomain(): ArenaSettings = ArenaSettings( + presetCode, widthM, depthM, marginM, startXM, startYM, + requireNotNull(StartHeading.fromCode(startHeading)), + ) +} + +private fun ArenaSettings.toSnapshot() = ArenaSnapshot( + presetCode, widthM, depthM, marginM, startXM, startYM, startHeading.code, +) diff --git a/src/main/kotlin/team/inreok/poppyserver/domain/arena/model/ArenaSettings.kt b/src/main/kotlin/team/inreok/poppyserver/domain/arena/model/ArenaSettings.kt new file mode 100644 index 0000000..b8f7e88 --- /dev/null +++ b/src/main/kotlin/team/inreok/poppyserver/domain/arena/model/ArenaSettings.kt @@ -0,0 +1,117 @@ +package team.inreok.poppyserver.domain.arena.model + +import kotlin.math.floor +import kotlin.math.min + +/** 출발 시 로봇이 바라보는 방향. 값은 Agent 의 POPPY_PHYSICAL_START_HEADING 과 같다. */ +enum class StartHeading(val code: String) { + PLUS_Y("+Y"), + PLUS_X("+X"), + MINUS_Y("-Y"), + MINUS_X("-X"), + ; + + companion object { + fun fromCode(code: String): StartHeading? = entries.firstOrNull { it.code == code } + } +} + +/** + * 체험 공간. 좌표는 m, 원점은 왼쪽 아래 모서리. + * 이 값이 공간의 단일 출처이며 Client·Agent 는 조회해서 쓴다. + */ +data class ArenaSettings( + val presetCode: String?, + val widthM: Double, + val depthM: Double, + val marginM: Double, + val startXM: Double, + val startYM: Double, + val startHeading: StartHeading, +) { + /** 로봇이 들어갈 수 있는 영역(벽 여유 안쪽). */ + val usableWidthM: Double get() = round2(widthM - 2 * marginM) + val usableDepthM: Double get() = round2(depthM - 2 * marginM) + + /** + * 1회 이동 최대 거리. 한 번 이동한 뒤에도 제자리 회전 지름(0.8 m)이 영역 안에 남아야 하므로 + * `(가용 영역의 짧은 변) - 0.8` 을 0.1 m 단위로 내림하고 하드 상한 3 m 로 자른다. + * 6×6(가용 5.2) → 3.0, 3×3(가용 2.0) → 1.2. + */ + val maxMovePerCommandM: Double + get() { + val raw = min(usableWidthM, usableDepthM) - ArenaBounds.TURN_CIRCLE_DIAMETER_M + return min(ArenaBounds.MAX_MOVE_PER_COMMAND_M, floorTenth(raw)) + } + + /** 새 이동 블록의 기본 거리. 최대 이동의 절반을 0.5 m 단위로 내림하고 0.5~1.0 m 로 자른다(6×6 → 1.0, 3×3 → 0.5). */ + val defaultMoveDistanceM: Double + get() { + val half = floor(maxMovePerCommandM / 2 / 0.5 + EPS) * 0.5 + return half.coerceIn(0.5, 1.0) + } + + /** 모든 위반을 돌려준다(필드명 → 이유). 비어 있으면 유효. */ + fun violations(): Map { + val out = linkedMapOf() + fun side(field: String, value: Double) { + if (!value.isFinite() || value < ArenaBounds.MIN_SIDE_M - EPS || value > ArenaBounds.MAX_SIDE_M + EPS) { + out[field] = "must be between ${ArenaBounds.MIN_SIDE_M} and ${ArenaBounds.MAX_SIDE_M} m" + } + } + side("widthM", widthM) + side("depthM", depthM) + if (!marginM.isFinite() || marginM < ArenaBounds.MIN_MARGIN_M - EPS || marginM > ArenaBounds.MAX_MARGIN_M + EPS) { + out["marginM"] = "must be between ${ArenaBounds.MIN_MARGIN_M} and ${ArenaBounds.MAX_MARGIN_M} m" + } + if (out.isEmpty()) { + if (usableWidthM < ArenaBounds.MIN_USABLE_SIDE_M - EPS) { + out["widthM"] = "usable width (width - 2*margin) must be at least ${ArenaBounds.MIN_USABLE_SIDE_M} m" + } + if (usableDepthM < ArenaBounds.MIN_USABLE_SIDE_M - EPS) { + out["depthM"] = "usable depth (depth - 2*margin) must be at least ${ArenaBounds.MIN_USABLE_SIDE_M} m" + } + } + if (out.isEmpty()) { + if (!startXM.isFinite() || startXM < marginM - EPS || startXM > widthM - marginM + EPS) { + out["startXM"] = "must be inside the margin (${marginM}..${round2(widthM - marginM)})" + } + if (!startYM.isFinite() || startYM < marginM - EPS || startYM > depthM - marginM + EPS) { + out["startYM"] = "must be inside the margin (${marginM}..${round2(depthM - marginM)})" + } + } + return out + } + + private fun floorTenth(value: Double): Double = floor(value * 10 + EPS) / 10 + + private fun round2(value: Double): Double = Math.round(value * 100) / 100.0 + + companion object { + private const val EPS = 1e-9 + } +} + +/** 값 검증의 하한·상한. Agent 의 하드 상한(한 변 6 m, 벽 여유 0.4 m 이상, 1회 이동 3 m)보다 넓지 않다. */ +object ArenaBounds { + const val MIN_SIDE_M = 2.0 + const val MAX_SIDE_M = 6.0 + const val MIN_MARGIN_M = 0.4 + const val MAX_MARGIN_M = 1.0 + const val MIN_USABLE_SIDE_M = 1.3 + const val TURN_CIRCLE_DIAMETER_M = 0.8 + const val MAX_MOVE_PER_COMMAND_M = 3.0 +} + +object ArenaPresets { + const val EXPO_6X6 = "6x6-박람회" + const val BOOTH_3X3 = "3x3-부스" + + val ALL: Map = linkedMapOf( + EXPO_6X6 to ArenaSettings(EXPO_6X6, 6.0, 6.0, 0.4, 5.6, 0.4, StartHeading.PLUS_Y), + BOOTH_3X3 to ArenaSettings(BOOTH_3X3, 3.0, 3.0, 0.5, 2.5, 0.5, StartHeading.PLUS_Y), + ) + + /** 설정이 없을 때의 값 = 지금까지의 동작(6×6). */ + val DEFAULT: ArenaSettings = ALL.getValue(EXPO_6X6) +} diff --git a/src/main/kotlin/team/inreok/poppyserver/domain/arena/presentation/ArenaSettingsController.kt b/src/main/kotlin/team/inreok/poppyserver/domain/arena/presentation/ArenaSettingsController.kt new file mode 100644 index 0000000..5be4f5c --- /dev/null +++ b/src/main/kotlin/team/inreok/poppyserver/domain/arena/presentation/ArenaSettingsController.kt @@ -0,0 +1,115 @@ +package team.inreok.poppyserver.domain.arena.presentation + +import java.time.Instant +import java.util.UUID +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty +import org.springframework.web.bind.annotation.GetMapping +import org.springframework.web.bind.annotation.PutMapping +import org.springframework.web.bind.annotation.RequestAttribute +import org.springframework.web.bind.annotation.RequestBody +import org.springframework.web.bind.annotation.RequestMapping +import org.springframework.web.bind.annotation.RestController +import team.inreok.poppyserver.domain.arena.application.ArenaSettingsService +import team.inreok.poppyserver.domain.arena.application.ArenaSettingsUpdate +import team.inreok.poppyserver.domain.arena.application.CurrentArenaSettings +import team.inreok.poppyserver.domain.arena.model.ArenaPresets +import team.inreok.poppyserver.domain.arena.model.ArenaSettings +import team.inreok.poppyserver.global.response.ApiResponse +import team.inreok.poppyserver.global.security.AdminSessionCredentials + +/** Client 와 Agent 가 읽어 가는 공간 설정. 비밀 값이 없어 공개 조회다. */ +@RestController +@ConditionalOnProperty(prefix = "spring.datasource", name = ["url"]) +@RequestMapping("/api/v1/arena-settings") +class ArenaSettingsController( + private val service: ArenaSettingsService, +) { + @GetMapping + fun get(): ApiResponse = ApiResponse.success(service.currentWithTimestamp().toResponse()) + + @GetMapping("/presets") + fun presets(): ApiResponse> = + ApiResponse.success(ArenaPresets.ALL.values.map { CurrentArenaSettings(it, null).toResponse() }) +} + +/** 관리자만 바꾼다(/api/v1/admin 아래는 관리자 세션 인터셉터와 CSRF 보호 대상). */ +@RestController +@ConditionalOnProperty(prefix = "spring.datasource", name = ["url"]) +@RequestMapping("/api/v1/admin/arena-settings") +class AdminArenaSettingsController( + private val service: ArenaSettingsService, +) { + @PutMapping + fun update( + @RequestAttribute(AdminSessionCredentials.SESSION_ID_ATTRIBUTE) adminSessionId: UUID, + @RequestBody request: ArenaSettingsUpdateRequest, + ): ApiResponse { + val updated = service.update(request.toUpdate(), changedBy = "admin-session:$adminSessionId") + return ApiResponse.success(updated.toResponse()) + } + + @GetMapping("/history") + fun history(): ApiResponse> = ApiResponse.success( + service.history().map { + ArenaSettingChangeResponse( + changedAt = it.changedAt, + changedBy = it.changedBy, + previous = CurrentArenaSettings(it.previous, null).toResponse(), + next = CurrentArenaSettings(it.next, it.changedAt).toResponse(), + ) + }, + ) +} + +data class ArenaSettingsUpdateRequest( + val presetCode: String? = null, + val widthM: Double? = null, + val depthM: Double? = null, + val marginM: Double? = null, + val startXM: Double? = null, + val startYM: Double? = null, + val startHeading: String? = null, +) { + fun toUpdate() = ArenaSettingsUpdate(presetCode, widthM, depthM, marginM, startXM, startYM, startHeading) +} + +data class ArenaLimitsResponse( + val usableWidthM: Double, + val usableDepthM: Double, + val maxMovePerCommandM: Double, + val defaultMoveDistanceM: Double, +) + +data class ArenaSettingsResponse( + val presetCode: String?, + val widthM: Double, + val depthM: Double, + val marginM: Double, + val startXM: Double, + val startYM: Double, + val startHeading: String, + val limits: ArenaLimitsResponse, + /** 저장된 적이 없으면 null(= 기본값 6x6-박람회). */ + val updatedAt: Instant?, +) + +data class ArenaSettingChangeResponse( + val changedAt: Instant, + val changedBy: String, + val previous: ArenaSettingsResponse, + val next: ArenaSettingsResponse, +) + +private fun ArenaSettings.toLimits() = ArenaLimitsResponse(usableWidthM, usableDepthM, maxMovePerCommandM, defaultMoveDistanceM) + +private fun CurrentArenaSettings.toResponse() = ArenaSettingsResponse( + presetCode = settings.presetCode, + widthM = settings.widthM, + depthM = settings.depthM, + marginM = settings.marginM, + startXM = settings.startXM, + startYM = settings.startYM, + startHeading = settings.startHeading.code, + limits = settings.toLimits(), + updatedAt = updatedAt, +) diff --git a/src/main/kotlin/team/inreok/poppyserver/domain/block/application/BlockDefinitionCatalog.kt b/src/main/kotlin/team/inreok/poppyserver/domain/block/application/BlockDefinitionCatalog.kt index b801750..7caa8c8 100644 --- a/src/main/kotlin/team/inreok/poppyserver/domain/block/application/BlockDefinitionCatalog.kt +++ b/src/main/kotlin/team/inreok/poppyserver/domain/block/application/BlockDefinitionCatalog.kt @@ -1,17 +1,22 @@ package team.inreok.poppyserver.domain.block.application import org.springframework.stereotype.Component +import team.inreok.poppyserver.domain.arena.application.ArenaSettingsProvider +import team.inreok.poppyserver.domain.arena.application.DefaultArenaSettingsProvider import team.inreok.poppyserver.domain.block.model.BlockCategory import team.inreok.poppyserver.domain.block.model.BlockDefinition import team.inreok.poppyserver.domain.block.model.BlockType import team.inreok.poppyserver.domain.block.model.ParameterDefinition @Component -class BlockDefinitionCatalog { - fun list(): List = DEFINITIONS +class BlockDefinitionCatalog( + private val arenaSettingsProvider: ArenaSettingsProvider = DefaultArenaSettingsProvider, +) { + /** 이동 블록의 최대 거리는 현재 체험 공간(1회 이동 한도)을 따른다. */ + fun list(): List = definitions(arenaSettingsProvider.current().maxMovePerCommandM) companion object { - private val DEFINITIONS = listOf( + private fun definitions(maxMoveMeters: Double): List = listOf( definition(BlockType.START, "시작"), definition( BlockType.WAIT, @@ -33,14 +38,14 @@ class BlockDefinitionCatalog { "앞으로 이동", unit = "m", min = BlockProgramLimits.MIN_DISTANCE_METERS, - max = BlockProgramLimits.MAX_DISTANCE_METERS, + max = maxMoveMeters, ), definition( BlockType.MOVE_BACKWARD, "뒤로 이동", unit = "m", min = BlockProgramLimits.MIN_DISTANCE_METERS, - max = BlockProgramLimits.MAX_DISTANCE_METERS, + max = maxMoveMeters, ), definition( BlockType.TURN_LEFT, diff --git a/src/main/kotlin/team/inreok/poppyserver/domain/block/application/BlockProgramLimitValidator.kt b/src/main/kotlin/team/inreok/poppyserver/domain/block/application/BlockProgramLimitValidator.kt index 9000b65..215d420 100644 --- a/src/main/kotlin/team/inreok/poppyserver/domain/block/application/BlockProgramLimitValidator.kt +++ b/src/main/kotlin/team/inreok/poppyserver/domain/block/application/BlockProgramLimitValidator.kt @@ -1,16 +1,21 @@ package team.inreok.poppyserver.domain.block.application import org.springframework.stereotype.Component +import team.inreok.poppyserver.domain.arena.application.ArenaSettingsProvider +import team.inreok.poppyserver.domain.arena.application.DefaultArenaSettingsProvider import team.inreok.poppyserver.domain.block.model.BlockInstance import team.inreok.poppyserver.domain.block.model.BlockParameters import team.inreok.poppyserver.domain.block.model.BlockProgram import team.inreok.poppyserver.domain.block.model.BlockType @Component -class BlockProgramLimitValidator { +class BlockProgramLimitValidator( + private val arenaSettingsProvider: ArenaSettingsProvider = DefaultArenaSettingsProvider, +) { fun validate(program: BlockProgram): BlockProgramValidationResult { val errors = mutableListOf() - collectParameterErrors(program.blocks, "blocks", errors) + val maxMoveMeters = arenaSettingsProvider.current().maxMovePerCommandM + collectParameterErrors(program.blocks, "blocks", maxMoveMeters, errors) if (errors.isEmpty()) { val totals = ExecutionTotals().also { it.accumulate(program.blocks) } @@ -34,20 +39,21 @@ class BlockProgramLimitValidator { private fun collectParameterErrors( blocks: List, path: String, + maxMoveMeters: Double, errors: MutableList, ) { blocks.forEachIndexed { index, block -> val blockPath = "$path[$index]" - parameterError(block, blockPath)?.let { errors += it } - block.children?.let { collectParameterErrors(it, "$blockPath.children", errors) } + parameterError(block, blockPath, maxMoveMeters)?.let { errors += it } + block.children?.let { collectParameterErrors(it, "$blockPath.children", maxMoveMeters, errors) } } } - private fun parameterError(block: BlockInstance, path: String): BlockProgramValidationError? { + private fun parameterError(block: BlockInstance, path: String, maxMoveMeters: Double): BlockProgramValidationError? { val parameters = block.parameters val inRange = when { block.type in MOVE_TYPES && parameters is BlockParameters.DistanceMeters -> - parameters.value in BlockProgramLimits.MIN_DISTANCE_METERS..BlockProgramLimits.MAX_DISTANCE_METERS + parameters.value in BlockProgramLimits.MIN_DISTANCE_METERS..maxMoveMeters block.type in TURN_TYPES && parameters is BlockParameters.AngleDegrees -> parameters.value in BlockProgramLimits.MIN_ANGLE_DEGREES..BlockProgramLimits.MAX_ANGLE_DEGREES block.type == BlockType.WAIT && parameters is BlockParameters.DurationSeconds -> diff --git a/src/main/kotlin/team/inreok/poppyserver/global/error/ErrorCode.kt b/src/main/kotlin/team/inreok/poppyserver/global/error/ErrorCode.kt index 1f33349..bfb17bf 100644 --- a/src/main/kotlin/team/inreok/poppyserver/global/error/ErrorCode.kt +++ b/src/main/kotlin/team/inreok/poppyserver/global/error/ErrorCode.kt @@ -51,6 +51,7 @@ enum class ErrorCode( ADMIN_SESSION_INVALID(HttpStatus.UNAUTHORIZED, "ADMIN_SESSION_INVALID", "The admin session is invalid"), AI_INPUT_INVALID(HttpStatus.BAD_REQUEST, "AI_INPUT_INVALID", "AI 요청 입력이 올바르지 않습니다"), AI_INPUT_REJECTED(HttpStatus.BAD_REQUEST, "AI_INPUT_REJECTED", "AI 요청 입력을 처리할 수 없습니다"), + ARENA_SETTINGS_INVALID(HttpStatus.BAD_REQUEST, "ARENA_SETTINGS_INVALID", "체험 공간 설정 값이 올바르지 않습니다"), AI_UNAVAILABLE(HttpStatus.SERVICE_UNAVAILABLE, "AI_UNAVAILABLE", "AI 도우미를 지금 사용할 수 없습니다"), ADMIN_LOGOUT_FAILED(HttpStatus.INTERNAL_SERVER_ERROR, "ADMIN_LOGOUT_FAILED", "The admin logout could not be processed"), } diff --git a/src/main/resources/db/migration/V20__create_experience_arena_settings.sql b/src/main/resources/db/migration/V20__create_experience_arena_settings.sql new file mode 100644 index 0000000..e690ff4 --- /dev/null +++ b/src/main/resources/db/migration/V20__create_experience_arena_settings.sql @@ -0,0 +1,24 @@ +-- 체험 공간 설정(단일 행)과 변경 이력. 행이 없으면 서버는 6x6-박람회 기본값을 쓴다. +CREATE TABLE experience_arena_settings ( + id SMALLINT PRIMARY KEY, + preset_code TEXT, + width_m DOUBLE PRECISION NOT NULL, + depth_m DOUBLE PRECISION NOT NULL, + margin_m DOUBLE PRECISION NOT NULL, + start_x_m DOUBLE PRECISION NOT NULL, + start_y_m DOUBLE PRECISION NOT NULL, + start_heading VARCHAR(2) NOT NULL, + updated_at TIMESTAMPTZ NOT NULL, + updated_by TEXT NOT NULL, + CONSTRAINT ck_experience_arena_settings_singleton CHECK (id = 1) +); + +CREATE TABLE experience_arena_setting_changes ( + id UUID PRIMARY KEY, + changed_at TIMESTAMPTZ NOT NULL, + changed_by TEXT NOT NULL, + previous_settings TEXT NOT NULL, + new_settings TEXT NOT NULL +); + +CREATE INDEX idx_experience_arena_setting_changes_changed_at ON experience_arena_setting_changes (changed_at DESC); diff --git a/src/test/kotlin/team/inreok/poppyserver/domain/arena/model/ArenaSettingsTest.kt b/src/test/kotlin/team/inreok/poppyserver/domain/arena/model/ArenaSettingsTest.kt new file mode 100644 index 0000000..9d95d44 --- /dev/null +++ b/src/test/kotlin/team/inreok/poppyserver/domain/arena/model/ArenaSettingsTest.kt @@ -0,0 +1,65 @@ +package team.inreok.poppyserver.domain.arena.model + +import org.junit.jupiter.api.Test +import kotlin.test.assertEquals +import kotlin.test.assertTrue + +class ArenaSettingsTest { + private val expo = ArenaPresets.ALL.getValue(ArenaPresets.EXPO_6X6) + private val booth = ArenaPresets.ALL.getValue(ArenaPresets.BOOTH_3X3) + + @Test + fun `기본값은 지금까지의 6x6 동작과 같다`() { + assertEquals(expo, ArenaPresets.DEFAULT) + assertEquals(6.0, expo.widthM) + assertEquals(6.0, expo.depthM) + assertEquals(0.4, expo.marginM) + assertEquals(5.6, expo.startXM) + assertEquals(0.4, expo.startYM) + assertEquals(5.2, expo.usableWidthM) + assertEquals(3.0, expo.maxMovePerCommandM) + assertEquals(1.0, expo.defaultMoveDistanceM) + assertTrue(expo.violations().isEmpty()) + } + + @Test + fun `3x3 부스는 가용 2_0m 1회 이동 1_2m 기본 이동 0_5m 로 계산된다`() { + assertEquals(0.5, booth.marginM) + assertEquals(2.0, booth.usableWidthM) + assertEquals(2.0, booth.usableDepthM) + assertEquals(1.2, booth.maxMovePerCommandM) + assertEquals(0.5, booth.defaultMoveDistanceM) + assertEquals(2.5, booth.startXM) + assertEquals(0.5, booth.startYM) + assertTrue(booth.violations().isEmpty()) + } + + @Test + fun `1회 이동 한도는 가용 영역에서 회전 지름 0_8m 를 뺀 값이고 3m 를 넘지 않는다`() { + assertEquals(2.2, custom(width = 4.0, depth = 4.0, margin = 0.5, startX = 3.5, startY = 0.5).maxMovePerCommandM) + assertEquals(3.0, custom(width = 6.0, depth = 6.0, margin = 0.4, startX = 5.6, startY = 0.4).maxMovePerCommandM) + // 짧은 변이 기준이다 + assertEquals(1.2, custom(width = 5.0, depth = 3.0, margin = 0.5, startX = 4.5, startY = 0.5).maxMovePerCommandM) + } + + @Test + fun `하한 상한과 출발점 검증`() { + assertTrue("widthM" in custom(width = 6.5).violations()) + assertTrue("depthM" in custom(depth = 1.9).violations()) + assertTrue("marginM" in custom(margin = 0.3).violations(), "Agent 하드 최소 벽 여유 0.4 m 보다 작으면 거부") + assertTrue("marginM" in custom(margin = 1.1).violations()) + assertTrue("startXM" in custom(startX = 0.3).violations()) + assertTrue("startXM" in custom(startX = 5.7).violations()) + assertTrue("startYM" in custom(startY = 6.0).violations()) + assertTrue("widthM" in custom(width = 2.0, margin = 0.4, startX = 1.0, startY = 1.0).violations(), "가용 폭 1.2 m < 1.3 m") + assertTrue(custom(width = Double.NaN).violations().isNotEmpty()) + } + + private fun custom( + width: Double = 6.0, + depth: Double = 6.0, + margin: Double = 0.4, + startX: Double = 5.6, + startY: Double = 0.4, + ) = ArenaSettings(null, width, depth, margin, startX, startY, StartHeading.PLUS_Y) +} diff --git a/src/test/kotlin/team/inreok/poppyserver/domain/arena/presentation/ArenaSettingsAdminBoundaryTest.kt b/src/test/kotlin/team/inreok/poppyserver/domain/arena/presentation/ArenaSettingsAdminBoundaryTest.kt new file mode 100644 index 0000000..e8536d0 --- /dev/null +++ b/src/test/kotlin/team/inreok/poppyserver/domain/arena/presentation/ArenaSettingsAdminBoundaryTest.kt @@ -0,0 +1,31 @@ +package team.inreok.poppyserver.domain.arena.presentation + +import org.junit.jupiter.api.Test +import org.springframework.beans.factory.annotation.Autowired +import org.springframework.boot.test.context.SpringBootTest +import org.springframework.boot.webmvc.test.autoconfigure.AutoConfigureMockMvc +import org.springframework.http.MediaType +import org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.csrf +import org.springframework.test.web.servlet.MockMvc +import org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get +import org.springframework.test.web.servlet.request.MockMvcRequestBuilders.put +import org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath +import org.springframework.test.web.servlet.result.MockMvcResultMatchers.status +import team.inreok.poppyserver.infrastructure.PostgresIntegrationTest + +/** 관리자 세션 쿠키가 없으면 공간 설정을 바꾸거나 이력을 볼 수 없다. 조회(공개)는 된다. */ +@SpringBootTest +@AutoConfigureMockMvc +class ArenaSettingsAdminBoundaryTest : PostgresIntegrationTest() { + @Autowired lateinit var mockMvc: MockMvc + + @Test + fun `관리자 세션 없이 PUT 과 이력 조회는 401 이고 공개 조회는 200 이다`() { + mockMvc.perform( + put("/api/v1/admin/arena-settings").with(csrf()).contentType(MediaType.APPLICATION_JSON) + .content("""{"presetCode":"3x3-부스"}"""), + ).andExpect(status().isUnauthorized).andExpect(jsonPath("$.error.code").value("ADMIN_SESSION_INVALID")) + mockMvc.perform(get("/api/v1/admin/arena-settings/history")).andExpect(status().isUnauthorized) + mockMvc.perform(get("/api/v1/arena-settings")).andExpect(status().isOk) + } +} diff --git a/src/test/kotlin/team/inreok/poppyserver/domain/arena/presentation/ArenaSettingsIntegrationTest.kt b/src/test/kotlin/team/inreok/poppyserver/domain/arena/presentation/ArenaSettingsIntegrationTest.kt new file mode 100644 index 0000000..a65b25f --- /dev/null +++ b/src/test/kotlin/team/inreok/poppyserver/domain/arena/presentation/ArenaSettingsIntegrationTest.kt @@ -0,0 +1,141 @@ +package team.inreok.poppyserver.domain.arena.presentation + +import org.junit.jupiter.api.AfterEach +import org.junit.jupiter.api.BeforeEach +import org.junit.jupiter.api.Test +import org.springframework.beans.factory.annotation.Autowired +import org.springframework.boot.test.context.SpringBootTest +import org.springframework.boot.webmvc.test.autoconfigure.AutoConfigureMockMvc +import org.springframework.context.annotation.Import +import org.springframework.http.MediaType +import org.springframework.jdbc.core.JdbcTemplate +import org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.csrf +import org.springframework.test.web.servlet.MockMvc +import org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get +import org.springframework.test.web.servlet.request.MockMvcRequestBuilders.put +import org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath +import org.springframework.test.web.servlet.result.MockMvcResultMatchers.status +import team.inreok.poppyserver.domain.block.application.BlockDefinitionCatalog +import team.inreok.poppyserver.domain.block.application.BlockProgramLimitValidator +import team.inreok.poppyserver.domain.block.model.BlockInstance +import team.inreok.poppyserver.domain.block.model.BlockParameters +import team.inreok.poppyserver.domain.block.model.BlockProgram +import team.inreok.poppyserver.domain.block.model.BlockType +import team.inreok.poppyserver.infrastructure.PostgresIntegrationTest +import team.inreok.poppyserver.support.AdminSessionCookieTestConfiguration +import team.inreok.poppyserver.support.AdminSessionTestSupport +import kotlin.test.assertEquals +import kotlin.test.assertFalse +import kotlin.test.assertTrue + +@SpringBootTest +@AutoConfigureMockMvc +@Import(AdminSessionCookieTestConfiguration::class) +class ArenaSettingsIntegrationTest : PostgresIntegrationTest() { + @Autowired lateinit var mockMvc: MockMvc + + @Autowired lateinit var jdbcTemplate: JdbcTemplate + + @Autowired lateinit var validator: BlockProgramLimitValidator + + @Autowired lateinit var catalog: BlockDefinitionCatalog + + @BeforeEach + fun setUp() { + AdminSessionTestSupport.insertValidSession(jdbcTemplate) + clean() + } + + @AfterEach + fun clean() { + jdbcTemplate.update("DELETE FROM experience_arena_setting_changes") + jdbcTemplate.update("DELETE FROM experience_arena_settings") + } + + private fun putJson(body: String) = + mockMvc.perform(put("/api/v1/admin/arena-settings").with(csrf()).contentType(MediaType.APPLICATION_JSON).content(body)) + + private fun move(meters: Double) = BlockProgram( + schemaVersion = 1, + blocks = listOf(BlockInstance("m", BlockType.MOVE_FORWARD, BlockParameters.DistanceMeters(meters))), + ) + + @Test + fun `저장된 설정이 없으면 6x6 박람회 기본값이고 updatedAt 은 null 이다`() { + mockMvc.perform(get("/api/v1/arena-settings")) + .andExpect(status().isOk) + .andExpect(jsonPath("$.data.presetCode").value("6x6-박람회")) + .andExpect(jsonPath("$.data.widthM").value(6.0)) + .andExpect(jsonPath("$.data.startXM").value(5.6)) + .andExpect(jsonPath("$.data.limits.maxMovePerCommandM").value(3.0)) + .andExpect(jsonPath("$.data.limits.defaultMoveDistanceM").value(1.0)) + .andExpect(jsonPath("$.data.updatedAt").doesNotExist()) + assertTrue(validator.validate(move(3.0)).isValid) + } + + @Test + fun `프리셋 목록은 2종이다`() { + mockMvc.perform(get("/api/v1/arena-settings/presets")) + .andExpect(status().isOk) + .andExpect(jsonPath("$.data.length()").value(2)) + .andExpect(jsonPath("$.data[1].presetCode").value("3x3-부스")) + .andExpect(jsonPath("$.data[1].limits.maxMovePerCommandM").value(1.2)) + } + + @Test + fun `관리자가 3x3 프리셋으로 바꾸면 조회 블록 검증 카탈로그가 함께 바뀌고 이력이 남는다`() { + putJson("""{"presetCode":"3x3-부스"}""") + .andExpect(status().isOk) + .andExpect(jsonPath("$.data.presetCode").value("3x3-부스")) + .andExpect(jsonPath("$.data.limits.usableWidthM").value(2.0)) + .andExpect(jsonPath("$.data.limits.maxMovePerCommandM").value(1.2)) + .andExpect(jsonPath("$.data.limits.defaultMoveDistanceM").value(0.5)) + + mockMvc.perform(get("/api/v1/arena-settings")) + .andExpect(jsonPath("$.data.widthM").value(3.0)) + .andExpect(jsonPath("$.data.marginM").value(0.5)) + .andExpect(jsonPath("$.data.startXM").value(2.5)) + .andExpect(jsonPath("$.data.startYM").value(0.5)) + + assertTrue(validator.validate(move(1.2)).isValid) + assertFalse(validator.validate(move(1.3)).isValid) + assertEquals(1.2, catalog.list().first { it.type == BlockType.MOVE_FORWARD }.parameters.single().max) + + mockMvc.perform(get("/api/v1/admin/arena-settings/history")) + .andExpect(status().isOk) + .andExpect(jsonPath("$.data.length()").value(1)) + .andExpect(jsonPath("$.data[0].previous.presetCode").value("6x6-박람회")) + .andExpect(jsonPath("$.data[0].next.presetCode").value("3x3-부스")) + .andExpect(jsonPath("$.data[0].changedBy").value(org.hamcrest.Matchers.startsWith("admin-session:"))) + } + + @Test + fun `개별 값으로 바꿀 수 있고 다시 6x6 으로 되돌리면 기존 동작이다`() { + putJson("""{"widthM":4.0,"depthM":3.0,"marginM":0.5,"startXM":3.5,"startYM":0.5,"startHeading":"+Y"}""") + .andExpect(status().isOk) + .andExpect(jsonPath("$.data.presetCode").doesNotExist()) + .andExpect(jsonPath("$.data.limits.maxMovePerCommandM").value(1.2)) + putJson("""{"presetCode":"6x6-박람회"}""").andExpect(status().isOk) + assertTrue(validator.validate(move(3.0)).isValid) + mockMvc.perform(get("/api/v1/admin/arena-settings/history")).andExpect(jsonPath("$.data.length()").value(2)) + } + + @Test + fun `잘못된 값은 400 이고 설정과 이력이 바뀌지 않는다`() { + putJson("""{"widthM":9.0,"depthM":3.0,"marginM":0.5,"startXM":3.5,"startYM":0.5,"startHeading":"+Y"}""") + .andExpect(status().isBadRequest) + .andExpect(jsonPath("$.error.code").value("ARENA_SETTINGS_INVALID")) + .andExpect(jsonPath("$.error.fieldErrors[0].field").value("widthM")) + putJson("""{"widthM":3.0,"depthM":3.0,"marginM":0.3,"startXM":2.5,"startYM":0.5,"startHeading":"+Y"}""") + .andExpect(status().isBadRequest) + .andExpect(jsonPath("$.error.fieldErrors[0].field").value("marginM")) + putJson("""{"widthM":3.0,"depthM":3.0,"marginM":0.5,"startXM":0.2,"startYM":0.5,"startHeading":"+Y"}""") + .andExpect(status().isBadRequest) + .andExpect(jsonPath("$.error.fieldErrors[0].field").value("startXM")) + putJson("""{"presetCode":"없는-프리셋"}""").andExpect(status().isBadRequest) + putJson("""{"presetCode":"3x3-부스","widthM":3.0}""").andExpect(status().isBadRequest) + putJson("""{"widthM":3.0}""").andExpect(status().isBadRequest) + mockMvc.perform(get("/api/v1/admin/arena-settings/history")).andExpect(jsonPath("$.data.length()").value(0)) + mockMvc.perform(get("/api/v1/arena-settings")).andExpect(jsonPath("$.data.presetCode").value("6x6-박람회")) + } +} diff --git a/src/test/kotlin/team/inreok/poppyserver/domain/block/application/BlockProgramLimitValidatorTest.kt b/src/test/kotlin/team/inreok/poppyserver/domain/block/application/BlockProgramLimitValidatorTest.kt index 19a0b6a..cd1130d 100644 --- a/src/test/kotlin/team/inreok/poppyserver/domain/block/application/BlockProgramLimitValidatorTest.kt +++ b/src/test/kotlin/team/inreok/poppyserver/domain/block/application/BlockProgramLimitValidatorTest.kt @@ -5,6 +5,8 @@ import team.inreok.poppyserver.domain.block.model.BlockInstance import team.inreok.poppyserver.domain.block.model.BlockParameters import team.inreok.poppyserver.domain.block.model.BlockProgram import team.inreok.poppyserver.domain.block.model.BlockType +import kotlin.test.assertEquals +import kotlin.test.assertFalse import kotlin.test.assertTrue class BlockProgramLimitValidatorTest { @@ -129,3 +131,40 @@ class BlockProgramLimitValidatorTest { children: List? = null, ) = BlockInstance(id, type, parameters, children) } + +class BlockProgramLimitValidatorArenaTest { + private val booth = team.inreok.poppyserver.domain.arena.application.ArenaSettingsProvider { + team.inreok.poppyserver.domain.arena.model.ArenaPresets.ALL.getValue( + team.inreok.poppyserver.domain.arena.model.ArenaPresets.BOOTH_3X3, + ) + } + + private fun move(meters: Double) = BlockProgram( + schemaVersion = 1, + blocks = listOf( + BlockInstance(id = "m", type = BlockType.MOVE_FORWARD, parameters = BlockParameters.DistanceMeters(meters)), + ), + ) + + @Test + fun `3x3 부스에서는 1회 이동 1_2m 까지만 허용한다`() { + val validator = BlockProgramLimitValidator(booth) + assertTrue(validator.validate(move(1.2)).isValid) + assertFalse(validator.validate(move(1.3)).isValid) + assertFalse(validator.validate(move(3.0)).isValid) + } + + @Test + fun `설정이 없으면(기본 6x6) 3m 까지 허용하는 기존 동작이 그대로다`() { + val validator = BlockProgramLimitValidator() + assertTrue(validator.validate(move(3.0)).isValid) + assertFalse(validator.validate(move(3.1)).isValid) + } + + @Test + fun `블록 정의 카탈로그의 이동 최대값도 공간을 따른다`() { + fun max(catalog: BlockDefinitionCatalog) = catalog.list().first { it.type == BlockType.MOVE_FORWARD }.parameters.single().max + assertEquals(1.2, max(BlockDefinitionCatalog(booth))) + assertEquals(3.0, max(BlockDefinitionCatalog())) + } +}