Merge pull request #186 from depromeet/feature/#171

feat(#171): 피드에 누락된 필드 추가
depromeet · Feb 24, 2024 · 57e9347 · 57e9347
2 parents 059d83c + 49a7205
commit 57e9347
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 0 deletions.
diff --git a/backend/application/api/src/main/kotlin/io/raemian/api/goal/domain/GoalSubset.kt b/backend/application/api/src/main/kotlin/io/raemian/api/goal/domain/GoalSubset.kt
@@ -2,6 +2,7 @@ package io.raemian.api.goal.domain
 
 import io.raemian.storage.db.core.model.GoalExploreQueryResult
 import java.time.LocalDate
+import java.time.LocalDateTime
 
 data class GoalSubset(
     val id: Long,
@@ -10,6 +11,7 @@ data class GoalSubset(
     val deadline: LocalDate,
     val sticker: String,
     val tag: String,
+    val createdAt: LocalDateTime,
 ) {
     constructor(result: GoalExploreQueryResult) : this(
         id = result.goalId,
@@ -18,5 +20,6 @@ data class GoalSubset(
         deadline = result.deadline,
         sticker = result.stickerUrl,
         tag = result.tagContent,
+        createdAt = result.createdAt,
     )
 }
diff --git a/backend/application/api/src/main/kotlin/io/raemian/api/lifemap/domain/LifeMapDTO.kt b/backend/application/api/src/main/kotlin/io/raemian/api/lifemap/domain/LifeMapDTO.kt
@@ -28,6 +28,7 @@ data class LifeMapDTO(
         user = UserSubset(
             id = user.id ?: 0,
             nickname = user.nickname!!,
+            username = user.username ?: "",
             image = user.image,
         ),
     )

diff --git a/backend/application/api/src/main/kotlin/io/raemian/api/user/domain/UserSubset.kt b/backend/application/api/src/main/kotlin/io/raemian/api/user/domain/UserSubset.kt
@@ -6,17 +6,20 @@ import io.raemian.storage.db.core.user.User
 data class UserSubset(
     val id: Long,
     val nickname: String,
+    val username: String,
     val image: String,
 ) {
     constructor(user: User) : this(
         id = user.id!!,
         nickname = user.nickname ?: "",
+        username = user.username ?: "",
         image = user.image,
     )
 
     constructor(result: GoalExploreQueryResult) : this(
         id = result.userId,
         nickname = result.nickname,
+        username = result.username,
         image = result.userImage,
     )
 }
diff --git a/backend/storage/db-core/src/main/kotlin/io/raemian/storage/db/core/goal/GoalRepository.kt b/backend/storage/db-core/src/main/kotlin/io/raemian/storage/db/core/goal/GoalRepository.kt
@@ -32,6 +32,7 @@ interface GoalRepository : JpaRepository<Goal, Long> {
                 count.viewCount,
                 user.id,
                 user.nickname,
+                user.username,
                 user.image
             )
         FROM 

diff --git a/...e/db-core/src/main/kotlin/io/raemian/storage/db/core/goal/model/GoalExploreQueryResult.kt b/...e/db-core/src/main/kotlin/io/raemian/storage/db/core/goal/model/GoalExploreQueryResult.kt
@@ -17,5 +17,6 @@ data class GoalExploreQueryResult(
     val viewCount: Long,
     val userId: Long,
     val nickname: String,
+    val username: String,
     val userImage: String,
 )