diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/member/Member.kt b/src/main/kotlin/kr/co/vividnext/sodalive/member/Member.kt index 0a9ba25b..a30b31c6 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/member/Member.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/member/Member.kt @@ -47,7 +47,10 @@ data class Member( var isActive: Boolean = true, - var container: String = "web" + var container: String = "web", + + // ISO 3166-1 alpha-2 국가 코드 + var countryCode: String? = null ) : BaseEntity() { @OneToMany(mappedBy = "member", cascade = [CascadeType.ALL]) val stipulationAgrees: MutableList = mutableListOf() diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/member/MemberService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/member/MemberService.kt index f1d34e63..5d053cc1 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/member/MemberService.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/member/MemberService.kt @@ -7,6 +7,7 @@ import kr.co.vividnext.sodalive.can.charge.ChargeRepository import kr.co.vividnext.sodalive.can.payment.CanPaymentService import kr.co.vividnext.sodalive.can.use.CanUsage import kr.co.vividnext.sodalive.common.ApiResponse +import kr.co.vividnext.sodalive.common.CountryContext import kr.co.vividnext.sodalive.common.SodaException import kr.co.vividnext.sodalive.content.order.OrderService import kr.co.vividnext.sodalive.email.SendEmailService @@ -99,6 +100,7 @@ class MemberService( private val messageSource: SodaMessageSource, private val langContext: LangContext, + private val countryContext: CountryContext, private val objectMapper: ObjectMapper, @@ -133,7 +135,8 @@ class MemberService( nickname = nickname, profileImage = "profile/default-profile.png", gender = Gender.NONE, - container = request.container + container = request.container, + countryCode = countryContext.countryCode ) if (!request.marketingPid.isNullOrBlank()) { @@ -390,7 +393,8 @@ class MemberService( password = passwordEncoder.encode(request.password), nickname = request.nickname, gender = request.gender, - container = request.container + container = request.container, + countryCode = countryContext.countryCode ) if (!request.marketingPid.isNullOrBlank()) { @@ -848,7 +852,8 @@ class MemberService( profileImage = "profile/default-profile.png", gender = Gender.NONE, provider = MemberProvider.GOOGLE, - container = container + container = container, + countryCode = countryContext.countryCode ) if (!marketingPid.isNullOrBlank()) { @@ -904,7 +909,8 @@ class MemberService( profileImage = "profile/default-profile.png", gender = Gender.NONE, provider = MemberProvider.KAKAO, - container = container + container = container, + countryCode = countryContext.countryCode ) if (!marketingPid.isNullOrBlank()) {