feat(event): 접속 국가별 이벤트 언어 필터를 적용한다

src/main/kotlin/kr/co/vividnext/sodalive/event/Event.kt

@@ -1,9 +1,12 @@
 package kr.co.vividnext.sodalive.event
 
 import kr.co.vividnext.sodalive.common.BaseEntity
+import kr.co.vividnext.sodalive.i18n.Lang
 import java.time.LocalDateTime
 import javax.persistence.Column
 import javax.persistence.Entity
+import javax.persistence.EnumType
+import javax.persistence.Enumerated
 
 @Entity
 data class Event(
@@ -17,6 +20,9 @@ data class Event(
     var link: String?,
     @Column(nullable = true)
     var title: String?,
+    @Column(nullable = false)
+    @Enumerated(value = EnumType.STRING)
+    var lang: Lang = Lang.KO,
     @Column(nullable = true)
     var isAdult: Boolean? = null,
     @Column(nullable = false)

src/main/kotlin/kr/co/vividnext/sodalive/event/EventController.kt

@@ -22,17 +22,14 @@ class EventController(private val service: EventService) {
         @AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member?
     ) = run {
         ApiResponse.ok(
-            service.getEventList(
-                memberId = member?.id,
-                memberRole = member?.role
-            )
+            service.getEventList(member = member)
         )
     }
 
     @GetMapping("/popup")
     fun getEventPopup(
         @AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member?
-    ) = ApiResponse.ok(service.getEventPopup(memberId = member?.id))
+    ) = ApiResponse.ok(service.getEventPopup(member = member))
 
     @PostMapping
     @PreAuthorize("hasRole('ADMIN')")

src/main/kotlin/kr/co/vividnext/sodalive/event/EventRepository.kt

@@ -2,6 +2,7 @@ package kr.co.vividnext.sodalive.event
 
 import com.querydsl.jpa.impl.JPAQueryFactory
 import kr.co.vividnext.sodalive.event.QEvent.event
+import kr.co.vividnext.sodalive.i18n.Lang
 import org.springframework.data.jpa.repository.JpaRepository
 import org.springframework.stereotype.Repository
 import java.time.LocalDateTime
@@ -10,13 +11,13 @@ import java.time.LocalDateTime
 interface EventRepository : JpaRepository<Event, Long>, EventQueryRepository
 
 interface EventQueryRepository {
-    fun getEventList(isAdult: Boolean? = null): List<EventItem>
-    fun getMainEventPopup(isAdult: Boolean): EventItem?
+    fun getEventList(isAdult: Boolean? = null, lang: Lang? = null): List<EventItem>
+    fun getMainEventPopup(isAdult: Boolean, lang: Lang? = null): EventItem?
 }
 
 @Repository
 class EventQueryRepositoryImpl(private val queryFactory: JPAQueryFactory) : EventQueryRepository {
-    override fun getEventList(isAdult: Boolean?): List<EventItem> {
+    override fun getEventList(isAdult: Boolean?, lang: Lang?): List<EventItem> {
         val now = LocalDateTime.now()
         var where = event.isActive.isTrue
             .and(event.startDate.loe(now))
@@ -36,6 +37,10 @@ class EventQueryRepositoryImpl(private val queryFactory: JPAQueryFactory) : Even
             }
         }
 
+        if (lang != null) {
+            where = where.and(event.lang.eq(lang))
+        }
+
         return queryFactory
             .select(
                 QEventItem(
@@ -52,7 +57,7 @@ class EventQueryRepositoryImpl(private val queryFactory: JPAQueryFactory) : Even
             .fetch()
     }
 
-    override fun getMainEventPopup(isAdult: Boolean): EventItem? {
+    override fun getMainEventPopup(isAdult: Boolean, lang: Lang?): EventItem? {
         val now = LocalDateTime.now()
         var where = event.isActive.isTrue
             .and(event.isPopup.isTrue)
@@ -71,6 +76,9 @@ class EventQueryRepositoryImpl(private val queryFactory: JPAQueryFactory) : Even
                     .or(event.isAdult.isFalse)
             )
         }
+        if (lang != null) {
+            where = where.and(event.lang.eq(lang))
+        }
 
         return queryFactory
             .select(

src/main/kotlin/kr/co/vividnext/sodalive/event/EventService.kt

@@ -3,8 +3,11 @@ package kr.co.vividnext.sodalive.event
 import com.amazonaws.services.s3.model.ObjectMetadata
 import kr.co.vividnext.sodalive.aws.s3.S3Uploader
 import kr.co.vividnext.sodalive.common.SodaException
+import kr.co.vividnext.sodalive.i18n.Lang
+import kr.co.vividnext.sodalive.member.Member
 import kr.co.vividnext.sodalive.member.MemberRole
 import kr.co.vividnext.sodalive.member.auth.AuthRepository
+import kr.co.vividnext.sodalive.member.contentpreference.MemberContentPreferenceService
 import kr.co.vividnext.sodalive.utils.generateFileName
 import org.springframework.beans.factory.annotation.Value
 import org.springframework.data.repository.findByIdOrNull
@@ -20,6 +23,7 @@ class EventService(
     private val repository: EventRepository,
     private val s3Uploader: S3Uploader,
     private val authRepository: AuthRepository,
+    private val memberContentPreferenceService: MemberContentPreferenceService,
 
     @Value("\${cloud.aws.s3.bucket}")
     private val bucket: String,
@@ -27,8 +31,8 @@ class EventService(
     private val cloudFrontHost: String
 ) {
     @Transactional(readOnly = true)
-    fun getEventList(isAdult: Boolean? = null): GetEventResponse {
-        val eventList = repository.getEventList(isAdult)
+    fun getEventList(isAdult: Boolean? = null, lang: Lang? = null): GetEventResponse {
+        val eventList = repository.getEventList(isAdult, lang)
             .map {
                 if (!it.thumbnailImageUrl.startsWith("https://")) {
                     it.thumbnailImageUrl = "$cloudFrontHost/${it.thumbnailImageUrl}"
@@ -49,18 +53,18 @@ class EventService(
     }
 
     @Transactional(readOnly = true)
-    fun getEventList(memberId: Long?, memberRole: MemberRole?): GetEventResponse {
-        val isAdult = if (memberRole == MemberRole.ADMIN) {
+    fun getEventList(member: Member?): GetEventResponse {
+        val isAdult = if (member?.role == MemberRole.ADMIN) {
             null
         } else {
-            memberId?.let { authRepository.getAuthIdByMemberId(it) != null } ?: false
+            member?.id?.let { authRepository.getAuthIdByMemberId(it) != null } ?: false
         }
-        return getEventList(isAdult)
+        return getEventList(isAdult = isAdult, lang = resolveEventLang(member))
     }
 
     @Transactional(readOnly = true)
-    fun getEventPopup(isAdult: Boolean): EventItem? {
-        val eventPopup = repository.getMainEventPopup(isAdult)
+    fun getEventPopup(isAdult: Boolean, lang: Lang? = null): EventItem? {
+        val eventPopup = repository.getMainEventPopup(isAdult, lang)
 
         if (eventPopup != null) {
             if (!eventPopup.thumbnailImageUrl.startsWith("https://")) {
@@ -80,11 +84,14 @@ class EventService(
     }
 
     @Transactional(readOnly = true)
-    fun getEventPopup(memberId: Long?): EventItem? {
-        val isAdult = memberId?.let { authRepository.getAuthIdByMemberId(it) != null } ?: false
-        return getEventPopup(isAdult)
+    fun getEventPopup(member: Member?): EventItem? {
+        val isAdult = member?.id?.let { authRepository.getAuthIdByMemberId(it) != null } ?: false
+        return getEventPopup(isAdult = isAdult, lang = resolveEventLang(member))
     }
 
+    private fun resolveEventLang(member: Member?): Lang =
+        if (memberContentPreferenceService.resolveCountryCode(member) == "JP") Lang.JA else Lang.KO
+
     @Transactional
     fun save(
         thumbnail: MultipartFile,