feat(event): 접속 국가별 이벤트 언어 필터를 적용한다
This commit is contained in:
@@ -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,
|
||||
|
||||
Reference in New Issue
Block a user