Merge pull request '[#72] 로그 레벨 재조정' (#73) from refactor/#72 into main

Reviewed-on: #73

.gitignore

@@ -37,3 +37,7 @@ out/
 .vscode/
 logs
 .kotlin
+
+### sql
+data/*.sql
+data/*.txt

Dockerfile

@@ -1,10 +1,9 @@
-FROM gradle:8-jdk17 AS builder
-WORKDIR /app
-COPY . .
-RUN ./gradlew bootjar --no-daemon
-
 FROM amazoncorretto:17
+
 WORKDIR /app
+
+COPY service/build/libs/service.jar app.jar
+
 EXPOSE 8080
-COPY --from=builder /app/build/libs/*.jar app.jar
+
 ENTRYPOINT ["java", "-jar", "app.jar"]

README.md

@@ -1,3 +0,0 @@
-# issue-pr-template
-
-공통으로 사용하게 될 이슈, PR 템플릿 저장소

build.gradle.kts

@@ -1,91 +1,52 @@
+import org.jetbrains.kotlin.gradle.plugin.KaptExtension
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
     val springBootVersion = "3.5.3"
     val kotlinVersion = "2.2.0"
 
-    id("org.springframework.boot") version springBootVersion
+    id("io.spring.dependency-management") version "1.1.7" apply false
-    id("io.spring.dependency-management") version "1.1.7"
+    id("org.springframework.boot") version springBootVersion apply false
-    kotlin("jvm") version kotlinVersion
+    kotlin("jvm") version kotlinVersion apply false
-    kotlin("plugin.spring") version kotlinVersion
+    kotlin("kapt") version kotlinVersion apply false
-    kotlin("plugin.jpa") version kotlinVersion
+    kotlin("plugin.spring") version kotlinVersion apply false
-    kotlin("kapt") version kotlinVersion
+    kotlin("plugin.jpa") version kotlinVersion apply false
 }
 
 group = "com.sangdol"
 version = "0.0.1-SNAPSHOT"
 
-java {
+allprojects {
-    toolchain {
+    repositories {
-        languageVersion = JavaLanguageVersion.of(17)
+        mavenCentral()
     }
 }
 
-tasks.jar {
+subprojects {
-    enabled = false
+    apply(plugin = "org.jetbrains.kotlin.jvm")
-}
+    apply(plugin = "org.jetbrains.kotlin.kapt")
+    apply(plugin = "io.spring.dependency-management")
 
-kapt {
+    extensions.configure<JavaPluginExtension> {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
+
+    extensions.configure<KaptExtension> {
         keepJavacAnnotationProcessors = true
-}
+    }
 
-repositories {
+    dependencies {
-    mavenCentral()
+        add("implementation", "io.github.oshai:kotlin-logging-jvm:7.0.3")
-}
+        add("implementation", "io.kotest:kotest-runner-junit5:5.9.1")
+        add("implementation", "ch.qos.logback:logback-classic:1.5.18")
+    }
 
-dependencies {
+    tasks.withType<Test> {
-    // Spring
-    implementation("org.springframework.boot:spring-boot-starter-web")
-    implementation("org.springframework.boot:spring-boot-starter-data-jpa")
-    implementation("org.springframework.boot:spring-boot-starter-validation")
-
-    // API docs
-    implementation("org.springdoc:springdoc-openapi-starter-webmvc-ui:2.8.9")
-
-    // DB
-    implementation("com.github.f4b6a3:tsid-creator:5.2.6")
-    runtimeOnly("com.h2database:h2")
-    runtimeOnly("com.mysql:mysql-connector-j")
-
-    // Jwt
-    implementation("io.jsonwebtoken:jjwt:0.12.6")
-
-    // Logging
-    implementation("io.github.oshai:kotlin-logging-jvm:7.0.3")
-    implementation("net.logstash.logback:logstash-logback-encoder:8.1")
-    implementation("com.github.loki4j:loki-logback-appender:2.0.0")
-    implementation("net.ttddyy.observation:datasource-micrometer-spring-boot:1.1.1")
-
-    // Observability
-    implementation("org.springframework.boot:spring-boot-starter-actuator")
-    implementation("io.micrometer:micrometer-tracing-bridge-otel")
-    implementation("io.opentelemetry:opentelemetry-exporter-otlp")
-    runtimeOnly("io.micrometer:micrometer-registry-prometheus")
-
-    // Kotlin
-    implementation("org.jetbrains.kotlin:kotlin-reflect")
-    implementation("com.fasterxml.jackson.module:jackson-module-kotlin")
-    implementation("io.github.oshai:kotlin-logging-jvm:7.0.3")
-
-    // Test
-    testImplementation("org.springframework.boot:spring-boot-starter-test")
-    testImplementation("io.mockk:mockk:1.14.4")
-    testImplementation("com.ninja-squad:springmockk:4.0.2")
-
-    // Kotest
-    testImplementation("io.kotest:kotest-runner-junit5:5.9.1")
-    testImplementation("io.kotest.extensions:kotest-extensions-spring:1.3.0")
-
-    // RestAssured
-    testImplementation("io.rest-assured:rest-assured:5.5.5")
-    testImplementation("io.rest-assured:kotlin-extensions:5.5.5")
-}
-
-tasks.withType<Test> {
         useJUnitPlatform()
-}
+    }
 
-tasks.withType<KotlinCompile> {
+    tasks.withType<KotlinCompile> {
         compilerOptions {
             freeCompilerArgs.addAll(
                 "-Xjsr305=strict",
@@ -93,4 +54,5 @@ tasks.withType<KotlinCompile> {
             )
             jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17)
         }
+    }
 }

build.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+IMAGE_NAME="roomescape-backend"
+IMAGE_TAG=$1
+
+./gradlew build -x test && docker buildx build --platform=linux/amd64 -t ${PRIVATE_REGISTRY}/$IMAGE_NAME:$IMAGE_TAG . --push

common/log/build.gradle.kts

@@ -0,0 +1,11 @@
+dependencies {
+    api("net.ttddyy.observation:datasource-micrometer-spring-boot:1.1.2")
+    implementation("com.fasterxml.jackson.module:jackson-module-kotlin:2.20.0")
+    implementation(project(":common:utils"))
+
+    testImplementation("io.mockk:mockk:1.14.4")
+}
+
+tasks.named<Jar>("jar") {
+    enabled = true
+}

common/log/src/main/kotlin/com/sangdol/common/log/constant/LogType.kt

@@ -0,0 +1,9 @@
+package com.sangdol.common.log.constant
+
+enum class LogType {
+    INCOMING_HTTP_REQUEST,
+    CONTROLLER_INVOKED,
+    SUCCEED,
+    APPLICATION_FAILURE,
+    UNHANDLED_EXCEPTION
+}

common/log/src/main/kotlin/com/sangdol/common/log/message/AbstractLogMaskingConverter.kt

@@ -1,4 +1,4 @@
-package roomescape.common.log
+package com.sangdol.common.log.message
 
 import ch.qos.logback.classic.pattern.MessageConverter
 import ch.qos.logback.classic.spi.ILoggingEvent
@@ -7,13 +7,14 @@ import com.fasterxml.jackson.databind.ObjectMapper
 import com.fasterxml.jackson.databind.node.ArrayNode
 import com.fasterxml.jackson.databind.node.ObjectNode
 import com.fasterxml.jackson.databind.node.TextNode
-import roomescape.common.config.JacksonConfig
 
-private const val MASK: String = "****"
+abstract class AbstractLogMaskingConverter(
-private val SENSITIVE_KEYS = setOf("password", "accessToken", "phone")
+    val sensitiveKeys: Set<String>,
-private val objectMapper: ObjectMapper = JacksonConfig().objectMapper()
+    val objectMapper: ObjectMapper
+) : MessageConverter() {
+
+    val mask: String = "****"
 
-class RoomescapeLogMaskingConverter : MessageConverter() {
     override fun convert(event: ILoggingEvent): String {
         val message: String = event.formattedMessage
 
@@ -35,13 +36,13 @@ class RoomescapeLogMaskingConverter : MessageConverter() {
         .toString()
 
     private fun maskedPlainMessage(message: String): String {
-        val keys: String = SENSITIVE_KEYS.joinToString("|")
+        val keys: String = sensitiveKeys.joinToString("|")
-        val regex = Regex("(?i)($keys)(\\s*=\\s*)([^(,|\"|?)\\s]+)")
+        val regex = Regex("(?i)($keys)(\\s*[:=]\\s*)([^(,|\"|?)]+)")
 
         return regex.replace(message) { matchResult ->
             val key = matchResult.groupValues[1]
             val delimiter = matchResult.groupValues[2]
-            val maskedValue = maskValue(matchResult.groupValues[3])
+            val maskedValue = maskValue(matchResult.groupValues[3].trim())
 
             "${key}${delimiter}${maskedValue}"
         }
@@ -51,7 +52,7 @@ class RoomescapeLogMaskingConverter : MessageConverter() {
         node?.forEachEntry { key, childNode ->
             when {
                 childNode.isValueNode -> {
-                    if (key in SENSITIVE_KEYS) (node as ObjectNode).put(key, maskValue(childNode.asText()))
+                    if (key in sensitiveKeys) (node as ObjectNode).put(key, maskValue(childNode.asText()))
                 }
 
                 childNode.isObject -> maskRecursive(childNode)
@@ -72,10 +73,6 @@ class RoomescapeLogMaskingConverter : MessageConverter() {
     }
 
     private fun maskValue(value: String): String {
-        return if (value.length <= 2) {
+        return "${value.first()}$mask${value.last()}"
-            MASK
-        } else {
-            "${value.first()}$MASK${value.last()}"
-        }
     }
 }

common/log/src/main/kotlin/com/sangdol/common/log/sql/MDCAwareSlowQueryListenerWithoutParams.kt

@@ -1,4 +1,4 @@
-package roomescape.common.log
+package com.sangdol.common.log.sql
 
 import net.ttddyy.dsproxy.ExecutionInfo
 import net.ttddyy.dsproxy.QueryInfo

common/log/src/main/kotlin/com/sangdol/common/log/sql/SlowQueryDataSourceFactory.kt

@@ -0,0 +1,20 @@
+package com.sangdol.common.log.sql
+
+import net.ttddyy.dsproxy.listener.logging.SLF4JLogLevel
+import net.ttddyy.dsproxy.support.ProxyDataSourceBuilder
+import javax.sql.DataSource
+
+object SlowQueryDataSourceFactory {
+
+    fun create(dataSource: DataSource, loggerName: String, logLevel: String, thresholdMs: Long): DataSource {
+        val mdcAwareListener = MDCAwareSlowQueryListenerWithoutParams(
+            logLevel = SLF4JLogLevel.nullSafeValueOf(logLevel.uppercase()),
+            thresholdMs = thresholdMs
+        )
+
+        return ProxyDataSourceBuilder.create(dataSource)
+            .name(loggerName)
+            .listener(mdcAwareListener)
+            .buildProxy()
+    }
+}

common/log/src/test/kotlin/com/sangdol/common/log/AbstractLogMaskingConverterTest.kt

@@ -0,0 +1,57 @@
+package com.sangdol.common.log
+
+import ch.qos.logback.classic.spi.ILoggingEvent
+import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
+import com.sangdol.common.log.message.AbstractLogMaskingConverter
+import io.kotest.assertions.assertSoftly
+import io.kotest.core.spec.style.FunSpec
+import io.kotest.matchers.equals.shouldBeEqual
+import io.kotest.matchers.shouldBe
+import io.mockk.every
+import io.mockk.mockk
+
+class TestLogMaskingConverter : AbstractLogMaskingConverter(
+    sensitiveKeys = setOf("account", "address"),
+    objectMapper = jacksonObjectMapper()
+)
+
+class AbstractLogMaskingConverterTest : FunSpec({
+
+    val converter = TestLogMaskingConverter()
+    val event: ILoggingEvent = mockk()
+    val account = "sangdol@example.com"
+    val address = "서울특별시 강북구 수유1동 123-456"
+
+    context("sensitiveKeys=${converter.sensitiveKeys}에 있는 항목은 가린다.") {
+        context("평문 로그를 처리할 때, 여러 key / value가 있는 경우 서로 간의 구분자는 trim 처리한다.") {
+            listOf(":", "=", " : ", " = ").forEach { keyValueDelimiter ->
+                listOf(",", ", ").forEach { valueDelimiter ->
+                    test("key1${keyValueDelimiter}value1${valueDelimiter}key2${keyValueDelimiter}value2 형식을 처리한다.") {
+                        every {
+                            event.formattedMessage
+                        } returns "account$keyValueDelimiter$account${valueDelimiter}address$keyValueDelimiter$address"
+
+                        assertSoftly(converter.convert(event)) {
+                            this shouldBe "account${keyValueDelimiter}${account.first()}${converter.mask}${account.last()}${valueDelimiter}address${keyValueDelimiter}${address.first()}${converter.mask}${address.last()}"
+                        }
+                    }
+                }
+            }
+        }
+
+        context("JSON 로그") {
+            test("정상 처리") {
+                val json = "{\"request_body\":{\"account\":\"%s\",\"address\":\"%s\"}}"
+
+                every {
+                    event.formattedMessage
+                } returns json.format(account, address)
+
+                converter.convert(event) shouldBeEqual json.format(
+                    "${account.first()}${converter.mask}${account.last()}",
+                    "${address.first()}${converter.mask}${address.last()}"
+                )
+            }
+        }
+    }
+})

common/log/src/test/kotlin/com/sangdol/common/log/MDCAwareSlowQueryListenerWithoutParamsTest.kt

@@ -1,5 +1,7 @@
-package roomescape.common.log
+package com.sangdol.common.log
 
+import com.sangdol.common.log.sql.SlowQueryPredicate
+import com.sangdol.common.log.sql.SqlLogFormatter
 import io.kotest.assertions.assertSoftly
 import io.kotest.core.spec.style.StringSpec
 import io.kotest.matchers.shouldBe
@@ -18,9 +20,9 @@ class MDCAwareSlowQueryListenerWithoutParamsTest : StringSpec({
         val slowQueryPredicate = SlowQueryPredicate(thresholdMs = slowQueryThreshold)
 
         assertSoftly(slowQueryPredicate) {
-            it.test(slowQueryThreshold) shouldBe true
+            this.test(slowQueryThreshold) shouldBe true
-            it.test(slowQueryThreshold + 1) shouldBe true
+            this.test(slowQueryThreshold + 1) shouldBe true
-            it.test(slowQueryThreshold - 1) shouldBe false
+            this.test(slowQueryThreshold - 1) shouldBe false
         }
     }
 })

common/persistence/build.gradle.kts

@@ -0,0 +1,29 @@
+import org.springframework.boot.gradle.tasks.bundling.BootJar
+
+plugins {
+    id("org.springframework.boot")
+    kotlin("plugin.spring")
+    kotlin("plugin.jpa")
+}
+
+dependencies {
+    api("org.springframework.boot:spring-boot-starter-data-jpa")
+    api("com.github.f4b6a3:tsid-creator:5.2.6")
+
+    implementation(project(":common:utils"))
+    implementation(project(":common:types"))
+
+    testRuntimeOnly("com.h2database:h2")
+    testImplementation("org.springframework.boot:spring-boot-starter-test")
+    testImplementation("io.kotest:kotest-runner-junit5:5.9.1")
+    testImplementation("io.kotest.extensions:kotest-extensions-spring:1.3.0")
+    testImplementation("io.mockk:mockk:1.14.4")
+}
+
+tasks.named<BootJar>("bootJar") {
+    enabled = false
+}
+
+tasks.named<Jar>("jar") {
+    enabled = true
+}

common/persistence/src/main/kotlin/com/sangdol/common/persistence/AuditingBaseEntity.kt

@@ -1,14 +1,14 @@
-package roomescape.common.entity
+package com.sangdol.common.persistence
 
-import jakarta.persistence.*
+import jakarta.persistence.Column
+import jakarta.persistence.EntityListeners
+import jakarta.persistence.MappedSuperclass
 import org.springframework.data.annotation.CreatedBy
 import org.springframework.data.annotation.CreatedDate
 import org.springframework.data.annotation.LastModifiedBy
 import org.springframework.data.annotation.LastModifiedDate
-import org.springframework.data.domain.Persistable
 import org.springframework.data.jpa.domain.support.AuditingEntityListener
-import java.time.LocalDateTime
+import java.time.Instant
-import kotlin.jvm.Transient
 
 @MappedSuperclass
 @EntityListeners(AuditingEntityListener::class)
@@ -17,7 +17,7 @@ abstract class AuditingBaseEntity(
 ) : PersistableBaseEntity(id) {
     @Column(updatable = false)
     @CreatedDate
-    lateinit var createdAt: LocalDateTime
+    lateinit var createdAt: Instant
 
     @Column(updatable = false)
     @CreatedBy
@@ -25,29 +25,9 @@ abstract class AuditingBaseEntity(
 
     @Column
     @LastModifiedDate
-    lateinit var updatedAt: LocalDateTime
+    lateinit var updatedAt: Instant
 
     @Column
     @LastModifiedBy
     var updatedBy: Long = 0L
 }
-
-@MappedSuperclass
-abstract class PersistableBaseEntity(
-    @Id
-    @Column(name = "id")
-    private val _id: Long,
-
-    @Transient
-    private var isNewEntity: Boolean = true
-) : Persistable<Long> {
-
-    @PostLoad
-    @PrePersist
-    fun markNotNew() {
-        isNewEntity = false
-    }
-
-    override fun getId(): Long = _id
-    override fun isNew(): Boolean = isNewEntity
-}

common/persistence/src/main/kotlin/com/sangdol/common/persistence/IDGenerator.kt

@@ -0,0 +1,13 @@
+package com.sangdol.common.persistence
+
+import com.github.f4b6a3.tsid.TsidFactory
+
+interface IDGenerator {
+    fun create(): Long
+}
+
+class TsidIDGenerator(
+    private val tsidFactory: TsidFactory
+) : IDGenerator {
+    override fun create(): Long = tsidFactory.create().toLong()
+}

common/persistence/src/main/kotlin/com/sangdol/common/persistence/PersistableBaseEntity.kt

@@ -0,0 +1,25 @@
+package com.sangdol.common.persistence
+
+import jakarta.persistence.*
+import org.springframework.data.domain.Persistable
+import kotlin.jvm.Transient
+
+@MappedSuperclass
+abstract class PersistableBaseEntity(
+    @Id
+    @Column(name = "id")
+    private val _id: Long,
+
+    @Transient
+    private var isNewEntity: Boolean = true
+) : Persistable<Long> {
+
+    @PostLoad
+    @PrePersist
+    fun markNotNew() {
+        isNewEntity = false
+    }
+
+    override fun getId(): Long = _id
+    override fun isNew(): Boolean = isNewEntity
+}

common/persistence/src/main/kotlin/com/sangdol/common/persistence/PersistenceConfig.kt

@@ -0,0 +1,44 @@
+package com.sangdol.common.persistence
+
+import com.github.f4b6a3.tsid.TsidFactory
+import com.sangdol.common.utils.MdcPrincipalIdUtil
+import org.springframework.beans.factory.annotation.Value
+import org.springframework.context.annotation.Bean
+import org.springframework.context.annotation.Configuration
+import org.springframework.context.annotation.Primary
+import org.springframework.data.domain.AuditorAware
+import org.springframework.data.jpa.repository.config.EnableJpaAuditing
+import org.springframework.transaction.PlatformTransactionManager
+import java.util.*
+
+@Configuration
+@EnableJpaAuditing
+class PersistenceConfig {
+
+    @Value("\${POD_NAME:app-0}")
+    private lateinit var podName: String
+
+    @Bean
+    fun auditorAware(): AuditorAware<Long> = MdcAuditorAware()
+
+    @Bean
+    @Primary
+    fun idGenerator(): IDGenerator {
+        val node = podName.substringAfterLast("-").toInt()
+
+        val tsidFactory = TsidFactory.builder().withNode(node).build()
+
+        return TsidIDGenerator(tsidFactory)
+    }
+
+    @Bean
+    fun transactionExecutionUtil(
+        transactionManager: PlatformTransactionManager
+    ): TransactionExecutionUtil {
+        return TransactionExecutionUtil(transactionManager)
+    }
+}
+
+class MdcAuditorAware : AuditorAware<Long> {
+    override fun getCurrentAuditor(): Optional<Long> = MdcPrincipalIdUtil.extractAsOptionalLongOrEmpty()
+}

common/persistence/src/main/kotlin/com/sangdol/common/persistence/TransactionExecutionUtil.kt

@@ -1,31 +1,19 @@
-package roomescape.common.util
+package com.sangdol.common.persistence
 
-import io.github.oshai.kotlinlogging.KLogger
-import io.github.oshai.kotlinlogging.KotlinLogging
-import org.springframework.stereotype.Component
 import org.springframework.transaction.PlatformTransactionManager
 import org.springframework.transaction.TransactionDefinition
 import org.springframework.transaction.support.TransactionTemplate
-import roomescape.common.exception.CommonErrorCode
-import roomescape.common.exception.RoomescapeException
 
-private val log: KLogger = KotlinLogging.logger {}
-
-@Component
 class TransactionExecutionUtil(
     private val transactionManager: PlatformTransactionManager
 ) {
 
-    fun <T> withNewTransaction(isReadOnly: Boolean, action: () -> T): T {
+    fun <T> withNewTransaction(isReadOnly: Boolean, action: () -> T?): T? {
         val transactionTemplate = TransactionTemplate(transactionManager).apply {
             this.isReadOnly = isReadOnly
             this.propagationBehavior = TransactionDefinition.PROPAGATION_REQUIRES_NEW
         }
 
         return transactionTemplate.execute { action() }
-            ?: run {
-                log.error { "[TransactionExecutionUtil.withNewTransaction] 트랜잭션 작업 중 예상치 못한 null 반환 " }
-                throw RoomescapeException(CommonErrorCode.UNEXPECTED_SERVER_ERROR)
-            }
     }
 }

common/persistence/src/test/kotlin/com/sangdol/common/persistence/BaseEntityTest.kt

@@ -0,0 +1,53 @@
+package com.sangdol.common.persistence
+
+import com.sangdol.common.utils.MdcPrincipalIdUtil
+import io.kotest.assertions.assertSoftly
+import io.kotest.core.spec.style.FunSpec
+import io.kotest.matchers.date.shouldBeBefore
+import io.kotest.matchers.equality.shouldBeEqualUsingFields
+import io.kotest.matchers.nulls.shouldNotBeNull
+import io.kotest.matchers.shouldBe
+import org.springframework.boot.test.context.SpringBootTest
+import java.time.LocalDateTime
+
+@SpringBootTest
+class BaseEntityTest(
+    private val testPersistableBaseEntityRepository: TestPersistableBaseEntityRepository,
+    private val testAuditingBaseEntityRepository: TestAuditingBaseEntityRepository,
+    private val idGenerator: IDGenerator
+) : FunSpec({
+    context("TestPersistableBaseEntityRepository") {
+        test("PK를 지정하여 INSERT 쿼리를 한번만 전송한다.") {
+            val entity = TestPersistableBaseEntity(idGenerator.create(), "hello").also {
+                testPersistableBaseEntityRepository.saveAndFlush(it)
+            }
+
+            testPersistableBaseEntityRepository.findById(entity.id).also {
+                it.shouldNotBeNull()
+                it.get() shouldBeEqualUsingFields entity
+            }
+        }
+    }
+
+    context("TestAuditingBaseEntityRepository") {
+        test("Entity 저장 후 Audit 정보를 확인한다.") {
+            val id = idGenerator.create()
+                .also {
+                    MdcPrincipalIdUtil.set(it.toString())
+                }.also {
+                    testAuditingBaseEntityRepository.saveAndFlush(TestAuditingBaseEntity(it, "hello"))
+                }
+
+            testAuditingBaseEntityRepository.findById(id).also {
+                it.shouldNotBeNull()
+
+                assertSoftly(it.get()) {
+                    this.createdAt shouldBeBefore LocalDateTime.now()
+                    this.updatedAt shouldBeBefore LocalDateTime.now()
+                    this.createdBy shouldBe id
+                    this.updatedBy shouldBe id
+                }
+            }
+        }
+    }
+})

common/persistence/src/test/kotlin/com/sangdol/common/persistence/TestApplication.kt

@@ -0,0 +1,6 @@
+package com.sangdol.common.persistence
+
+import org.springframework.boot.autoconfigure.SpringBootApplication
+
+@SpringBootApplication
+class TestApplication

common/persistence/src/test/kotlin/com/sangdol/common/persistence/TestAuditingBaseEntity.kt

@@ -0,0 +1,12 @@
+package com.sangdol.common.persistence
+
+import jakarta.persistence.Entity
+import org.springframework.data.jpa.repository.JpaRepository
+
+@Entity
+class TestAuditingBaseEntity(
+    id: Long,
+    val name: String
+) : AuditingBaseEntity(id)
+
+interface TestAuditingBaseEntityRepository : JpaRepository<TestAuditingBaseEntity, Long>

common/persistence/src/test/kotlin/com/sangdol/common/persistence/TestPersistableBaseEntity.kt

@@ -0,0 +1,12 @@
+package com.sangdol.common.persistence
+
+import jakarta.persistence.Entity
+import org.springframework.data.jpa.repository.JpaRepository
+
+@Entity
+class TestPersistableBaseEntity(
+    id: Long,
+    val name: String
+) : PersistableBaseEntity(id)
+
+interface TestPersistableBaseEntityRepository : JpaRepository<TestPersistableBaseEntity, Long>

common/persistence/src/test/kotlin/com/sangdol/common/persistence/TransactionExecutionUtilTest.kt

@@ -0,0 +1,71 @@
+package com.sangdol.common.persistence
+
+import io.kotest.assertions.assertSoftly
+import io.kotest.core.spec.style.FunSpec
+import io.kotest.matchers.equality.shouldBeEqualUsingFields
+import io.kotest.matchers.nulls.shouldNotBeNull
+import io.kotest.matchers.shouldBe
+import io.mockk.*
+import org.junit.jupiter.api.assertThrows
+import org.springframework.transaction.PlatformTransactionManager
+import org.springframework.transaction.TransactionDefinition
+import org.springframework.transaction.TransactionStatus
+import org.springframework.transaction.support.DefaultTransactionDefinition
+
+class TransactionExecutionUtilTest() : FunSpec() {
+    private val transactionManager = mockk<PlatformTransactionManager>(relaxed = true)
+    private val transactionExecutionUtil = TransactionExecutionUtil(transactionManager)
+
+    init {
+        context("withNewTransaction") {
+
+            beforeTest {
+                clearMocks(transactionManager)
+            }
+
+            val body = TestPersistableBaseEntity(123458192L, "hello")
+
+            test("지정한 action이 성공하면, 해당 값을 반환하고 트랜잭션을 커밋한다.") {
+                transactionExecutionUtil.withNewTransaction(isReadOnly = false) {
+                    body
+                }.also {
+                    it.shouldNotBeNull()
+                    it shouldBeEqualUsingFields body
+                    verify { transactionManager.commit(any()) }
+                    verify(exactly = 0) { transactionManager.rollback(any()) }
+                }
+            }
+
+            test("지정한 action 실행 도중 예외가 발생하면, 예외를 던지고 트랜잭션을 롤백한다.") {
+                assertThrows<RuntimeException> {
+                    transactionExecutionUtil.withNewTransaction(isReadOnly = false) {
+                        throw RuntimeException()
+                    }
+                }.also {
+                    verify { transactionManager.rollback(any()) }
+                    verify(exactly = 0) { transactionManager.commit(any()) }
+                }
+            }
+
+            test("isReadOnly=true 지정시 읽기 전용 트랜잭션으로 실행한다.") {
+                val transactionStatus = mockk<TransactionStatus>(relaxed = true)
+                val transactionDefinitionSlot = slot<TransactionDefinition>()
+
+                every {
+                    transactionManager.getTransaction(capture(transactionDefinitionSlot))
+                } returns transactionStatus
+
+                transactionExecutionUtil.withNewTransaction(isReadOnly = true) {
+                    "hello"
+                }.also {
+                    assertSoftly(transactionDefinitionSlot.captured) {
+                        this.isReadOnly shouldBe true
+                        this.propagationBehavior shouldBe DefaultTransactionDefinition.PROPAGATION_REQUIRES_NEW
+                    }
+
+                    verify { transactionManager.commit(any()) }
+                }
+            }
+        }
+    }
+}

common/persistence/src/test/resources/application.yaml

@@ -0,0 +1,18 @@
+spring:
+  jpa:
+    properties:
+      hibernate:
+        format_sql: true
+    hibernate:
+      ddl-auto: create-drop
+    show-sql: true
+  h2:
+    console:
+      enabled: true
+      path: /h2-console
+  datasource:
+    hikari:
+      jdbc-url: jdbc:h2:mem:database
+      driver-class-name: org.h2.Driver
+      username: sa
+      password:

common/types/build.gradle.kts

@@ -0,0 +1,3 @@
+tasks.named<Jar>("jar") {
+    enabled = true
+}

common/types/src/main/kotlin/com/sangdol/common/types/exception/CommonErrorCode.kt

@@ -1,6 +1,6 @@
-package roomescape.common.exception
+package com.sangdol.common.types.exception
 
-import org.springframework.http.HttpStatus
+import com.sangdol.common.types.web.HttpStatus
 
 enum class CommonErrorCode(
     override val httpStatus: HttpStatus,

common/types/src/main/kotlin/com/sangdol/common/types/exception/ErrorCode.kt

@@ -1,6 +1,6 @@
-package roomescape.common.exception
+package com.sangdol.common.types.exception
 
-import org.springframework.http.HttpStatus
+import com.sangdol.common.types.web.HttpStatus
 
 interface ErrorCode {
     val httpStatus: HttpStatus

common/types/src/main/kotlin/com/sangdol/common/types/exception/RoomescapeException.kt

@@ -1,4 +1,4 @@
-package roomescape.common.exception
+package com.sangdol.common.types.exception
 
 open class RoomescapeException(
     open val errorCode: ErrorCode,

common/types/src/main/kotlin/com/sangdol/common/types/web/ApiResponses.kt

@@ -1,9 +1,7 @@
-package roomescape.common.dto.response
+package com.sangdol.common.types.web
 
-import com.fasterxml.jackson.annotation.JsonInclude
+import com.sangdol.common.types.exception.ErrorCode
-import roomescape.common.exception.ErrorCode
 
-@JsonInclude(JsonInclude.Include.NON_NULL)
 data class CommonApiResponse<T>(
     val data: T? = null,
 )

common/types/src/main/kotlin/com/sangdol/common/types/web/HttpStatus.kt

@@ -0,0 +1,24 @@
+package com.sangdol.common.types.web
+
+enum class HttpStatus(
+    val code: Int
+) {
+    OK(200),
+    CREATED(201),
+    NO_CONTENT(204),
+    BAD_REQUEST(400),
+    UNAUTHORIZED(401),
+    FORBIDDEN(403),
+    NOT_FOUND(404),
+    CONFLICT(409),
+    INTERNAL_SERVER_ERROR(500)
+    ;
+
+    fun isClientError(): Boolean {
+        return code in 400..<500
+    }
+
+    fun value(): Int {
+        return code
+    }
+}

common/utils/build.gradle.kts

@@ -0,0 +1,7 @@
+dependencies {
+    implementation("org.slf4j:slf4j-api:2.0.17")
+}
+
+tasks.named<Jar>("jar") {
+    enabled = true
+}

common/utils/src/main/kotlin/com/sangdol/common/utils/KoreaDateTimeExtensions.kt

@@ -0,0 +1,21 @@
+package com.sangdol.common.utils
+
+import java.time.*
+import java.time.temporal.ChronoUnit
+
+private val KST_CLOCK = Clock.system(ZoneId.of("Asia/Seoul"))
+
+object KoreaDate {
+    fun today(): LocalDate = LocalDate.now(KST_CLOCK)
+}
+
+object KoreaTime {
+    fun now(): LocalTime = LocalTime.now(KST_CLOCK).truncatedTo(ChronoUnit.MINUTES)
+}
+
+object KoreaDateTime {
+    fun now(): LocalDateTime = LocalDateTime.now(KST_CLOCK)
+    fun nowWithOffset(): OffsetDateTime = OffsetDateTime.now(KST_CLOCK)
+}
+
+fun Instant.toKoreaDateTime(): LocalDateTime = this.atZone(KST_CLOCK.zone).toLocalDateTime()

common/utils/src/main/kotlin/com/sangdol/common/utils/MdcPrincipalIdUtil.kt

@@ -0,0 +1,26 @@
+package com.sangdol.common.utils
+
+import org.slf4j.MDC
+import java.util.*
+
+object MdcPrincipalIdUtil {
+    const val MDC_PRINCIPAL_ID_KEY = "principal_id"
+
+    fun extractAsLongOrNull(): Long? {
+        return MDC.get(MDC_PRINCIPAL_ID_KEY)?.toLong()
+    }
+
+    fun extractAsOptionalLongOrEmpty(): Optional<Long> {
+        return MDC.get(MDC_PRINCIPAL_ID_KEY)?.let {
+            Optional.of(it.toLong())
+        } ?: Optional.empty()
+    }
+
+    fun set(id: String) {
+        MDC.put(MDC_PRINCIPAL_ID_KEY, id)
+    }
+
+    fun clear() {
+        MDC.remove(MDC_PRINCIPAL_ID_KEY)
+    }
+}

common/utils/src/main/kotlin/com/sangdol/common/utils/MdcStartTimeUtil.kt

@@ -0,0 +1,25 @@
+package com.sangdol.common.utils
+
+import org.slf4j.MDC
+
+object MdcStartTimeUtil {
+    const val MDC_START_TIME_KEY = "start_time"
+
+    fun extractDurationMsOrNull(): Long? {
+        return extractOrNull()?.let { System.currentTimeMillis() - it }
+    }
+
+    fun setCurrentTime() {
+        extractOrNull() ?: run {
+            MDC.put(MDC_START_TIME_KEY, System.currentTimeMillis().toString())
+        }
+    }
+
+    fun clear() {
+        MDC.remove(MDC_START_TIME_KEY)
+    }
+
+    private fun extractOrNull(): Long? {
+        return MDC.get(MDC_START_TIME_KEY)?.toLong()
+    }
+}

common/utils/src/test/kotlin/com/sangdol/common/utils/KoreaDateTimeExtensionsTest.kt

@@ -0,0 +1,45 @@
+package com.sangdol.common.utils
+
+import io.kotest.assertions.assertSoftly
+import io.kotest.core.spec.style.FunSpec
+import io.kotest.matchers.shouldBe
+import java.time.*
+
+class KoreaDateTimeExtensionsTest : FunSpec({
+
+    test("한국 시간 기준으로 현재 시간을 가져오며, 초 단위는 제외한다.") {
+        assertSoftly(KoreaTime.now()) {
+            val utcNow = LocalTime.now(ZoneId.of("UTC"))
+
+            this.hour shouldBe utcNow.hour.plus(9)
+            this.minute shouldBe utcNow.minute
+            this.second shouldBe 0
+            this.nano shouldBe 0
+        }
+    }
+
+    test("한국 시간 기준으로 현재 날짜 + 시간을 LocalDateTime 타입으로 가져온다.") {
+        assertSoftly(KoreaDateTime.now()) {
+            val utcNow = LocalDateTime.now(ZoneId.of("UTC"))
+
+            this.withSecond(0).withNano(0) shouldBe utcNow.plusHours(9).withSecond(0).withNano(0)
+        }
+    }
+
+    test("한국 시간 기준으로 현재 날짜 + 시간을 OffsetDateTime 타입으로 가져온다.") {
+        assertSoftly(KoreaDateTime.nowWithOffset()) {
+            val utcNow = OffsetDateTime.now(ZoneId.of("UTC"))
+
+            this.toLocalDateTime().withSecond(0).withNano(0) shouldBe utcNow.toLocalDateTime().plusHours(9)
+                .withSecond(0).withNano(0)
+        }
+    }
+
+    test("UTC 시간을 LocalDateTime 타입의 한국 시간으로 변환한다.") {
+        val now = Instant.now()
+        val kstConverted = now.toKoreaDateTime()
+        val utc = now.atZone(ZoneId.of("UTC")).toLocalDateTime()
+
+        kstConverted.withSecond(0).withNano(0) shouldBe utc.plusHours(9).withSecond(0).withNano(0)
+    }
+})

common/utils/src/test/kotlin/com/sangdol/common/utils/MdcPrincipalIdUtilTest.kt

@@ -0,0 +1,28 @@
+package com.sangdol.common.utils
+
+import io.kotest.core.spec.style.StringSpec
+import io.kotest.matchers.shouldBe
+import java.util.*
+
+class MdcPrincipalIdUtilTest : StringSpec({
+
+    val id = 1872847943L
+
+    "값을 설정한다." {
+        MdcPrincipalIdUtil.set(id.toString()).also {
+            MdcPrincipalIdUtil.extractAsLongOrNull() shouldBe id
+            MdcPrincipalIdUtil.extractAsOptionalLongOrEmpty() shouldBe Optional.of(id)
+        }
+    }
+
+    "값을 제거한다." {
+        MdcPrincipalIdUtil.set(id.toString()).also {
+            MdcPrincipalIdUtil.extractAsLongOrNull() shouldBe id
+        }
+
+        MdcPrincipalIdUtil.clear().also {
+            MdcPrincipalIdUtil.extractAsLongOrNull() shouldBe null
+            MdcPrincipalIdUtil.extractAsOptionalLongOrEmpty() shouldBe Optional.empty()
+        }
+    }
+})

common/utils/src/test/kotlin/com/sangdol/common/utils/MdcStartTimeUtilTest.kt

@@ -0,0 +1,34 @@
+package com.sangdol.common.utils
+
+import io.kotest.core.spec.style.FunSpec
+import io.kotest.matchers.nulls.shouldNotBeNull
+import io.kotest.matchers.shouldBe
+
+class MdcStartTimeUtilTest : FunSpec({
+
+    test("기존에 등록된 startTime 값을 기준으로 duration_ms를 구한다.") {
+        MdcStartTimeUtil.setCurrentTime()
+        MdcStartTimeUtil.extractDurationMsOrNull().shouldNotBeNull()
+        MdcStartTimeUtil.clear()
+    }
+
+    test("기존에 등록된 startTime 값이 없으면 duration_ms는 null이다.") {
+        MdcStartTimeUtil.extractDurationMsOrNull() shouldBe null
+    }
+
+    test("현재 시간을 등록한다.") {
+        MdcStartTimeUtil.setCurrentTime()
+        MdcStartTimeUtil.extractDurationMsOrNull().shouldNotBeNull()
+        MdcStartTimeUtil.clear()
+    }
+
+    test("등록된 시간을 지운다.") {
+        MdcStartTimeUtil.setCurrentTime().also {
+            MdcStartTimeUtil.extractDurationMsOrNull().shouldNotBeNull()
+        }
+
+        MdcStartTimeUtil.clear().also {
+            MdcStartTimeUtil.extractDurationMsOrNull() shouldBe null
+        }
+    }
+})

common/web/build.gradle.kts

@@ -0,0 +1,28 @@
+import org.gradle.kotlin.dsl.named
+import org.springframework.boot.gradle.tasks.bundling.BootJar
+
+plugins {
+    id("org.springframework.boot")
+    kotlin("plugin.spring")
+}
+
+dependencies {
+    api("org.springframework.boot:spring-boot-starter-web")
+    api("org.springframework.boot:spring-boot-starter-aop")
+    api("com.fasterxml.jackson.module:jackson-module-kotlin")
+
+    api(project(":common:log"))
+    api(project(":common:utils"))
+    api(project(":common:types"))
+
+    testImplementation("io.kotest:kotest-runner-junit5:5.9.1")
+    testImplementation("io.mockk:mockk:1.14.4")
+}
+
+tasks.named<BootJar>("bootJar") {
+    enabled = false
+}
+
+tasks.named<Jar>("jar") {
+    enabled = true
+}

common/web/src/main/kotlin/com/sangdol/common/web/asepct/ControllerLoggingAspect.kt

@@ -1,5 +1,7 @@
-package roomescape.common.log
+package com.sangdol.common.web.asepct
 
+import com.sangdol.common.log.constant.LogType
+import com.sangdol.common.web.support.log.WebLogMessageConverter
 import io.github.oshai.kotlinlogging.KLogger
 import io.github.oshai.kotlinlogging.KotlinLogging
 import jakarta.servlet.http.HttpServletRequest
@@ -9,7 +11,6 @@ import org.aspectj.lang.annotation.Around
 import org.aspectj.lang.annotation.Aspect
 import org.aspectj.lang.annotation.Pointcut
 import org.aspectj.lang.reflect.MethodSignature
-import org.slf4j.MDC
 import org.springframework.http.ResponseEntity
 import org.springframework.web.bind.annotation.PathVariable
 import org.springframework.web.bind.annotation.RequestBody
@@ -21,19 +22,17 @@ private val log: KLogger = KotlinLogging.logger {}
 
 @Aspect
 class ControllerLoggingAspect(
-    private val messageConverter: ApiLogMessageConverter,
+    private val messageConverter: WebLogMessageConverter,
 ) {
 
-    @Pointcut("execution(* roomescape..web..*Controller*.*(..))")
+    @Pointcut("execution(* com.sangdol..web..*Controller*.*(..))")
     fun allController() {
     }
 
     @Around("allController()")
     fun logAPICalls(joinPoint: ProceedingJoinPoint): Any? {
-        val startTime: Long = MDC.get("startTime").toLongOrNull() ?: System.currentTimeMillis()
-        val controllerPayload: Map<String, Any> = parsePayload(joinPoint)
-
         val servletRequest: HttpServletRequest = servletRequest()
+        val controllerPayload: Map<String, Any> = parseControllerPayload(joinPoint)
 
         log.info {
             messageConverter.convertToControllerInvokedMessage(servletRequest, controllerPayload)
@@ -41,28 +40,21 @@ class ControllerLoggingAspect(
 
         try {
             return joinPoint.proceed()
-                .also { logSuccess(servletRequest.getEndpoint(), startTime, it) }
+                .also { logSuccess(servletRequest, it as ResponseEntity<*>) }
         } catch (e: Exception) {
             throw e
         }
     }
 
-    private fun logSuccess(endpoint: String, startTime: Long, result: Any) {
+    private fun logSuccess(servletRequest: HttpServletRequest, result: ResponseEntity<*>) {
-        val responseEntity = result as ResponseEntity<*>
+        val body: Any? = if (log.isDebugEnabled()) result.body else null
-        var convertResponseMessageRequest = ConvertResponseMessageRequest(
-            type = LogType.CONTROLLER_SUCCESS,
-            endpoint = endpoint,
-            httpStatus = responseEntity.statusCode.value(),
-            startTime = startTime,
-        )
 
-        if (log.isDebugEnabled()) {
+        val logMessage = messageConverter.convertToResponseMessage(
-            convertResponseMessageRequest = convertResponseMessageRequest.copy(
+            type = LogType.SUCCEED,
-                body = responseEntity.body
+            servletRequest = servletRequest,
+            httpStatusCode = result.statusCode.value(),
+            responseBody = body,
         )
-        }
-
-        val logMessage = messageConverter.convertToResponseMessage(convertResponseMessageRequest)
 
         log.info { logMessage }
     }
@@ -71,14 +63,16 @@ class ControllerLoggingAspect(
         return (RequestContextHolder.currentRequestAttributes() as ServletRequestAttributes).request
     }
 
-    private fun parsePayload(joinPoint: JoinPoint): Map<String, Any> {
+    private fun parseControllerPayload(joinPoint: JoinPoint): Map<String, Any> {
         val signature = joinPoint.signature as MethodSignature
         val args = joinPoint.args
-        val payload = mutableMapOf<String, Any>()
+        val payload = mutableMapOf<String, Any>(
-        payload["controller_method"] = joinPoint.signature.toShortString()
+            "controller_method" to joinPoint.signature.toShortString()
+        )
 
         val requestParams: MutableMap<String, Any> = mutableMapOf()
         val pathVariables: MutableMap<String, Any> = mutableMapOf()
+
         signature.method.parameters.forEachIndexed { index, parameter ->
             val arg = args[index]
 
@@ -93,9 +87,10 @@ class ControllerLoggingAspect(
             parameter.getAnnotation(RequestParam::class.java)?.let {
                 requestParams[parameter.name] = arg
             }
-        }
+        }.also {
             if (pathVariables.isNotEmpty()) payload["path_variable"] = pathVariables
             if (requestParams.isNotEmpty()) payload["request_param"] = requestParams
+        }
 
         return payload
     }

common/web/src/main/kotlin/com/sangdol/common/web/asepct/ServiceObservationAspect.kt

@@ -0,0 +1,26 @@
+package com.sangdol.common.web.asepct
+
+import io.micrometer.observation.Observation
+import io.micrometer.observation.ObservationRegistry
+import org.aspectj.lang.ProceedingJoinPoint
+import org.aspectj.lang.annotation.Around
+import org.aspectj.lang.annotation.Aspect
+import org.aspectj.lang.annotation.Pointcut
+
+@Aspect
+class ServiceObservationAspect(
+    private val observationRegistry: ObservationRegistry
+) {
+
+    @Pointcut("execution(* com.sangdol..business..*Service*.*(..))")
+    fun allServices() {
+    }
+
+    @Around("allServices()")
+    fun runWithObserve(joinPoint: ProceedingJoinPoint): Any? {
+        val methodName: String = joinPoint.signature.toShortString()
+
+        return Observation.createNotStarted(methodName, observationRegistry)
+            .observe<Any?> { joinPoint.proceed() }
+    }
+}

common/web/src/main/kotlin/com/sangdol/common/web/config/JacksonConfig.kt

@@ -0,0 +1,50 @@
+package com.sangdol.common.web.config
+
+import com.fasterxml.jackson.databind.DeserializationFeature
+import com.fasterxml.jackson.databind.ObjectMapper
+import com.fasterxml.jackson.databind.SerializationFeature
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateDeserializer
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalTimeDeserializer
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateSerializer
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalTimeSerializer
+import com.fasterxml.jackson.module.kotlin.kotlinModule
+import org.springframework.context.annotation.Bean
+import org.springframework.context.annotation.Configuration
+import java.time.LocalDate
+import java.time.LocalTime
+import java.time.format.DateTimeFormatter
+
+@Configuration
+class JacksonConfig {
+
+    companion object {
+        private val LOCAL_TIME_FORMATTER: DateTimeFormatter =
+            DateTimeFormatter.ofPattern("HH:mm")
+    }
+
+    @Bean
+    fun objectMapper(): ObjectMapper = ObjectMapper()
+        .registerModule(javaTimeModule())
+        .registerModule(kotlinModule())
+        .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
+        .configure(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false)
+
+    private fun javaTimeModule(): JavaTimeModule = JavaTimeModule()
+        .addSerializer(
+            LocalDate::class.java,
+            LocalDateSerializer(DateTimeFormatter.ISO_LOCAL_DATE)
+        )
+        .addDeserializer(
+            LocalDate::class.java,
+            LocalDateDeserializer(DateTimeFormatter.ISO_LOCAL_DATE)
+        )
+        .addSerializer(
+            LocalTime::class.java,
+            LocalTimeSerializer(LOCAL_TIME_FORMATTER)
+        )
+        .addDeserializer(
+            LocalTime::class.java,
+            LocalTimeDeserializer(LOCAL_TIME_FORMATTER)
+        ) as JavaTimeModule
+}

common/web/src/main/kotlin/com/sangdol/common/web/config/ObservationConfig.kt

@@ -0,0 +1,41 @@
+package com.sangdol.common.web.config
+
+import com.sangdol.common.web.asepct.ServiceObservationAspect
+import io.micrometer.observation.ObservationPredicate
+import io.micrometer.observation.ObservationRegistry
+import io.micrometer.observation.aop.ObservedAspect
+import jakarta.servlet.http.HttpServletRequest
+import org.springframework.beans.factory.annotation.Value
+import org.springframework.context.annotation.Bean
+import org.springframework.context.annotation.Configuration
+import org.springframework.http.server.observation.ServerRequestObservationContext
+
+@Configuration
+class ObservationConfig(
+    @Value("\${management.endpoints.web.base-path}") private val actuatorPath: String
+) {
+
+    @Bean
+    fun observedAspect(observationRegistry: ObservationRegistry): ObservedAspect {
+        return ObservedAspect(observationRegistry)
+    }
+
+    @Bean
+    fun serviceObservationAspect(observationRegistry: ObservationRegistry): ServiceObservationAspect {
+        return ServiceObservationAspect(observationRegistry)
+    }
+
+    @Bean
+    fun excludeActuatorPredicate(): ObservationPredicate {
+        return ObservationPredicate { _, context ->
+            if (context !is ServerRequestObservationContext) {
+                return@ObservationPredicate true
+            }
+
+            val servletRequest: HttpServletRequest = context.carrier
+            val requestUri = servletRequest.requestURI
+
+            !requestUri.contains(actuatorPath)
+        }
+    }
+}

common/web/src/main/kotlin/com/sangdol/common/web/config/WebLoggingConfig.kt

@@ -0,0 +1,40 @@
+package com.sangdol.common.web.config
+
+import com.fasterxml.jackson.databind.ObjectMapper
+import com.sangdol.common.web.asepct.ControllerLoggingAspect
+import com.sangdol.common.web.servlet.HttpRequestLoggingFilter
+import com.sangdol.common.web.support.log.WebLogMessageConverter
+import io.micrometer.tracing.CurrentTraceContext
+import org.springframework.boot.web.servlet.FilterRegistrationBean
+import org.springframework.context.annotation.Bean
+import org.springframework.context.annotation.Configuration
+import org.springframework.context.annotation.DependsOn
+import org.springframework.core.Ordered
+import org.springframework.web.filter.OncePerRequestFilter
+
+@Configuration
+class WebLoggingConfig {
+
+    @Bean
+    @DependsOn(value = ["webLogMessageConverter"])
+    fun filterRegistrationBean(
+        webLogMessageConverter: WebLogMessageConverter,
+        currentTraceContext: CurrentTraceContext
+    ): FilterRegistrationBean<OncePerRequestFilter> {
+        val filter = HttpRequestLoggingFilter(webLogMessageConverter, currentTraceContext)
+
+        return FilterRegistrationBean<OncePerRequestFilter>(filter)
+            .apply { this.order = Ordered.HIGHEST_PRECEDENCE + 2 }
+    }
+
+    @Bean
+    @DependsOn(value = ["webLogMessageConverter"])
+    fun apiLoggingAspect(webLogMessageConverter: WebLogMessageConverter): ControllerLoggingAspect {
+        return ControllerLoggingAspect(webLogMessageConverter)
+    }
+
+    @Bean
+    fun webLogMessageConverter(objectMapper: ObjectMapper): WebLogMessageConverter {
+        return WebLogMessageConverter(objectMapper)
+    }
+}

common/web/src/main/kotlin/com/sangdol/common/web/exception/GlobalExceptionhandler.kt

@@ -1,27 +1,25 @@
-package roomescape.common.exception
+package com.sangdol.common.web.exception
 
+import com.sangdol.common.types.exception.CommonErrorCode
+import com.sangdol.common.types.exception.ErrorCode
+import com.sangdol.common.types.exception.RoomescapeException
+import com.sangdol.common.types.web.CommonErrorResponse
+import com.sangdol.common.types.web.HttpStatus
+import com.sangdol.common.web.support.log.WebLogMessageConverter
 import io.github.oshai.kotlinlogging.KLogger
 import io.github.oshai.kotlinlogging.KotlinLogging
 import jakarta.servlet.http.HttpServletRequest
-import org.slf4j.MDC
-import org.springframework.http.HttpStatus
 import org.springframework.http.ResponseEntity
 import org.springframework.http.converter.HttpMessageNotReadableException
 import org.springframework.web.bind.MethodArgumentNotValidException
 import org.springframework.web.bind.annotation.ExceptionHandler
 import org.springframework.web.bind.annotation.RestControllerAdvice
-import roomescape.auth.exception.AuthException
-import roomescape.common.dto.response.CommonErrorResponse
-import roomescape.common.log.ApiLogMessageConverter
-import roomescape.common.log.ConvertResponseMessageRequest
-import roomescape.common.log.LogType
-import roomescape.common.log.getEndpoint
 
 private val log: KLogger = KotlinLogging.logger {}
 
 @RestControllerAdvice
-class ExceptionControllerAdvice(
+class GlobalExceptionHandler(
-    private val messageConverter: ApiLogMessageConverter
+    private val messageConverter: WebLogMessageConverter
 ) {
     @ExceptionHandler(value = [RoomescapeException::class])
     fun handleRoomException(
@@ -32,17 +30,10 @@ class ExceptionControllerAdvice(
         val httpStatus: HttpStatus = errorCode.httpStatus
         val errorResponse = CommonErrorResponse(errorCode)
 
-        val type = if (e is AuthException) LogType.AUTHENTICATION_FAILURE else LogType.APPLICATION_FAILURE
+        log.info { convertExceptionLogMessage(servletRequest, httpStatus, errorResponse, e) }
-        logException(
-            type = type,
-            servletRequest = servletRequest,
-            httpStatus = httpStatus.value(),
-            errorResponse = errorResponse,
-            exception = e
-        )
 
         return ResponseEntity
-            .status(httpStatus)
+            .status(httpStatus.value())
             .body(errorResponse)
     }
 
@@ -51,29 +42,24 @@ class ExceptionControllerAdvice(
         servletRequest: HttpServletRequest,
         e: Exception
     ): ResponseEntity<CommonErrorResponse> {
-        val message: String = if (e is MethodArgumentNotValidException) {
+        if (e is MethodArgumentNotValidException) {
             e.bindingResult.allErrors
                 .mapNotNull { it.defaultMessage }
                 .joinToString(", ")
         } else {
             e.message!!
+        }.also {
+            log.warn { "[ExceptionControllerAdvice] Invalid Request Value Exception occurred: $it" }
         }
-        log.debug { "[ExceptionControllerAdvice] Invalid Request Value Exception occurred: $message" }
 
         val errorCode: ErrorCode = CommonErrorCode.INVALID_INPUT_VALUE
         val httpStatus: HttpStatus = errorCode.httpStatus
         val errorResponse = CommonErrorResponse(errorCode)
 
-        logException(
+        log.warn { convertExceptionLogMessage(servletRequest, httpStatus, errorResponse, e) }
-            type = LogType.APPLICATION_FAILURE,
-            servletRequest = servletRequest,
-            httpStatus = httpStatus.value(),
-            errorResponse = errorResponse,
-            exception = e
-        )
 
         return ResponseEntity
-            .status(httpStatus)
+            .status(httpStatus.value())
             .body(errorResponse)
     }
 
@@ -88,40 +74,26 @@ class ExceptionControllerAdvice(
         val httpStatus: HttpStatus = errorCode.httpStatus
         val errorResponse = CommonErrorResponse(errorCode)
 
-        logException(
+        log.warn { convertExceptionLogMessage(servletRequest, httpStatus, errorResponse, e) }
-            type = LogType.UNHANDLED_EXCEPTION,
-            servletRequest = servletRequest,
-            httpStatus = httpStatus.value(),
-            errorResponse = errorResponse,
-            exception = e
-        )
 
         return ResponseEntity
-            .status(httpStatus)
+            .status(httpStatus.value())
             .body(errorResponse)
     }
 
-    private fun logException(
+    private fun convertExceptionLogMessage(
-        type: LogType,
         servletRequest: HttpServletRequest,
-        httpStatus: Int,
+        httpStatus: HttpStatus,
         errorResponse: CommonErrorResponse,
         exception: Exception
-    ) {
+    ): String {
-        val commonRequest = ConvertResponseMessageRequest(
+        val actualException: Exception? = if (errorResponse.message == exception.message) null else exception
-            type = type,
+
-            endpoint = servletRequest.getEndpoint(),
+        return messageConverter.convertToErrorResponseMessage(
+            servletRequest = servletRequest,
             httpStatus = httpStatus,
-            startTime = MDC.get("startTime")?.toLongOrNull(),
+            responseBody = errorResponse,
-            body = errorResponse,
+            exception = actualException
         )
-
-        val logMessage = if (errorResponse.message == exception.message) {
-            messageConverter.convertToResponseMessage(commonRequest)
-        } else {
-            messageConverter.convertToResponseMessage(commonRequest.copy(exception = exception))
-        }
-
-        log.warn { logMessage }
     }
 }

common/web/src/main/kotlin/com/sangdol/common/web/servlet/HttpRequestLoggingFilter.kt

@@ -1,11 +1,14 @@
-package roomescape.common.log
+package com.sangdol.common.web.servlet
 
+import com.sangdol.common.utils.MdcPrincipalIdUtil
+import com.sangdol.common.utils.MdcStartTimeUtil
+import com.sangdol.common.web.support.log.WebLogMessageConverter
 import io.github.oshai.kotlinlogging.KLogger
 import io.github.oshai.kotlinlogging.KotlinLogging
+import io.micrometer.tracing.CurrentTraceContext
 import jakarta.servlet.FilterChain
 import jakarta.servlet.http.HttpServletRequest
 import jakarta.servlet.http.HttpServletResponse
-import org.slf4j.MDC
 import org.springframework.web.filter.OncePerRequestFilter
 import org.springframework.web.util.ContentCachingRequestWrapper
 import org.springframework.web.util.ContentCachingResponseWrapper
@@ -13,7 +16,8 @@ import org.springframework.web.util.ContentCachingResponseWrapper
 private val log: KLogger = KotlinLogging.logger {}
 
 class HttpRequestLoggingFilter(
-    private val messageConverter: ApiLogMessageConverter
+    private val messageConverter: WebLogMessageConverter,
+    private val currentTraceContext: CurrentTraceContext
 ) : OncePerRequestFilter() {
     override fun doFilterInternal(
         request: HttpServletRequest,
@@ -25,15 +29,17 @@ class HttpRequestLoggingFilter(
         val cachedRequest = ContentCachingRequestWrapper(request)
         val cachedResponse = ContentCachingResponseWrapper(response)
 
-        val startTime = System.currentTimeMillis()
+        MdcStartTimeUtil.setCurrentTime()
-        MDC.put("startTime", startTime.toString())
 
         try {
             filterChain.doFilter(cachedRequest, cachedResponse)
             cachedResponse.copyBodyToResponse()
+        } catch (e: Exception) {
+            throw e
         } finally {
-            MDC.remove("startTime")
+            MdcStartTimeUtil.clear()
-            MDC.remove("member_id")
+            MdcPrincipalIdUtil.clear()
+            currentTraceContext.maybeScope(null)
         }
     }
 }

common/web/src/main/kotlin/com/sangdol/common/web/support/log/LogPayloadBuilder.kt

@@ -0,0 +1,75 @@
+package com.sangdol.common.web.support.log
+
+import com.sangdol.common.log.constant.LogType
+import com.sangdol.common.utils.MdcPrincipalIdUtil
+import com.sangdol.common.utils.MdcStartTimeUtil
+import jakarta.servlet.http.HttpServletRequest
+
+class LogPayloadBuilder(
+    private val type: LogType,
+    private val servletRequest: HttpServletRequest,
+    private val payload: MutableMap<String, Any> = mutableMapOf("type" to type)
+) {
+    fun endpoint(): LogPayloadBuilder {
+        payload["endpoint"] = "${servletRequest.method} ${servletRequest.requestURI}"
+        return this
+    }
+
+    fun clientIp(): LogPayloadBuilder {
+        servletRequest.remoteAddr?.let { payload["client_ip"] = it }
+        return this
+    }
+
+    fun userAgent(): LogPayloadBuilder {
+        servletRequest.getHeader("User-Agent")?.let { payload["user_agent"] = it }
+        return this
+    }
+
+    fun queryString(): LogPayloadBuilder {
+        servletRequest.queryString?.let { payload["query_params"] = it }
+        return this
+    }
+
+    fun httpStatus(statusCode: Int?): LogPayloadBuilder {
+        statusCode?.let { payload["status_code"] = it }
+
+        return this
+    }
+
+    fun responseBody(body: Any?): LogPayloadBuilder {
+        body?.let { payload["response_body"] = it }
+
+        return this
+    }
+
+    fun durationMs(): LogPayloadBuilder {
+        MdcStartTimeUtil.extractDurationMsOrNull()?.let { payload["duration_ms"] = it }
+        return this
+    }
+
+    fun principalId(): LogPayloadBuilder {
+        MdcPrincipalIdUtil.extractAsLongOrNull()
+            ?.let { payload["principal_id"] = it }
+            ?: run { payload["principal_id"] = "UNKNOWN" }
+
+        return this
+    }
+
+    fun exception(exception: Exception?): LogPayloadBuilder {
+        exception?.let {
+            payload["exception"] = mapOf(
+                "class" to it.javaClass.simpleName,
+                "message" to it.message
+            )
+        }
+
+        return this
+    }
+
+    fun additionalPayloads(payload: Map<String, Any>): LogPayloadBuilder {
+        this.payload.putAll(payload)
+        return this
+    }
+
+    fun build(): Map<String, Any> = payload
+}

common/web/src/main/kotlin/com/sangdol/common/web/support/log/WebLogMessageConverter.kt

@@ -0,0 +1,68 @@
+package com.sangdol.common.web.support.log
+
+import com.fasterxml.jackson.databind.ObjectMapper
+import com.sangdol.common.log.constant.LogType
+import com.sangdol.common.types.web.HttpStatus
+import jakarta.servlet.http.HttpServletRequest
+
+class WebLogMessageConverter(
+    private val objectMapper: ObjectMapper
+) {
+    fun convertToHttpRequestMessage(servletRequest: HttpServletRequest): String {
+        val payload = LogPayloadBuilder(type = LogType.INCOMING_HTTP_REQUEST, servletRequest = servletRequest)
+            .endpoint()
+            .queryString()
+            .clientIp()
+            .userAgent()
+            .build()
+
+        return objectMapper.writeValueAsString(payload)
+    }
+
+    fun convertToControllerInvokedMessage(
+        servletRequest: HttpServletRequest,
+        controllerPayload: Map<String, Any>
+    ): String {
+        val payload = LogPayloadBuilder(type = LogType.CONTROLLER_INVOKED, servletRequest = servletRequest)
+            .endpoint()
+            .principalId()
+            .additionalPayloads(controllerPayload)
+            .build()
+
+        return objectMapper.writeValueAsString(payload)
+    }
+
+    fun convertToResponseMessage(
+        type: LogType,
+        servletRequest: HttpServletRequest,
+        httpStatusCode: Int,
+        responseBody: Any? = null,
+        exception: Exception? = null,
+    ): String {
+        val payload = LogPayloadBuilder(type = type, servletRequest = servletRequest)
+            .endpoint()
+            .httpStatus(httpStatusCode)
+            .durationMs()
+            .principalId()
+            .responseBody(responseBody)
+            .exception(exception)
+            .build()
+
+        return objectMapper.writeValueAsString(payload)
+    }
+
+    fun convertToErrorResponseMessage(
+        servletRequest: HttpServletRequest,
+        httpStatus: HttpStatus,
+        responseBody: Any? = null,
+        exception: Exception? = null,
+    ): String {
+        val type = if (httpStatus.isClientError()) {
+            LogType.APPLICATION_FAILURE
+        } else {
+            LogType.UNHANDLED_EXCEPTION
+        }
+
+        return convertToResponseMessage(type, servletRequest, httpStatus.value(), responseBody, exception)
+    }
+}

common/web/src/test/kotlin/com/sangdol/common/web/config/JacksonConfigTest.kt

@@ -1,4 +1,4 @@
-package roomescape.common.config
+package com.sangdol.common.web.config
 
 import com.fasterxml.jackson.databind.ObjectMapper
 import com.fasterxml.jackson.databind.exc.InvalidFormatException
@@ -6,11 +6,12 @@ import io.kotest.assertions.throwables.shouldThrow
 import io.kotest.core.spec.style.FunSpec
 import io.kotest.matchers.shouldBe
 import io.kotest.matchers.string.shouldContain
-import java.time.*
+import java.time.LocalDate
+import java.time.LocalTime
 
-class JacksonConfigTest(
+class JacksonConfigTest : FunSpec({
-    private val objectMapper: ObjectMapper = JacksonConfig().objectMapper()
+
-) : FunSpec({
+    val objectMapper: ObjectMapper = JacksonConfig().objectMapper()
 
     context("날짜는 yyyy-mm-dd 형식이다.") {
         val date = "2025-07-14"
@@ -51,38 +52,4 @@ class JacksonConfigTest(
             }.message shouldContain "Text '$hour:$minute:$sec' could not be parsed"
         }
     }
-
-    context("Long 타입은 문자열로 (역)직렬화된다.") {
-        val number = 1234567890L
-        val serialized: String = objectMapper.writeValueAsString(number)
-        val deserialized: Long = objectMapper.readValue(serialized, Long::class.java)
-
-        test("Long 직렬화") {
-            serialized shouldBe "$number"
-        }
-
-        test("Long 역직렬화") {
-            deserialized shouldBe number
-        }
-    }
-
-    context("OffsetDateTime은 ISO 8601 형식으로 직렬화된다.") {
-        val date = LocalDate.of(2025, 7, 14)
-        val time = LocalTime.of(12, 30, 0)
-        val dateTime = OffsetDateTime.of(date, time, ZoneOffset.ofHours(9))
-        val serialized: String = objectMapper.writeValueAsString(dateTime)
-
-        test("OffsetDateTime 직렬화") {
-            serialized shouldBe "\"2025-07-14T12:30:00+09:00\""
-        }
-    }
-
-    context("LocalDateTime은 ISO 8601 형식으로 직렬화된다.") {
-        val dateTime = LocalDateTime.of(2025, 7, 14, 12, 30, 0)
-        val serialized: String = objectMapper.writeValueAsString(dateTime)
-
-        test("LocalDateTime 직렬화") {
-            serialized shouldBe "\"2025-07-14T12:30:00+09:00\""
-        }
-    }
 })

common/web/src/test/kotlin/com/sangdol/common/web/support/log/LogPayloadBuilderTest.kt

@@ -0,0 +1,233 @@
+package com.sangdol.common.web.support.log
+
+import com.sangdol.common.log.constant.LogType
+import com.sangdol.common.utils.MdcPrincipalIdUtil
+import com.sangdol.common.utils.MdcStartTimeUtil
+import io.kotest.core.spec.style.FunSpec
+import io.kotest.matchers.nulls.shouldNotBeNull
+import io.kotest.matchers.shouldBe
+import io.mockk.clearMocks
+import io.mockk.every
+import io.mockk.mockk
+import jakarta.servlet.http.HttpServletRequest
+
+class LogPayloadBuilderTest : FunSpec({
+    val servletRequest: HttpServletRequest = mockk()
+
+    lateinit var method: String
+    lateinit var requestUri: String
+    lateinit var remoteAddr: String
+    lateinit var userAgent: String
+    lateinit var queryString: String
+
+    beforeTest {
+        method = "GET".also { every { servletRequest.method } returns it }
+        requestUri = "/converter/test".also { every { servletRequest.requestURI } returns it }
+        remoteAddr = "localhost".also { every { servletRequest.remoteAddr } returns it }
+        userAgent = "Mozilla/5.0".also { every { servletRequest.getHeader("User-Agent") } returns it }
+        queryString = "key=value".also { every { servletRequest.queryString } returns it }
+    }
+
+    afterSpec {
+        clearMocks(servletRequest)
+    }
+
+    context("endpoint") {
+        test("정상 응답") {
+            val result = LogPayloadBuilder(type = LogType.INCOMING_HTTP_REQUEST, servletRequest = servletRequest)
+                .endpoint()
+                .build()
+
+            result["endpoint"] shouldBe "$method $requestUri"
+        }
+
+        test("ServletRequest에서 null이 반환되면 그대로 들어간다.") {
+            every { servletRequest.method } returns null
+            every { servletRequest.requestURI } returns null
+
+            val result = LogPayloadBuilder(type = LogType.INCOMING_HTTP_REQUEST, servletRequest = servletRequest)
+                .endpoint()
+                .build()
+
+            result["endpoint"] shouldBe "null null"
+        }
+    }
+
+    context("clientIp") {
+        test("정상 응답") {
+            val result = LogPayloadBuilder(type = LogType.INCOMING_HTTP_REQUEST, servletRequest = servletRequest)
+                .clientIp()
+                .build()
+
+            result["client_ip"] shouldBe remoteAddr
+        }
+
+        test("ServletRequest에서 null이 반환되면 추가되지 않는다.") {
+            every { servletRequest.remoteAddr } returns null
+
+            val result = LogPayloadBuilder(type = LogType.INCOMING_HTTP_REQUEST, servletRequest = servletRequest)
+                .clientIp()
+                .build()
+
+            result["client_ip"] shouldBe null
+        }
+    }
+
+    context("userAgent") {
+        test("정상 응답") {
+            val result = LogPayloadBuilder(type = LogType.INCOMING_HTTP_REQUEST, servletRequest = servletRequest)
+                .userAgent()
+                .build()
+
+            result["user_agent"] shouldBe userAgent
+        }
+
+        test("ServletRequest에서 null이 반환되면 추가되지 않는다.") {
+            every { servletRequest.getHeader("User-Agent") } returns null
+
+            val result = LogPayloadBuilder(type = LogType.INCOMING_HTTP_REQUEST, servletRequest = servletRequest)
+                .userAgent()
+                .build()
+
+            result["user_agent"] shouldBe null
+        }
+    }
+
+    context("queryString") {
+        test("정상 응답") {
+            val result = LogPayloadBuilder(type = LogType.INCOMING_HTTP_REQUEST, servletRequest = servletRequest)
+                .queryString()
+                .build()
+
+            result["query_params"] shouldBe queryString
+        }
+
+        test("ServletRequest에서 null이 반환되면 추가되지 않는다.") {
+            every { servletRequest.queryString } returns null
+
+            val result = LogPayloadBuilder(type = LogType.INCOMING_HTTP_REQUEST, servletRequest = servletRequest)
+                .queryString()
+                .build()
+
+            result["query_params"] shouldBe null
+        }
+    }
+
+    context("httpStatus") {
+        test("정상 응답") {
+            val result = LogPayloadBuilder(type = LogType.INCOMING_HTTP_REQUEST, servletRequest = servletRequest)
+                .httpStatus(200)
+                .build()
+
+            result["status_code"] shouldBe 200
+        }
+
+        test("null을 입력하면 추가되지 않는다.") {
+            val result = LogPayloadBuilder(type = LogType.INCOMING_HTTP_REQUEST, servletRequest = servletRequest)
+                .httpStatus(null)
+                .build()
+
+            result["status_code"] shouldBe null
+        }
+    }
+
+    context("responseBody") {
+        test("정상 응답") {
+            val body = mapOf("key" to "value")
+            val result = LogPayloadBuilder(type = LogType.INCOMING_HTTP_REQUEST, servletRequest = servletRequest)
+                .responseBody(body)
+                .build()
+
+            result["response_body"] shouldBe body
+        }
+
+        test("null을 입력하면 추가되지 않는다.") {
+            val result = LogPayloadBuilder(type = LogType.INCOMING_HTTP_REQUEST, servletRequest = servletRequest)
+                .responseBody(null)
+                .build()
+
+            result["response_body"] shouldBe null
+        }
+    }
+
+    context("durationMs") {
+        test("정상 응답") {
+            MdcStartTimeUtil.setCurrentTime()
+
+            val result = LogPayloadBuilder(type = LogType.INCOMING_HTTP_REQUEST, servletRequest = servletRequest)
+                .durationMs()
+                .build()
+
+            result["duration_ms"].shouldNotBeNull()
+            MdcStartTimeUtil.clear()
+        }
+
+        test("MDC에서 값을 가져올 수 없으면 추가되지 않는다.") {
+            val result = LogPayloadBuilder(type = LogType.INCOMING_HTTP_REQUEST, servletRequest = servletRequest)
+                .durationMs()
+                .build()
+
+            result["duration_ms"] shouldBe null
+        }
+    }
+
+    context("principalId") {
+        test("정상 응답") {
+            val principalId = 759980174446956066L.also {
+                MdcPrincipalIdUtil.set(it.toString())
+            }
+
+            val result = LogPayloadBuilder(type = LogType.INCOMING_HTTP_REQUEST, servletRequest = servletRequest)
+                .principalId()
+                .build()
+
+            result["principal_id"] shouldBe principalId
+            MdcPrincipalIdUtil.clear()
+        }
+
+        test("MDC에서 값을 가져올 수 없으면 UNKNOWN 으로 표기된다.") {
+            val result = LogPayloadBuilder(type = LogType.INCOMING_HTTP_REQUEST, servletRequest = servletRequest)
+                .principalId()
+                .build()
+
+            result["principal_id"] shouldBe "UNKNOWN"
+        }
+    }
+
+    context("exception") {
+        test("정상 응답") {
+            val exception = RuntimeException("hello")
+            val result = LogPayloadBuilder(type = LogType.INCOMING_HTTP_REQUEST, servletRequest = servletRequest)
+                .exception(exception)
+                .build()
+
+            result["exception"] shouldBe mapOf(
+                "class" to exception.javaClass.simpleName,
+                "message" to exception.message
+            )
+        }
+
+        test("null을 입력하면 추가되지 않는다.") {
+            val result = LogPayloadBuilder(type = LogType.INCOMING_HTTP_REQUEST, servletRequest = servletRequest)
+                .exception(null)
+                .build()
+
+            result["exception"] shouldBe null
+        }
+    }
+
+    context("additionalPayloads") {
+        test("정상 응답") {
+            val payload = mapOf(
+                "key1" to "value1",
+                "key2" to "value2"
+            )
+            val result = LogPayloadBuilder(type = LogType.INCOMING_HTTP_REQUEST, servletRequest = servletRequest)
+                .additionalPayloads(payload)
+                .build()
+
+            result["key1"] shouldBe "value1"
+            result["key2"] shouldBe "value2"
+        }
+    }
+})

common/web/src/test/kotlin/com/sangdol/common/web/support/log/WebLogMessageConverterTest.kt

@@ -0,0 +1,194 @@
+package com.sangdol.common.web.support.log
+
+import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
+import com.sangdol.common.log.constant.LogType
+import com.sangdol.common.types.web.HttpStatus
+import com.sangdol.common.utils.MdcPrincipalIdUtil
+import com.sangdol.common.utils.MdcStartTimeUtil
+import io.kotest.assertions.assertSoftly
+import io.kotest.core.spec.style.FunSpec
+import io.kotest.matchers.nulls.shouldNotBeNull
+import io.kotest.matchers.shouldBe
+import io.mockk.clearMocks
+import io.mockk.every
+import io.mockk.mockk
+import jakarta.servlet.http.HttpServletRequest
+
+class WebLogMessageConverterTest : FunSpec({
+
+    val objectMapper = jacksonObjectMapper()
+    val converter = WebLogMessageConverter(objectMapper)
+    val servletRequest: HttpServletRequest = mockk()
+
+    lateinit var method: String
+    lateinit var requestUri: String
+    lateinit var remoteAddr: String
+    lateinit var userAgent: String
+    lateinit var queryString: String
+
+    beforeTest {
+        method = "GET".also { every { servletRequest.method } returns it }
+        requestUri = "/converter/test".also { every { servletRequest.requestURI } returns it }
+        remoteAddr = "localhost".also { every { servletRequest.remoteAddr } returns it }
+        userAgent = "Mozilla/5.0".also { every { servletRequest.getHeader("User-Agent") } returns it }
+        queryString = "key=value".also { every { servletRequest.queryString } returns it }
+    }
+
+    afterSpec {
+        clearMocks(servletRequest)
+    }
+
+    context("Http 요청 메시지를 변환한다.") {
+        test("정상 응답") {
+            val result = converter.convertToHttpRequestMessage(servletRequest)
+
+            result shouldBe """
+                {"type":"${LogType.INCOMING_HTTP_REQUEST.name}","endpoint":"$method $requestUri","query_params":"$queryString","client_ip":"$remoteAddr","user_agent":"$userAgent"}
+            """.trimIndent()
+        }
+    }
+
+    context("Controller 요청 메시지를 변환한다") {
+        val principalId = 759980174446956066L.also {
+            MdcPrincipalIdUtil.set(it.toString())
+        }
+
+        test("정상 응답") {
+            val controllerPayload: Map<String, Any> = mapOf(
+                "controller_method" to "ThemeController.findThemeById(..)",
+                "path_variable" to mapOf("id" to "7599801744469560667")
+            )
+
+            val result = converter.convertToControllerInvokedMessage(servletRequest, controllerPayload)
+
+            result shouldBe """
+                {"type":"${LogType.CONTROLLER_INVOKED.name}","endpoint":"$method $requestUri","principal_id":$principalId,"controller_method":"${controllerPayload["controller_method"]}","path_variable":{"id":"${7599801744469560667}"}}
+             """.trimIndent()
+        }
+    }
+
+    context("응답 메시지를 변환한다.") {
+        val principalId = 7599801744469560666
+
+        val body = mapOf(
+            "id" to 7599801744469560667,
+            "name" to "sangdol"
+        )
+
+        val exception = RuntimeException("hello")
+
+        beforeTest {
+            MdcPrincipalIdUtil.set(principalId.toString())
+            MdcStartTimeUtil.setCurrentTime()
+        }
+
+        afterTest {
+            MdcPrincipalIdUtil.clear()
+            MdcStartTimeUtil.clear()
+        }
+
+        test("응답 본문을 포함한다.") {
+            val result = converter.convertToResponseMessage(
+                type = LogType.SUCCEED,
+                servletRequest = servletRequest,
+                httpStatusCode = HttpStatus.OK.value(),
+                responseBody = body
+            )
+
+            assertSoftly(objectMapper.readValue(result, LinkedHashMap::class.java)) {
+                this["type"] shouldBe LogType.SUCCEED.name
+                this["endpoint"] shouldBe "$method $requestUri"
+                this["status_code"] shouldBe HttpStatus.OK.value()
+                this["duration_ms"].shouldNotBeNull()
+                this["principal_id"] shouldBe principalId
+                this["response_body"] shouldBe body
+                this["exception"] shouldBe null
+            }
+        }
+
+        test("예외를 포함한다.") {
+            val result = converter.convertToResponseMessage(
+                type = LogType.SUCCEED,
+                servletRequest = servletRequest,
+                httpStatusCode = HttpStatus.OK.value(),
+                exception = exception
+            )
+
+            assertSoftly(objectMapper.readValue(result, LinkedHashMap::class.java)) {
+                this["type"] shouldBe LogType.SUCCEED.name
+                this["endpoint"] shouldBe "$method $requestUri"
+                this["status_code"] shouldBe HttpStatus.OK.value()
+                this["duration_ms"].shouldNotBeNull()
+                this["principal_id"] shouldBe principalId
+                this["response_body"] shouldBe null
+                this["exception"] shouldBe mapOf(
+                    "class" to exception.javaClass.simpleName,
+                    "message" to exception.message
+                )
+            }
+        }
+
+        test("예외 + 응답 본문을 모두 포함한다.") {
+            val result = converter.convertToResponseMessage(
+                type = LogType.SUCCEED,
+                servletRequest = servletRequest,
+                httpStatusCode = HttpStatus.OK.value(),
+                responseBody = body,
+                exception = exception
+            )
+
+            assertSoftly(objectMapper.readValue(result, LinkedHashMap::class.java)) {
+                this["type"] shouldBe LogType.SUCCEED.name
+                this["endpoint"] shouldBe "$method $requestUri"
+                this["status_code"] shouldBe HttpStatus.OK.value()
+                this["duration_ms"].shouldNotBeNull()
+                this["principal_id"] shouldBe principalId
+                this["response_body"] shouldBe body
+                this["exception"] shouldBe mapOf(
+                    "class" to exception.javaClass.simpleName,
+                    "message" to exception.message
+                )
+            }
+        }
+
+        test("예외, 응답 본문 모두 제외한다.") {
+            val result = converter.convertToResponseMessage(
+                type = LogType.SUCCEED,
+                servletRequest = servletRequest,
+                httpStatusCode = HttpStatus.OK.value(),
+            )
+
+            assertSoftly(objectMapper.readValue(result, LinkedHashMap::class.java)) {
+                this["type"] shouldBe LogType.SUCCEED.name
+                this["endpoint"] shouldBe "$method $requestUri"
+                this["status_code"] shouldBe HttpStatus.OK.value()
+                this["duration_ms"].shouldNotBeNull()
+                this["principal_id"] shouldBe principalId
+                this["response_body"] shouldBe null
+                this["exception"] shouldBe null
+            }
+        }
+
+        test("4xx 에러가 발생하면 ${LogType.APPLICATION_FAILURE} 타입으로 변환한다.") {
+            val result = converter.convertToErrorResponseMessage(
+                servletRequest = servletRequest,
+                httpStatus = HttpStatus.BAD_REQUEST,
+            )
+
+            assertSoftly(objectMapper.readValue(result, LinkedHashMap::class.java)) {
+                this["type"] shouldBe LogType.APPLICATION_FAILURE.name
+            }
+        }
+
+        test("5xx 에러가 발생하면 ${LogType.UNHANDLED_EXCEPTION} 타입으로 변환한다.") {
+            val result = converter.convertToErrorResponseMessage(
+                servletRequest = servletRequest,
+                httpStatus = HttpStatus.INTERNAL_SERVER_ERROR,
+            )
+
+            assertSoftly(objectMapper.readValue(result, LinkedHashMap::class.java)) {
+                this["type"] shouldBe LogType.UNHANDLED_EXCEPTION.name
+            }
+        }
+    }
+})

docker/docker-compose.yaml

@@ -0,0 +1,14 @@
+services:
+  mysql-local:
+    image: mysql:8.4
+    container_name: mysql-local
+    restart: always
+    ports:
+      - "23306:3306"
+    environment:
+      MYSQL_ROOT_PASSWORD: init
+      MYSQL_DATABASE: roomescape_local
+      TZ: UTC
+    command:
+      - --character-set-server=utf8mb4
+      - --collation-server=utf8mb4_unicode_ci

frontend/.dockerignore

@@ -1,6 +1,18 @@
-node_modules
 .git
-.DS_Store
+.gitignore
+
+# Node.js
+node_modules
 npm-debug.log
-dist
+
+# Build output
 build
+dist
+
+# Editor/OS specific
+.vscode
+.idea
+.DS_Store
+
+# Environment variables
+.env*

frontend/Dockerfile

@@ -1,18 +1,17 @@
-# Stage 1: Build the React app
+FROM node:24-alpine AS builder
-FROM node:24 AS builder
 WORKDIR /app
-COPY package.json ./
-COPY package-lock.json ./
 
-RUN npm install --frozen-lockfile
+COPY package.json package-lock.json ./
+
+RUN npm ci
 
 COPY . .
 
 RUN npm run build
+FROM nginx:1.27-alpine
 
-# Stage 2: Serve with Nginx
-FROM nginx:latest
 COPY --from=builder /app/dist /usr/share/nginx/html
 COPY nginx.conf /etc/nginx/conf.d/default.conf
+
 EXPOSE 80
 CMD ["nginx", "-g", "daemon off;"]

frontend/src/App.tsx

@@ -1,10 +1,12 @@
-import {BrowserRouter as Router, Route, Routes} from 'react-router-dom';
+import { BrowserRouter as Router, Route, Routes } from 'react-router-dom';
-import AdminRoute from './components/AdminRoute';
 import Layout from './components/Layout';
-import {AuthProvider} from './context/AuthContext';
+import { AdminAuthProvider } from './context/AdminAuthContext';
+import { AuthProvider } from './context/AuthContext';
 import AdminLayout from './pages/admin/AdminLayout';
+import AdminLoginPage from './pages/admin/AdminLoginPage';
 import AdminPage from './pages/admin/AdminPage';
 import AdminSchedulePage from './pages/admin/AdminSchedulePage';
+import AdminStorePage from './pages/admin/AdminStorePage';
 import AdminThemeEditPage from './pages/admin/AdminThemeEditPage';
 import AdminThemePage from './pages/admin/AdminThemePage';
 import HomePage from '@_pages/HomePage';
@@ -16,26 +18,28 @@ import ReservationStep2Page from '@_pages/ReservationStep2Page';
 import ReservationSuccessPage from '@_pages/ReservationSuccessPage';
 import SignupPage from '@_pages/SignupPage';
 
-const AdminRoutes = () => (
-    <AdminLayout>
-        <Routes>
-            <Route path="/" element={<AdminPage />} />
-            <Route path="/theme" element={<AdminThemePage />} />
-            <Route path="/theme/edit/:themeId" element={<AdminThemeEditPage />} />
-            <Route path="/schedule" element={<AdminSchedulePage />} />
-        </Routes>
-    </AdminLayout>
-);
-
 function App() {
     return (
         <AuthProvider>
             <Router>
                 <Routes>
                     <Route path="/admin/*" element={
-                        <AdminRoute>
+                        <AdminAuthProvider>
-                            <AdminRoutes />
+                            <Routes>
-                        </AdminRoute>
+                                <Route path="/login" element={<AdminLoginPage />} />
+                                <Route path="/*" element={
+                                    <AdminLayout>
+                                        <Routes>
+                                            <Route path="/" element={<AdminPage />} />
+                                            <Route path="/theme" element={<AdminThemePage />} />
+                                            <Route path="/theme/edit/:themeId" element={<AdminThemeEditPage />} />
+                                            <Route path="/store" element={<AdminStorePage />} />
+                                            <Route path="/schedule" element={<AdminSchedulePage />} />
+                                        </Routes>
+                                    </AdminLayout>
+                                } />
+                            </Routes>
+                        </AdminAuthProvider>
                     } />
                     <Route path="/*" element={
                         <Layout>

frontend/src/api/apiClient.ts

@@ -1,5 +1,6 @@
 import axios, {type AxiosError, type AxiosRequestConfig, type Method} from 'axios';
 import JSONbig from 'json-bigint';
+import { PrincipalType } from './auth/authTypes';
 
 // Create a JSONbig instance that stores big integers as strings
 const JSONbigString = JSONbig({ storeAsString: true });
@@ -38,7 +39,7 @@ async function request<T>(
     method: Method,
     endpoint: string,
     data: object = {},
-    isRequiredAuth: boolean = false
+    type: PrincipalType,
 ): Promise<T> {
     const config: AxiosRequestConfig = {
         method,
@@ -48,8 +49,9 @@ async function request<T>(
         },
     };
 
+    const accessTokenKey = type === PrincipalType.ADMIN ? 'adminAccessToken' : 'accessToken';
+    const accessToken = localStorage.getItem(accessTokenKey);
 
-    const accessToken = localStorage.getItem('accessToken');
     if (accessToken) {
         if (!config.headers) {
             config.headers = {};
@@ -57,7 +59,6 @@ async function request<T>(
         config.headers['Authorization'] = `Bearer ${accessToken}`;
     }
 
-
     if (method.toUpperCase() !== 'GET') {
         config.data = data;
     }
@@ -72,30 +73,50 @@ async function request<T>(
     }
 }
 
-async function get<T>(endpoint: string, isRequiredAuth: boolean = false): Promise<T> {
+async function get<T>(endpoint: string): Promise<T> {
-    return request<T>('GET', endpoint, {}, isRequiredAuth);
+    return request<T>('GET', endpoint, {}, PrincipalType.USER);
 }
 
-async function post<T>(endpoint: string, data: object = {}, isRequiredAuth: boolean = false): Promise<T> {
+async function adminGet<T>(endpoint: string): Promise<T> {
-    return request<T>('POST', endpoint, data, isRequiredAuth);
+    return request<T>('GET', endpoint, {}, PrincipalType.ADMIN);
 }
 
-async function put<T>(endpoint: string, data: object = {}, isRequiredAuth: boolean = false): Promise<T> {
+async function post<T>(endpoint: string, data: object = {}): Promise<T> {
-    return request<T>('PUT', endpoint, data, isRequiredAuth);
+    return request<T>('POST', endpoint, data, PrincipalType.USER);
 }
 
-async function patch<T>(endpoint: string, data: object = {}, isRequiredAuth: boolean = false): Promise<T> {
+async function adminPost<T>(endpoint: string, data: object = {}): Promise<T> {
-    return request<T>('PATCH', endpoint, data, isRequiredAuth);
+    return request<T>('POST', endpoint, data, PrincipalType.ADMIN);
 }
 
-async function del<T>(endpoint: string, isRequiredAuth: boolean = false): Promise<T> {
+async function put<T>(endpoint: string, data: object = {}): Promise<T> {
-    return request<T>('DELETE', endpoint, {}, isRequiredAuth);
+    return request<T>('PUT', endpoint, data, PrincipalType.USER);
+}
+
+async function adminPut<T>(endpoint: string, data: object = {}): Promise<T> {
+    return request<T>('PUT', endpoint, data, PrincipalType.ADMIN);
+}
+
+async function patch<T>(endpoint: string, data: object = {}): Promise<T> {
+    return request<T>('PATCH', endpoint, data, PrincipalType.USER);
+}
+
+async function adminPatch<T>(endpoint: string, data: object = {}): Promise<T> {
+    return request<T>('PATCH', endpoint, data, PrincipalType.ADMIN);
+}
+
+async function del<T>(endpoint: string): Promise<T> {
+    return request<T>('DELETE', endpoint, {}, PrincipalType.USER);
+}
+
+async function adminDel<T>(endpoint: string): Promise<T> {
+    return request<T>('DELETE', endpoint, {}, PrincipalType.ADMIN);
 }
 
 export default {
-    get,
+    get, adminGet,
-    post,
+    post, adminPost,
-    put,
+    put, adminPut,
-    patch,
+    patch, adminPatch,
-    del
+    del, adminDel,
 };

frontend/src/api/auth/authAPI.ts

@@ -1,19 +1,33 @@
 import apiClient from '@_api/apiClient';
-import type {CurrentUserContext, LoginRequest, LoginSuccessResponse} from './authTypes';
+import {
+    type AdminLoginSuccessResponse,
+    type LoginRequest,
+    PrincipalType,
+    type UserLoginSuccessResponse,
+} from './authTypes';
 
-
+export const userLogin = async (
-export const login = async (data: LoginRequest): Promise<LoginSuccessResponse> => {
+    data: Omit<LoginRequest, 'principalType'>,
-    const response = await apiClient.post<LoginSuccessResponse>('/auth/login', data, false);
+): Promise<UserLoginSuccessResponse> => {
-    localStorage.setItem('accessToken', response.accessToken);
+    return await apiClient.post<UserLoginSuccessResponse>(
-
+        '/auth/login',
-    return response;
+        { ...data, principalType: PrincipalType.USER },
+    );
 };
 
-export const checkLogin = async (): Promise<CurrentUserContext> => {
+export const adminLogin = async (
-    return await apiClient.get<CurrentUserContext>('/auth/login/check', true);
+    data: Omit<LoginRequest, 'principalType'>,
+): Promise<AdminLoginSuccessResponse> => {
+    return await apiClient.adminPost<AdminLoginSuccessResponse>(
+        '/auth/login',
+        { ...data, principalType: PrincipalType.ADMIN },
+    );
 };
 
 export const logout = async (): Promise<void> => {
-    await apiClient.post('/auth/logout', {}, true);
+    await apiClient.post('/auth/logout', {});
-    localStorage.removeItem('accessToken');
 };
+
+export const adminLogout = async (): Promise<void> => {
+    await apiClient.adminPost('/auth/logout', {});
+}

frontend/src/api/auth/authTypes.ts

@@ -5,6 +5,13 @@ export const PrincipalType = {
 
 export type PrincipalType = typeof PrincipalType[keyof typeof PrincipalType];
 
+export const AdminType = {
+    HQ: 'HQ',
+    STORE: 'STORE',
+} as const;
+
+export type AdminType = typeof AdminType[keyof typeof AdminType];
+
 export interface LoginRequest {
     account: string,
     password: string;
@@ -13,6 +20,15 @@ export interface LoginRequest {
 
 export interface LoginSuccessResponse {
     accessToken: string;
+    name: string;
+}
+
+export interface UserLoginSuccessResponse extends LoginSuccessResponse {
+}
+
+export interface AdminLoginSuccessResponse extends LoginSuccessResponse {
+    type: AdminType;
+    storeId: string | null;
 }
 
 export interface CurrentUserContext {

frontend/src/api/common/commonTypes.ts

@@ -0,0 +1,11 @@
+export interface OperatorInfo {
+    id: string;
+    name: string;
+}
+
+export interface AuditInfo {
+    createdAt: string;
+    updatedAt: string;
+    createdBy: OperatorInfo;
+    updatedBy: OperatorInfo;
+}

frontend/src/api/order/orderAPI.ts

@@ -0,0 +1,12 @@
+import apiClient from "@_api/apiClient";
+import type { PaymentConfirmRequest } from "@_api/payment/PaymentTypes";
+
+export const confirm = async (
+    reservationId: string,
+    data: PaymentConfirmRequest,
+): Promise<void> => {
+    return await apiClient.post<void>(
+        `/orders/${reservationId}/confirm`,
+        data
+    );
+};

frontend/src/api/order/orderTypes.ts

@@ -0,0 +1,5 @@
+export interface OrderErrorResponse {
+    code: string;
+    message: string;
+    trial: number;
+}

frontend/src/api/payment/PaymentTypes.ts

@@ -2,7 +2,6 @@ export interface PaymentConfirmRequest {
     paymentKey: string;
     orderId: string;
     amount: number;
-    paymentType: PaymentType;
 }
 
 export interface PaymentCancelRequest {

frontend/src/api/region/regionAPI.ts

@@ -0,0 +1,14 @@
+import apiClient from "@_api/apiClient";
+import type { RegionCodeResponse, SidoListResponse, SigunguListResponse } from "./regionTypes";
+
+export const fetchSidoList = async (): Promise<SidoListResponse> => {
+    return await apiClient.get(`/regions/sido`);
+};
+
+export const fetchSigunguList = async (sidoCode: string): Promise<SigunguListResponse> => {
+    return await apiClient.get(`/regions/sigungu?sidoCode=${sidoCode}`);
+}
+
+export const fetchRegionCode = async (sidoCode: string, sigunguCode: string): Promise<RegionCodeResponse> => {
+    return await apiClient.get(`/regions/code?sidoCode=${sidoCode}&sigunguCode=${sigunguCode}`);
+}

frontend/src/api/region/regionTypes.ts

@@ -0,0 +1,27 @@
+export interface SidoResponse {
+    code: string,
+    name: string,
+}
+
+export interface SidoListResponse {
+    sidoList: SidoResponse[]
+}
+
+export interface SigunguResponse {
+    code: string,
+    name: string,
+}
+
+export interface SigunguListResponse {
+    sigunguList: SigunguResponse[]
+}
+
+export interface RegionCodeResponse {
+    code: string
+}
+
+export interface RegionInfoResponse {
+    code: string,
+    sidoName: string,
+    sigunguName: string,
+}

frontend/src/api/reservation/reservationAPI.ts

@@ -4,7 +4,7 @@ import type {
     PendingReservationCreateRequest,
     PendingReservationCreateResponse,
     ReservationDetailRetrieveResponse,
-    ReservationSummaryRetrieveListResponse
+    ReservationOverviewListResponse
 } from './reservationTypes';
 
 export const createPendingReservation = async (request: PendingReservationCreateRequest): Promise<PendingReservationCreateResponse> => {
@@ -17,11 +17,11 @@ export const confirmReservation = async (reservationId: string): Promise<void> =
 
 
 export const cancelReservation = async (id: string, cancelReason: string): Promise<void> => {
-    return await apiClient.post(`/reservations/${id}/cancel`, { cancelReason }, true);
+    return await apiClient.post(`/reservations/${id}/cancel`, { cancelReason });
 };
 
-export const fetchSummaryByMember = async (): Promise<ReservationSummaryRetrieveListResponse> => {
+export const fetchAllOverviewByUser = async (): Promise<ReservationOverviewListResponse> => {
-    return await apiClient.get<ReservationSummaryRetrieveListResponse>('/reservations/summary');
+    return await apiClient.get<ReservationOverviewListResponse>('/reservations/overview');
 }
 
 export const fetchDetailById = async (reservationId: string): Promise<ReservationDetailRetrieveResponse> => {
@@ -29,5 +29,5 @@ export const fetchDetailById = async (reservationId: string): Promise<Reservatio
 }
 
 export const fetchMostReservedThemeIds = async (count: number = 10): Promise<MostReservedThemeIdListResponse> => {
-    return await apiClient.get<MostReservedThemeIdListResponse>(`/reservations/popular-themes?count=${count}`, false);
+    return await apiClient.get<MostReservedThemeIdListResponse>(`/reservations/popular-themes?count=${count}`);
 }

frontend/src/api/reservation/reservationTypes.ts

@@ -1,6 +1,24 @@
 import type {PaymentRetrieveResponse} from "@_api/payment/PaymentTypes";
 import type {UserContactRetrieveResponse} from "@_api/user/userTypes";
 
+export interface ReservationData {
+    scheduleId: string;
+    store: {
+        id: string;
+        name: string;
+    }
+    theme: {
+        id: string;
+        name: string;
+        price: number;
+        minParticipants: number;
+        maxParticipants: number;
+    }
+    date: string; // "yyyy-MM-dd"
+    startFrom: string; // "HH:mm ~ HH:mm"
+    endAt: string;
+}
+
 export const ReservationStatus = {
     PENDING: 'PENDING',
     CONFIRMED: 'CONFIRMED',
@@ -28,30 +46,38 @@ export interface PendingReservationCreateResponse {
   id: string
 }
 
-export interface ReservationSummaryRetrieveResponse {
+export interface ReservationOverviewResponse {
   id: string;
+  storeName: string;
   themeName: string;
   date: string;
-  startAt: string;
+  startFrom: string;
+  endAt: string;
   status: ReservationStatus;
 }
 
-export interface ReservationSummaryRetrieveListResponse {
+export interface ReservationOverviewListResponse {
-  reservations: ReservationSummaryRetrieveResponse[];
+  reservations: ReservationOverviewResponse[];
+}
+
+export interface ReserverInfo {
+  name: string;
+  contact: string;
+  participantCount: number;
+  requirement: string;
 }
 
 export interface ReservationDetailRetrieveResponse {
     id: string;
+    reserver: ReserverInfo;
     user: UserContactRetrieveResponse;
     applicationDateTime: string; 
     payment: PaymentRetrieveResponse;
 }
 
 export interface ReservationDetail {
-    id: string;
+    overview: ReservationOverviewResponse;
-    themeName: string;
+    reserver: ReserverInfo;
-    date: string;
-    startAt: string;
     user: UserContactRetrieveResponse;
     applicationDateTime: string;
     payment?: PaymentRetrieveResponse;

frontend/src/api/schedule/scheduleAPI.ts

@@ -1,37 +1,55 @@
-import apiClient from '../apiClient';
+import apiClient from "@_api/apiClient";
+import type {AuditInfo} from "@_api/common/commonTypes";
 import type {
-    AvailableThemeIdListResponse,
+    AdminScheduleSummaryListResponse,
     ScheduleCreateRequest,
     ScheduleCreateResponse,
-    ScheduleDetailRetrieveResponse,
+    ScheduleUpdateRequest,
-    ScheduleRetrieveListResponse,
+    ScheduleWithThemeListResponse
-    ScheduleUpdateRequest
+} from "./scheduleTypes";
-} from './scheduleTypes';
 
-export const findAvailableThemesByDate = async (date: string): Promise<AvailableThemeIdListResponse> => {
+// admin 
-    return await apiClient.get<AvailableThemeIdListResponse>(`/schedules/themes?date=${date}`);
+export const fetchAdminSchedules = async (storeId: string, date?: string, themeId?: string): Promise<AdminScheduleSummaryListResponse> => {
-};
+    const queryParams: string[] = [];
 
-export const findSchedules = async (date: string, themeId: string): Promise<ScheduleRetrieveListResponse> => {
+    if (date && date.trim() !== '') {
-    return await apiClient.get<ScheduleRetrieveListResponse>(`/schedules?date=${date}&themeId=${themeId}`);
+        queryParams.push(`date=${date}`);
-};
+    }
     
-export const findScheduleById = async (id: string): Promise<ScheduleDetailRetrieveResponse> => {
+    if (themeId && themeId.trim() !== '') {
-    return await apiClient.get<ScheduleDetailRetrieveResponse>(`/schedules/${id}`);
+        queryParams.push(`themeId=${themeId}`);
+    }
+    
+    // 기본 URL에 쿼리 파라미터 추가
+    const baseUrl = `/admin/stores/${storeId}/schedules`;
+    const fullUrl = queryParams.length > 0
+        ? `${baseUrl}?${queryParams.join('&')}`
+        : baseUrl;
+
+    return await apiClient.adminGet<AdminScheduleSummaryListResponse>(fullUrl);
 }
 
-export const createSchedule = async (request: ScheduleCreateRequest): Promise<ScheduleCreateResponse> => {
+export const fetchScheduleAudit = async (scheduleId: string): Promise<AuditInfo> => {
-    return await apiClient.post<ScheduleCreateResponse>('/schedules', request);
+    return await apiClient.adminGet<AuditInfo>(`/admin/schedules/${scheduleId}/audits`);
+}
+
+export const createSchedule = async (storeId: string, request: ScheduleCreateRequest): Promise<ScheduleCreateResponse> => {
+    return await apiClient.adminPost<ScheduleCreateResponse>(`/admin/stores/${storeId}/schedules`, request);
 };
 
 export const updateSchedule = async (id: string, request: ScheduleUpdateRequest): Promise<void> => {
-    await apiClient.patch(`/schedules/${id}`, request);
+    return await apiClient.adminPatch<void>(`/admin/schedules/${id}`, request);
 };
 
 export const deleteSchedule = async (id: string): Promise<void> => {
-    await apiClient.del(`/schedules/${id}`);
+    return await apiClient.adminDel<void>(`/admin/schedules/${id}`);
 };
 
+// public
 export const holdSchedule = async (id: string): Promise<void> => {
-    await apiClient.patch(`/schedules/${id}/hold`, {});
+    return await apiClient.post<void>(`/schedules/${id}/hold`);
+};
+
+export const fetchSchedules = async (storeId: string, date: string): Promise<ScheduleWithThemeListResponse> => {
+        return await apiClient.get<ScheduleWithThemeListResponse>(`/stores/${storeId}/schedules?date=${date}`);
 };

frontend/src/api/schedule/scheduleTypes.ts

@@ -7,24 +7,11 @@ export const ScheduleStatus = {
     BLOCKED: 'BLOCKED' as ScheduleStatus,
 };
 
-export interface AvailableThemeIdListResponse {
+// Admin
-    themeIds: string[];
-}
-
-export interface ScheduleRetrieveResponse {
-    id: string;
-    time: string; // "HH:mm"
-    status: ScheduleStatus;
-}
-
-export interface ScheduleRetrieveListResponse {
-    schedules: ScheduleRetrieveResponse[];
-}
-
 export interface ScheduleCreateRequest {
-    date: string; // "yyyy-MM-dd"
+    date: string;
-    time: string; // "HH:mm"
     themeId: string;
+    time: string;
 }
 
 export interface ScheduleCreateResponse {
@@ -38,13 +25,48 @@ export interface ScheduleUpdateRequest {
     status?: ScheduleStatus;
 }
 
-export interface ScheduleDetailRetrieveResponse {
+export interface AdminScheduleSummaryResponse {
-    id: string;
+    id: string,
-    date: string; // "yyyy-MM-dd"
+    themeName: string,
-    time: string; // "HH:mm"
+    startFrom: string,
-    status: ScheduleStatus;
+    endAt: string,
-    createdAt: string; // or Date
+    status: ScheduleStatus,
-    createdBy: string;
+}
-    updatedAt: string; // or Date
+
-    updatedBy: string;
+export interface AdminScheduleSummaryListResponse {
+    schedules: AdminScheduleSummaryResponse[];
+}
+
+// Public
+export interface ScheduleResponse {
+    id: string;
+    date: string;
+    startFrom: string;
+    endAt: string;
+    status: ScheduleStatus;
+}
+
+export interface ScheduleThemeInfo {
+    id: string;
+    name: string;
+}
+
+export interface ScheduleStoreInfo {
+    id: string;
+    name: string;
+}
+
+export interface ScheduleWithStoreAndThemeResponse {
+    schedule: ScheduleResponse,
+    theme: ScheduleThemeInfo,
+    store: ScheduleStoreInfo,
+}
+
+export interface ScheduleWithThemeResponse {
+    schedule: ScheduleResponse,
+    theme: ScheduleThemeInfo
+}
+
+export interface ScheduleWithThemeListResponse {
+    schedules: ScheduleWithThemeResponse[];
 }

frontend/src/api/store/storeAPI.ts

@@ -0,0 +1,48 @@
+import apiClient from '@_api/apiClient';
+import type {
+    SimpleStoreListResponse,
+    StoreCreateResponse,
+    StoreDetailResponse,
+    StoreInfoResponse,
+    StoreRegisterRequest,
+    UpdateStoreRequest
+} from './storeTypes';
+
+export const getStores = async (sidoCode?: string, sigunguCode?: string): Promise<SimpleStoreListResponse> => {
+    const queryParams: string[] = [];
+
+    if (sidoCode && sidoCode.trim() !== '') {
+        queryParams.push(`sido=${sidoCode}`);
+    }
+
+    if (sigunguCode && sigunguCode.trim() !== '') {
+        queryParams.push(`sigungu=${sigunguCode}`);
+    }
+
+    const baseUrl = `/stores`;
+    const fullUrl = queryParams.length > 0
+        ? `${baseUrl}?${queryParams.join('&')}`
+        : baseUrl;
+
+        return await apiClient.get(fullUrl);
+};
+
+export const getStoreInfo = async (id: string): Promise<StoreInfoResponse> => {
+    return await apiClient.get(`/stores/${id}`);
+}
+
+export const getStoreDetail = async (id: string): Promise<StoreDetailResponse> => {
+    return await apiClient.adminGet(`/admin/stores/${id}/detail`);
+};
+
+export const createStore = async (request: StoreRegisterRequest): Promise<StoreCreateResponse> => {
+    return await apiClient.adminPost<StoreCreateResponse>('/admin/stores', request);
+};
+
+export const updateStore = async (id: string, request: UpdateStoreRequest): Promise<void> => {
+    await apiClient.adminPatch(`/admin/stores/${id}`, request);
+};
+
+export const deleteStore = async (id: string): Promise<void> => {
+    await apiClient.adminPost(`/admin/stores/${id}/disable`, {});
+};

frontend/src/api/store/storeTypes.ts

@@ -0,0 +1,48 @@
+import {type AuditInfo} from '@_api/common/commonTypes';
+import type {RegionInfoResponse} from '@_api/region/regionTypes';
+
+export interface SimpleStoreResponse {
+    id: string;
+    name: string;
+}
+
+export interface SimpleStoreListResponse {
+    stores: SimpleStoreResponse[];
+}
+
+export interface StoreDetailResponse {
+    id: string;
+    name: string;
+    address: string;
+    contact: string;
+    businessRegNum: string;
+    region: RegionInfoResponse;
+    audit: AuditInfo;
+}
+
+export interface StoreRegisterRequest {
+    name: string;
+    address: string;
+    contact: string;
+    businessRegNum: string;
+    regionCode: string;
+}
+
+export interface UpdateStoreRequest {
+    name?: string;
+    address?: string;
+    contact?: string;
+    regionCode?: string;
+}
+
+export interface StoreInfoResponse {
+    id: string;
+    name: string;
+    address: string;
+    contact: string;
+    businessRegNum: string;
+}
+
+export interface StoreCreateResponse {
+    id: string;
+}

frontend/src/api/theme/themeAPI.ts

@@ -1,38 +1,48 @@
 import apiClient from '@_api/apiClient';
 import type {
-    AdminThemeDetailRetrieveResponse,
+    AdminThemeDetailResponse,
-    AdminThemeSummaryRetrieveListResponse,
+    AdminThemeSummaryListResponse,
+    SimpleActiveThemeListResponse,
     ThemeCreateRequest,
     ThemeCreateResponse,
     ThemeIdListResponse,
     ThemeInfoListResponse,
+    ThemeInfoResponse,
     ThemeUpdateRequest
 } from './themeTypes';
 
-export const fetchAdminThemes = async (): Promise<AdminThemeSummaryRetrieveListResponse> => {
+export const fetchAdminThemes = async (): Promise<AdminThemeSummaryListResponse> => {
-    return await apiClient.get<AdminThemeSummaryRetrieveListResponse>('/admin/themes');
+    return await apiClient.adminGet<AdminThemeSummaryListResponse>('/admin/themes');
 };
 
-export const fetchAdminThemeDetail = async (id: string): Promise<AdminThemeDetailRetrieveResponse> => {
+export const fetchAdminThemeDetail = async (id: string): Promise<AdminThemeDetailResponse> => {
-    return await apiClient.get<AdminThemeDetailRetrieveResponse>(`/admin/themes/${id}`);
+    return await apiClient.adminGet<AdminThemeDetailResponse>(`/admin/themes/${id}`);
 };
 
 export const createTheme = async (themeData: ThemeCreateRequest): Promise<ThemeCreateResponse> => {
-    return await apiClient.post<ThemeCreateResponse>('/admin/themes', themeData);
+    return await apiClient.adminPost<ThemeCreateResponse>('/admin/themes', themeData);
 };
 
 export const updateTheme = async (id: string, themeData: ThemeUpdateRequest): Promise<void> => {
-    await apiClient.patch<any>(`/admin/themes/${id}`, themeData);
+    await apiClient.adminPatch<any>(`/admin/themes/${id}`, themeData);
 };
 
 export const deleteTheme = async (id: string): Promise<void> => {
-    await apiClient.del<any>(`/admin/themes/${id}`);
+    await apiClient.adminDel<any>(`/admin/themes/${id}`);
 };
 
-export const fetchUserThemes = async (): Promise<ThemeInfoListResponse> => {
+export const fetchActiveThemes = async (): Promise<SimpleActiveThemeListResponse> => {
-    return await apiClient.get<ThemeInfoListResponse>('/themes');
+    return await apiClient.adminGet<SimpleActiveThemeListResponse>('/admin/themes/active');
 };
 
-export const findThemesByIds = async (request: ThemeIdListResponse): Promise<ThemeInfoListResponse> => {
+export const fetchThemesByIds = async (request: ThemeIdListResponse): Promise<ThemeInfoListResponse> => {
-    return await apiClient.post<ThemeInfoListResponse>('/themes/retrieve', request);
+    return await apiClient.post<ThemeInfoListResponse>('/themes/batch', request);
+};
+
+export const fetchThemeById = async (id: string): Promise<ThemeInfoResponse> => {
+    return await apiClient.get<ThemeInfoResponse>(`/themes/${id}`);
+}
+
+export const fetchMostReservedThemes = async (count: number): Promise<ThemeInfoListResponse> => {
+    return await apiClient.get<ThemeInfoListResponse>(`/themes/most-reserved?count=${count}`);
 };

frontend/src/api/theme/themeTypes.ts

@@ -1,20 +1,9 @@
+import type { AuditInfo } from '@_api/common/commonTypes';
+
 export interface AdminThemeDetailResponse {
-    id: string;
+    theme: ThemeInfoResponse;
-    name: string;
+    isActive: boolean;
-    description: string;
+    audit: AuditInfo
-    thumbnailUrl: string;
-    difficulty: Difficulty;
-    price: number;
-    minParticipants: number;
-    maxParticipants: number;
-    availableMinutes: number;
-    expectedMinutesFrom: number;
-    expectedMinutesTo: number;
-    isOpen: boolean;
-    createDate: string; // Assuming ISO string format
-    updatedDate: string; // Assuming ISO string format
-    createdBy: string;
-    updatedBy: string;
 }
 
 export interface ThemeCreateRequest {
@@ -28,7 +17,7 @@ export interface ThemeCreateRequest {
     availableMinutes: number;
     expectedMinutesFrom: number;
     expectedMinutesTo: number;
-    isOpen: boolean;
+    isActive: boolean;
 }
 
 export interface ThemeCreateResponse {
@@ -46,38 +35,19 @@ export interface ThemeUpdateRequest {
     availableMinutes?: number;
     expectedMinutesFrom?: number;
     expectedMinutesTo?: number;
-    isOpen?: boolean;
+    isActive?: boolean;
 }
 
-export interface AdminThemeSummaryRetrieveResponse {
+export interface AdminThemeSummaryResponse {
     id: string;
     name: string;
     difficulty: Difficulty;
     price: number;
-    isOpen: boolean;
+    isActive: boolean;
 }
 
-export interface AdminThemeSummaryRetrieveListResponse {
+export interface AdminThemeSummaryListResponse {
-    themes: AdminThemeSummaryRetrieveResponse[];
+    themes: AdminThemeSummaryResponse[];
-}
-
-export interface AdminThemeDetailRetrieveResponse {
-    id: string;
-    name: string;
-    description: string;
-    thumbnailUrl: string;
-    difficulty: Difficulty;
-    price: number;
-    minParticipants: number;
-    maxParticipants: number;
-    availableMinutes: number;
-    expectedMinutesFrom: number;
-    expectedMinutesTo: number;
-    isOpen: boolean;
-    createdAt: string; // LocalDateTime in Kotlin, map to string (ISO format)
-    createdBy: string;
-    updatedAt: string; // LocalDateTime in Kotlin, map to string (ISO format)
-    updatedBy: string;
 }
 
 export interface ThemeInfoResponse {
@@ -102,18 +72,34 @@ export interface ThemeIdListResponse {
     themeIds: string[];
 }
 
-// @ts-ignore
 export enum Difficulty {
-    VERY_EASY = '매우 쉬움',
+    VERY_EASY = 'VERY_EASY',
-    EASY = '쉬움',
+    EASY = 'EASY',
-    NORMAL = '보통',
+    NORMAL = 'NORMAL',
-    HARD = '어려움',
+    HARD = 'HARD',
-    VERY_HARD = '매우 어려움',
+    VERY_HARD = 'VERY_HARD',
 }
 
+export const DifficultyKoreanMap: Record<Difficulty, string> = {
+    [Difficulty.VERY_EASY]: '매우 쉬움',
+    [Difficulty.EASY]: '쉬움',
+    [Difficulty.NORMAL]: '보통',
+    [Difficulty.HARD]: '어려움',
+    [Difficulty.VERY_HARD]: '매우 어려움',
+};
+
 export function mapThemeResponse(res: any): ThemeInfoResponse {
     return {
         ...res,
         difficulty: Difficulty[res.difficulty as keyof typeof Difficulty],
     }
 }
+
+export interface SimpleActiveThemeResponse {
+    id: string;
+    name: string;
+}
+
+export interface SimpleActiveThemeListResponse {
+    themes: SimpleActiveThemeResponse[];
+}

frontend/src/api/user/userAPI.ts

@@ -2,9 +2,9 @@ import apiClient from "@_api/apiClient";
 import type {UserContactRetrieveResponse, UserCreateRequest, UserCreateResponse} from "./userTypes";
 
 export const signup = async (data: UserCreateRequest): Promise<UserCreateResponse> => {
-    return await apiClient.post('/users', data, false);
+    return await apiClient.post('/users', data);
 };
 
 export const fetchContact = async (): Promise<UserContactRetrieveResponse> => {
-    return await apiClient.get<UserContactRetrieveResponse>('/users/contact', true);
+    return await apiClient.get<UserContactRetrieveResponse>('/users/contact');
 }

frontend/src/components/AdminRoute.tsx

@@ -1,28 +0,0 @@
-import React from 'react';
-import {Navigate, useLocation} from 'react-router-dom';
-import {useAuth} from '../context/AuthContext';
-
-const AdminRoute: React.FC<{ children: JSX.Element }> = ({ children }) => {
-    const { loggedIn, role, loading } = useAuth();
-    const location = useLocation();
-
-    if (loading) {
-        return <div>Loading...</div>; // Or a proper spinner component
-    }
-
-    if (!loggedIn) {
-        // Not logged in, redirect to login page. No alert needed here
-        // as the user is simply redirected.
-        return <Navigate to="/login" state={{ from: location }} replace />;
-    }
-
-    if (role !== 'ADMIN') {
-        // Logged in but not an admin, show alert and redirect.
-        alert('접근 권한이 없어요. 관리자에게 문의해주세요.');
-        return <Navigate to="/" replace />;
-    }
-
-    return children;
-};
-
-export default AdminRoute;

frontend/src/context/AdminAuthContext.tsx

@@ -0,0 +1,96 @@
+import { adminLogin as apiLogin, adminLogout as apiLogout } from '@_api/auth/authAPI';
+import {
+    type AdminLoginSuccessResponse,
+    type AdminType,
+    type LoginRequest,
+} from '@_api/auth/authTypes';
+import React, { createContext, type ReactNode, useContext, useEffect, useState } from 'react';
+
+interface AdminAuthContextType {
+    isAdmin: boolean;
+    name: string | null;
+    type: AdminType | null;
+    storeId: string | null;
+    loading: boolean;
+    login: (data: Omit<LoginRequest, 'principalType'>) => Promise<AdminLoginSuccessResponse>;
+    logout: () => Promise<void>;
+}
+
+const AdminAuthContext = createContext<AdminAuthContextType | undefined>(undefined);
+
+export const AdminAuthProvider: React.FC<{ children: ReactNode }> = ({ children }) => {
+    const [isAdmin, setIsAdmin] = useState(false);
+    const [name, setName] = useState<string | null>(null);
+    const [type, setType] = useState<AdminType | null>(null);
+    const [storeId, setStoreId] = useState<string | null>(null);
+    const [loading, setLoading] = useState(true);
+
+    useEffect(() => {
+        try {
+            const token = localStorage.getItem('adminAccessToken');
+            const storedName = localStorage.getItem('adminName');
+            const storedType = localStorage.getItem('adminType') as AdminType | null;
+            const storedStoreId = localStorage.getItem('adminStoreId');
+
+            if (token && storedName && storedType) {
+                setIsAdmin(true);
+                setName(storedName);
+                setType(storedType);
+                setStoreId(storedStoreId ? storedStoreId : null);
+            }
+        } catch (error) {
+            console.error("Failed to load admin auth state from storage", error);
+        } finally {
+            setLoading(false);
+        }
+    }, []);
+
+    const login = async (data: Omit<LoginRequest, 'principalType'>) => {
+        const response = await apiLogin(data);
+
+        localStorage.setItem('adminAccessToken', response.accessToken);
+        localStorage.setItem('adminName', response.name);
+        localStorage.setItem('adminType', response.type);
+        if (response.storeId) {
+            localStorage.setItem('adminStoreId', response.storeId.toString());
+        } else {
+            localStorage.removeItem('adminStoreId');
+        }
+
+        setIsAdmin(true);
+        setName(response.name);
+        setType(response.type);
+        setStoreId(response.storeId);
+
+        return response;
+    };
+
+    const logout = async () => {
+        try {
+            await apiLogout();
+        } finally {
+            localStorage.removeItem('adminAccessToken');
+            localStorage.removeItem('adminName');
+            localStorage.removeItem('adminType');
+            localStorage.removeItem('adminStoreId');
+            setIsAdmin(false);
+            setName(null);
+            setType(null);
+            setStoreId(null);
+        }
+    };
+
+    return (
+        <AdminAuthContext.Provider value={{ isAdmin, name, type, storeId, loading, login, logout }}>
+            {children}
+        </AdminAuthContext.Provider>
+    );
+};
+
+export const useAdminAuth = (): AdminAuthContextType => {
+    const context = useContext(AdminAuthContext);
+    if (!context) {
+        throw new Error('useAdminAuth must be used within an AdminAuthProvider');
+    }
+    return context;
+};

frontend/src/context/AuthContext.tsx

@@ -1,15 +1,13 @@
-import {checkLogin as apiCheckLogin, login as apiLogin, logout as apiLogout} from '@_api/auth/authAPI';
+import { logout as apiLogout, userLogin as apiLogin } from '@_api/auth/authAPI';
-import {type LoginRequest, type LoginSuccessResponse, PrincipalType} from '@_api/auth/authTypes';
+import { type LoginRequest, type UserLoginSuccessResponse } from '@_api/auth/authTypes';
-import React, {createContext, type ReactNode, useContext, useEffect, useState} from 'react';
+import React, { createContext, type ReactNode, useContext, useEffect, useState } from 'react';
 
 interface AuthContextType {
     loggedIn: boolean;
     userName: string | null;
-    type: PrincipalType | null;
     loading: boolean;
-    login: (data: LoginRequest) => Promise<LoginSuccessResponse>;
+    login: (data: Omit<LoginRequest, 'principalType'>) => Promise<UserLoginSuccessResponse>;
     logout: () => Promise<void>;
-    checkLogin: () => Promise<void>;
 }
 
 const AuthContext = createContext<AuthContextType | undefined>(undefined);
@@ -17,33 +15,33 @@ const AuthContext = createContext<AuthContextType | undefined>(undefined);
 export const AuthProvider: React.FC<{ children: ReactNode }> = ({ children }) => {
     const [loggedIn, setLoggedIn] = useState(false);
     const [userName, setUserName] = useState<string | null>(null);
-    const [type, setType] = useState<PrincipalType | null>(null);
+    const [loading, setLoading] = useState(true);
-    const [loading, setLoading] = useState(true); // Add loading state
-
-    const checkLogin = async () => {
-        try {
-            const response = await apiCheckLogin();
-            setLoggedIn(true);
-            setUserName(response.name);
-            setType(response.type);
-        } catch (error) {
-            setLoggedIn(false);
-            setUserName(null);
-            setType(null);
-            localStorage.removeItem('accessToken');
-        } finally {
-            setLoading(false); // Set loading to false after check is complete
-        }
-    };
 
     useEffect(() => {
-        checkLogin();
+        try {
+            const token = localStorage.getItem('accessToken');
+            const storedUserName = localStorage.getItem('userName');
+
+            if (token && storedUserName) {
+                setLoggedIn(true);
+                setUserName(storedUserName);
+            }
+        } catch (error) {
+            console.error("Failed to load user auth state from storage", error);
+        } finally {
+            setLoading(false);
+        }
     }, []);
 
-    const login = async (data: LoginRequest) => {
+    const login = async (data: Omit<LoginRequest, 'principalType'>) => {
-        const response = await apiLogin({ ...data });
+        const response = await apiLogin(data);
+
+        localStorage.setItem('accessToken', response.accessToken);
+        localStorage.setItem('userName', response.name);
+
         setLoggedIn(true);
-        setType(data.principalType);
+        setUserName(response.name);
+
         return response;
     };
 
@@ -51,15 +49,15 @@ export const AuthProvider: React.FC<{ children: ReactNode }> = ({ children }) =>
         try {
             await apiLogout();
         } finally {
+            localStorage.removeItem('accessToken');
+            localStorage.removeItem('userName');
             setLoggedIn(false);
             setUserName(null);
-            setType(null);
-            localStorage.removeItem('accessToken');
         }
     };
 
     return (
-        <AuthContext.Provider value={{ loggedIn, userName, type, loading, login, logout, checkLogin }}>
+        <AuthContext.Provider value={{ loggedIn, userName, loading, login, logout }}>
             {children}
         </AuthContext.Provider>
     );

frontend/src/css/admin-schedule-page.css

@@ -1,11 +1,13 @@
+/* New CSS content */
 .admin-schedule-container {
     padding: 2rem;
     max-width: 1200px;
     margin: 0 auto;
+    font-size: 0.95rem; /* Slightly smaller base font */
 }
 
 .page-title {
-    font-size: 2rem;
+    font-size: 1.8rem; /* smaller */
     font-weight: bold;
     margin-bottom: 2rem;
     text-align: center;
@@ -18,7 +20,7 @@
     padding: 1.5rem;
     background-color: #f9f9f9;
     border-radius: 8px;
-    align-items: center;
+    align-items: flex-end; /* Align to bottom */
 }
 
 .schedule-controls .form-group {
@@ -26,18 +28,29 @@
     flex-direction: column;
 }
 
+/* Width adjustments */
+.schedule-controls .store-selector-group,
+.schedule-controls .date-selector-group {
+    flex: 1 1 180px;
+}
+
+.schedule-controls .theme-selector-group {
+    flex: 2 1 300px;
+}
+
+
 .schedule-controls .form-label {
-    font-size: 0.9rem;
+    font-size: 0.85rem; /* smaller */
     margin-bottom: 0.5rem;
     color: #555;
 }
 
 .schedule-controls .form-input,
 .schedule-controls .form-select {
-    padding: 0.75rem;
+    padding: 0.6rem; /* smaller */
     border: 1px solid #ccc;
     border-radius: 4px;
-    font-size: 1rem;
+    font-size: 0.9rem; /* smaller */
 }
 
 .section-card {
@@ -63,10 +76,11 @@ table {
 }
 
 th, td {
-    padding: 1rem;
+    padding: 0.8rem; /* smaller */
     text-align: left;
     border-bottom: 1px solid #eee;
     vertical-align: middle;
+    font-size: 0.9rem; /* smaller */
 }
 
 th {
@@ -75,11 +89,11 @@ th {
 }
 
 .btn {
-    padding: 0.5rem 1rem;
+    padding: 0.4rem 0.8rem; /* smaller */
     border: none;
     border-radius: 4px;
     cursor: pointer;
-    font-size: 0.9rem;
+    font-size: 0.85rem; /* smaller */
     transition: background-color 0.2s;
     white-space: nowrap;
 }
@@ -174,8 +188,8 @@ th {
     font-size: 1rem;
     border: 1px solid #dee2e6;
     border-radius: 4px;
-    height: 3rem;
+    height: auto; /* remove fixed height */
-    box-sizing: border-box; /* Ensures padding/border are included in height */
+    box-sizing: border-box;
 }
 
 .details-form-container .button-group {
@@ -190,7 +204,7 @@ th {
     border: 1px solid #dee2e6;
     border-radius: 8px;
     background-color: #fff;
-    margin-bottom: 1.5rem; /* Add margin to separate from buttons */
+    margin-bottom: 1.5rem;
 }
 
 .audit-title {
@@ -212,3 +226,95 @@ th {
     color: #212529;
     margin-right: 0.5rem;
 }
+
+.theme-selector-button-group {
+    display: flex;
+    flex-direction: row !important;
+    align-items: flex-end;
+    gap: 0.5rem;
+}
+
+.theme-selector-button-group .form-select {
+    flex-grow: 1;
+}
+
+/* Modal Styles */
+.modal-overlay {
+    position: fixed;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    background-color: rgba(0, 0, 0, 0.6);
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    z-index: 1000;
+}
+
+.modal-content {
+    background-color: #ffffff !important;
+    padding: 2rem !important;
+    border-radius: 8px !important;
+    box-shadow: 0 5px 15px rgba(0, 0, 0, 0.3) !important;
+    width: 90% !important;
+    max-width: 600px !important;
+    position: relative !important;
+}
+
+.modal-close-btn {
+    position: absolute;
+    top: 1rem;
+    right: 1rem;
+    background: none;
+    border: none;
+    font-size: 1.5rem;
+    cursor: pointer;
+    color: #888;
+}
+
+.modal-title {
+    font-size: 1.75rem;
+    font-weight: bold;
+    margin-top: 0;
+    margin-bottom: 1.5rem;
+    text-align: center;
+}
+
+.theme-modal-thumbnail {
+    width: 100%;
+    max-height: 300px;
+    object-fit: cover;
+    border-radius: 8px;
+    margin-bottom: 1.5rem;
+}
+
+.theme-modal-description {
+    font-size: 1rem;
+    line-height: 1.6;
+    color: #555;
+    margin-bottom: 1.5rem;
+}
+
+.theme-details-button {
+    white-space: nowrap;
+}
+
+.view-mode-buttons {
+    justify-content: flex-end;
+}
+
+/* Added for modal info alignment */
+.modal-info-grid p {
+  display: flex;
+  align-items: flex-start;
+  margin: 0.6rem 0;
+  line-height: 1.5;
+}
+.modal-info-grid p strong {
+  flex: 0 0 130px; /* fixed width for labels */
+  font-weight: 600;
+}
+.modal-info-grid p span {
+  flex: 1;
+}

frontend/src/css/admin-store-page.css

@@ -0,0 +1,207 @@
+/* /src/css/admin-store-page.css */
+.admin-store-container {
+  max-width: 1400px;
+  margin: 40px auto;
+  padding: 40px;
+  font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', Arial, sans-serif;
+  background-color: #f4f6f8;
+  border-radius: 16px;
+}
+
+.admin-store-container .page-title {
+  font-size: 32px;
+  font-weight: 700;
+  color: #333d4b;
+  margin-bottom: 30px;
+  text-align: center;
+}
+
+.filter-controls {
+    display: flex;
+    gap: 1rem;
+    margin-bottom: 1.5rem;
+    padding: 1.5rem;
+    background-color: #f9f9f9;
+    border-radius: 8px;
+}
+
+.filter-controls .form-group {
+    flex: 1;
+}
+
+.section-card {
+  background-color: #ffffff;
+  border-radius: 12px;
+  padding: 24px;
+  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.06);
+}
+
+.table-header {
+  display: flex;
+  justify-content: flex-end;
+  margin-bottom: 20px;
+}
+
+.table-container table {
+  width: 100%;
+  border-collapse: collapse;
+  font-size: 15px;
+}
+
+.table-container th,
+.table-container td {
+  padding: 12px 16px;
+  text-align: left;
+  border-bottom: 1px solid #e5e8eb;
+  vertical-align: middle;
+}
+
+.table-container th {
+  background-color: #f9fafb;
+  color: #505a67;
+  font-weight: 600;
+}
+
+.table-container tr:last-child td {
+  border-bottom: none;
+}
+
+.table-container tr:hover {
+  background-color: #f4f6f8;
+}
+
+.form-input, .form-select, .form-textarea {
+  width: 100%;
+  padding: 10px 12px;
+  font-size: 15px;
+  border: 1px solid #E5E8EB;
+  border-radius: 8px;
+  box-sizing: border-box;
+  transition: border-color 0.2s, box-shadow 0.2s;
+}
+
+.form-input:focus, .form-select:focus, .form-textarea:focus {
+  outline: none;
+  border-color: #3182F6;
+  box-shadow: 0 0 0 3px rgba(49, 130, 246, 0.2);
+}
+
+.btn {
+  padding: 8px 16px;
+  font-size: 15px;
+  font-weight: 600;
+  border-radius: 8px;
+  border: none;
+  cursor: pointer;
+  transition: background-color 0.2s;
+}
+
+.btn-primary {
+  background-color: #3182F6;
+  color: #ffffff;
+}
+
+.btn-primary:hover {
+  background-color: #1B64DA;
+}
+
+.btn-secondary {
+  background-color: #F2F4F6;
+  color: #4E5968;
+}
+
+.btn-secondary:hover {
+  background-color: #E5E8EB;
+}
+
+.btn-danger {
+  background-color: #e53e3e;
+  color: white;
+}
+
+.btn-danger:hover {
+  background-color: #c53030;
+}
+
+.action-buttons {
+    display: flex;
+    gap: 0.5rem;
+}
+
+.details-row td {
+    padding: 0;
+    background-color: #f8f9fa;
+}
+
+.details-container {
+    padding: 1.5rem;
+}
+
+.details-form-card {
+    background-color: #fff;
+    padding: 1.5rem;
+    border-radius: 8px;
+    box-shadow: 0 4px 8px rgba(0, 0, 0, 0.05);
+    margin-bottom: 1.5rem;
+}
+
+.form-row {
+    display: flex;
+    gap: 1.5rem;
+    margin-bottom: 1rem;
+}
+
+.form-group {
+    flex: 1;
+}
+
+.form-label {
+    display: block;
+    margin-bottom: 8px;
+    font-size: 14px;
+    font-weight: 600;
+    color: #4E5968;
+}
+
+.button-group {
+    display: flex;
+    justify-content: flex-end;
+    gap: 0.75rem;
+    margin-top: 1.5rem;
+}
+
+.audit-info {
+    padding: 1.5rem;
+    border: 1px solid #dee2e6;
+    border-radius: 8px;
+    background-color: #fff;
+    margin-bottom: 1.5rem;
+}
+
+.audit-title {
+    font-size: 1.1rem;
+    font-weight: 600;
+    color: #343a40;
+    margin-bottom: 1rem;
+    padding-bottom: 0.75rem;
+    border-bottom: 1px solid #dee2e6;
+}
+
+.audit-body p {
+    margin: 0.5rem 0;
+    font-size: 0.9rem;
+    color: #495057;
+}
+
+.audit-body p strong {
+    color: #212529;
+    margin-right: 0.5rem;
+}
+
+.add-store-form {
+    padding: 1.5rem;
+    background-color: #fdfdff;
+    border: 1px solid #e5e8eb;
+    border-radius: 8px;
+    margin-bottom: 2rem;
+}

frontend/src/css/home-page-v2.css

@@ -81,15 +81,15 @@
 }
 
 .theme-modal-content {
-  background-color: #ffffff;
+  background-color: #ffffff !important;
-  padding: 30px;
+  padding: 30px !important;
-  border-radius: 16px;
+  border-radius: 16px !important;
-  width: 90%;
+  width: 90% !important;
-  max-width: 600px;
+  max-width: 600px !important;
-  box-shadow: 0 5px 20px rgba(0, 0, 0, 0.2);
+  box-shadow: 0 5px 20px rgba(0, 0, 0, 0.2) !important;
-  display: flex;
+  display: flex !important;
-  flex-direction: column;
+  flex-direction: column !important;
-  gap: 20px;
+  gap: 20px !important;
 }
 
 .modal-thumbnail {
@@ -163,3 +163,18 @@
 .modal-button.close:hover {
   background-color: #5a6268;
 }
+
+/* Added for modal info alignment */
+.modal-info-grid p {
+  display: flex;
+  align-items: flex-start;
+  margin: 0.6rem 0;
+  line-height: 1.5;
+}
+.modal-info-grid p strong {
+  flex: 0 0 130px; /* fixed width for labels */
+  font-weight: 600;
+}
+.modal-info-grid p span {
+  flex: 1;
+}

frontend/src/css/my-reservation-v2.css

@@ -49,10 +49,24 @@
   box-shadow: 0 4px 12px rgba(0, 0, 0, 0.1);
 }
 
+.summary-subdetails-v2 {
+  display: flex;
+  flex-direction: column;
+  margin: 0px;
+  gap: 0px;
+}
+
+.summary-store-name-v2 {
+  font-size: 16px;
+  font-weight: bold;
+  color: #505a67;
+  margin: 0 0 5px 0;
+}
+
 .summary-details-v2 {
   display: flex;
   flex-direction: column;
-  gap: 4px;
+  gap: 10px;
 }
 
 .summary-theme-name-v2 {
@@ -65,15 +79,15 @@
 .summary-datetime-v2 {
   font-size: 16px;
   color: #505a67;
-  margin: 0;
+  margin-bottom: 5px;
 }
 
 /* --- Status Badge --- */
 .card-status-badge {
   position: absolute;
-  top: 15px;
+  top: 30px;
-  right: 15px;
+  right: 10px;
-  padding: 4px 10px;
+  padding: 3px 10px;
   border-radius: 12px;
   font-size: 12px;
   font-weight: 700;
@@ -177,16 +191,16 @@
 }
 
 .modal-content-v2 {
-  background: #ffffff;
+  background: #ffffff !important;
-  padding: 30px;
+  padding: 30px !important;
-  border-radius: 16px;
+  border-radius: 16px !important;
-  width: 90%;
+  width: 90% !important;
-  max-width: 500px;
+  max-width: 500px !important;
-  position: relative;
+  position: relative !important;
-  box-shadow: 0 5px 15px rgba(0,0,0,0.3);
+  box-shadow: 0 5px 15px rgba(0,0,0,0.3) !important;
-  animation: slide-up 0.3s ease-out;
+  animation: slide-up 0.3s ease-out !important;
-  max-height: 90vh; /* Prevent modal from being too tall */
+  max-height: 90vh !important; /* Prevent modal from being too tall */
-  overflow-y: auto; /* Allow scrolling for long content */
+  overflow-y: auto !important; /* Allow scrolling for long content */
 }
 
 @keyframes slide-up {
@@ -240,13 +254,6 @@
   color: #505a67;
 }
 
-.modal-section-v2 p strong {
-  color: #333d4b;
-  font-weight: 600;
-  min-width: 100px;
-  display: inline-block;
-}
-
 .cancellation-section-v2 {
   background-color: #fcf2f2;
   padding: 15px;
@@ -346,3 +353,18 @@
   border-color: #007bff;
   box-shadow: 0 0 0 2px rgba(0, 123, 255, 0.25);
 }
+
+/* Added for modal info alignment */
+.modal-info-grid p {
+  display: flex;
+  align-items: flex-start;
+  margin: 0.6rem 0;
+  line-height: 1.5;
+}
+.modal-info-grid p strong {
+  flex: 0 0 130px; /* fixed width for labels */
+  font-weight: 600;
+}
+.modal-info-grid p span {
+  flex: 1;
+}

frontend/src/css/reservation-v2-1.css

@@ -1,43 +1,43 @@
 /* General Container */
 .reservation-v21-container {
-    padding: 40px;
+    width: 100%;
     max-width: 900px;
-    margin: 40px auto;
+    margin: 2rem auto;
-    background-color: #ffffff;
+    padding: 2rem;
-    border-radius: 16px;
+    font-family: 'Pretendard', sans-serif;
-    box-shadow: 0 8px 20px rgba(0, 0, 0, 0.07);
+    background-color: #fff;
-    font-family: 'Toss Product Sans', sans-serif;
+    border-radius: 12px;
-    color: #333D4B;
+    box-shadow: 0 4px 12px rgba(0, 0, 0, 0.05);
 }
 
 .page-title {
-    font-size: 28px;
-    font-weight: 700;
-    margin-bottom: 40px;
-    color: #191F28;
     text-align: center;
+    font-size: 2rem;
+    font-weight: 700;
+    margin-bottom: 2.5rem;
+    color: #212529;
 }
 
-/* Step Sections */
+/* Step Section */
 .step-section {
-    margin-bottom: 40px;
+    margin-bottom: 3rem;
-    padding: 24px;
+    padding: 1.5rem;
-    border: 1px solid #E5E8EB;
+    border: 1px solid #f1f3f5;
-    border-radius: 12px;
+    border-radius: 8px;
-    transition: all 0.3s ease;
+    background-color: #f8f9fa;
 }
 
 .step-section.disabled {
     opacity: 0.5;
     pointer-events: none;
-    background-color: #F9FAFB;
 }
 
 .step-section h3 {
-    font-size: 20px;
+    font-size: 1.5rem;
     font-weight: 600;
-    margin-bottom: 20px;
+    margin-top: 0;
-    color: #191F28;
+    margin-bottom: 1.5rem;
+    color: #343a40;
 }
 
 /* Date Carousel */
@@ -45,274 +45,241 @@
     display: flex;
     align-items: center;
     justify-content: space-between;
-    gap: 10px;
+    margin-bottom: 1rem;
-    margin: 20px 0;
+}
+
+.carousel-arrow {
+    background: none;
+    border: none;
+    font-size: 2rem;
+    color: #868e96;
+    cursor: pointer;
+    padding: 0 1rem;
 }
 
 .date-options-container {
     display: flex;
-    gap: 8px;
+    gap: 10px;
-    overflow-x: hidden;
+    overflow-x: auto;
-    flex-grow: 1;
+    -ms-overflow-style: none;
-    justify-content: space-between;
+    scrollbar-width: none;
-    margin: 0px 15px;
 }
 
-.carousel-arrow, .today-button {
+.date-options-container::-webkit-scrollbar {
-    background-color: #F2F4F6;
+    display: none;
-    border: 1px solid #E5E8EB;
-    border-radius: 50%;
-    width: 36px;
-    height: 36px;
-    font-size: 20px;
-    font-weight: bold;
-    color: #4E5968;
-    cursor: pointer;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    flex-shrink: 0;
-    transition: background-color 0.2s;
-}
-
-.today-button {
-    border-radius: 8px;
-    font-size: 14px;
-    font-weight: 600;
-    width: auto;
-    padding: 0 15px;
-}
-
-.carousel-arrow:hover, .today-button:hover {
-    background-color: #E5E8EB;
 }
 
 .date-option {
+    text-align: center;
     cursor: pointer;
-    padding: 8px;
+    padding: 10px;
-    border-radius: 8px;
+    border-radius: 50%;
+    width: 60px;
+    height: 60px;
     display: flex;
     flex-direction: column;
-    align-items: center;
     justify-content: center;
-    border: 1px solid transparent;
+    align-items: center;
-    transition: all 0.3s ease;
+    transition: background-color 0.3s, color 0.3s;
-    width: 60px;
-    flex-shrink: 0;
-}
-
-.date-option:hover {
-    background-color: #f0f0f0;
-}
-
-.date-option.active {
-    border: 1px solid #007bff;
-    background-color: #e7f3ff;
 }
 
 .date-option .day-of-week {
-    font-size: 12px;
+    font-size: 0.8rem;
-    color: #888;
+    margin-bottom: 4px;
-}
-
-.date-option.active .day-of-week {
-    color: #007bff;
 }
 
 .date-option .day-circle {
-    font-size: 16px;
+    font-weight: 600;
-    font-weight: bold;
-    width: 32px;
-    height: 32px;
-    border-radius: 50%;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    margin-top: 4px;
-    background-color: #f0f0f0;
-    color: #333;
 }
 
-.date-option.active .day-circle {
+.date-option.active {
-    background-color: #007bff;
+    background-color: #0064FF;
     color: white;
 }
 
+.date-option:not(.active):hover {
+    background-color: #f1f3f5;
+}
+
 .date-option.disabled {
-    opacity: 0.5;
+    color: #ced4da;
     cursor: not-allowed;
-    pointer-events: none;
 }
 
-.date-option.disabled .day-circle {
+.today-button {
-    background-color: #E5E8EB;
+    background-color: #f8f9fa;
-    color: #B0B8C1;
+    border: 1px solid #dee2e6;
-}
+    border-radius: 20px;
-
+    padding: 0.5rem 1rem;
-
-/* Theme List */
-.theme-list {
-    display: grid;
-    grid-template-columns: repeat(auto-fill, minmax(200px, 1fr));
-    gap: 16px;
-}
-
-.theme-card {
     cursor: pointer;
-    border-radius: 12px;
+    margin-left: 1rem;
-    overflow: hidden;
+    font-weight: 500;
-    border: 2px solid #E5E8EB;
+}
-    transition: all 0.2s ease-in-out;
+
+/* --- Region & Store Selectors --- */
+.region-store-selectors {
+    display: flex;
+    gap: 1rem;
+    margin-bottom: 1.5rem;
+}
+
+.region-store-selectors select {
+    flex: 1;
+    padding: 0.75rem;
+    border: 1px solid #ddd;
+    border-radius: 8px;
     background-color: #fff;
+    font-size: 1rem;
+    cursor: pointer;
+    transition: border-color 0.2s;
+    -webkit-appearance: none;
+    -moz-appearance: none;
+    appearance: none;
+    background-image: url('data:image/svg+xml;charset=US-ASCII,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%22292.4%22%20height%3D%22292.4%22%3E%3Cpath%20fill%3D%22%23868e96%22%20d%3D%22M287%2069.4a17.6%2017.6%200%200%200-13-5.4H18.4c-5%200-9.3%201.8-12.9%205.4A17.6%2017.6%200%200%200%200%2082.2c0%205%201.8%209.3%205.4%2012.9l128%20127.9c3.6%203.6%207.8%205.4%2012.8%205.4s9.2-1.8%2012.8-5.4L287%2095c3.5-3.5%205.4-7.8%205.4-12.8%200-5-1.9-9.2-5.5-12.8z%22%2F%3E%3C%2Fsvg%3E');
+    background-repeat: no-repeat;
+    background-position: right .7em top 50%;
+    background-size: .65em auto;
+}
+
+.region-store-selectors select:disabled {
+    background-color: #f8f9fa;
+    cursor: not-allowed;
+    color: #adb5bd;
+}
+
+.region-store-selectors select:focus {
+    outline: none;
+    border-color: #0064FF;
+}
+
+/* --- Schedule List --- */
+.schedule-list {
     display: flex;
     flex-direction: column;
+    gap: 1.5rem;
 }
 
-.theme-card:hover {
+.theme-schedule-group {
-    transform: translateY(-4px);
+    background-color: #fff;
-    box-shadow: 0 4px 12px rgba(0, 0, 0, 0.08);
+    border: 1px solid #e9ecef;
+    border-radius: 8px;
+    padding: 1.5rem;
 }
 
-.theme-card.active {
+.theme-header {
-    border-color: #3182F6;
-    box-shadow: 0 0 0 3px rgba(49, 130, 246, 0.2);
-}
-
-.theme-thumbnail {
-    width: 100%;
-    height: 120px;
-    object-fit: cover;
-}
-
-.theme-info {
-    padding: 16px;
     display: flex;
-    flex-direction: column;
+    justify-content: space-between;
-    flex-grow: 1;
+    align-items: center;
+    padding-bottom: 1rem;
+    margin-bottom: 1rem;
+    border-bottom: 1px solid #f1f3f5;
 }
 
-.theme-info h4 {
+.theme-header h4 {
-    font-size: 16px;
-    font-weight: 600;
-    margin-bottom: 8px;
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
-}
-
-.theme-info p {
-    font-size: 14px;
-    color: #6B7684;
     margin: 0;
-}
+    font-size: 1.25rem;
-
+    font-weight: 600;
-.theme-meta {
+    color: #343a40;
-    font-size: 14px;
-    color: #4E5968;
-    margin-bottom: 12px;
-    flex-grow: 1;
-}
-
-.theme-meta p {
-    margin: 2px 0;
-}
-.theme-meta strong {
-    color: #333D4B;
 }
 
 .theme-detail-button {
-    width: 100%;
+    padding: 0.5rem 1rem;
-    padding: 8px;
+    font-size: 0.9rem;
-    font-size: 14px;
+    background-color: transparent;
-    font-weight: 600;
+    color: #0064FF;
-    border: none;
+    border: 1px solid #0064FF;
-    background-color: #F2F4F6;
+    border-radius: 6px;
-    color: #4E5968;
-    border-radius: 8px;
     cursor: pointer;
-    transition: background-color 0.2s;
+    font-weight: 600;
+    transition: background-color 0.2s, color 0.2s;
 }
 
 .theme-detail-button:hover {
-    background-color: #E5E8EB;
+    background-color: #0064FF;
+    color: #fff;
 }
 
 /* Time Slots */
 .time-slots {
     display: grid;
-    grid-template-columns: repeat(auto-fill, minmax(120px, 1fr));
+    grid-template-columns: repeat(auto-fill, minmax(140px, 1fr));
-    gap: 12px;
+    gap: 0.75rem;
 }
 
 .time-slot {
-    cursor: pointer;
+    padding: 0.75rem;
-    padding: 16px;
+    border: 1px solid #dee2e6;
-    border-radius: 8px;
+    border-radius: 6px;
     text-align: center;
-    background-color: #F2F4F6;
+    cursor: pointer;
-    font-weight: 600;
+    transition: all 0.2s;
-    transition: all 0.2s ease-in-out;
+    background-color: #fff;
-    position: relative;
 }
 
-.time-slot:hover {
+.time-slot:hover:not(.disabled) {
-    background-color: #E5E8EB;
+    border-color: #0064FF;
+    color: #0064FF;
 }
 
 .time-slot.active {
-    background-color: #3182F6;
+    background-color: #0064FF;
-    color: #ffffff;
+    color: white;
+    border-color: #0064FF;
+    font-weight: 600;
 }
 
 .time-slot.disabled {
-    background-color: #F9FAFB;
+    background-color: #f8f9fa;
-    color: #B0B8C1;
+    color: #adb5bd;
     cursor: not-allowed;
     text-decoration: line-through;
 }
 
 .time-availability {
-    font-size: 12px;
     display: block;
+    font-size: 0.8rem;
     margin-top: 4px;
-    font-weight: 500;
 }
 
 .no-times {
+    color: #868e96;
+    padding: 2rem;
     text-align: center;
-    padding: 20px;
+    background-color: #fff;
-    color: #8A94A2;
+    border-radius: 8px;
 }
 
-/* Next Step Button */
+/* --- Next Step Button --- */
 .next-step-button-container {
-    display: flex;
+    margin-top: 2rem;
-    justify-content: flex-end;
+    text-align: center;
-    margin-top: 30px;
 }
 
 .next-step-button {
-    padding: 14px 28px;
+    width: 100%;
-    font-size: 18px;
+    max-width: 400px;
+    padding: 1rem;
+    font-size: 1.2rem;
     font-weight: 700;
+    color: #fff;
+    background-color: #0064FF;
     border: none;
-    background-color: #3182F6;
+    border-radius: 8px;
-    color: #ffffff;
-    border-radius: 12px;
     cursor: pointer;
     transition: background-color 0.2s;
 }
 
+.next-step-button:hover:not(:disabled) {
+    background-color: #0053d1;
+}
+
 .next-step-button:disabled {
-    background-color: #B0B8C1;
+    background-color: #a0a0a0;
     cursor: not-allowed;
 }
 
-.next-step-button:hover:not(:disabled) {
-    background-color: #1B64DA;
-}
 
-/* Modal Styles */
+/* --- Modal Styles --- */
 .modal-overlay {
     position: fixed;
     top: 0;
@@ -328,170 +295,158 @@
 
 .modal-content {
     background-color: #ffffff !important;
-    padding: 32px !important;
+    padding: 2rem !important;
-    border-radius: 16px !important;
+    border-radius: 12px !important;
+    box-shadow: 0 5px 15px rgba(0, 0, 0, 0.3) !important;
     width: 90% !important;
     max-width: 500px !important;
     position: relative !important;
-    box-shadow: 0 10px 30px rgba(0, 0, 0, 0.1) !important;
+    max-height: 90vh !important;
+    overflow-y: auto !important;
 }
 
 .modal-close-button {
     position: absolute;
-    top: 16px;
+    top: 1rem;
-    right: 16px;
+    right: 1rem;
     background: none;
     border: none;
-    font-size: 24px;
+    font-size: 1.5rem;
+    color: #868e96;
     cursor: pointer;
-    color: #8A94A2;
 }
 
 .modal-theme-thumbnail {
     width: 100%;
     height: 200px;
     object-fit: cover;
-    border-radius: 12px;
+    border-radius: 8px;
-    margin-bottom: 24px;
+    margin-bottom: 1.5rem;
 }
 
 .modal-content h2 {
-    font-size: 24px;
+    margin-top: 0;
-    font-weight: 700;
+    margin-bottom: 2rem;
-    margin-bottom: 24px;
+    text-align: center;
-    color: #191F28;
 }
 
 .modal-section {
-    margin-bottom: 20px;
+    margin-bottom: 1.5rem;
+    padding-bottom: 1.5rem;
+    border-bottom: 1px solid #f1f3f5;
+}
+
+.modal-section:last-child {
+    border-bottom: none;
+    margin-bottom: 0;
+    padding-bottom: 0;
 }
 
 .modal-section h3 {
-    font-size: 18px;
+    margin-top: 0;
-    font-weight: 600;
+    margin-bottom: 1rem;
-    margin-bottom: 12px;
+    font-size: 1.1rem;
-    border-bottom: 1px solid #E5E8EB;
+    color: #495057;
-    padding-bottom: 8px;
 }
 
 .modal-section p {
-    font-size: 16px;
+    margin: 0.5rem 0;
+    color: #495057;
     line-height: 1.6;
-    margin-bottom: 8px;
-    color: #4E5968;
-}
-
-.modal-section p strong {
-    color: #333D4B;
-    margin-right: 8px;
 }
 
 .modal-actions {
     display: flex;
     justify-content: flex-end;
-    gap: 12px;
+    gap: 1rem;
-    margin-top: 30px;
+    margin-top: 2rem;
 }
 
-.modal-actions button {
+.modal-actions .cancel-button,
-    padding: 12px 24px;
+.modal-actions .confirm-button {
-    font-size: 16px;
+    padding: 0.75rem 1.5rem;
-    font-weight: 600;
     border-radius: 8px;
-    cursor: pointer;
     border: none;
-    transition: background-color 0.2s;
+    font-size: 1rem;
+    font-weight: 600;
+    cursor: pointer;
 }
 
 .modal-actions .cancel-button {
-    background-color: #E5E8EB;
+    background-color: #f1f3f5;
-    color: #4E5968;
+    color: #495057;
-}
-.modal-actions .cancel-button:hover {
-    background-color: #D1D6DB;
 }
 
 .modal-actions .confirm-button {
-    background-color: #3182F6;
+    background-color: #0064FF;
-    color: #ffffff;
+    color: #fff;
-}
-.modal-actions .confirm-button:hover {
-    background-color: #1B64DA;
 }
 
-/* Styles for ReservationFormPage */
+/* --- Form Styles for ReservationFormPage --- */
 .form-group {
-    margin-bottom: 20px;
+    margin-bottom: 1rem;
 }
 
 .form-group label {
     display: block;
-    font-weight: bold;
+    margin-bottom: 0.5rem;
-    margin-bottom: 8px;
+    font-weight: 600;
-    color: #333;
+    color: #495057;
 }
 
-.form-group input[type="text"],
+.form-input {
-.form-group input[type="tel"],
-.form-group input[type="number"],
-.form-group textarea {
     width: 100%;
-    padding: 12px;
+    padding: 0.75rem;
-    border: 1px solid #ccc;
+    border: 1px solid #ddd;
     border-radius: 8px;
-    font-size: 16px;
+    font-size: 1rem;
-    box-sizing: border-box;
-    transition: border-color 0.2s, box-shadow 0.2s;
 }
 
-.form-group input:focus, .form-group textarea:focus {
+/* Success Page */
-    outline: none;
+.success-icon {
-    border-color: #3182F6;
+    font-size: 4rem;
-    box-shadow: 0 0 0 3px rgba(49, 130, 246, 0.2);
+    color: #0064FF;
-}
-
-.form-group textarea {
-    resize: vertical;
-    min-height: 100px;
-}
-
-.participant-control {
-    display: flex;
-    align-items: center;
-}
-
-.participant-control input {
     text-align: center;
-    border-left: none;
+    margin-bottom: 1.5rem;
-    border-right: none;
-    width: 60px;
-    border-radius: 0;
 }
 
-.participant-control button {
+.success-page-actions {
-    width: 44px;
+    display: flex;
-    height: 44px;
+    justify-content: center;
-    border: 1px solid #ccc;
+    gap: 1rem;
-    background-color: #f0f0f0;
+    margin-top: 2.5rem;
-    font-size: 20px;
+}
-    cursor: pointer;
+
+.success-page-actions .action-button {
+    padding: 0.8rem 1.6rem;
+    border-radius: 8px;
+    text-decoration: none;
+    font-size: 1rem;
+    font-weight: 600;
     transition: background-color 0.2s;
 }
 
-.participant-control button:hover:not(:disabled) {
+.success-page-actions .action-button.secondary {
-    background-color: #e0e0e0;
+    background-color: #f1f3f5;
+    color: #495057;
 }
 
-.participant-control button:disabled {
+.success-page-actions .action-button:not(.secondary) {
-    background-color: #e9ecef;
+    background-color: #0064FF;
-    cursor: not-allowed;
+    color: #fff;
-    color: #aaa;
 }
 
-.participant-control button:first-of-type {
+/* Added for modal info alignment */
-    border-radius: 8px 0 0 8px;
+.modal-info-grid p {
+  display: flex;
+  align-items: flex-start;
+  margin: 0.6rem 0;
+  line-height: 1.5;
 }
-
+.modal-info-grid p strong {
-.participant-control button:last-of-type {
+  flex: 0 0 130px; /* fixed width for labels */
-    border-radius: 0 8px 8px 0;
+  font-weight: 600;
+}
+.modal-info-grid p span {
+  flex: 1;
 }

frontend/src/css/signup-page-v2.css

@@ -69,3 +69,12 @@
   font-size: 12px;
   margin-top: 4px;
 }
+
+.region-select-group {
+  display: flex;
+  gap: 10px;
+}
+
+.region-select-group select {
+  flex: 1;
+}

frontend/src/pages/HomePage.tsx

@@ -1,9 +1,8 @@
-import {fetchMostReservedThemeIds} from '@_api/reservation/reservationAPI';
 import '@_css/home-page-v2.css';
 import React, {useEffect, useState} from 'react';
 import {useNavigate} from 'react-router-dom';
-import {findThemesByIds} from '@_api/theme/themeAPI';
+import {fetchMostReservedThemes} from '@_api/theme/themeAPI';
-import {mapThemeResponse, type ThemeInfoResponse} from '@_api/theme/themeTypes';
+import {DifficultyKoreanMap, mapThemeResponse, type ThemeInfoResponse} from '@_api/theme/themeTypes';
 
 const HomePage: React.FC = () => {
   const [ranking, setRanking] = useState<ThemeInfoResponse[]>([]);
@@ -13,19 +12,8 @@ const HomePage: React.FC = () => {
   useEffect(() => {
     const fetchData = async () => {
       try {
-        const themeIds = await fetchMostReservedThemeIds().then(res => {
+        const themeFetchCount = 10;
-          const themeIds = res.themeIds;
+        const response = await fetchMostReservedThemes(themeFetchCount);
-          if (themeIds.length === 0) {
-            setRanking([]);
-            return;
-          }
-          return themeIds;
-        })
-        
-        if (themeIds === undefined) return;
-        if (themeIds.length === 0) return;
-
-        const response = await findThemesByIds({ themeIds: themeIds });
         setRanking(response.themes.map(mapThemeResponse));
       } catch (err) {
         console.error('Error fetching ranking:', err);
@@ -71,11 +59,12 @@ const HomePage: React.FC = () => {
             <div className="modal-theme-info">
               <h2>{selectedTheme.name}</h2>
               <p>{selectedTheme.description}</p>
-              <div className="theme-details">
+              <div className="theme-details modal-info-grid">
-                <p><strong>난이도:</strong> {selectedTheme.difficulty}</p>
+                <p><strong>난이도:</strong><span>{DifficultyKoreanMap[selectedTheme.difficulty]}</span></p>
-                <p><strong>가격:</strong> {selectedTheme.price.toLocaleString()}원</p>
+                <p><strong>이용 가능 인원:</strong><span>{selectedTheme.minParticipants} ~ {selectedTheme.maxParticipants}명</span></p>
-                <p><strong>예상 시간:</strong> {selectedTheme.expectedMinutesFrom} ~ {selectedTheme.expectedMinutesTo}분</p>
+                <p><strong>1인당 요금:</strong><span>{selectedTheme.price.toLocaleString()}원</span></p>
-                <p><strong>이용 가능 인원:</strong> {selectedTheme.minParticipants} ~ {selectedTheme.maxParticipants}명</p>
+                <p><strong>예상 시간:</strong><span>{selectedTheme.expectedMinutesFrom} ~ {selectedTheme.expectedMinutesTo}분</span></p>
+                <p><strong>이용 가능 시간:</strong><span>{selectedTheme.availableMinutes}분</span></p>
               </div>
             </div>
             <div className="modal-buttons">

frontend/src/pages/LoginPage.tsx

@@ -15,11 +15,11 @@ const LoginPage: React.FC = () => {
   const handleLogin = async (e: React.FormEvent) => {
     e.preventDefault();
     try {
-      const principalType = from.startsWith('/admin') ? 'ADMIN' : 'USER';
+      await login({ account: email, password: password });
-      await login({ account: email, password: password, principalType: principalType });
 
       alert('로그인에 성공했어요!');
-      navigate(from, { replace: true });
+      const redirectTo = from.startsWith('/admin') ? '/' : from;
+      navigate(redirectTo, { replace: true });
     } catch (error: any) {
       const message = error.response?.data?.message || '로그인에 실패했어요. 이메일과 비밀번호를 확인해주세요.';
       alert(message);

frontend/src/pages/MyReservationPage.tsx

@@ -1,17 +1,18 @@
-import {cancelPayment} from '@_api/payment/paymentAPI';
+import { cancelPayment } from '@_api/payment/paymentAPI';
-import type {PaymentRetrieveResponse} from '@_api/payment/PaymentTypes';
+import type { PaymentRetrieveResponse } from '@_api/payment/PaymentTypes';
-import {cancelReservation, fetchDetailById, fetchSummaryByMember} from '@_api/reservation/reservationAPI';
+import { cancelReservation, fetchDetailById, fetchAllOverviewByUser } from '@_api/reservation/reservationAPI';
 import {
-    type ReservationDetail,
   ReservationStatus,
-    type ReservationSummaryRetrieveResponse
+  type ReservationDetail,
+  type ReservationOverviewResponse
 } from '@_api/reservation/reservationTypes';
-import React, {useEffect, useState} from 'react';
 import '@_css/my-reservation-v2.css';
+import { formatDate, formatDisplayDateTime, formatTime } from '@_util/DateTimeFormatter';
+import React, { useEffect, useState } from 'react';
 
-const getReservationStatus = (reservation: ReservationSummaryRetrieveResponse): { className: string, text: string } => {
+const getReservationStatus = (reservation: ReservationOverviewResponse): { className: string, text: string } => {
   const now = new Date();
-  const reservationDateTime = new Date(`${reservation.date}T${reservation.startAt}`);
+  const reservationDateTime = new Date(`${reservation.date}T${reservation.startFrom}`);
 
   switch (reservation.status) {
     case ReservationStatus.CANCELED:
@@ -28,75 +29,6 @@ const getReservationStatus = (reservation: ReservationSummaryRetrieveResponse):
   }
 };
 
-const formatDisplayDateTime = (dateTime: any): string => {
-  let date: Date;
-
-  if (typeof dateTime === 'string') {
-    // ISO 문자열 형식 처리 (LocalDateTime, OffsetDateTime 모두 포함)
-    date = new Date(dateTime);
-  } else if (typeof dateTime === 'number') {
-    // Unix 타임스탬프(초) 형식 처리
-    date = new Date(dateTime * 1000);
-  } else if (Array.isArray(dateTime) && dateTime.length >= 6) {
-    // 배열 형식 처리: [year, month, day, hour, minute, second, nanosecond?]
-    const year = dateTime[0];
-    const month = dateTime[1] - 1; // JS Date의 월은 0부터 시작
-    const day = dateTime[2];
-    const hour = dateTime[3];
-    const minute = dateTime[4];
-    const second = dateTime[5];
-    const millisecond = dateTime.length > 6 ? Math.floor(dateTime[6] / 1000000) : 0;
-    date = new Date(year, month, day, hour, minute, second, millisecond);
-  } else {
-    return '유효하지 않은 날짜 형식';
-  }
-
-  if (isNaN(date.getTime())) {
-    return '유효하지 않은 날짜';
-  }
-
-  const options: Intl.DateTimeFormatOptions = {
-    year: 'numeric',
-    month: 'long',
-    day: 'numeric',
-    hour: 'numeric',
-    minute: 'numeric',
-    hour12: true,
-    second: 'numeric'
-  };
-  return new Intl.DateTimeFormat('ko-KR', options).format(date);
-};
-
-const formatCardDateTime = (dateStr: string, timeStr: string): string => {
-  const date = new Date(`${dateStr}T${timeStr}`);
-  const currentYear = new Date().getFullYear();
-  const reservationYear = date.getFullYear();
-
-  const days = ['일', '월', '화', '수', '목', '금', '토'];
-  const dayOfWeek = days[date.getDay()];
-  const month = date.getMonth() + 1;
-  const day = date.getDate();
-  let hours = date.getHours();
-  const minutes = date.getMinutes();
-  const ampm = hours >= 12 ? '오후' : '오전';
-  hours = hours % 12;
-  hours = hours ? hours : 12;
-
-  let datePart = '';
-  if (currentYear === reservationYear) {
-    datePart = `${month}월 ${day}일(${dayOfWeek})`;
-  } else {
-    datePart = `${reservationYear}년 ${month}월 ${day}일(${dayOfWeek})`;
-  }
-
-  let timePart = `${ampm} ${hours}시`;
-  if (minutes !== 0) {
-    timePart += ` ${minutes}분`;
-  }
-
-  return `${datePart} ${timePart}`;
-};
-
 // --- Cancellation View Component ---
 const CancellationView: React.FC<{
   reservation: ReservationDetail;
@@ -117,10 +49,10 @@ const CancellationView: React.FC<{
   return (
     <div className="cancellation-view-v2">
       <h3>취소 정보 확인</h3>
-      <div className="cancellation-summary-v2">
+      <div className="cancellation-summary-v2 modal-info-grid">
-        <p><strong>테마:</strong> {reservation.themeName}</p>
+        <p><strong>테마:</strong><span>{reservation.overview.themeName}</span></p>
-        <p><strong>신청 일시:</strong> {formatDisplayDateTime(reservation.applicationDateTime)}</p>
+        <p><strong>신청 일시:</strong><span>{formatDisplayDateTime(reservation.applicationDateTime)}</span></p>
-        {reservation.payment && <p><strong>결제 금액:</strong> {reservation.payment.totalAmount.toLocaleString()}원</p>}
+        {reservation.payment && <p><strong>결제 금액:</strong><span>{reservation.payment.totalAmount.toLocaleString()}원</span></p>}
       </div>
       <textarea
         value={reason}
@@ -157,33 +89,33 @@ const ReservationDetailView: React.FC<{
           <>
             {payment.totalAmount !== detail.amount && (
               <>
-                <p><strong>(카드)승인 금액:</strong> {detail.amount.toLocaleString()}원</p>
+                <p><strong>승인 금액:</strong><span>{detail.amount.toLocaleString()}원</span></p>
                 {detail.easypayDiscountAmount && (
-                  <p><strong>(간편결제)할인 금액:</strong> {detail.easypayDiscountAmount.toLocaleString()}원</p>
+                  <p><strong>할인 금액:</strong><span>{detail.easypayDiscountAmount.toLocaleString()}원</span></p>
                 )}
               </>
             )}
             {detail.easypayProviderName && (
-              <p><strong>간편결제사: </strong> {detail.easypayProviderName}</p>
+              <p><strong>간편결제사: </strong><span>{detail.easypayProviderName}</span></p>
             )}
-            <p><strong>카드사 / 구분:</strong> {detail.issuerCode}({detail.ownerType}) / {detail.cardType}</p>
+            <p><strong>카드사 / 구분:</strong><span>{detail.issuerCode}({detail.ownerType}) / {detail.cardType}</span></p>
-            <p><strong>카드 번호:</strong> {detail.cardNumber}</p>
+            <p><strong>카드 번호:</strong><span>{detail.cardNumber}</span></p>
-            <p><strong>할부 방식:</strong> {detail.installmentPlanMonths === 0 ? '일시불' : `${detail.installmentPlanMonths}개월`}</p>
+            <p><strong>할부:</strong><span>{detail.installmentPlanMonths === 0 ? '일시불' : `${detail.installmentPlanMonths}개월`}</span></p>
-            <p><strong>승인 번호:</strong> {detail.approvalNumber}</p>
+            <p><strong>승인 번호:</strong><span>{detail.approvalNumber}</span></p>
           </>
         );
       case 'BANK_TRANSFER':
         return (
           <>
-            <p><strong>은행:</strong> {detail.bankName}</p>
+            <p><strong>은행:</strong><span>{detail.bankName}</span></p>
-            <p><strong>정산 상태:</strong> {detail.settlementStatus}</p>
+            <p><strong>정산 상태:</strong><span>{detail.settlementStatus}</span></p>
           </>
         );
       case 'EASYPAY_PREPAID':
         return (
           <>
-            <p><strong>결제 금액:</strong> {detail.amount.toLocaleString()}원</p>
+            <p><strong>결제 금액:</strong><span>{detail.amount.toLocaleString()}원</span></p>
-            {detail.discountAmount > 0 && <p><strong>포인트 사용:</strong> {detail.discountAmount.toLocaleString()}원</p>}
+            {detail.discountAmount > 0 && <p><strong>포인트 사용:</strong><span>{detail.discountAmount.toLocaleString()}원</span></p>}
           </>
         );
       default:
@@ -193,13 +125,14 @@ const ReservationDetailView: React.FC<{
 
   return (
     <>
-      <div className="modal-section-v2">
+      <div className="modal-section-v2 modal-info-grid">
         <h3>예약 정보</h3>
-        <p><strong>예약 테마:</strong> {reservation.themeName}</p>
+        <p><strong>매장:</strong><span>{reservation.overview.storeName}</span></p>
-        <p><strong>이용 예정일:</strong> {formatCardDateTime(reservation.date, reservation.startAt)}</p>
+        <p><strong>테마:</strong><span>{reservation.overview.themeName}</span></p>
-        <p><strong>예약자 이름:</strong> {reservation.user.name}</p>
+        <p><strong>이용일시:</strong><span>{formatDate(reservation.overview.date)} {formatTime(reservation.overview.startFrom)} ~ {formatTime(reservation.overview.endAt)}</span></p>
-        <p><strong>예약자 이메일:</strong> {reservation.user.phone}</p>
+        <p><strong>예약자 성함:</strong><span>{reservation.reserver.name}</span></p>
-        <p><strong>예약 신청 일시:</strong> {formatDisplayDateTime(reservation.applicationDateTime)}</p>
+        <p><strong>예약자 연락처:</strong><span>{reservation.reserver.contact}</span></p>
+        <p><strong>예약 신청 일시:</strong><span>{formatDisplayDateTime(reservation.applicationDateTime)}</span></p>
       </div>
 
       {!reservation.payment ? (
@@ -209,14 +142,14 @@ const ReservationDetailView: React.FC<{
         </div>
       ) : (
         <>
-          <div className="modal-section-v2">
+          <div className="modal-section-v2 modal-info-grid">
             <h3>결제 정보</h3>
-            <p><strong>주문 ID:</strong> {reservation.payment.orderId}</p>
+            <p><strong>주문 ID:</strong><span>{reservation.payment.orderId}</span></p>
-            <p><strong>총 결제액:</strong> {reservation.payment.totalAmount.toLocaleString()}원</p>
+            <p><strong>총 결제액:</strong><span>{reservation.payment.totalAmount.toLocaleString()}원</span></p>
-            <p><strong>결제 수단:</strong> {reservation.payment.method}</p>
+            <p><strong>결제 수단:</strong><span>{reservation.payment.method}</span></p>
-            {reservation.payment.approvedAt && <p><strong>결제 승인 일시:</strong> {formatDisplayDateTime(reservation.payment.approvedAt)}</p>}
+            {reservation.payment.approvedAt && <p><strong>결제 승인 일시:</strong><span>{formatDisplayDateTime(reservation.payment.approvedAt)}</span></p>}
           </div>
-          <div className="modal-section-v2">
+          <div className="modal-section-v2 modal-info-grid">
             <h3>결제 상세 정보</h3>
             {renderPaymentSubDetails(reservation.payment)}
           </div>
@@ -224,12 +157,12 @@ const ReservationDetailView: React.FC<{
       )}
 
       {reservation.payment && reservation.payment.cancel && (
-        <div className="modal-section-v2 cancellation-section-v2">
+        <div className="modal-section-v2 cancellation-section-v2 modal-info-grid">
           <h3>취소 정보</h3>
-          <p><strong>취소 요청 일시:</strong> {formatDisplayDateTime(reservation.payment.cancel.cancellationRequestedAt)}</p>
+          <p><strong>취소 요청 일시:</strong><span>{formatDisplayDateTime(reservation.payment.cancel.cancellationRequestedAt)}</span></p>
-          <p><strong>환불 완료 일시:</strong> {formatDisplayDateTime(reservation.payment.cancel.cancellationApprovedAt)}</p>
+          <p><strong>환불 완료 일시:</strong><span>{formatDisplayDateTime(reservation.payment.cancel.cancellationApprovedAt)}</span></p>
-          <p><strong>취소 사유:</strong> {reservation.payment.cancel.cancelReason}</p>
+          <p><strong>취소 사유:</strong><span>{reservation.payment.cancel.cancelReason}</span></p>
-          <p><strong>취소 요청인:</strong> {reservation.payment.cancel.canceledBy == reservation.user.id ? '회원 본인' : '관리자'}</p>
+          <p><strong>취소 요청인:</strong><span>{reservation.payment.cancel.canceledBy == reservation.user.id ? '회원 본인' : '관리자'}</span></p>
         </div>
       )}
       {reservation.payment && reservation.payment.status !== 'CANCELED' && (
@@ -243,7 +176,7 @@ const ReservationDetailView: React.FC<{
 
 // --- Main Page Component ---
 const MyReservationPage: React.FC = () => {
-  const [reservations, setReservations] = useState<ReservationSummaryRetrieveResponse[]>([]);
+  const [reservations, setReservations] = useState<ReservationOverviewResponse[]>([]);
   const [isLoading, setIsLoading] = useState(true);
   const [error, setError] = useState<string | null>(null);
 
@@ -258,7 +191,7 @@ const MyReservationPage: React.FC = () => {
   const loadReservations = async () => {
     try {
       setIsLoading(true);
-      const data = await fetchSummaryByMember();
+      const data = await fetchAllOverviewByUser();
       setReservations(data.reservations);
       setError(null);
     } catch (err) {
@@ -272,17 +205,15 @@ const MyReservationPage: React.FC = () => {
     loadReservations();
   }, []);
 
-  const handleShowDetail = async (id: string, themeName: string, date: string, time: string) => {
+  const handleShowDetail = async (overview: ReservationOverviewResponse) => {
     try {
       setIsDetailLoading(true);
       setDetailError(null);
       setModalView('detail');
-      const detailData = await fetchDetailById(id);
+      const detailData = await fetchDetailById(overview.id);
       setSelectedReservation({
-        id: detailData.id,
+        overview: overview,
-        themeName: themeName,
+        reserver: detailData.reserver,
-        date: date,
-        startAt: time,
         user: detailData.user,
         applicationDateTime: detailData.applicationDateTime,
         payment: detailData.payment
@@ -310,8 +241,8 @@ const MyReservationPage: React.FC = () => {
     try {
       setIsCancelling(true);
       setDetailError(null);
-      await cancelReservation(selectedReservation.id, reason);
+      await cancelPayment({ reservationId: selectedReservation.overview.id, cancelReason: reason });
-      cancelPayment({ reservationId: selectedReservation.id, cancelReason: reason });
+      await cancelReservation(selectedReservation.overview.id, reason);
       alert('예약을 취소했어요. 결제 취소까지는 3-5일 정도 소요될 수 있어요.');
       handleCloseModal();
       await loadReservations(); // Refresh the list
@@ -325,7 +256,7 @@ const MyReservationPage: React.FC = () => {
 
   return (
     <div className="my-reservation-container-v2">
-      <h1>내 예약 V2</h1>
+      <h1>내 예약</h1>
 
       {isLoading && <p>목록 로딩 중...</p>}
       {error && <p className="error-message-v2">{error}</p>}
@@ -338,15 +269,18 @@ const MyReservationPage: React.FC = () => {
               <div key={res.id} className={`reservation-summary-card-v2 ${status.className}`}>
                 <div className="card-status-badge">{status.text}</div>
                 <div className="summary-details-v2">
-                  <h3 className="summary-theme-name-v2">{res.themeName}</h3>
+                  <div><h3 className="summary-theme-name-v2">{res.themeName}</h3></div>
-                  <p className="summary-datetime-v2">{formatCardDateTime(res.date, res.startAt)}</p>
+                  <div className="summary-subdetails-v2">
+                    <p className="summary-store-name-v2">{res.storeName}</p>
+                    <p className="summary-datetime-v2">{formatDate(res.date)} {formatTime(res.startFrom)} ~ {formatTime(res.endAt)}</p>
+                  </div>
                 </div>
                 <button
-                  onClick={() => handleShowDetail(res.id, res.themeName, res.date, res.startAt)}
+                  onClick={() => handleShowDetail(res)}
                   disabled={isDetailLoading}
                   className="detail-button-v2"
                 >
-                  {isDetailLoading && selectedReservation?.id === res.id ? '로딩중...' : '상세보기'}
+                  {isDetailLoading && selectedReservation?.overview.id === res.id ? '로딩중...' : '상세보기'}
                 </button>
               </div>
             );

frontend/src/pages/ReservationFormPage.tsx

@@ -1,19 +1,20 @@
-import {isLoginRequiredError} from '@_api/apiClient';
+import { isLoginRequiredError } from '@_api/apiClient';
-import {createPendingReservation} from '@_api/reservation/reservationAPI';
+import { createPendingReservation } from '@_api/reservation/reservationAPI';
-import {fetchContact} from '@_api/user/userAPI';
+import type { ReservationData } from '@_api/reservation/reservationTypes';
+import { fetchContact } from '@_api/user/userAPI';
 import '@_css/reservation-v2-1.css';
-import React, {useEffect, useState} from 'react';
+import React, { useEffect, useState } from 'react';
-import {useLocation, useNavigate} from 'react-router-dom';
+import { useLocation, useNavigate } from 'react-router-dom';
-import {formatDate, formatTime} from 'src/util/DateTimeFormatter';
+import { formatDate, formatTime } from 'src/util/DateTimeFormatter';
 
 const ReservationFormPage: React.FC = () => {
     const navigate = useNavigate();
     const location = useLocation();
-    const { scheduleId, theme, date, time } = location.state || {};
+    const reservationData = location.state as ReservationData;
 
     const [reserverName, setReserverName] = useState('');
     const [reserverContact, setReserverContact] = useState('');
-    const [participantCount, setParticipantCount] = useState(theme.minParticipants || 1);
+    const [participantCount, setParticipantCount] = useState(reservationData.theme.minParticipants || 2);
     const [requirement, setRequirement] = useState('');
     const [isLoadingUserInfo, setIsLoadingUserInfo] = useState(true);
 
@@ -50,30 +51,29 @@ const ReservationFormPage: React.FC = () => {
             return;
         }
 
-        const reservationData = {
+        createPendingReservation({
-            scheduleId,
+            scheduleId: reservationData.scheduleId,
             reserverName,
             reserverContact,
             participantCount,
             requirement,
-        };
+        }).then(res => {
-
-        createPendingReservation(reservationData)
-            .then(res => {
             navigate('/reservation/payment', {
                 state: {
                     reservationId: res.id,
-                        themeName: theme.name,
+                    storeName: reservationData.store.name,
-                        date: date,
+                    themeName: reservationData.theme.name,
-                        startAt: time,
+                    date: reservationData.date,
-                        price: theme.price * participantCount,
+                    time: formatTime(reservationData.startFrom) + ' ~ ' + formatTime(reservationData.endAt),
+                    themePrice: reservationData.theme.price,
+                    totalPrice: reservationData.theme.price * participantCount,
+                    participantCount: participantCount,
                 }
             });
-            })
+        }).catch(handleError);
-            .catch(handleError);
     };
 
-    if (!scheduleId || !theme) {
+    if (!reservationData) {
         return (
             <div className="reservation-v21-container">
                 <h2 className="page-title">잘못된 접근</h2>
@@ -89,9 +89,10 @@ const ReservationFormPage: React.FC = () => {
 
             <div className="step-section">
                 <h3>예약 내용 확인</h3>
-                <p><strong>테마:</strong> {theme.name}</p>
+                <p><strong>매장:</strong> {reservationData.store.name}</p>
-                <p><strong>날짜:</strong> {formatDate(date)}</p>
+                <p><strong>테마:</strong> {reservationData.theme.name}</p>
-                <p><strong>시간:</strong> {formatTime(time)}</p>
+                <p><strong>날짜:</strong> {formatDate(reservationData.date)}</p>
+                <p><strong>시간:</strong> {formatTime(reservationData.startFrom)} ~ {formatTime(reservationData.endAt)}</p>
             </div>
 
             <div className="step-section">
@@ -124,9 +125,9 @@ const ReservationFormPage: React.FC = () => {
                         <input
                             type="number"
                             value={participantCount}
-                            onChange={e => setParticipantCount(Math.max(theme.minParticipants, Math.min(theme.maxParticipants, Number(e.target.value))))}
+                            onChange={e => setParticipantCount(Math.max(reservationData.theme.minParticipants, Math.min(reservationData.theme.maxParticipants, Number(e.target.value))))}
-                            min={theme.minParticipants}
+                            min={reservationData.theme.minParticipants}
-                            max={theme.maxParticipants}
+                            max={reservationData.theme.maxParticipants}
                         />
                     </div>
                 </div>

frontend/src/pages/ReservationStep1Page.tsx

@@ -1,30 +1,44 @@
-import {isLoginRequiredError} from '@_api/apiClient';
+import { isLoginRequiredError } from '@_api/apiClient';
-import {findAvailableThemesByDate, findSchedules, holdSchedule} from '@_api/schedule/scheduleAPI';
+import { fetchSidoList, fetchSigunguList } from '@_api/region/regionAPI';
-import {type ScheduleRetrieveResponse, ScheduleStatus} from '@_api/schedule/scheduleTypes';
+import { type SidoResponse, type SigunguResponse } from '@_api/region/regionTypes';
-import {findThemesByIds} from '@_api/theme/themeAPI';
+import { type ReservationData } from '@_api/reservation/reservationTypes';
-import {mapThemeResponse, type ThemeInfoResponse} from '@_api/theme/themeTypes';
+import { fetchSchedules, holdSchedule } from '@_api/schedule/scheduleAPI';
+import { ScheduleStatus, type ScheduleWithThemeResponse } from '@_api/schedule/scheduleTypes';
+import { getStores } from '@_api/store/storeAPI';
+import { type SimpleStoreResponse } from '@_api/store/storeTypes';
+import { fetchThemeById } from '@_api/theme/themeAPI';
+import { DifficultyKoreanMap, type ThemeInfoResponse } from '@_api/theme/themeTypes';
 import '@_css/reservation-v2-1.css';
-import React, {useEffect, useState} from 'react';
+import React, { useEffect, useState } from 'react';
-import {useLocation, useNavigate} from 'react-router-dom';
+import { useLocation, useNavigate } from 'react-router-dom';
-import {formatDate, formatTime} from 'src/util/DateTimeFormatter';
+import { formatDate } from 'src/util/DateTimeFormatter';
-
 
 const ReservationStep1Page: React.FC = () => {
     const [selectedDate, setSelectedDate] = useState<Date>(new Date());
-    const [viewDate, setViewDate] = useState<Date>(new Date()); // For carousel
+    const [viewDate, setViewDate] = useState<Date>(new Date());
-    const [themes, setThemes] = useState<ThemeInfoResponse[]>([]);
+
-    const [selectedTheme, setSelectedTheme] = useState<ThemeInfoResponse | null>(null);
+    const [sidoList, setSidoList] = useState<SidoResponse[]>([]);
-    const [schedules, setSchedules] = useState<ScheduleRetrieveResponse[]>([]);
+    const [sigunguList, setSigunguList] = useState<SigunguResponse[]>([]);
-    const [selectedSchedule, setSelectedSchedule] = useState<ScheduleRetrieveResponse | null>(null);
+    const [storeList, setStoreList] = useState<SimpleStoreResponse[]>([]);
+
+    const [selectedSido, setSelectedSido] = useState('');
+    const [selectedSigungu, setSelectedSigungu] = useState('');
+    const [selectedStore, setSelectedStore] = useState<SimpleStoreResponse | null>(null);
+
+    const [schedulesByTheme, setSchedulesByTheme] = useState<Record<string, ScheduleWithThemeResponse[]>>({});
+    const [selectedSchedule, setSelectedSchedule] = useState<ScheduleWithThemeResponse | null>(null);
+
     const [isThemeModalOpen, setIsThemeModalOpen] = useState(false);
+    const [modalThemeDetails, setModalThemeDetails] = useState<ThemeInfoResponse | null>(null);
     const [isConfirmModalOpen, setIsConfirmModalOpen] = useState(false);
+
     const navigate = useNavigate();
     const location = useLocation();
 
     const handleError = (err: any) => {
         if (isLoginRequiredError(err)) {
             alert('로그인이 필요해요.');
-            navigate('/login', { state: { from: location } });
+            navigate('/login', {state: {from: location}});
         } else {
             const message = err.response?.data?.message || '알 수 없는 오류가 발생했습니다.';
             alert(message);
@@ -33,89 +47,48 @@ const ReservationStep1Page: React.FC = () => {
     };
 
     useEffect(() => {
-        if (selectedDate) {
+        fetchSidoList().then(res => setSidoList(res.sidoList)).catch(handleError);
-            const dateStr = selectedDate.toLocaleDateString('en-CA'); // yyyy-mm-dd
+    }, []);
-            findAvailableThemesByDate(dateStr)
-                .then(res => {
-                    console.log('Available themes response:', res);
-                    const themeIds: string[] = res.themeIds;
-                    console.log('Available theme IDs:', themeIds);
-                    if (themeIds.length > 0) {
-                        return findThemesByIds({ themeIds });
-                    } else {
-                        return Promise.resolve({ themes: [] });
-                    }
-                })
-                .then(themeResponse => {
-                    setThemes(themeResponse.themes.map(mapThemeResponse));
-                })
-                .catch((err) => {
-                    if (isLoginRequiredError(err)) {
-                        setThemes([]);
-                    } else {
-                        const message = err.response?.data?.message || '알 수 없는 오류가 발생했습니다.';
-                        alert(message);
-                        console.error(err);
-                    }
-                })
-                .finally(() => {
-                    setSelectedTheme(null);
-                    setSchedules([]);
-                    setSelectedSchedule(null);
-                });
-        }
-    }, [selectedDate]);
 
     useEffect(() => {
-        if (selectedDate && selectedTheme) {
+        if (selectedSido) {
+            fetchSigunguList(selectedSido).then(res => setSigunguList(res.sigunguList)).catch(handleError);
+        } else {
+            setSigunguList([]);
+        }
+        setSelectedSigungu('');
+    }, [selectedSido]);
+
+    useEffect(() => {
+        if (selectedSido) {
+            getStores(selectedSido, selectedSigungu)
+                .then(res => setStoreList(res.stores))
+                .catch(handleError);
+        } else {
+            setStoreList([]);
+        }
+        setSelectedStore(null);
+    }, [selectedSido, selectedSigungu]);
+
+    useEffect(() => {
+        if (selectedDate && selectedStore) {
             const dateStr = selectedDate.toLocaleDateString('en-CA');
-            findSchedules(dateStr, selectedTheme.id)
+            fetchSchedules(selectedStore.id, dateStr)
                 .then(res => {
-                    setSchedules(res.schedules);
+                    const grouped = res.schedules.reduce((acc, schedule) => {
-                    setSelectedSchedule(null);
+                        const key = schedule.theme.name;
+                        if (!acc[key]) acc[key] = [];
+                        acc[key].push(schedule);
+                        return acc;
+                    }, {} as Record<string, ScheduleWithThemeResponse[]>);
+                    setSchedulesByTheme(grouped);
                 })
-                .catch((err) => {
+                .catch(handleError);
-                    if (isLoginRequiredError(err)) {
-                        setSchedules([]);
         } else {
-                        const message = err.response?.data?.message || '알 수 없는 오류가 발생했습니다.';
+            setSchedulesByTheme({});
-                        alert(message);
-                        console.error(err);
         }
         setSelectedSchedule(null);
-                });
+    }, [selectedDate, selectedStore]);
-        }
-    }, [selectedDate, selectedTheme]);
-
-    const handleNextStep = () => {
-        if (!selectedDate || !selectedTheme || !selectedSchedule) {
-            alert('날짜, 테마, 시간을 모두 선택해주세요.');
-            return;
-        }
-        if (selectedSchedule.status !== ScheduleStatus.AVAILABLE) {
-            alert('예약할 수 없는 시간입니다.');
-            return;
-        }
-        setIsConfirmModalOpen(true);
-    };
-
-    const handleConfirmReservation = () => {
-        if (!selectedSchedule) return;
-
-        holdSchedule(selectedSchedule.id)
-            .then(() => {
-                navigate('/reservation/form', { 
-                    state: { 
-                        scheduleId: selectedSchedule.id,
-                        theme: selectedTheme,
-                        date: selectedDate.toLocaleDateString('en-CA'),
-                        time: selectedSchedule.time,
-                    } 
-                });
-            })
-            .catch(handleError)
-            .finally(() => setIsConfirmModalOpen(false));
-    };
 
     const handleDateSelect = (date: Date) => {
         const today = new Date();
@@ -125,7 +98,53 @@ const ReservationStep1Page: React.FC = () => {
             return;
         }
         setSelectedDate(date);
+    };
+
+    const handleNextStep = () => {
+        if (!selectedSchedule) {
+            alert('예약할 시간을 선택해주세요.');
+            return;
         }
+        setIsConfirmModalOpen(true);
+    };
+
+    const handleConfirmReservation = () => {
+        if (!selectedSchedule) return;
+
+        holdSchedule(selectedSchedule.schedule.id)
+            .then(() => {
+                fetchThemeById(selectedSchedule.theme.id).then(res => {
+                    const reservationData: ReservationData = {
+                        scheduleId: selectedSchedule.schedule.id,
+                        store: {
+                            id: selectedStore!.id,
+                            name: selectedStore!.name,
+                        },
+                        theme: {
+                            id: res.id,
+                            name: res.name,
+                            price: res.price,
+                            minParticipants: res.minParticipants,
+                            maxParticipants: res.maxParticipants,
+                        },
+                        date: selectedDate.toLocaleDateString('en-CA'),
+                        startFrom: selectedSchedule.schedule.startFrom,
+                        endAt: selectedSchedule.schedule.endAt,
+                    };
+                    navigate('/reservation/form', {state: reservationData});
+                }).catch(handleError);
+            })
+            .catch(handleError);
+    };
+
+    const openThemeModal = (themeId: string) => {
+        fetchThemeById(themeId)
+            .then(themeDetails => {
+                setModalThemeDetails(themeDetails);
+                setIsThemeModalOpen(true);
+            })
+            .catch(handleError);
+    };
 
     const renderDateCarousel = () => {
         const dates = [];
@@ -184,11 +203,6 @@ const ReservationStep1Page: React.FC = () => {
         );
     };
 
-    const openThemeModal = (theme: ThemeInfoResponse) => {
-        setSelectedTheme(theme);
-        setIsThemeModalOpen(true);
-    };
-    
     const getStatusText = (status: ScheduleStatus) => {
         switch (status) {
             case ScheduleStatus.AVAILABLE:
@@ -200,8 +214,6 @@ const ReservationStep1Page: React.FC = () => {
         }
     };
 
-    const isButtonDisabled = !selectedDate || !selectedTheme || !selectedSchedule || selectedSchedule.status !== ScheduleStatus.AVAILABLE;
-
     return (
         <div className="reservation-v21-container">
             <h2 className="page-title">예약하기</h2>
@@ -212,82 +224,97 @@ const ReservationStep1Page: React.FC = () => {
             </div>
 
             <div className={`step-section ${!selectedDate ? 'disabled' : ''}`}>
-                <h3>2. 테마 선택</h3>
+                <h3>2. 매장 선택</h3>
-                <div className="theme-list">
+                <div className="region-store-selectors">
-                    {themes.map(theme => (
+                    <select value={selectedSido} onChange={e => setSelectedSido(e.target.value)}>
+                        <option value="">시/도</option>
+                        {sidoList.map(s => <option key={s.code} value={s.code}>{s.name}</option>)}
+                    </select>
+                    <select value={selectedSigungu} onChange={e => setSelectedSigungu(e.target.value)}
+                            disabled={!selectedSido}>
+                        <option value="">시/군/구 (전체)</option>
+                        {sigunguList.map(s => <option key={s.code} value={s.code}>{s.name}</option>)}
+                    </select>
+                    <select value={selectedStore?.id || ''}
+                            onChange={e => setSelectedStore(storeList.find(s => s.id === e.target.value) || null)}
+                            disabled={storeList.length === 0}>
+                        <option value="">매장 선택</option>
+                        {storeList.map(s => <option key={s.id} value={s.id}>{s.name}</option>)}
+                    </select>
+                </div>
+            </div>
+
+            <div className={`step-section ${!selectedStore ? 'disabled' : ''}`}>
+                <h3>3. 시간 선택</h3>
+                <div className="schedule-list">
+                    {Object.keys(schedulesByTheme).length > 0 ? (
+                        Object.entries(schedulesByTheme).map(([themeName, scheduleAndTheme]) => (
+                            <div key={themeName} className="theme-schedule-group">
+                                <div className="theme-header">
+                                    <h4>{themeName}</h4>
+                                    <button onClick={() => openThemeModal(scheduleAndTheme[0].theme.id)}
+                                            className="theme-detail-button">상세보기
+                                    </button>
+                                </div>
+                                <div className="time-slots">
+                                    {scheduleAndTheme.map(schedule => (
                                         <div
-                            key={theme.id}
+                                            key={schedule.schedule.id}
-                            className={`theme-card ${selectedTheme?.id === theme.id ? 'active' : ''}`}
+                                            className={`time-slot ${selectedSchedule?.schedule.id === schedule.schedule.id ? 'active' : ''} ${schedule.schedule.status !== ScheduleStatus.AVAILABLE ? 'disabled' : ''}`}
-                            onClick={() => setSelectedTheme(theme)}
+                                            onClick={() => schedule.schedule.status === ScheduleStatus.AVAILABLE && setSelectedSchedule(schedule)}
                                         >
-                            <div className="theme-info">
+                                            {`${schedule.schedule.startFrom} ~ ${schedule.schedule.endAt}`}
-                                <h4>{theme.name}</h4>
+                                            <span className="time-availability">{getStatusText(schedule.schedule.status)}</span>
-                                <div className="theme-meta">
-                                    <p><strong>1인당 요금:</strong> {theme.price.toLocaleString()}원</p>
-                                    <p><strong>난이도:</strong> {theme.difficulty}</p>
-                                    <p><strong>참여 가능 인원:</strong> {theme.minParticipants} ~ {theme.maxParticipants}명</p>
-                                    <p><strong>예상 소요 시간:</strong> {theme.expectedMinutesFrom} ~ {theme.expectedMinutesTo}분</p>
-                                    <p><strong>이용 가능 시간:</strong> {theme.availableMinutes}분</p>
-                                </div>
-                                <button className="theme-detail-button" onClick={(e) => { e.stopPropagation(); openThemeModal(theme); }}>상세보기</button>
-                            </div>
                                         </div>
                                     ))}
                                 </div>
                             </div>
-
+                        ))
-            <div className={`step-section ${!selectedTheme ? 'disabled' : ''}`}>
+                    ) : (
-                <h3>3. 시간 선택</h3>
+                        <div className="no-times">선택한 조건으로 예약 가능한 시간이 없습니다.</div>
-                <div className="time-slots">
+                    )}
-                    {schedules.length > 0 ? schedules.map(schedule => (
-                        <div
-                            key={schedule.id}
-                            className={`time-slot ${selectedSchedule?.id === schedule.id ? 'active' : ''} ${schedule.status !== ScheduleStatus.AVAILABLE ? 'disabled' : ''}`}
-                            onClick={() => schedule.status === ScheduleStatus.AVAILABLE && setSelectedSchedule(schedule)}
-                        >
-                            {schedule.time}
-                            <span className="time-availability">{getStatusText(schedule.status)}</span>
-                        </div>
-                    )) : <div className="no-times">선택 가능한 시간이 없습니다.</div>}
                 </div>
             </div>
 
             <div className="next-step-button-container">
-                <button className="next-step-button" disabled={isButtonDisabled} onClick={handleNextStep}>
+                <button className="next-step-button" disabled={!selectedSchedule} onClick={handleNextStep}>
                     예약하기
                 </button>
             </div>
 
-            {isThemeModalOpen && selectedTheme && (
+            {isThemeModalOpen && modalThemeDetails && (
                 <div className="modal-overlay" onClick={() => setIsThemeModalOpen(false)}>
                     <div className="modal-content" onClick={(e) => e.stopPropagation()}>
                         <button className="modal-close-button" onClick={() => setIsThemeModalOpen(false)}>×</button>
-                        <img src={selectedTheme.thumbnailUrl} alt={selectedTheme.name} className="modal-theme-thumbnail" />
+                        <img src={modalThemeDetails.thumbnailUrl} alt={modalThemeDetails.name}
-                        <h2>{selectedTheme.name}</h2>
+                             className="modal-theme-thumbnail"/>
-                        <div className="modal-section">
+                        <h2>{modalThemeDetails.name}</h2>
+                        <div className="modal-section modal-info-grid">
                             <h3>테마 정보</h3>
-                            <p><strong>난이도:</strong> {selectedTheme.difficulty}</p>
+                            <p><strong>난이도:</strong><span>{DifficultyKoreanMap[modalThemeDetails.difficulty]}</span></p>
-                            <p><strong>참여 인원:</strong> {selectedTheme.minParticipants} ~ {selectedTheme.maxParticipants}명</p>
+                            <p><strong>이용 가능 인원:</strong><span>{modalThemeDetails.minParticipants} ~ {modalThemeDetails.maxParticipants}명</span></p>
-                            <p><strong>소요 시간:</strong> {selectedTheme.expectedMinutesFrom} ~ {selectedTheme.expectedMinutesTo}분</p>
+                            <p><strong>1인당 요금:</strong><span>{modalThemeDetails.price.toLocaleString()}원</span></p>
-                            <p><strong>1인당 요금:</strong> {selectedTheme.price.toLocaleString()}원</p>
+                            <p><strong>예상 시간:</strong><span>{modalThemeDetails.expectedMinutesFrom} ~ {modalThemeDetails.expectedMinutesTo}분</span></p>
+                            <p><strong>이용 가능 시간:</strong><span>{modalThemeDetails.availableMinutes}분</span></p>
                         </div>
                         <div className="modal-section">
                             <h3>소개</h3>
-                            <p>{selectedTheme.description}</p>
+                            <p>{modalThemeDetails.description}</p>
                         </div>
                     </div>
                 </div>
             )}
 
-            {isConfirmModalOpen && (
+            {isConfirmModalOpen && selectedSchedule && (
                 <div className="modal-overlay" onClick={() => setIsConfirmModalOpen(false)}>
                     <div className="modal-content" onClick={(e) => e.stopPropagation()}>
                         <button className="modal-close-button" onClick={() => setIsConfirmModalOpen(false)}>×</button>
                         <h2>예약 정보를 확인해주세요</h2>
-                        <div className="modal-section">
+                        <div className="modal-section modal-info-grid">
-                            <p><strong>날짜:</strong> {formatDate(selectedDate!!.toLocaleDateString('ko-KR'))}</p>
+                            <p><strong>날짜:</strong><span>{formatDate(selectedDate.toLocaleDateString('ko-KR'))}</span></p>
-                            <p><strong>테마:</strong> {selectedTheme!!.name}</p>
+                            <p><strong>매장:</strong><span>{selectedStore?.name}</span></p>
-                            <p><strong>시간:</strong> {formatTime(selectedSchedule!!.time)}</p>
+                            <p><strong>테마:</strong><span>{selectedSchedule.theme.name}</span></p>
+                            <p><strong>시간:</strong><span>{`${selectedSchedule.schedule.startFrom} ~ ${selectedSchedule.schedule.endAt}`}</span></p>
                         </div>
                         <div className="modal-actions">
                             <button className="cancel-button" onClick={() => setIsConfirmModalOpen(false)}>취소</button>

frontend/src/pages/ReservationStep2Page.tsx

@@ -1,11 +1,12 @@
-import {isLoginRequiredError} from '@_api/apiClient';
+import { confirm } from '@_api/order/orderAPI';
-import {confirmPayment} from '@_api/payment/paymentAPI';
+import type { OrderErrorResponse } from '@_api/order/orderTypes';
-import {type PaymentConfirmRequest, PaymentType} from '@_api/payment/PaymentTypes';
+import { type PaymentConfirmRequest } from '@_api/payment/PaymentTypes';
-import {confirmReservation} from '@_api/reservation/reservationAPI';
+import { confirmReservation } from '@_api/reservation/reservationAPI';
 import '@_css/reservation-v2-1.css';
-import React, {useEffect, useRef} from 'react';
+import type { AxiosError } from 'axios';
-import {useLocation, useNavigate} from 'react-router-dom';
+import React, { useEffect, useRef } from 'react';
-import {formatDate, formatTime} from 'src/util/DateTimeFormatter';
+import { useLocation, useNavigate } from 'react-router-dom';
+import { formatDate } from 'src/util/DateTimeFormatter';
 
 declare global {
     interface Window {
@@ -19,18 +20,7 @@ const ReservationStep2Page: React.FC = () => {
     const paymentWidgetRef = useRef<any>(null);
     const paymentMethodsRef = useRef<any>(null);
 
-    const { reservationId, themeName, date, startAt, price } = location.state || {};
+    const { reservationId, storeName, themeName, themePrice, totalPrice, date, time, participantCount } = location.state || {};
-
-    const handleError = (err: any) => {
-        if (isLoginRequiredError(err)) {
-            alert('로그인이 필요해요.');
-            navigate('/login', { state: { from: location } });
-        } else {
-            const message = err.response?.data?.message || '알 수 없는 오류가 발생했습니다.';
-            alert(message);
-            console.error(err);
-        }
-    };
 
     useEffect(() => {
         if (!reservationId) {
@@ -51,12 +41,12 @@ const ReservationStep2Page: React.FC = () => {
 
             const paymentMethods = paymentWidget.renderPaymentMethods(
                 "#payment-method",
-                { value: price },
+                { value: totalPrice, currency: "KRW" },
                 { variantKey: "DEFAULT" }
             );
             paymentMethodsRef.current = paymentMethods;
         };
-    }, [reservationId, price, navigate]);
+    }, [reservationId, totalPrice, navigate]);
 
     const handlePayment = () => {
         if (!paymentWidgetRef.current || !reservationId) {
@@ -67,36 +57,75 @@ const ReservationStep2Page: React.FC = () => {
         const generateRandomString = () =>
             crypto.randomUUID().replace(/-/g, '');
 
+
         paymentWidgetRef.current.requestPayment({
             orderId: generateRandomString(),
             orderName: `${themeName} 예약 결제`,
-            amount: price,
+            amount: totalPrice,
         }).then((data: any) => {
             const paymentData: PaymentConfirmRequest = {
                 paymentKey: data.paymentKey,
                 orderId: data.orderId,
-                amount: price, // Use the price from component state instead of widget response
+                amount: totalPrice,
-                paymentType: data.paymentType || PaymentType.NORMAL,
             };
-
+            confirm(reservationId, paymentData)
-            confirmPayment(reservationId, paymentData)
-                .then(() => {
-                    return confirmReservation(reservationId);
-                })
                 .then(() => {
                     alert('결제가 완료되었어요!');
                     navigate('/reservation/success', {
                         state: {
-                            themeName,
+                            storeName: storeName,
-                            date,
+                            themeName: themeName,
-                            startAt,
+                            date: date,
+                            time: time,
+                            participantCount: participantCount,
+                            totalPrice: totalPrice,
                         }
                     });
                 })
-                .catch(handleError);
+                .catch(err => {
+                    const error = err as AxiosError<OrderErrorResponse>;
+                    const errorCode = error.response?.data?.code;
+                    const errorMessage = error.response?.data?.message;
+
+                    if (errorCode === 'B000') {
+                        alert(`예약을 완료할 수 없어요.(${errorMessage})`);
+                        navigate('/reservation');
+                        return;
+                    }
+
+                    const trial = error.response?.data?.trial || 0;
+                    if (trial < 2) {
+                        alert(errorMessage);
+                        return;
+                    }
+                    alert(errorMessage);
+
+                    setTimeout(() => {
+                        const agreeToOnsitePayment = window.confirm('재시도 횟수를 초과했어요. 현장결제를 하시겠어요?');
+
+                        if (agreeToOnsitePayment) {
+                            confirmReservation(reservationId)
+                                .then(() => {
+                                    navigate('/reservation/success', {
+                                        state: {
+                                            storeName,
+                                            themeName,
+                                            date,
+                                            time,
+                                            participantCount,
+                                            totalPrice,
+                                        },
+                                    });
+                                });
+                        } else {
+                            alert('다음에 다시 시도해주세요. 메인 페이지로 이동할게요.');
+                            navigate('/');
+                        }
+                    }, 100);
+                });
         }).catch((error: any) => {
             console.error("Payment request error:", error);
-            alert("결제 요청 중 오류가 발생했습니다.");
+            alert("결제 요청 중 오류가 발생했어요. 새로고침 후 다시 시도해주세요.");
         });
     };
 
@@ -109,10 +138,13 @@ const ReservationStep2Page: React.FC = () => {
             <h2 className="page-title">결제하기</h2>
             <div className="step-section">
                 <h3>결제 정보 확인</h3>
-                <p><strong>테마:</strong> {themeName}</p>
                 <p><strong>날짜:</strong> {formatDate(date)}</p>
-                <p><strong>시간:</strong> {formatTime(startAt)}</p>
+                <p><strong>시간:</strong> {time}</p>
-                <p><strong>금액:</strong> {price.toLocaleString()}원</p>
+                <p><strong>테마:</strong> {themeName}</p>
+                <p><strong>매장:</strong> {storeName}</p>
+                <p><strong>인원:</strong> {participantCount}명</p>
+                <p><strong>1인당 금액:</strong> {themePrice.toLocaleString()}원</p>
+                <p><strong>총 금액:</strong> {totalPrice.toLocaleString()}원</p>
             </div>
             <div className="step-section">
                 <h3>결제 수단</h3>
@@ -121,7 +153,7 @@ const ReservationStep2Page: React.FC = () => {
             </div>
             <div className="next-step-button-container">
                 <button onClick={handlePayment} className="next-step-button">
-                    {price.toLocaleString()}원 결제하기
+                    {totalPrice.toLocaleString()}원 결제하기
                 </button>
             </div>
         </div>

frontend/src/pages/ReservationSuccessPage.tsx

@@ -1,18 +1,13 @@
-import '@_css/reservation-v2-1.css'; // Reuse the new CSS
+import '@_css/reservation-v2-1.css';
 import React from 'react';
-import {Link, useLocation} from 'react-router-dom';
+import { Link, useLocation } from 'react-router-dom';
-import {formatDate, formatTime} from 'src/util/DateTimeFormatter';
+import { formatDate } from 'src/util/DateTimeFormatter';
 
 const ReservationSuccessPage: React.FC = () => {
     const location = useLocation();
-    const { themeName, date, startAt } = (location.state as {
+    const { storeName, themeName, date, time, participantCount, totalPrice } = location.state || {};
-        themeName: string;
-        date: string;
-        startAt: string;
-    }) || {};
 
-    const formattedDate = formatDate(date)
+    const formattedDate = date ? formatDate(date) : '';
-    const formattedTime = formatTime(startAt);
 
     return (
         <div className="reservation-v21-container">
@@ -20,9 +15,12 @@ const ReservationSuccessPage: React.FC = () => {
             <h2 className="page-title">예약이 확정되었습니다!</h2>
             <div className="step-section">
                 <h3>최종 예약 정보</h3>
+                <p><strong>매장:</strong> {storeName}</p>
                 <p><strong>테마:</strong> {themeName}</p>
                 <p><strong>날짜:</strong> {formattedDate}</p>
-                <p><strong>시간:</strong> {formattedTime}</p>
+                <p><strong>시간:</strong> {time}</p>
+                <p><strong>인원:</strong> {participantCount}명</p>
+                <p><strong>결제 금액:</strong> {totalPrice?.toLocaleString()}원</p>
             </div>
             <div className="success-page-actions">
                 <Link to="/my-reservation" className="action-button">

frontend/src/pages/SignupPage.tsx

@@ -1,8 +1,17 @@
-import {signup} from '@_api/user/userAPI';
+import {
-import type {UserCreateRequest, UserCreateResponse} from '@_api/user/userTypes';
+  fetchRegionCode,
+  fetchSidoList,
+  fetchSigunguList,
+} from '@_api/region/regionAPI';
+import type {
+  SidoResponse,
+  SigunguResponse,
+} from '@_api/region/regionTypes';
+import { signup } from '@_api/user/userAPI';
+import type { UserCreateRequest, UserCreateResponse } from '@_api/user/userTypes';
 import '@_css/signup-page-v2.css';
-import React, {useEffect, useState} from 'react';
+import React, { useEffect, useState } from 'react';
-import {useNavigate} from 'react-router-dom';
+import { useNavigate } from 'react-router-dom';
 
 const MIN_PASSWORD_LENGTH = 8;
 
@@ -14,8 +23,43 @@ const SignupPage: React.FC = () => {
   const [errors, setErrors] = useState<Record<string, string>>({});
   const [hasSubmitted, setHasSubmitted] = useState(false);
 
+  const [sidoList, setSidoList] = useState<SidoResponse[]>([]);
+  const [sigunguList, setSigunguList] = useState<SigunguResponse[]>([]);
+  const [selectedSidoCode, setSelectedSidoCode] = useState('');
+  const [selectedSigunguCode, setSelectedSigunguCode] = useState('');
+
   const navigate = useNavigate();
 
+  useEffect(() => {
+    const fetchSido = async () => {
+      try {
+        const response = await fetchSidoList();
+        setSidoList(response.sidoList);
+      } catch (error) {
+        console.error('시/도 목록을 불러오는 데 실패했습니다.', error);
+      }
+    };
+    fetchSido();
+  }, []);
+
+  useEffect(() => {
+    if (selectedSidoCode) {
+      const fetchSigungu = async () => {
+        try {
+          const response = await fetchSigunguList(selectedSidoCode);
+          setSigunguList(response.sigunguList);
+          setSelectedSigunguCode('');
+        } catch (error) {
+          console.error('시/군/구 목록을 불러오는 데 실패했습니다.', error);
+        }
+      };
+      fetchSigungu();
+    } else {
+      setSigunguList([]);
+      setSelectedSigunguCode('');
+    }
+  }, [selectedSidoCode]);
+
   const validate = () => {
     const newErrors: Record<string, string> = {};
 
@@ -36,6 +80,12 @@ const SignupPage: React.FC = () => {
       newErrors.phone = '올바른 휴대폰 번호 형식이 아닙니다. (예: 01012345678)';
     }
 
+    if (selectedSidoCode || selectedSigunguCode) {
+      if (!selectedSidoCode || !selectedSigunguCode) {
+        newErrors.region = '모든 지역 정보를 선택해주세요.';
+      }
+    }
+
     return newErrors;
   };
 
@@ -44,7 +94,7 @@ const SignupPage: React.FC = () => {
     if (hasSubmitted) {
       setErrors(validate());
     }
-  }, [email, password, name, phone, hasSubmitted]);
+  }, [email, password, name, phone, hasSubmitted, selectedSidoCode, selectedSigunguCode]);
 
   const handleSignup = async (e: React.FormEvent) => {
     e.preventDefault();
@@ -55,7 +105,22 @@ const SignupPage: React.FC = () => {
 
     if (Object.keys(newErrors).length > 0) return;
 
-    const request: UserCreateRequest = { email, password, name, phone, regionCode: null };
+    let regionCode: string | null = null;
+    if (selectedSidoCode && selectedSigunguCode) {
+      try {
+        const response = await fetchRegionCode(
+          selectedSidoCode,
+          selectedSigunguCode,
+        );
+        regionCode = response.code;
+      } catch (error) {
+        alert('지역 코드를 가져오는 데 실패했습니다.');
+        console.error(error);
+        return;
+      }
+    }
+
+    const request: UserCreateRequest = { email, password, name, phone, regionCode };
     try {
       const response: UserCreateResponse = await signup(request);
       alert(`${response.name}님, 회원가입을 축하드려요. 로그인 후 이용해주세요!`);
@@ -133,6 +198,40 @@ const SignupPage: React.FC = () => {
           )}
         </div>
 
+        <div className="form-group">
+          <label className="form-label">지역 (선택)</label>
+          <div className="region-select-group">
+            <select
+              className="form-input"
+              value={selectedSidoCode}
+              onChange={e => setSelectedSidoCode(e.target.value)}
+            >
+              <option value="">시/도</option>
+              {sidoList.map(s => (
+                <option key={s.code} value={s.code}>
+                  {s.name}
+                </option>
+              ))}
+            </select>
+            <select
+              className="form-input"
+              value={selectedSigunguCode}
+              onChange={e => setSelectedSigunguCode(e.target.value)}
+              disabled={!selectedSidoCode}
+            >
+              <option value="">시/군/구</option>
+              {sigunguList.map(s => (
+                <option key={s.code} value={s.code}>
+                  {s.name}
+                </option>
+              ))}
+            </select>
+          </div>
+          {hasSubmitted && errors.region && (
+            <p className="error-text">{errors.region}</p>
+          )}
+        </div>
+
         <button
           type="submit"
           className="btn-primary"

frontend/src/pages/admin/AdminLayout.tsx

@@ -1,4 +1,6 @@
-import React, {type ReactNode} from 'react';
+import { useAdminAuth } from '@_context/AdminAuthContext';
+import React, { type ReactNode, useEffect } from 'react';
+import { useNavigate } from 'react-router-dom';
 import AdminNavbar from './AdminNavbar';
 
 interface AdminLayoutProps {
@@ -6,6 +8,23 @@ interface AdminLayoutProps {
 }
 
 const AdminLayout: React.FC<AdminLayoutProps> = ({ children }) => {
+  const { isAdmin, loading } = useAdminAuth();
+  const navigate = useNavigate();
+
+  useEffect(() => {
+    if (!loading && !isAdmin) {
+      navigate('/admin/login');
+    }
+  }, [isAdmin, loading, navigate]);
+
+  if (loading) {
+    return <div>Loading...</div>;
+  }
+
+  if (!isAdmin) {
+    return null;
+  }
+  
   return (
     <>
       <AdminNavbar />

frontend/src/pages/admin/AdminLoginPage.tsx

@@ -0,0 +1,61 @@
+import React, { useState } from 'react';
+import { useLocation, useNavigate } from 'react-router-dom';
+import { useAdminAuth } from '@_context/AdminAuthContext';
+import '@_css/login-page-v2.css';
+
+const AdminLoginPage: React.FC = () => {
+  const [account, setAccount] = useState('');
+  const [password, setPassword] = useState('');
+  const { login } = useAdminAuth();
+  const navigate = useNavigate();
+  const location = useLocation();
+
+  const from = location.state?.from?.pathname || '/admin';
+
+  const handleLogin = async (e: React.FormEvent) => {
+    e.preventDefault();
+    try {
+      await login({ account: account, password: password });
+      alert('관리자 로그인에 성공했어요!');
+      navigate(from, { replace: true });
+    } catch (error: any) {
+      const message = error.response?.data?.message || '로그인에 실패했어요. 계정과 비밀번호를 확인해주세요.';
+      alert(message);
+      console.error('관리자 로그인 실패:', error);
+      setPassword('');
+    }
+  };
+
+  return (
+    <div className="login-container-v2">
+      <h2 className="page-title">관리자 로그인</h2>
+      <form className="login-form-v2" onSubmit={handleLogin}>
+        <div className="form-group">
+          <input
+            type="text"
+            className="form-input"
+            placeholder="계정"
+            value={account}
+            onChange={e => setAccount(e.target.value)}
+            required
+          />
+        </div>
+        <div className="form-group">
+          <input
+            type="password"
+            className="form-input"
+            placeholder="비밀번호"
+            value={password}
+            onChange={e => setPassword(e.target.value)}
+            required
+          />
+        </div>
+        <div className="button-group">
+          <button type="submit" className="btn btn-primary">로그인</button>
+        </div>
+      </form>
+    </div>
+  );
+};
+
+export default AdminLoginPage;

frontend/src/pages/admin/AdminNavbar.tsx

@@ -1,10 +1,10 @@
+import { useAdminAuth } from '@_context/AdminAuthContext';
 import React from 'react';
-import {Link, useNavigate} from 'react-router-dom';
+import { Link, useNavigate } from 'react-router-dom';
-import {useAuth} from '@_context/AuthContext';
 import '@_css/navbar.css';
 
 const AdminNavbar: React.FC = () => {
-    const { loggedIn, userName, logout } = useAuth();
+    const { isAdmin, name, type, logout } = useAdminAuth();
     const navigate = useNavigate();
 
     const handleLogout = async (e: React.MouseEvent) => {
@@ -21,16 +21,17 @@ const AdminNavbar: React.FC = () => {
         <nav className="navbar-container">
             <div className="nav-links">
                 <Link className="nav-link" to="/admin">홈</Link>
-                <Link className="nav-link" to="/admin/theme">테마</Link>
+                {type === 'HQ' && <Link className="nav-link" to="/admin/theme">테마</Link>}
+                {type === 'HQ' && <Link className="nav-link" to="/admin/store">매장</Link>}
                 <Link className="nav-link" to="/admin/schedule">일정</Link>
             </div>
             <div className="nav-actions">
-                {!loggedIn ? (
+                {!isAdmin ? (
-                    <button className="btn btn-primary" onClick={() => navigate('/v2/login')}>Login</button>
+                    <button className="btn btn-primary" onClick={() => navigate('/admin/login')}>Login</button>
                 ) : (
                     <div className="profile-info">
                         <img className="profile-image" src="/image/default-profile.png" alt="Profile" />
-                        <span>{userName || 'Profile'}</span>
+                        <span>{name || 'Profile'}</span>
                         <div className="dropdown-menu">
                             <a className="dropdown-item" href="#" onClick={handleLogout}>Logout</a>
                         </div>

frontend/src/pages/admin/AdminSchedulePage.tsx

@@ -1,19 +1,20 @@
 import {isLoginRequiredError} from '@_api/apiClient';
+import type {AuditInfo} from '@_api/common/commonTypes';
 import {
     createSchedule,
     deleteSchedule,
-    findScheduleById,
+    fetchAdminSchedules,
-    findSchedules,
+    fetchScheduleAudit,
     updateSchedule
 } from '@_api/schedule/scheduleAPI';
-import {
+import {type AdminScheduleSummaryResponse, ScheduleStatus,} from '@_api/schedule/scheduleTypes';
-    type ScheduleDetailRetrieveResponse,
+import {getStores} from '@_api/store/storeAPI';
-    type ScheduleRetrieveResponse,
+import {type SimpleStoreResponse} from '@_api/store/storeTypes';
-    ScheduleStatus
+import {fetchActiveThemes} from '@_api/theme/themeAPI';
-} from '@_api/schedule/scheduleTypes';
+import {DifficultyKoreanMap, type SimpleActiveThemeResponse, type ThemeInfoResponse} from '@_api/theme/themeTypes';
-import {fetchAdminThemes} from '@_api/theme/themeAPI';
+import {useAdminAuth} from '@_context/AdminAuthContext';
-import type {AdminThemeSummaryRetrieveResponse} from '@_api/theme/themeTypes';
 import '@_css/admin-schedule-page.css';
+import {formatDisplayDateTime} from '@_util/DateTimeFormatter';
 import React, {Fragment, useEffect, useState} from 'react';
 import {useLocation, useNavigate} from 'react-router-dom';
 
@@ -32,28 +33,41 @@ const getScheduleStatusText = (status: ScheduleStatus): string => {
     }
 };
 
+type ScheduleDetail = AdminScheduleSummaryResponse & { audit?: AuditInfo };
+type EditingSchedule = ScheduleDetail & { time: string };
+
 const AdminSchedulePage: React.FC = () => {
-    const [schedules, setSchedules] = useState<ScheduleRetrieveResponse[]>([]);
+    const [schedules, setSchedules] = useState<AdminScheduleSummaryResponse[]>([]);
-    const [themes, setThemes] = useState<AdminThemeSummaryRetrieveResponse[]>([]);
+    const [themes, setThemes] = useState<SimpleActiveThemeResponse[]>([]);
-    const [selectedThemeId, setSelectedThemeId] = useState<string>('');
+    const [stores, setStores] = useState<SimpleStoreResponse[]>([]);
+    const [selectedStoreId, setSelectedStoreId] = useState<string>('');
+    const [selectedTheme, setSelectedTheme] = useState<SimpleActiveThemeResponse | null>(null);
     const [selectedDate, setSelectedDate] = useState<string>(new Date().toLocaleDateString('en-CA'));
 
     const [isAdding, setIsAdding] = useState(false);
     const [newScheduleTime, setNewScheduleTime] = useState('');
 
     const [expandedScheduleId, setExpandedScheduleId] = useState<string | null>(null);
-    const [detailedSchedules, setDetailedSchedules] = useState<{ [key: string]: ScheduleDetailRetrieveResponse }>({});
+    const [detailedSchedules, setDetailedSchedules] = useState<{ [key: string]: ScheduleDetail }>({});
     const [isLoadingDetails, setIsLoadingDetails] = useState<boolean>(false);
     const [isEditing, setIsEditing] = useState(false);
-    const [editingSchedule, setEditingSchedule] = useState<ScheduleDetailRetrieveResponse | null>(null);
+    const [editingSchedule, setEditingSchedule] = useState<EditingSchedule | null>(null);
+
+    const [isModalOpen, setIsModalOpen] = useState(false);
+    const [selectedThemeDetails] = useState<ThemeInfoResponse | null>(null);
+    const [isLoadingThemeDetails] = useState<boolean>(false);
 
     const navigate = useNavigate();
     const location = useLocation();
+    const {type: adminType, storeId: adminStoreId} = useAdminAuth();
+
+    const storeIdForFetch = adminType === 'HQ' ? selectedStoreId : adminStoreId;
+    const showThemeColumn = !selectedTheme?.id;
 
     const handleError = (err: any) => {
         if (isLoginRequiredError(err)) {
             alert('로그인이 필요해요.');
-            navigate('/login', { state: { from: location } });
+            navigate('/admin/login', {state: {from: location}});
         } else {
             const message = err.response?.data?.message || '알 수 없는 오류가 발생했습니다.';
             alert(message);
@@ -62,19 +76,36 @@ const AdminSchedulePage: React.FC = () => {
     };
 
     useEffect(() => {
-        fetchAdminThemes()
+        if (!adminType) return;
-            .then(res => {
+
-                setThemes(res.themes);
+        const fetchPrerequisites = async () => {
-                if (res.themes.length > 0) {
+            try {
-                    setSelectedThemeId(String(res.themes[0].id));
+                // Fetch themes
+                const themeRes = await fetchActiveThemes();
+                const themeData = themeRes.themes.map(t => ({id: String(t.id), name: t.name}));
+                const allThemesOption = {id: '', name: '전체'};
+                setThemes([allThemesOption, ...themeData]);
+                setSelectedTheme(allThemesOption);
+
+                // Fetch stores for HQ admin
+                if (adminType === 'HQ') {
+                    const storeRes = (await getStores()).stores;
+                    setStores(storeRes);
+                    if (storeRes.length > 0) {
+                        setSelectedStoreId(String(storeRes[0].id));
                     }
-            })
+                }
-            .catch(handleError);
+            } catch (error) {
-    }, []);
+                handleError(error);
+            }
+        };
+
+        fetchPrerequisites();
+    }, [adminType]);
 
     const fetchSchedules = () => {
-        if (selectedDate && selectedThemeId) {
+        if (storeIdForFetch) {
-            findSchedules(selectedDate, selectedThemeId)
+            fetchAdminSchedules(storeIdForFetch, selectedDate, selectedTheme?.id === '' ? undefined : selectedTheme?.id)
                 .then(res => setSchedules(res.schedules))
                 .catch(err => {
                     setSchedules([]);
@@ -82,12 +113,14 @@ const AdminSchedulePage: React.FC = () => {
                         handleError(err);
                     }
                 });
+        } else {
+            setSchedules([]);
         }
     }
 
     useEffect(() => {
         fetchSchedules();
-    }, [selectedDate, selectedThemeId]);
+    }, [selectedDate, selectedTheme, storeIdForFetch]);
 
     const handleAddSchedule = async () => {
         if (!newScheduleTime) {
@@ -98,10 +131,18 @@ const AdminSchedulePage: React.FC = () => {
             alert('시간 형식이 올바르지 않습니다. HH:MM 형식으로 입력해주세요.');
             return;
         }
+        if (adminType !== 'STORE' || !adminStoreId) {
+            alert('매장 관리자만 일정을 추가할 수 있습니다.');
+            return;
+        }
+        if (!selectedDate || !selectedTheme?.id) {
+            alert('날짜와 특정 테마를 선택해주세요.');
+            return;
+        }
         try {
-            await createSchedule({
+            await createSchedule(adminStoreId, {
                 date: selectedDate,
-                themeId: selectedThemeId,
+                themeId: selectedTheme.id,
                 time: newScheduleTime,
             });
             fetchSchedules();
@@ -116,7 +157,7 @@ const AdminSchedulePage: React.FC = () => {
         if (window.confirm('정말 이 일정을 삭제하시겠습니까?')) {
             try {
                 await deleteSchedule(scheduleId);
-                setSchedules(schedules.filter(s => s.id !== scheduleId));
+                fetchSchedules();
                 setExpandedScheduleId(null); // Close the details view after deletion
             } catch (error) {
                 handleError(error);
@@ -126,16 +167,22 @@ const AdminSchedulePage: React.FC = () => {
 
     const handleToggleDetails = async (scheduleId: string) => {
         const isAlreadyExpanded = expandedScheduleId === scheduleId;
-        setIsEditing(false); // Reset editing state whenever toggling
+        setIsEditing(false);
         if (isAlreadyExpanded) {
             setExpandedScheduleId(null);
         } else {
             setExpandedScheduleId(scheduleId);
-            if (!detailedSchedules[scheduleId]) {
+            const scheduleInList = schedules.find(s => s.id === scheduleId);
+            if (!scheduleInList) return;
+
+            if (!detailedSchedules[scheduleId]?.audit) {
                 setIsLoadingDetails(true);
                 try {
-                    const details = await findScheduleById(scheduleId);
+                    const auditInfo = await fetchScheduleAudit(scheduleId);
-                    setDetailedSchedules(prev => ({ ...prev, [scheduleId]: details }));
+                    setDetailedSchedules(prev => ({
+                        ...prev,
+                        [scheduleId]: {...scheduleInList, audit: auditInfo}
+                    }));
                 } catch (error) {
                     handleError(error);
                 } finally {
@@ -147,7 +194,15 @@ const AdminSchedulePage: React.FC = () => {
 
     const handleEditClick = () => {
         if (expandedScheduleId && detailedSchedules[expandedScheduleId]) {
-            setEditingSchedule({ ...detailedSchedules[expandedScheduleId] });
+            const scheduleToEdit = detailedSchedules[expandedScheduleId];
+            setEditingSchedule({
+                ...scheduleToEdit,
+                time: new Date(scheduleToEdit.startFrom).toLocaleTimeString('en-CA', {
+                    hour: '2-digit',
+                    minute: '2-digit',
+                    hour12: false
+                }),
+            });
             setIsEditing(true);
         }
     };
@@ -158,9 +213,9 @@ const AdminSchedulePage: React.FC = () => {
     };
 
     const handleEditChange = (e: React.ChangeEvent<HTMLInputElement | HTMLSelectElement>) => {
-        const { name, value } = e.target;
+        const {name, value} = e.target;
         if (editingSchedule) {
-            setEditingSchedule({ ...editingSchedule, [name]: value });
+            setEditingSchedule({...editingSchedule, [name]: value});
         }
     };
 
@@ -172,24 +227,39 @@ const AdminSchedulePage: React.FC = () => {
                 time: editingSchedule.time,
                 status: editingSchedule.status,
             });
-            // Refresh data
+            fetchSchedules();
-            const details = await findScheduleById(editingSchedule.id);
+            setExpandedScheduleId(null);
-            setDetailedSchedules(prev => ({ ...prev, [editingSchedule.id]: details }));
-            setSchedules(schedules.map(s => s.id === editingSchedule.id ? { ...s, time: details.time, status: details.status } : s));
-
-            alert('일정이 성공적으로 업데이트되었습니다.');
             setIsEditing(false);
+            setEditingSchedule(null);
+            alert('일정이 성공적으로 업데이트되었습니다.');
         } catch (error) {
             handleError(error);
         }
     };
 
+    const canModify = adminType === 'STORE';
+
     return (
         <div className="admin-schedule-container">
             <h2 className="page-title">일정 관리</h2>
 
             <div className="schedule-controls">
-                <div className="form-group">
+                {adminType === 'HQ' && (
+                    <div className="form-group store-selector-group">
+                        <label className="form-label" htmlFor="store-filter">매장</label>
+                        <select
+                            id="store-filter"
+                            className="form-select"
+                            value={selectedStoreId}
+                            onChange={e => setSelectedStoreId(e.target.value)}
+                        >
+                            {stores.map(store => (
+                                <option key={store.id} value={store.id}>{store.name}</option>
+                            ))}
+                        </select>
+                    </div>
+                )}
+                <div className="form-group date-selector-group">
                     <label className="form-label" htmlFor="date-filter">날짜</label>
                     <input
                         id="date-filter"
@@ -199,13 +269,17 @@ const AdminSchedulePage: React.FC = () => {
                         onChange={e => setSelectedDate(e.target.value)}
                     />
                 </div>
-                <div className="form-group">
+                <div className="form-group theme-selector-group">
                     <label className="form-label" htmlFor="theme-filter">테마</label>
+                    <div className='theme-selector-button-group'>
                         <select
                             id="theme-filter"
                             className="form-select"
-                        value={selectedThemeId}
+                            value={selectedTheme?.id || ''}
-                        onChange={e => setSelectedThemeId(e.target.value)}
+                            onChange={e => {
+                                const theme = themes.find(t => t.id === e.target.value);
+                                setSelectedTheme(theme || null);
+                            }}
                         >
                             {themes.map(theme => (
                                 <option key={theme.id} value={theme.id}>{theme.name}</option>
@@ -213,15 +287,19 @@ const AdminSchedulePage: React.FC = () => {
                         </select>
                     </div>
                 </div>
+            </div>
 
             <div className="section-card">
+                {canModify && (
                     <div className="table-header">
                         <button className="btn btn-primary" onClick={() => setIsAdding(true)}>일정 추가</button>
                     </div>
+                )}
                 <div className="table-container">
                     <table>
                         <thead>
                         <tr>
+                            {showThemeColumn && <th>테마</th>}
                             <th>시간</th>
                             <th>상태</th>
                             <th>관리</th>
@@ -231,7 +309,8 @@ const AdminSchedulePage: React.FC = () => {
                         {schedules.map(schedule => (
                             <Fragment key={schedule.id}>
                                 <tr>
-                                        <td>{schedule.time}</td>
+                                    {showThemeColumn && <td>{schedule.themeName}</td>}
+                                    <td>{schedule.startFrom}</td>
                                     <td>{getScheduleStatusText(schedule.status)}</td>
                                     <td className="action-buttons">
                                         <button
@@ -244,49 +323,76 @@ const AdminSchedulePage: React.FC = () => {
                                 </tr>
                                 {expandedScheduleId === schedule.id && (
                                     <tr className="schedule-details-row">
-                                            <td colSpan={3}>
+                                        <td colSpan={showThemeColumn ? 4 : 3}>
                                             {isLoadingDetails ? (
                                                 <p>로딩 중...</p>
                                             ) : detailedSchedules[schedule.id] ? (
                                                 <div className="details-form-container">
+                                                    {detailedSchedules[schedule.id].audit ? (
                                                         <div className="audit-info">
                                                             <h4 className="audit-title">감사 정보</h4>
                                                             <div className="audit-body">
-                                                                <p><strong>생성일:</strong> {new Date(detailedSchedules[schedule.id].createdAt).toLocaleString()}</p>
+                                                                <p>
-                                                                <p><strong>수정일:</strong> {new Date(detailedSchedules[schedule.id].updatedAt).toLocaleString()}</p>
+                                                                    <strong>생성일:</strong> {formatDisplayDateTime(detailedSchedules[schedule.id].audit!.createdAt)}
-                                                                <p><strong>생성자:</strong> {detailedSchedules[schedule.id].createdBy}</p>
+                                                                </p>
-                                                                <p><strong>수정자:</strong> {detailedSchedules[schedule.id].updatedBy}</p>
+                                                                <p>
+                                                                    <strong>수정일:</strong> {formatDisplayDateTime(detailedSchedules[schedule.id].audit!.updatedAt)}
+                                                                </p>
+                                                                <p>
+                                                                    <strong>생성자:</strong> {detailedSchedules[schedule.id].audit!.createdBy.name}({detailedSchedules[schedule.id].audit!.createdBy.id})
+                                                                </p>
+                                                                <p>
+                                                                    <strong>수정자:</strong> {detailedSchedules[schedule.id].audit!.updatedBy.name}({detailedSchedules[schedule.id].audit!.updatedBy.id})
+                                                                </p>
                                                             </div>
                                                         </div>
+                                                    ) : <p>감사 정보를 불러오는 중...</p>}
 
-                                                        {isEditing && editingSchedule ? (
+                                                    {isEditing && editingSchedule?.id === schedule.id ? (
                                                         // --- EDIT MODE ---
                                                         <div className="form-card">
                                                             <div className="form-section">
                                                                 <div className="form-row">
                                                                     <div className="form-group">
                                                                         <label className="form-label">시간</label>
-                                                                            <input type="time" name="time" className="form-input" value={editingSchedule.time} onChange={handleEditChange} />
+                                                                        <input type="time" name="time"
+                                                                               className="form-input"
+                                                                               value={editingSchedule.time}
+                                                                               onChange={handleEditChange}/>
                                                                     </div>
                                                                     <div className="form-group">
                                                                         <label className="form-label">상태</label>
-                                                                            <select name="status" className="form-select" value={editingSchedule.status} onChange={handleEditChange}>
+                                                                        <select name="status" className="form-select"
-                                                                                {Object.values(ScheduleStatus).map(s => <option key={s} value={s}>{getScheduleStatusText(s)}</option>)}
+                                                                                value={editingSchedule.status}
+                                                                                onChange={handleEditChange}>
+                                                                            {Object.values(ScheduleStatus).map(s =>
+                                                                                <option key={s}
+                                                                                        value={s}>{getScheduleStatusText(s)}</option>)}
                                                                         </select>
                                                                     </div>
                                                                 </div>
                                                             </div>
                                                             <div className="button-group">
-                                                                    <button type="button" className="btn btn-secondary" onClick={handleCancelEdit}>취소</button>
+                                                                <button type="button" className="btn btn-secondary"
-                                                                    <button type="button" className="btn btn-primary" onClick={handleSave}>저장</button>
+                                                                        onClick={handleCancelEdit}>취소
+                                                                </button>
+                                                                <button type="button" className="btn btn-primary"
+                                                                        onClick={handleSave}>저장
+                                                                </button>
                                                             </div>
                                                         </div>
                                                     ) : (
                                                         // --- VIEW MODE ---
+                                                        canModify && (
                                                             <div className="button-group view-mode-buttons">
-                                                                <button type="button" className="btn btn-danger" onClick={() => handleDeleteSchedule(schedule.id)}>삭제</button>
+                                                                <button type="button" className="btn btn-danger"
-                                                                <button type="button" className="btn btn-primary" onClick={handleEditClick}>수정</button>
+                                                                        onClick={() => handleDeleteSchedule(schedule.id)}>삭제
+                                                                </button>
+                                                                <button type="button" className="btn btn-primary"
+                                                                        onClick={handleEditClick}>수정
+                                                                </button>
                                                             </div>
+                                                        )
                                                     )}
                                                 </div>
                                             ) : (
@@ -297,8 +403,9 @@ const AdminSchedulePage: React.FC = () => {
                                 )}
                             </Fragment>
                         ))}
-                            {isAdding && (
+                        {isAdding && canModify && (
                             <tr className="editing-row">
+                                {showThemeColumn && <td></td>}
                                 <td>
                                     <input
                                         type="time"
@@ -318,6 +425,33 @@ const AdminSchedulePage: React.FC = () => {
                     </table>
                 </div>
             </div>
+
+            {isModalOpen && (
+                <div className="modal-overlay">
+                    <div className="modal-content">
+                        <button className="modal-close-btn" onClick={() => setIsModalOpen(false)}>×</button>
+                        {isLoadingThemeDetails ? (
+                            <p>로딩 중...</p>
+                        ) : selectedThemeDetails ? (
+                            <div className="theme-details-modal">
+                                <h3 className="modal-title">{selectedThemeDetails.name}</h3>
+                                <img src={selectedThemeDetails.thumbnailUrl} alt={selectedThemeDetails.name}
+                                     className="theme-modal-thumbnail"/>
+                                <p className="theme-modal-description">{selectedThemeDetails.description}</p>
+                                <div className="modal-info-grid">
+                                    <p><strong>난이도</strong><span>{DifficultyKoreanMap[selectedThemeDetails.difficulty]}</span></p>
+                                    <p><strong>이용 가능 인원</strong><span>{selectedThemeDetails.minParticipants} ~ {selectedThemeDetails.maxParticipants}명</span></p>
+                                    <p><strong>1인당 요금</strong><span>{selectedThemeDetails.price.toLocaleString()}원</span></p>
+                                    <p><strong>예상 시간</strong><span>{selectedThemeDetails.expectedMinutesFrom} ~ {selectedThemeDetails.expectedMinutesTo}분</span></p>
+                                    <p><strong>이용 가능 시간</strong><span>{selectedThemeDetails.availableMinutes}분</span></p>
+                                </div>
+                            </div>
+                        ) : (
+                            <p>테마 정보를 불러올 수 없습니다.</p>
+                        )}
+                    </div>
+                </div>
+            )}
         </div>
     );
 };

frontend/src/pages/admin/AdminStorePage.tsx

@@ -0,0 +1,371 @@
+import {isLoginRequiredError} from '@_api/apiClient';
+import {fetchSidoList, fetchSigunguList} from '@_api/region/regionAPI';
+import type {SidoResponse, SigunguResponse} from '@_api/region/regionTypes';
+import {createStore, deleteStore, getStoreDetail, getStores, updateStore} from '@_api/store/storeAPI';
+import {
+    type SimpleStoreResponse,
+    type StoreDetailResponse,
+    type StoreRegisterRequest,
+    type UpdateStoreRequest
+} from '@_api/store/storeTypes';
+import {useAdminAuth} from '@_context/AdminAuthContext';
+import '@_css/admin-store-page.css';
+import {formatDisplayDateTime} from '@_util/DateTimeFormatter';
+import React, {Fragment, useEffect, useState} from 'react';
+import {useLocation, useNavigate} from 'react-router-dom';
+
+const AdminStorePage: React.FC = () => {
+    const [stores, setStores] = useState<SimpleStoreResponse[]>([]);
+    const [isAdding, setIsAdding] = useState(false);
+    const [newStore, setNewStore] = useState<StoreRegisterRequest>({
+        name: '',
+        address: '',
+        contact: '',
+        businessRegNum: '',
+        regionCode: ''
+    });
+
+    const [expandedStoreId, setExpandedStoreId] = useState<string | null>(null);
+    const [detailedStores, setDetailedStores] = useState<{ [key: string]: StoreDetailResponse }>({});
+    const [isLoadingDetails, setIsLoadingDetails] = useState<boolean>(false);
+    const [isEditing, setIsEditing] = useState(false);
+    const [editingStore, setEditingStore] = useState<UpdateStoreRequest | null>(null);
+
+    const [sidoList, setSidoList] = useState<SidoResponse[]>([]);
+    const [sigunguList, setSigunguList] = useState<SigunguResponse[]>([]);
+    const [selectedSido, setSelectedSido] = useState('');
+    const [selectedSigungu, setSelectedSigungu] = useState('');
+
+    const navigate = useNavigate();
+    const location = useLocation();
+    const { type: adminType } = useAdminAuth();
+
+    const handleError = (err: any) => {
+        if (isLoginRequiredError(err)) {
+            alert('로그인이 필요합니다.');
+            navigate('/admin/login', { state: { from: location } });
+        } else {
+            const message = err.response?.data?.message || '알 수 없는 오류가 발생했습니다.';
+            alert(message);
+            console.error(err);
+        }
+    };
+
+    const fetchStores = async () => {
+        try {
+            const storesData = (await getStores(selectedSido || undefined, selectedSigungu || undefined)).stores;
+            setStores(storesData);
+        } catch (error) {
+            handleError(error);
+        };
+    }
+
+    useEffect(() => {
+        if (adminType !== 'HQ') {
+            alert('접근 권한이 없습니다.');
+            navigate('/admin');
+            return;
+        }
+
+        const fetchInitialData = async () => {
+            try {
+                const sidoRes = await fetchSidoList();
+                setSidoList(sidoRes.sidoList);
+            } catch (error) {
+                handleError(error);
+            }
+        };
+
+        fetchInitialData();
+    }, [adminType, navigate]);
+
+    useEffect(() => {
+        const fetchSigungu = async () => {
+            if (selectedSido) {
+                try {
+                    const sigunguRes = await fetchSigunguList(selectedSido);
+                    setSigunguList(sigunguRes.sigunguList);
+                } catch (error) {
+                    handleError(error);
+                }
+            } else {
+                setSigunguList([]);
+            }
+            setSelectedSigungu('');
+        };
+        fetchSigungu();
+    }, [selectedSido]);
+
+    useEffect(() => { fetchStores();}, [selectedSido, selectedSigungu]);
+
+    const handleInputChange = (e: React.ChangeEvent<HTMLInputElement>) => {
+        const { name, value } = e.target;
+        setNewStore(prev => ({ ...prev, [name]: value }));
+    };
+
+    const handleAddStore = async () => {
+        if (Object.values(newStore).some(val => val === '')) {
+            alert('모든 필드를 입력해주세요.');
+            return;
+        }
+        try {
+            await createStore(newStore);
+            const storesData = (await getStores(selectedSido || undefined, selectedSigungu || undefined)).stores;
+            setStores(storesData);
+            setIsAdding(false);
+            setNewStore({ name: '', address: '', contact: '', businessRegNum: '', regionCode: '' });
+        } catch (error) {
+            handleError(error);
+        }
+    };
+
+    const handleToggleDetails = async (storeId: string) => {
+        const isAlreadyExpanded = expandedStoreId === storeId;
+        setIsEditing(false);
+        if (isAlreadyExpanded) {
+            setExpandedStoreId(null);
+        } else {
+            setExpandedStoreId(storeId);
+            if (!detailedStores[storeId]) {
+                setIsLoadingDetails(true);
+                try {
+                    const details = await getStoreDetail(storeId);
+                    setDetailedStores(prev => ({ ...prev, [storeId]: details }));
+                } catch (error) {
+                    handleError(error);
+                } finally {
+                    setIsLoadingDetails(false);
+                }
+            }
+        }
+    };
+
+    const handleDeleteStore = async (storeId: string) => {
+        if (window.confirm('정말 이 매장을 삭제하시겠습니까? 관련 데이터가 모두 삭제될 수 있습니다.')) {
+            try {
+                await deleteStore(storeId);
+                fetchStores();
+                setExpandedStoreId(null);
+            } catch (error) {
+                handleError(error);
+            }
+        }
+    };
+
+    const handleEditClick = (store: StoreDetailResponse) => {
+        setEditingStore({ name: store.name, address: store.address, contact: store.contact });
+        setIsEditing(true);
+    };
+
+    const handleCancelEdit = () => {
+        setIsEditing(false);
+        setEditingStore(null);
+    };
+
+    const handleEditChange = (e: React.ChangeEvent<HTMLInputElement>) => {
+        const { name, value } = e.target;
+        if (editingStore) {
+            setEditingStore(prev => ({ ...prev!, [name]: value }));
+        }
+    };
+
+    const handleSave = async (storeId: string) => {
+        if (!editingStore) return;
+        try {
+            await updateStore(storeId, editingStore);
+            const updatedStore = await getStoreDetail(storeId);
+            setDetailedStores(prev => ({ ...prev, [storeId]: updatedStore }));
+            setStores(prev => prev.map(s => s.id === String(storeId) ? { ...s, name: updatedStore.name } : s));
+            setIsEditing(false);
+            setEditingStore(null);
+            alert('매장 정보가 성공적으로 업데이트되었습니다.');
+        } catch (error) {
+            handleError(error);
+        }
+    };
+
+    return (
+        <div className="admin-store-container">
+            <h2 className="page-title">매장 관리</h2>
+
+            <div className="filter-controls">
+                <div className="form-group">
+                    <label className="form-label">시/도</label>
+                    <select className="form-select" value={selectedSido} onChange={e => setSelectedSido(e.target.value)}>
+                        <option value="">전체</option>
+                        {sidoList.map(s => <option key={s.code} value={s.code}>{s.name}</option>)}
+                    </select>
+                </div>
+                <div className="form-group">
+                    <label className="form-label">시/군/구</label>
+                    <select className="form-select" value={selectedSigungu} onChange={e => setSelectedSigungu(e.target.value)} disabled={!selectedSido}>
+                        <option value="">전체</option>
+                        {sigunguList.map(s => <option key={s.code} value={s.code}>{s.name}</option>)}
+                    </select>
+                </div>
+            </div>
+
+            <div className="section-card">
+                <div className="table-header">
+                    <button className="btn btn-primary" onClick={() => setIsAdding(!isAdding)}>
+                        {isAdding ? '취소' : '매장 추가'}
+                    </button>
+                </div>
+
+                {isAdding && (
+                    <div className="add-store-form">
+                        <div className="form-row">
+                            <div className="form-group"><label className="form-label">매장명</label><input type="text"
+                                name="name"
+                                className="form-input"
+                                value={newStore.name}
+                                onChange={handleInputChange} />
+                            </div>
+                            <div className="form-group"><label className="form-label">주소</label><input type="text"
+                                name="address"
+                                className="form-input"
+                                value={newStore.address}
+                                onChange={handleInputChange} />
+                            </div>
+                        </div>
+                        <div className="form-row">
+                            <div className="form-group"><label className="form-label">연락처</label><input type="text"
+                                name="contact"
+                                className="form-input"
+                                value={newStore.contact}
+                                onChange={handleInputChange} />
+                            </div>
+                            <div className="form-group"><label className="form-label">사업자등록번호</label><input type="text"
+                                name="businessRegNum"
+                                className="form-input"
+                                value={newStore.businessRegNum}
+                                onChange={handleInputChange} />
+                            </div>
+                            <div className="form-group"><label className="form-label">지역 코드</label><input type="text"
+                                name="regionCode"
+                                className="form-input"
+                                value={newStore.regionCode}
+                                onChange={handleInputChange} />
+                            </div>
+                        </div>
+                        <div className="button-group">
+                            <button className="btn btn-primary" onClick={handleAddStore}>저장</button>
+                        </div>
+                    </div>
+                )}
+
+                <div className="table-container">
+                    <table>
+                        <thead>
+                            <tr>
+                                <th>ID</th>
+                                <th>매장명</th>
+                                <th>관리</th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                            {stores.map(store => (
+                                <Fragment key={store.id}>
+                                    <tr>
+                                        <td>{store.id}</td>
+                                        <td>{store.name}</td>
+                                        <td className="action-buttons">
+                                            <button className="btn btn-secondary"
+                                                onClick={() => handleToggleDetails(store.id)}>
+                                                {expandedStoreId === store.id ? '닫기' : '상세'}
+                                            </button>
+                                        </td>
+                                    </tr>
+                                    {expandedStoreId === store.id && (
+                                        <tr className="details-row">
+                                            <td colSpan={3}>
+                                                <div className="details-container">
+                                                    {isLoadingDetails ? <p>로딩 중...</p> : detailedStores[store.id] ? (
+                                                        <div>
+                                                            <div className="audit-info">
+                                                                <h4 className="audit-title">상세 정보</h4>
+                                                                <div className="audit-body">
+                                                                    <p>
+                                                                        <strong>주소:</strong> {detailedStores[store.id].address}
+                                                                    </p>
+                                                                    <p>
+                                                                        <strong>연락처:</strong> {detailedStores[store.id].contact}
+                                                                    </p>
+                                                                    <p>
+                                                                        <strong>사업자등록번호:</strong> {detailedStores[store.id].businessRegNum}
+                                                                    </p>
+                                                                    <p><strong>지역
+                                                                        코드:</strong> {detailedStores[store.id].region.code}
+                                                                    </p>
+                                                                    <p>
+                                                                        <strong>생성일:</strong> {formatDisplayDateTime(detailedStores[store.id].audit.createdAt)}
+                                                                    </p>
+                                                                    <p>
+                                                                        <strong>수정일:</strong> {formatDisplayDateTime(detailedStores[store.id].audit.updatedAt)}
+                                                                    </p>
+                                                                    <p>
+                                                                        <strong>생성자:</strong> {detailedStores[store.id].audit.createdBy.name}({detailedStores[store.id].audit.createdBy.id})
+                                                                    </p>
+                                                                    <p>
+                                                                        <strong>수정자:</strong> {detailedStores[store.id].audit.updatedBy.name}({detailedStores[store.id].audit.updatedBy.id})
+                                                                    </p>
+                                                                </div>
+                                                            </div>
+
+                                                            {isEditing && editingStore ? (
+                                                                <div className="details-form-card">
+                                                                    <div className="form-row">
+                                                                        <div className="form-group"><label
+                                                                            className="form-label">매장명</label><input
+                                                                                type="text" name="name" className="form-input"
+                                                                                value={editingStore.name}
+                                                                                onChange={handleEditChange} /></div>
+                                                                        <div className="form-group"><label
+                                                                            className="form-label">주소</label><input
+                                                                                type="text" name="address"
+                                                                                className="form-input"
+                                                                                value={editingStore.address}
+                                                                                onChange={handleEditChange} /></div>
+                                                                        <div className="form-group"><label
+                                                                            className="form-label">연락처</label><input
+                                                                                type="text" name="contact"
+                                                                                className="form-input"
+                                                                                value={editingStore.contact}
+                                                                                onChange={handleEditChange} /></div>
+                                                                    </div>
+                                                                    <div className="button-group">
+                                                                        <button className="btn btn-secondary"
+                                                                            onClick={handleCancelEdit}>취소
+                                                                        </button>
+                                                                        <button className="btn btn-primary"
+                                                                            onClick={() => handleSave(store.id)}>저장
+                                                                        </button>
+                                                                    </div>
+                                                                </div>
+                                                            ) : (
+                                                                <div className="button-group">
+                                                                    <button className="btn btn-danger"
+                                                                        onClick={() => handleDeleteStore(store.id)}>삭제
+                                                                    </button>
+                                                                    <button className="btn btn-primary"
+                                                                        onClick={() => handleEditClick(detailedStores[store.id])}>수정
+                                                                    </button>
+                                                                </div>
+                                                            )}
+                                                        </div>
+                                                    ) : <p>상세 정보를 불러올 수 없습니다.</p>}
+                                                </div>
+                                            </td>
+                                        </tr>
+                                    )}
+                                </Fragment>
+                            ))}
+                        </tbody>
+                    </table>
+                </div>
+            </div>
+        </div>
+    );
+};
+
+export default AdminStorePage;

frontend/src/pages/admin/AdminThemeEditPage.tsx

@@ -1,14 +1,30 @@
 import {isLoginRequiredError} from '@_api/apiClient';
 import {createTheme, deleteTheme, fetchAdminThemeDetail, updateTheme} from '@_api/theme/themeAPI';
 import {
-    type AdminThemeDetailResponse,
     Difficulty,
+    DifficultyKoreanMap,
     type ThemeCreateRequest,
     type ThemeUpdateRequest
 } from '@_api/theme/themeTypes';
 import React, {useEffect, useState} from 'react';
 import {useLocation, useNavigate, useParams} from 'react-router-dom';
 import '@_css/admin-theme-edit-page.css';
+import type {AuditInfo} from '@_api/common/commonTypes';
+import {formatDisplayDateTime} from '@_util/DateTimeFormatter';
+
+interface ThemeFormData {
+    name: string;
+    description: string;
+    thumbnailUrl: string;
+    difficulty: Difficulty;
+    price: number;
+    minParticipants: number;
+    maxParticipants: number;
+    availableMinutes: number;
+    expectedMinutesFrom: number;
+    expectedMinutesTo: number;
+    isActive: boolean;
+}
 
 const AdminThemeEditPage: React.FC = () => {
     const { themeId } = useParams<{ themeId: string }>();
@@ -17,15 +33,16 @@ const AdminThemeEditPage: React.FC = () => {
 
     const isNew = themeId === 'new';
 
-    const [theme, setTheme] = useState<AdminThemeDetailResponse | ThemeCreateRequest | null>(null);
+    const [formData, setFormData] = useState<ThemeFormData | null>(null);
-    const [originalTheme, setOriginalTheme] = useState<AdminThemeDetailResponse | ThemeCreateRequest | null>(null);
+    const [originalFormData, setOriginalFormData] = useState<ThemeFormData | null>(null);
+    const [auditInfo, setAuditInfo] = useState<AuditInfo | null>(null);
     const [isLoading, setIsLoading] = useState(true);
     const [isEditing, setIsEditing] = useState(isNew);
 
     const handleError = (err: any) => {
         if (isLoginRequiredError(err)) {
             alert('로그인이 필요해요.');
-            navigate('/login', { state: { from: location } });
+            navigate('/admin/login', { state: { from: location } });
         } else {
             const message = err.response?.data?.message || '알 수 없는 오류가 발생했습니다.';
             alert(message);
@@ -35,7 +52,7 @@ const AdminThemeEditPage: React.FC = () => {
 
     useEffect(() => {
         if (isNew) {
-            const newTheme: ThemeCreateRequest = {
+            const newTheme: ThemeFormData = {
                 name: '',
                 description: '',
                 thumbnailUrl: '',
@@ -43,38 +60,34 @@ const AdminThemeEditPage: React.FC = () => {
                 price: 0,
                 minParticipants: 2,
                 maxParticipants: 4,
-                availableMinutes: 60,
+                availableMinutes: 80,
                 expectedMinutesFrom: 50,
-                expectedMinutesTo: 70,
+                expectedMinutesTo: 60,
-                isOpen: true,
+                isActive: true,
             };
-            setTheme(newTheme);
+            setFormData(newTheme);
-            setOriginalTheme(newTheme);
+            setOriginalFormData(newTheme);
             setIsLoading(false);
         } else if (themeId) {
             fetchAdminThemeDetail(themeId)
                 .then(data => {
-                    // Map AdminThemeDetailRetrieveResponse to ThemeV2
+                    const { theme, isActive, audit } = data;
-                    const fetchedTheme: AdminThemeDetailResponse = {
+                    const themeData: ThemeFormData = {
-                        id: data.id,
+                        name: theme.name,
-                        name: data.name,
+                        description: theme.description,
-                        description: data.description,
+                        thumbnailUrl: theme.thumbnailUrl,
-                        thumbnailUrl: data.thumbnailUrl,
+                        difficulty: theme.difficulty,
-                        difficulty: data.difficulty,
+                        price: theme.price,
-                        price: data.price,
+                        minParticipants: theme.minParticipants,
-                        minParticipants: data.minParticipants,
+                        maxParticipants: theme.maxParticipants,
-                        maxParticipants: data.maxParticipants,
+                        availableMinutes: theme.availableMinutes,
-                        availableMinutes: data.availableMinutes,
+                        expectedMinutesFrom: theme.expectedMinutesFrom,
-                        expectedMinutesFrom: data.expectedMinutesFrom,
+                        expectedMinutesTo: theme.expectedMinutesTo,
-                        expectedMinutesTo: data.expectedMinutesTo,
+                        isActive: isActive,
-                        isOpen: data.isOpen,
-                        createDate: data.createdAt, // Map createdAt to createDate
-                        updatedDate: data.updatedAt, // Map updatedAt to updatedDate
-                        createdBy: data.createdBy,
-                        updatedBy: data.updatedBy,
                     };
-                    setTheme(fetchedTheme);
+                    setFormData(themeData);
-                    setOriginalTheme(fetchedTheme);
+                    setOriginalFormData(themeData);
+                    setAuditInfo(audit);
                 })
                 .catch(handleError)
                 .finally(() => setIsLoading(false));
@@ -85,20 +98,20 @@ const AdminThemeEditPage: React.FC = () => {
         const { name, value, type } = e.target;
         let processedValue: string | number | boolean = value;
 
-        if (name === 'isOpen') {
+        if (name === 'isActive') {
             processedValue = value === 'true';
         } else if (type === 'checkbox') {
             processedValue = (e.target as HTMLInputElement).checked;
         } else if (type === 'number') {
-            processedValue = value === '' ? '' : Number(value);
+            processedValue = value === '' ? 0 : Number(value);
         }
 
-        setTheme(prev => prev ? { ...prev, [name]: processedValue } : null);
+        setFormData(prev => prev ? { ...prev, [name]: processedValue } : null);
     };
 
     const handleCancelEdit = () => {
         if (!isNew) {
-            setTheme(originalTheme);
+            setFormData(originalFormData);
             setIsEditing(false);
         } else {
             navigate('/admin/theme');
@@ -106,22 +119,21 @@ const AdminThemeEditPage: React.FC = () => {
     };
 
     const handleSubmit = async (e: React.FormEvent) => {
-        console.log('handleSubmit called');
         e.preventDefault();
-        if (!theme) return;
+        if (!formData) return;
 
         try {
             if (isNew) {
-                await createTheme(theme as ThemeCreateRequest);
+                await createTheme(formData as ThemeCreateRequest);
                 alert('테마가 성공적으로 생성되었습니다.');
                 navigate(`/admin/theme`);
             } else {
                 if (!themeId) {
                     throw new Error('themeId is undefined');
                 }
-                await updateTheme(themeId, theme as ThemeUpdateRequest);
+                await updateTheme(themeId, formData as ThemeUpdateRequest);
                 alert('테마가 성공적으로 업데이트되었습니다.');
-                setOriginalTheme(theme);
+                setOriginalFormData(formData);
                 setIsEditing(false);
                 navigate(`/admin/theme`);
             }
@@ -147,7 +159,7 @@ const AdminThemeEditPage: React.FC = () => {
         return <div className="admin-theme-edit-container"><p>로딩 중...</p></div>;
     }
 
-    if (!theme) {
+    if (!formData) {
         return <div className="admin-theme-edit-container"><p>테마 정보를 찾을 수 없습니다.</p></div>;
     }
 
@@ -161,15 +173,15 @@ const AdminThemeEditPage: React.FC = () => {
                     <div className="form-section">
                         <div className="form-group full-width">
                             <label className="form-label" htmlFor="name">테마 이름</label>
-                            <input id="name" name="name" type="text" className="form-input" value={theme.name} onChange={handleChange} required disabled={!isEditing} />
+                            <input id="name" name="name" type="text" className="form-input" value={formData.name} onChange={handleChange} required disabled={!isEditing} />
                         </div>
                         <div className="form-group full-width">
                             <label className="form-label" htmlFor="description">설명</label>
-                            <textarea id="description" name="description" className="form-textarea" value={theme.description} onChange={handleChange} required disabled={!isEditing} />
+                            <textarea id="description" name="description" className="form-textarea" value={formData.description} onChange={handleChange} required disabled={!isEditing} />
                         </div>
                         <div className="form-group full-width">
                             <label className="form-label" htmlFor="thumbnailUrl">썸네일 URL</label>
-                            <input id="thumbnailUrl" name="thumbnailUrl" type="text" className="form-input" value={theme.thumbnailUrl} onChange={handleChange} required disabled={!isEditing} />
+                            <input id="thumbnailUrl" name="thumbnailUrl" type="text" className="form-input" value={formData.thumbnailUrl} onChange={handleChange} required disabled={!isEditing} />
                         </div>
                     </div>
 
@@ -177,13 +189,13 @@ const AdminThemeEditPage: React.FC = () => {
                         <div className="form-row">
                             <div className="form-group">
                                 <label className="form-label" htmlFor="difficulty">난이도</label>
-                                <select id="difficulty" name="difficulty" className="form-select" value={theme.difficulty} onChange={handleChange} disabled={!isEditing}>
+                                <select id="difficulty" name="difficulty" className="form-select" value={formData.difficulty} onChange={handleChange} disabled={!isEditing}>
-                                    {Object.values(Difficulty).map(d => <option key={d} value={d}>{d}</option>)}
+                                    {Object.values(Difficulty).map(d => <option key={d} value={d}>{DifficultyKoreanMap[d]}</option>)}
                                 </select>
                             </div>
                             <div className="form-group">
-                                <label className="form-label" htmlFor="isOpen">공개 여부</label>
+                                <label className="form-label" htmlFor="isActive">공개 여부</label>
-                                <select id="isOpen" name="isOpen" className="form-select" value={String(theme.isOpen)} onChange={handleChange} disabled={!isEditing}>
+                                <select id="isActive" name="isActive" className="form-select" value={String(formData.isActive)} onChange={handleChange} disabled={!isEditing}>
                                     <option value="true">공개</option>
                                     <option value="false">비공개</option>
                                 </select>
@@ -194,11 +206,11 @@ const AdminThemeEditPage: React.FC = () => {
                         <div className="form-row">
                             <div className="form-group">
                                 <label className="form-label" htmlFor="price">1인당 요금 (원)</label>
-                                <input id="price" name="price" type="number" className="form-input" value={theme.price} onChange={handleChange} required disabled={!isEditing} />
+                                <input id="price" name="price" type="number" className="form-input" value={formData.price} onChange={handleChange} required disabled={!isEditing} />
                             </div>
                             <div className="form-group">
                                 <label className="form-label" htmlFor="availableMinutes">총 이용시간 (분)</label>
-                                <input id="availableMinutes" name="availableMinutes" type="number" className="form-input" value={theme.availableMinutes} onChange={handleChange} required disabled={!isEditing} />
+                                <input id="availableMinutes" name="availableMinutes" type="number" className="form-input" value={formData.availableMinutes} onChange={handleChange} required disabled={!isEditing} />
                             </div>
                         </div>
 
@@ -206,22 +218,22 @@ const AdminThemeEditPage: React.FC = () => {
                         <div className="form-row">
                             <div className="form-group">
                                 <label className="form-label" htmlFor="expectedMinutesFrom">최소 예상 시간 (분)</label>
-                                <input id="expectedMinutesFrom" name="expectedMinutesFrom" type="number" className="form-input" value={theme.expectedMinutesFrom} onChange={handleChange} required disabled={!isEditing} />
+                                <input id="expectedMinutesFrom" name="expectedMinutesFrom" type="number" className="form-input" value={formData.expectedMinutesFrom} onChange={handleChange} required disabled={!isEditing} />
                             </div>
                             <div className="form-group">
                                 <label className="form-label" htmlFor="expectedMinutesTo">최대 예상 시간 (분)</label>
-                                <input id="expectedMinutesTo" name="expectedMinutesTo" type="number" className="form-input" value={theme.expectedMinutesTo} onChange={handleChange} required disabled={!isEditing} />
+                                <input id="expectedMinutesTo" name="expectedMinutesTo" type="number" className="form-input" value={formData.expectedMinutesTo} onChange={handleChange} required disabled={!isEditing} />
                             </div>
                         </div>
 
                         <div className="form-row">
                             <div className="form-group">
                                 <label className="form-label" htmlFor="minParticipants">최소 인원 (명)</label>
-                                <input id="minParticipants" name="minParticipants" type="number" className="form-input" value={theme.minParticipants} onChange={handleChange} required disabled={!isEditing} />
+                                <input id="minParticipants" name="minParticipants" type="number" className="form-input" value={formData.minParticipants} onChange={handleChange} required disabled={!isEditing} />
                             </div>
                             <div className="form-group">
                                 <label className="form-label" htmlFor="maxParticipants">최대 인원 (명)</label>
-                                <input id="maxParticipants" name="maxParticipants" type="number" className="form-input" value={theme.maxParticipants} onChange={handleChange} required disabled={!isEditing} />
+                                <input id="maxParticipants" name="maxParticipants" type="number" className="form-input" value={formData.maxParticipants} onChange={handleChange} required disabled={!isEditing} />
                             </div>
                         </div>
                     </div>
@@ -235,20 +247,20 @@ const AdminThemeEditPage: React.FC = () => {
                         ) : (
                             <div className="main-actions">
                                 <button type="button" className="btn btn-secondary" onClick={() => navigate('/admin/theme')}>목록</button>
-                                <button type="button" className="btn btn-primary" onClick={(e) => { e.preventDefault(); console.log('setIsEditing(true) called'); setIsEditing(true); }}>수정</button>
+                                <button type="button" className="btn btn-primary" onClick={(e) => { e.preventDefault(); setIsEditing(true); }}>수정</button>
                             </div>
                         )}
                     </div>
                 </form>
 
-                {!isNew && 'id' in theme && (
+                {!isNew && auditInfo && (
                     <div className="audit-info">
                         <h4 className="audit-title">감사 정보</h4>
                         <div className="audit-body">
-                            <p><strong>생성일:</strong> {new Date(theme.createDate).toLocaleString()}</p>
+                            <p><strong>생성일:</strong> {formatDisplayDateTime(auditInfo.createdAt)}</p>
-                            <p><strong>수정일:</strong> {new Date(theme.updatedDate).toLocaleString()}</p>
+                            <p><strong>수정일:</strong> {formatDisplayDateTime(auditInfo.updatedAt)}</p>
-                            <p><strong>생성자:</strong> {theme.createdBy}</p>
+                            <p><strong>생성자:</strong> {auditInfo.createdBy.name}</p>
-                            <p><strong>수정자:</strong> {theme.updatedBy}</p>
+                            <p><strong>수정자:</strong> {auditInfo.updatedBy.name}</p>
                         </div>
                     </div>
                 )}

frontend/src/pages/admin/AdminThemePage.tsx

@@ -1,19 +1,19 @@
 import React, {useEffect, useState} from 'react';
 import {useLocation, useNavigate} from 'react-router-dom';
 import {fetchAdminThemes} from '@_api/theme/themeAPI';
-import type {AdminThemeSummaryRetrieveResponse} from '@_api/theme/themeTypes';
+import {DifficultyKoreanMap, type AdminThemeSummaryResponse} from '@_api/theme/themeTypes';
 import {isLoginRequiredError} from '@_api/apiClient';
 import '@_css/admin-theme-page.css';
 
 const AdminThemePage: React.FC = () => {
-    const [themes, setThemes] = useState<AdminThemeSummaryRetrieveResponse[]>([]);
+    const [themes, setThemes] = useState<AdminThemeSummaryResponse[]>([]);
     const navigate = useNavigate();
     const location = useLocation();
 
     const handleError = (err: any) => {
         if (isLoginRequiredError(err)) {
             alert('로그인이 필요해요.');
-            navigate('/login', { state: { from: location } });
+            navigate('/admin/login', { state: { from: location } });
         } else {
             const message = err.response?.data?.message || '알 수 없는 오류가 발생했습니다.';
             alert(message);
@@ -63,9 +63,9 @@ const AdminThemePage: React.FC = () => {
                             {themes.map(theme => (
                                 <tr key={theme.id}>
                                     <td>{theme.name}</td>
-                                    <td>{theme.difficulty}</td>
+                                    <td>{DifficultyKoreanMap[theme.difficulty]}</td>
                                     <td>{theme.price.toLocaleString()}원</td>
-                                    <td>{theme.isOpen ? '공개' : '비공개'}</td>
+                                    <td>{theme.isActive ? '공개' : '비공개'}</td>
                                     <td>
                                         <button className="btn btn-secondary" onClick={() => handleManageClick(theme.id)}>관리</button>
                                     </td>

frontend/src/util/DateTimeFormatter.ts

@@ -33,3 +33,42 @@ export const formatTime = (timeStr: string) => {
 
     return timePart;
 }
+
+export const formatDisplayDateTime = (dateTime: any): string => {
+  let date: Date;
+
+  if (typeof dateTime === 'string') {
+    // ISO 문자열 형식 처리 (LocalDateTime, OffsetDateTime 모두 포함)
+    date = new Date(dateTime);
+  } else if (typeof dateTime === 'number') {
+    // Unix 타임스탬프(초) 형식 처리
+    date = new Date(dateTime * 1000);
+  } else if (Array.isArray(dateTime) && dateTime.length >= 6) {
+    // 배열 형식 처리: [year, month, day, hour, minute, second, nanosecond?]
+    const year = dateTime[0];
+    const month = dateTime[1] - 1; // JS Date의 월은 0부터 시작
+    const day = dateTime[2];
+    const hour = dateTime[3];
+    const minute = dateTime[4];
+    const second = dateTime[5];
+    const millisecond = dateTime.length > 6 ? Math.floor(dateTime[6] / 1000000) : 0;
+    date = new Date(year, month, day, hour, minute, second, millisecond);
+  } else {
+    return '유효하지 않은 날짜 형식';
+  }
+
+  if (isNaN(date.getTime())) {
+    return '유효하지 않은 날짜';
+  }
+
+  const options: Intl.DateTimeFormatOptions = {
+    year: 'numeric',
+    month: 'long',
+    day: 'numeric',
+    hour: 'numeric',
+    minute: 'numeric',
+    hour12: true,
+    second: 'numeric'
+  };
+  return new Intl.DateTimeFormat('ko-KR', options).format(date);
+};

frontend/tsconfig.app.json

@@ -19,7 +19,6 @@
     "strict": true,
     "noUnusedLocals": true,
     "noUnusedParameters": true,
-    "erasableSyntaxOnly": true,
     "noFallthroughCasesInSwitch": true,
     "noUncheckedSideEffectImports": true,
 
@@ -34,6 +33,7 @@
       "@_hooks/*": ["src/hooks/*"],
       "@_pages/*": ["src/pages/*"],
       "@_types/*": ["/src/types/*"],
+      "@_util/*": ["src/util/*"]
     }
   },
   "include": ["src"],

service/build.gradle.kts

@@ -0,0 +1,57 @@
+plugins {
+    id("org.springframework.boot")
+    kotlin("plugin.spring")
+    kotlin("plugin.jpa")
+}
+
+dependencies {
+    // API docs
+    implementation("org.springdoc:springdoc-openapi-starter-webmvc-ui:2.8.13")
+
+    // Cache
+    implementation("org.springframework.boot:spring-boot-starter-cache")
+    implementation("com.github.ben-manes.caffeine:caffeine")
+
+    // DB
+    runtimeOnly("com.h2database:h2")
+    runtimeOnly("com.mysql:mysql-connector-j")
+
+    // Jwt
+    implementation("io.jsonwebtoken:jjwt:0.12.6")
+
+    // Logging
+    implementation("net.logstash.logback:logstash-logback-encoder:8.1")
+    implementation("com.github.loki4j:loki-logback-appender:2.0.0")
+
+    // Observability
+    implementation("org.springframework.boot:spring-boot-starter-actuator")
+    implementation("io.micrometer:micrometer-tracing-bridge-otel")
+    implementation("io.opentelemetry:opentelemetry-exporter-otlp")
+    runtimeOnly("io.micrometer:micrometer-registry-prometheus")
+
+    // Kotlin
+    implementation("org.jetbrains.kotlin:kotlin-reflect")
+
+    // Test
+    testImplementation("org.springframework.boot:spring-boot-starter-test")
+    testImplementation("io.mockk:mockk:1.14.4")
+    testImplementation("com.ninja-squad:springmockk:4.0.2")
+
+    // Kotest
+    testImplementation("io.kotest.extensions:kotest-extensions-spring:1.3.0")
+
+    // RestAssured
+    testImplementation("io.rest-assured:rest-assured:5.5.5")
+    testImplementation("io.rest-assured:kotlin-extensions:5.5.5")
+
+    // etc
+    implementation("org.apache.poi:poi-ooxml:5.2.3")
+
+    // submodules
+    implementation(project(":common:persistence"))
+    implementation(project(":common:web"))
+}
+
+tasks.named<Jar>("jar") {
+    enabled = false
+}