pricelees/roomescape-refactored
1
0
Fork 0
generated from pricelees/issue-pr-template
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

[#44] 매장 기능 도입 #45

Merged
pricelees merged 116 commits from feat/#44 into main 2025-09-20 03:15:06 +00:00
Conversation 0 Commits 116 Files Changed 133 +13 -37
12 changed files with 13 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 8c6222237b - Show all commits

1
src/main/kotlin/roomescape/admin/business/AdminService.kt
View File

@ -7,7 +7,6 @@ import org.springframework.stereotype.Service
import org.springframework.transaction.annotation.Transactional import org.springframework.transaction.annotation.Transactional
import roomescape.admin.exception.AdminErrorCode import roomescape.admin.exception.AdminErrorCode
import roomescape.admin.exception.AdminException import roomescape.admin.exception.AdminException
import roomescape.admin.infrastructure.persistence.AdminEntity
import roomescape.admin.infrastructure.persistence.AdminRepository import roomescape.admin.infrastructure.persistence.AdminRepository
import roomescape.common.dto.AdminLoginCredentials import roomescape.common.dto.AdminLoginCredentials
import roomescape.common.dto.AuditConstant import roomescape.common.dto.AuditConstant

8
src/main/kotlin/roomescape/common/config/JacksonConfig.kt
View File

@ -1,8 +1,10 @@
package roomescape.common.config package roomescape.common.config
import com.fasterxml.jackson.core.JsonGenerator import com.fasterxml.jackson.core.JsonGenerator
import com.fasterxml.jackson.core.JsonParser import com.fasterxml.jackson.databind.DeserializationFeature
import com.fasterxml.jackson.databind.* import com.fasterxml.jackson.databind.JsonSerializer
import com.fasterxml.jackson.databind.ObjectMapper
import com.fasterxml.jackson.databind.SerializerProvider
import com.fasterxml.jackson.databind.module.SimpleModule import com.fasterxml.jackson.databind.module.SimpleModule
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule
import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateDeserializer import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateDeserializer
@ -12,8 +14,6 @@ import com.fasterxml.jackson.datatype.jsr310.ser.LocalTimeSerializer
import com.fasterxml.jackson.module.kotlin.kotlinModule import com.fasterxml.jackson.module.kotlin.kotlinModule
import org.springframework.context.annotation.Bean import org.springframework.context.annotation.Bean
import org.springframework.context.annotation.Configuration import org.springframework.context.annotation.Configuration
import roomescape.common.exception.CommonErrorCode
import roomescape.common.exception.RoomescapeException
import java.time.* import java.time.*
import java.time.format.DateTimeFormatter import java.time.format.DateTimeFormatter

2
src/main/kotlin/roomescape/common/util/MDCUtils.kt
View File

@ -1,7 +1,7 @@
package roomescape.common.util package roomescape.common.util
import org.slf4j.MDC import org.slf4j.MDC
import java.util.Optional import java.util.*
private const val MDC_PRINCIPAL_ID_KEY = "principal_id" private const val MDC_PRINCIPAL_ID_KEY = "principal_id"

6
src/main/kotlin/roomescape/payment/web/PaymentController.kt
View File

@ -2,11 +2,7 @@ package roomescape.payment.web
import jakarta.validation.Valid import jakarta.validation.Valid
import org.springframework.http.ResponseEntity import org.springframework.http.ResponseEntity
import org.springframework.web.bind.annotation.PostMapping import org.springframework.web.bind.annotation.*
import org.springframework.web.bind.annotation.RequestBody
import org.springframework.web.bind.annotation.RequestMapping
import org.springframework.web.bind.annotation.RequestParam
import org.springframework.web.bind.annotation.RestController
import roomescape.auth.web.support.User import roomescape.auth.web.support.User
import roomescape.common.dto.CurrentUserContext import roomescape.common.dto.CurrentUserContext
import roomescape.common.dto.response.CommonApiResponse import roomescape.common.dto.response.CommonApiResponse

2
src/main/kotlin/roomescape/reservation/web/ReservationDto.kt
View File

@ -1,10 +1,10 @@
package roomescape.reservation.web package roomescape.reservation.web
import jakarta.validation.constraints.NotEmpty import jakarta.validation.constraints.NotEmpty
import roomescape.user.web.UserContactResponse
import roomescape.payment.web.PaymentWithDetailResponse import roomescape.payment.web.PaymentWithDetailResponse
import roomescape.reservation.infrastructure.persistence.ReservationEntity import roomescape.reservation.infrastructure.persistence.ReservationEntity
import roomescape.reservation.infrastructure.persistence.ReservationStatus import roomescape.reservation.infrastructure.persistence.ReservationStatus
import roomescape.user.web.UserContactResponse
import java.time.LocalDate import java.time.LocalDate
import java.time.LocalDateTime import java.time.LocalDateTime
import java.time.LocalTime import java.time.LocalTime

1
src/main/kotlin/roomescape/store/infrastructure/persistence/StoreRepository.kt
View File

@ -1,6 +1,5 @@
package roomescape.store.infrastructure.persistence package roomescape.store.infrastructure.persistence
import com.fasterxml.jackson.databind.util.Named
import org.springframework.data.jpa.repository.JpaRepository import org.springframework.data.jpa.repository.JpaRepository
import org.springframework.data.jpa.repository.Query import org.springframework.data.jpa.repository.Query

1
src/main/kotlin/roomescape/theme/docs/ThemeApi.kt
View File

@ -3,7 +3,6 @@ package roomescape.theme.docs
import io.swagger.v3.oas.annotations.Operation import io.swagger.v3.oas.annotations.Operation
import io.swagger.v3.oas.annotations.responses.ApiResponse import io.swagger.v3.oas.annotations.responses.ApiResponse
import io.swagger.v3.oas.annotations.responses.ApiResponses import io.swagger.v3.oas.annotations.responses.ApiResponses
import io.swagger.v3.oas.annotations.tags.Tag
import jakarta.validation.Valid import jakarta.validation.Valid
import org.springframework.http.ResponseEntity import org.springframework.http.ResponseEntity
import org.springframework.web.bind.annotation.PathVariable import org.springframework.web.bind.annotation.PathVariable

8
src/main/kotlin/roomescape/theme/web/ThemeController.kt
View File

@ -2,13 +2,7 @@ package roomescape.theme.web
import jakarta.validation.Valid import jakarta.validation.Valid
import org.springframework.http.ResponseEntity import org.springframework.http.ResponseEntity
import org.springframework.web.bind.annotation.GetMapping import org.springframework.web.bind.annotation.*
import org.springframework.web.bind.annotation.PathVariable
import org.springframework.web.bind.annotation.PostMapping
import org.springframework.web.bind.annotation.RequestBody
import org.springframework.web.bind.annotation.RequestMapping
import org.springframework.web.bind.annotation.RestController
import roomescape.auth.web.support.Public
import roomescape.common.dto.response.CommonApiResponse import roomescape.common.dto.response.CommonApiResponse
import roomescape.theme.business.ThemeService import roomescape.theme.business.ThemeService
import roomescape.theme.docs.PublicThemeAPI import roomescape.theme.docs.PublicThemeAPI

6
src/main/kotlin/roomescape/user/web/UserController.kt
View File

@ -2,11 +2,7 @@ package roomescape.user.web
import jakarta.validation.Valid import jakarta.validation.Valid
import org.springframework.http.ResponseEntity import org.springframework.http.ResponseEntity
import org.springframework.web.bind.annotation.GetMapping import org.springframework.web.bind.annotation.*
import org.springframework.web.bind.annotation.PostMapping
import org.springframework.web.bind.annotation.RequestBody
import org.springframework.web.bind.annotation.RequestMapping
import org.springframework.web.bind.annotation.RestController
import roomescape.auth.web.support.User import roomescape.auth.web.support.User
import roomescape.common.dto.CurrentUserContext import roomescape.common.dto.CurrentUserContext
import roomescape.common.dto.response.CommonApiResponse import roomescape.common.dto.response.CommonApiResponse

6
src/test/kotlin/roomescape/region/RegionApiSuccessTest.kt
View File

@ -1,14 +1,8 @@
package roomescape.region package roomescape.region
import com.ninjasquad.springmockk.MockkBean
import io.kotest.matchers.shouldBe import io.kotest.matchers.shouldBe
import io.mockk.every
import org.springframework.http.HttpMethod
import org.springframework.http.HttpStatus import org.springframework.http.HttpStatus
import roomescape.region.exception.RegionErrorCode
import roomescape.region.infrastructure.persistence.RegionRepository
import roomescape.supports.FunSpecSpringbootTest import roomescape.supports.FunSpecSpringbootTest
import roomescape.supports.runExceptionTest
import roomescape.supports.runTest import roomescape.supports.runTest
class RegionApiSuccessTest: FunSpecSpringbootTest() { class RegionApiSuccessTest: FunSpecSpringbootTest() {

1
src/test/kotlin/roomescape/supports/DummyInitializer.kt
View File

@ -2,7 +2,6 @@ package roomescape.supports
import org.springframework.data.repository.findByIdOrNull import org.springframework.data.repository.findByIdOrNull
import roomescape.common.config.next import roomescape.common.config.next
import roomescape.common.util.MdcPrincipalId
import roomescape.payment.business.PaymentWriter import roomescape.payment.business.PaymentWriter
import roomescape.payment.infrastructure.client.CardDetail import roomescape.payment.infrastructure.client.CardDetail
import roomescape.payment.infrastructure.client.EasyPayDetail import roomescape.payment.infrastructure.client.EasyPayDetail

8
src/test/kotlin/roomescape/user/UserApiTest.kt
View File

@ -16,15 +16,15 @@ import org.springframework.http.MediaType
import roomescape.auth.exception.AuthErrorCode import roomescape.auth.exception.AuthErrorCode
import roomescape.auth.infrastructure.jwt.JwtUtils import roomescape.auth.infrastructure.jwt.JwtUtils
import roomescape.common.exception.CommonErrorCode import roomescape.common.exception.CommonErrorCode
import roomescape.supports.FunSpecSpringbootTest
import roomescape.supports.UserFixture
import roomescape.supports.runExceptionTest
import roomescape.supports.runTest
import roomescape.user.business.SIGNUP import roomescape.user.business.SIGNUP
import roomescape.user.exception.UserErrorCode import roomescape.user.exception.UserErrorCode
import roomescape.user.infrastructure.persistence.* import roomescape.user.infrastructure.persistence.*
import roomescape.user.web.MIN_PASSWORD_LENGTH import roomescape.user.web.MIN_PASSWORD_LENGTH
import roomescape.user.web.UserCreateRequest import roomescape.user.web.UserCreateRequest
import roomescape.supports.FunSpecSpringbootTest
import roomescape.supports.UserFixture
import roomescape.supports.runExceptionTest
import roomescape.supports.runTest
class UserApiTest( class UserApiTest(
private val userRepository: UserRepository, private val userRepository: UserRepository,