src/main/kotlin/kr/co/vividnext/sodalive/common/BaseEntity.kt

@@ -1,9 +1,5 @@
 package kr.co.vividnext.sodalive.common
 
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize
-import com.fasterxml.jackson.databind.annotation.JsonSerialize
-import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer
-import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer
 import java.time.LocalDateTime
 import javax.persistence.GeneratedValue
 import javax.persistence.GenerationType
@@ -18,12 +14,7 @@ abstract class BaseEntity {
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     var id: Long? = null
 
-    @JsonSerialize(using = LocalDateTimeSerializer::class)
-    @JsonDeserialize(using = LocalDateTimeDeserializer::class)
     var createdAt: LocalDateTime? = null
-
-    @JsonSerialize(using = LocalDateTimeSerializer::class)
-    @JsonDeserialize(using = LocalDateTimeDeserializer::class)
     var updatedAt: LocalDateTime? = null
 
     @PrePersist

src/main/kotlin/kr/co/vividnext/sodalive/configs/RedisConfig.kt

@@ -1,22 +1,14 @@
 package kr.co.vividnext.sodalive.configs
 
 import org.springframework.beans.factory.annotation.Value
-import org.springframework.cache.annotation.EnableCaching
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
-import org.springframework.data.redis.cache.RedisCacheConfiguration
-import org.springframework.data.redis.cache.RedisCacheManager
 import org.springframework.data.redis.connection.RedisConnectionFactory
 import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory
 import org.springframework.data.redis.core.RedisTemplate
 import org.springframework.data.redis.repository.configuration.EnableRedisRepositories
-import org.springframework.data.redis.serializer.GenericJackson2JsonRedisSerializer
-import org.springframework.data.redis.serializer.RedisSerializationContext
-import org.springframework.data.redis.serializer.StringRedisSerializer
-import java.time.Duration
 
 @Configuration
-@EnableCaching
 @EnableRedisRepositories
 class RedisConfig(
     @Value("\${spring.redis.host}")
@@ -35,31 +27,4 @@ class RedisConfig(
         redisTemplate.setConnectionFactory(redisConnectionFactory())
         return redisTemplate
     }
-
-    @Bean
-    fun cacheManager(connectionFactory: RedisConnectionFactory): RedisCacheManager {
-        val defaultConfig = RedisCacheConfiguration.defaultCacheConfig()
-            .entryTtl(Duration.ofHours(1)) // Default TTL
-            .serializeKeysWith(RedisSerializationContext.SerializationPair.fromSerializer(StringRedisSerializer()))
-            .serializeValuesWith(
-                RedisSerializationContext.SerializationPair.fromSerializer(
-                    GenericJackson2JsonRedisSerializer()
-                )
-            )
-
-        val weekLivedCacheConfig = RedisCacheConfiguration.defaultCacheConfig()
-            .entryTtl(Duration.ofDays(3))
-            .serializeKeysWith(RedisSerializationContext.SerializationPair.fromSerializer(StringRedisSerializer()))
-            .serializeValuesWith(
-                RedisSerializationContext.SerializationPair.fromSerializer(
-                    GenericJackson2JsonRedisSerializer()
-                )
-            )
-
-        return RedisCacheManager.RedisCacheManagerBuilder
-            .fromConnectionFactory(connectionFactory)
-            .cacheDefaults(defaultConfig)
-            .withCacheConfiguration("weekLivedCache", weekLivedCacheConfig)
-            .build()
-    }
 }

src/main/kotlin/kr/co/vividnext/sodalive/content/AudioContent.kt

@@ -42,7 +42,7 @@ data class AudioContent(
     var content: String? = null
     var coverImage: String? = null
 
-    @OneToOne(fetch = FetchType.EAGER)
+    @OneToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "theme_id", nullable = false)
     var theme: AudioContentTheme? = null
 

src/main/kotlin/kr/co/vividnext/sodalive/content/AudioContentRepository.kt

@@ -18,7 +18,6 @@ import kr.co.vividnext.sodalive.content.order.QOrder.order
 import kr.co.vividnext.sodalive.content.theme.QAudioContentTheme.audioContentTheme
 import kr.co.vividnext.sodalive.event.QEvent.event
 import kr.co.vividnext.sodalive.member.QMember.member
-import org.springframework.cache.annotation.Cacheable
 import org.springframework.data.jpa.repository.JpaRepository
 import org.springframework.stereotype.Repository
 import java.time.LocalDateTime
@@ -337,10 +336,6 @@ class AudioContentQueryRepositoryImpl(private val queryFactory: JPAQueryFactory)
             .fetch()
     }
 
-    @Cacheable(
-        value = ["getNewContentUploadCreatorList"],
-        cacheManager = "cacheManager"
-    )
     override fun getNewContentUploadCreatorList(
         cloudfrontHost: String,
         isAdult: Boolean
@@ -376,10 +371,6 @@ class AudioContentQueryRepositoryImpl(private val queryFactory: JPAQueryFactory)
             .toList()
     }
 
-    @Cacheable(
-        value = ["getAudioContentMainBannerList"],
-        cacheManager = "cacheManager"
-    )
     override fun getAudioContentMainBannerList(isAdult: Boolean): List<AudioContentBanner> {
         var where = audioContentBanner.isActive.isTrue
 
@@ -396,10 +387,6 @@ class AudioContentQueryRepositoryImpl(private val queryFactory: JPAQueryFactory)
             .fetch()
     }
 
-    @Cacheable(
-        value = ["getAudioContentCurations"],
-        cacheManager = "cacheManager"
-    )
     override fun getAudioContentCurations(isAdult: Boolean): List<AudioContentCuration> {
         var where = audioContentCuration.isActive.isTrue
 
@@ -451,10 +438,6 @@ class AudioContentQueryRepositoryImpl(private val queryFactory: JPAQueryFactory)
             .fetch()
     }
 
-    @Cacheable(
-        value = ["weekLivedCache"],
-        cacheManager = "cacheManager"
-    )
     override fun getAudioContentRanking(
         cloudfrontHost: String,
         isAdult: Boolean,

src/main/kotlin/kr/co/vividnext/sodalive/content/main/GetAudioContentRanking.kt

@@ -1,6 +1,5 @@
 package kr.co.vividnext.sodalive.content.main
 
-import com.fasterxml.jackson.annotation.JsonProperty
 import com.querydsl.core.annotations.QueryProjection
 
 data class GetAudioContentRanking(
@@ -10,12 +9,12 @@ data class GetAudioContentRanking(
 )
 
 data class GetAudioContentRankingItem @QueryProjection constructor(
-    @JsonProperty("contentId") val contentId: Long,
-    @JsonProperty("title") val title: String,
-    @JsonProperty("coverImageUrl") val coverImageUrl: String,
-    @JsonProperty("themeStr") val themeStr: String,
-    @JsonProperty("price") val price: Int,
-    @JsonProperty("duration") val duration: String,
-    @JsonProperty("creatorId") val creatorId: Long,
-    @JsonProperty("creatorNickname") val creatorNickname: String
+    val contentId: Long,
+    val title: String,
+    val coverImageUrl: String,
+    val themeStr: String,
+    val price: Int,
+    val duration: String,
+    val creatorId: Long,
+    val creatorNickname: String
 )

src/main/kotlin/kr/co/vividnext/sodalive/content/main/GetNewContentUploadCreator.kt

@@ -1,10 +1,9 @@
 package kr.co.vividnext.sodalive.content.main
 
-import com.fasterxml.jackson.annotation.JsonProperty
 import com.querydsl.core.annotations.QueryProjection
 
 data class GetNewContentUploadCreator @QueryProjection constructor(
-    @JsonProperty("creatorId") val creatorId: Long,
-    @JsonProperty("creatorNickname") val creatorNickname: String,
-    @JsonProperty("creatorProfileImageUrl") val creatorProfileImageUrl: String
+    val creatorId: Long,
+    val creatorNickname: String,
+    val creatorProfileImageUrl: String
 )

src/main/kotlin/kr/co/vividnext/sodalive/content/main/curation/AudioContentCuration.kt

@@ -1,8 +1,10 @@
 package kr.co.vividnext.sodalive.content.main.curation
 
 import kr.co.vividnext.sodalive.common.BaseEntity
+import kr.co.vividnext.sodalive.content.AudioContent
 import javax.persistence.Column
 import javax.persistence.Entity
+import javax.persistence.OneToMany
 import javax.persistence.Table
 
 @Entity
@@ -18,4 +20,7 @@ data class AudioContentCuration(
     var isActive: Boolean = true,
     @Column(nullable = false)
     var orders: Int = 1
-) : BaseEntity()
+) : BaseEntity() {
+    @OneToMany(mappedBy = "curation")
+    val audioContents: MutableList<AudioContent> = mutableListOf()
+}

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

@@ -5,7 +5,6 @@ import kr.co.vividnext.sodalive.aws.s3.S3Uploader
 import kr.co.vividnext.sodalive.common.SodaException
 import kr.co.vividnext.sodalive.utils.generateFileName
 import org.springframework.beans.factory.annotation.Value
-import org.springframework.cache.annotation.Cacheable
 import org.springframework.data.repository.findByIdOrNull
 import org.springframework.stereotype.Service
 import org.springframework.transaction.annotation.Transactional
@@ -21,10 +20,6 @@ class EventService(
     @Value("\${cloud.aws.cloud-front.host}")
     private val cloudFrontHost: String
 ) {
-    @Cacheable(
-        value = ["getEventList"],
-        cacheManager = "cacheManager"
-    )
     fun getEventList(): GetEventResponse {
         val eventList = repository.getEventList()
             .asSequence()

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

@@ -1,21 +1,18 @@
 package kr.co.vividnext.sodalive.event
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties
-import com.fasterxml.jackson.annotation.JsonProperty
 import com.querydsl.core.annotations.QueryProjection
 
 data class GetEventResponse(
-    @JsonProperty("totalCount") val totalCount: Int,
-    @JsonProperty("eventList") val eventList: List<EventItem>
+    val totalCount: Int,
+    val eventList: List<EventItem>
 )
 
-@JsonIgnoreProperties(ignoreUnknown = true)
 data class EventItem @QueryProjection constructor(
-    @JsonProperty("id") val id: Long,
-    @JsonProperty("title") val title: String? = null,
-    @JsonProperty("thumbnailImageUrl") var thumbnailImageUrl: String,
-    @JsonProperty("detailImageUrl") var detailImageUrl: String? = null,
-    @JsonProperty("popupImageUrl") var popupImageUrl: String? = null,
-    @JsonProperty("link") val link: String? = null,
-    @JsonProperty("isPopup") val isPopup: Boolean
+    val id: Long,
+    val title: String? = null,
+    var thumbnailImageUrl: String,
+    var detailImageUrl: String? = null,
+    var popupImageUrl: String? = null,
+    val link: String? = null,
+    val isPopup: Boolean
 )

src/main/kotlin/kr/co/vividnext/sodalive/live/recommend/GetRecommendLiveResponse.kt

@@ -1,8 +1,6 @@
 package kr.co.vividnext.sodalive.live.recommend
 
-import com.fasterxml.jackson.annotation.JsonProperty
-
 data class GetRecommendLiveResponse(
-    @JsonProperty("imageUrl") val imageUrl: String,
-    @JsonProperty("creatorId") val creatorId: Long
+    val imageUrl: String,
+    val creatorId: Long
 )

src/main/kotlin/kr/co/vividnext/sodalive/live/recommend/LiveRecommendRepository.kt

@@ -9,7 +9,6 @@ import kr.co.vividnext.sodalive.member.MemberRole
 import kr.co.vividnext.sodalive.member.QMember.member
 import kr.co.vividnext.sodalive.member.following.QCreatorFollowing.creatorFollowing
 import org.springframework.beans.factory.annotation.Value
-import org.springframework.cache.annotation.Cacheable
 import org.springframework.stereotype.Repository
 import java.time.LocalDateTime
 
@@ -20,10 +19,6 @@ class LiveRecommendRepository(
     @Value("\${cloud.aws.cloud-front.host}")
     private val cloudFrontHost: String
 ) {
-    @Cacheable(
-        value = ["getRecommendLive"],
-        cacheManager = "cacheManager"
-    )
     fun getRecommendLive(
         memberId: Long,
         isBlocked: (Long) -> Boolean,

src/main/resources/application.yml

@@ -73,8 +73,6 @@ spring:
         multipart:
             max-file-size: 1024MB
             max-request-size: 1024MB
-    cache:
-        type: redis
 ---
 spring:
     config:

src/test/resources/application.yml

@@ -47,5 +47,3 @@ spring:
             hibernate:
                 show_sql: true
                 format_sql: true
-    cache:
-        type: redis