v1.0.1

v1.0.1

Author: move-hoon

admin/src/main/resources/application.yml

@@ -34,6 +34,9 @@ springdoc:
     enabled: true
   override-with-generic-response: false
 
+app:
+  module-name: admin
+
 ---
 spring:
   config:

apis/src/main/kotlin/org/yapp/apis/config/InfraConfig.kt

@@ -13,7 +13,8 @@ import org.yapp.infra.InfraBaseConfigGroup
         InfraBaseConfigGroup.REST_CLIENT,
         InfraBaseConfigGroup.QUERY_DSL,
         InfraBaseConfigGroup.PAGE,
-        InfraBaseConfigGroup.AOP
+        InfraBaseConfigGroup.AOP,
+        InfraBaseConfigGroup.SENTRY
     ]
 )
 class InfraConfig

apis/src/main/resources/application.yml

@@ -42,6 +42,9 @@ springdoc:
     enabled: true
   override-with-generic-response: false
 
+app:
+  module-name: apis
+
 ---
 spring:
   config:

batch/src/main/resources/application.yml

@@ -23,6 +23,9 @@ spring:
       max-file-size: 10MB
       max-request-size: 30MB
 
+app:
+  module-name: batch
+
 ---
 spring:
   config:

buildSrc/src/main/kotlin/Dependencies.kt

@@ -70,4 +70,9 @@ object Dependencies {
     object Prometheus {
         const val MICROMETER_PROMETHEUS_REGISTRY = "io.micrometer:micrometer-registry-prometheus"
     }
+
+    object Sentry {
+        const val SPRING_BOOT_STARTER = "io.sentry:sentry-spring-boot-starter-jakarta:8.22.0"
+        const val LOG4J2 = "io.sentry:sentry-log4j2:8.22.0"
+    }
 }

domain/src/main/kotlin/org/yapp/domain/readingrecord/ReadingRecordDomainService.kt

@@ -102,8 +102,36 @@ class ReadingRecordDomainService(
         sort: ReadingRecordSortType?,
         pageable: Pageable
     ): Page<ReadingRecordInfoVO> {
-        return readingRecordRepository.findReadingRecordsByDynamicCondition(userBookId, sort, pageable)
-            .map { buildReadingRecordInfoVO(it) }
+        val readingRecordPage = readingRecordRepository.findReadingRecordsByDynamicCondition(userBookId, sort, pageable)
+        if (readingRecordPage.isEmpty) {
+            return Page.empty(pageable)
+        }
+
+        val readingRecords = readingRecordPage.content
+        val readingRecordIds = readingRecords.map { it.id.value }
+
+        val readingRecordTags = readingRecordTagRepository.findByReadingRecordIdIn(readingRecordIds)
+        val tagIds = readingRecordTags.map { it.tagId.value }
+        val tagsById = tagRepository.findByIds(tagIds).associateBy { it.id.value }
+
+        val tagsByReadingRecordId = readingRecordTags
+            .groupBy { it.readingRecordId.value }
+            .mapValues { (_, tags) ->
+                tags.mapNotNull { tagsById[it.tagId.value] }
+            }
+
+        val userBook = userBookRepository.findById(userBookId)
+
+        return readingRecordPage.map { readingRecord ->
+            ReadingRecordInfoVO.newInstance(
+                readingRecord = readingRecord,
+                emotionTags = tagsByReadingRecordId[readingRecord.id.value]?.map { it.name } ?: emptyList(),
+                bookTitle = userBook?.title,
+                bookPublisher = userBook?.publisher,
+                bookCoverImageUrl = userBook?.coverImageUrl,
+                author = userBook?.author
+            )
+        }
     }
 
     fun modifyReadingRecord(

domain/src/main/kotlin/org/yapp/domain/readingrecordtag/ReadingRecordTagRepository.kt

@@ -5,6 +5,7 @@ import java.util.UUID
 interface ReadingRecordTagRepository {
     fun saveAll(readingRecordTags: List<ReadingRecordTag>): List<ReadingRecordTag>
     fun findByReadingRecordId(readingRecordId: UUID): List<ReadingRecordTag>
+    fun findByReadingRecordIdIn(readingRecordIds: List<UUID>): List<ReadingRecordTag>
     fun deleteAllByReadingRecordId(readingRecordId: UUID)
     fun countTagsByUserIdAndUserBookIdAndCategories(userId: UUID, userBookId: UUID, categories: List<String>): Map<String, Int>
 }

infra/build.gradle.kts

@@ -17,6 +17,9 @@ dependencies {
 
     implementation(Dependencies.QueryDsl.JPA)
 
+    implementation(Dependencies.Sentry.SPRING_BOOT_STARTER)
+    implementation(Dependencies.Sentry.LOG4J2)
+
     kapt(Dependencies.QueryDsl.APT)
 
     testImplementation(Dependencies.Spring.BOOT_STARTER_TEST)

infra/src/main/kotlin/org/yapp/infra/InfraBaseConfigGroup.kt

@@ -7,6 +7,7 @@ import org.yapp.infra.config.internal.async.AsyncConfig
 import org.yapp.infra.config.internal.jpa.JpaConfig
 import org.yapp.infra.config.internal.page.PageConfig
 import org.yapp.infra.config.internal.querydsl.QuerydslConfig
+import org.yapp.infra.config.external.sentry.SentryConfig
 
 enum class InfraBaseConfigGroup(
     val configClass: Class<out InfraBaseConfig>
@@ -17,5 +18,6 @@ enum class InfraBaseConfigGroup(
     REDIS(RedisConfig::class.java),
     REST_CLIENT(RestClientConfig::class.java),
     QUERY_DSL(QuerydslConfig::class.java),
-    AOP(AopConfig::class.java)
+    AOP(AopConfig::class.java),
+    SENTRY(SentryConfig::class.java)
 }

infra/src/main/kotlin/org/yapp/infra/config/external/sentry/SentryConfig.kt

@@ -0,0 +1,35 @@
+package org.yapp.infra.config.external.sentry
+
+import io.sentry.Sentry
+import io.sentry.SentryOptions
+import org.springframework.beans.factory.annotation.Value
+import org.springframework.boot.context.properties.EnableConfigurationProperties
+import org.springframework.context.annotation.Bean
+import org.springframework.context.annotation.Configuration
+import org.yapp.infra.InfraBaseConfig
+
+@Configuration
+@EnableConfigurationProperties(SentryProperties::class)
+class SentryConfig(
+    private val sentryProperties: SentryProperties,
+    @Value("\${app.module-name}")
+    private val moduleName: String
+) : InfraBaseConfig {
+
+    @Bean
+    fun sentryOptionsCustomizer(): Sentry.OptionsConfiguration<SentryOptions> {
+        return Sentry.OptionsConfiguration { options: SentryOptions ->
+            if (sentryProperties.dsn.isBlank()) {
+                options.isEnabled = false
+                return@OptionsConfiguration
+            }
+
+            options.dsn = sentryProperties.dsn
+            options.environment = sentryProperties.environment
+            options.serverName = sentryProperties.serverName
+            options.setTag("module", moduleName)
+        }
+    }
+}
+
+