Merge branch 'develop' into main

src/main/kotlin/com/example/onui/domain/diary/entity/Diary.kt

@@ -81,6 +81,7 @@ Diary(
         this.tagList,
         this.image,
         this.user.name,
-        this.commentList.size
+        this.commentList.size,
+        this.createdAt.toLocalDate()
     )
 }

src/main/kotlin/com/example/onui/domain/timeline/presentation/dto/response/TimelineResponse.kt

@@ -1,6 +1,7 @@
 package com.example.onui.domain.timeline.presentation.dto.response
 
 import com.example.onui.domain.diary.entity.Mood
+import java.time.LocalDate
 import java.util.*
 
 data class TimelineResponse(
@@ -10,5 +11,6 @@ data class TimelineResponse(
     val tagList: MutableList<String>,
     val image: String?,
     val writer: String,
-    val commentCount: Int
+    val commentCount: Int,
+    val date: LocalDate
 )

src/main/kotlin/com/example/onui/domain/user/exception/ThemeNotFoundException.kt

@@ -0,0 +1,6 @@
+package com.example.onui.domain.user.exception
+
+import com.example.onui.global.config.error.data.ErrorCode
+import com.example.onui.global.config.error.exception.BusinessException
+
+object ThemeNotFoundException : BusinessException(ErrorCode.THEME_NOT_FOUND)

src/main/kotlin/com/example/onui/domain/user/presentation/UserController.kt

@@ -1,5 +1,6 @@
 package com.example.onui.domain.user.presentation
 
+import com.example.onui.domain.user.presentation.dto.request.ChangeRequest
 import com.example.onui.domain.user.presentation.dto.request.RenameRequest
 import com.example.onui.domain.user.presentation.dto.response.UserProfileResponse
 import com.example.onui.domain.user.service.UserService
@@ -22,4 +23,10 @@ class UserController(
 
     @GetMapping("/profile")
     fun getProfile(): UserProfileResponse = userService.getProfile()
+
+    @PatchMapping("/theme")
+    fun changeTheme(
+        @RequestBody @Valid
+        req: ChangeRequest
+    ): UserProfileResponse = userService.changeTheme(req.theme)
 }

src/main/kotlin/com/example/onui/domain/user/presentation/dto/request/ChangeRequest.kt

@@ -0,0 +1,9 @@
+package com.example.onui.domain.user.presentation.dto.request
+
+import javax.validation.constraints.NotBlank
+
+data class ChangeRequest(
+
+    @field:NotBlank(message = "theme가 null일 수 없습니다.")
+    val theme: String
+)

src/main/kotlin/com/example/onui/domain/user/service/UserService.kt

@@ -7,4 +7,6 @@ interface UserService {
     fun rename(name: String): UserProfileResponse
 
     fun getProfile(): UserProfileResponse
+
+    fun changeTheme(themeId: String): UserProfileResponse
 }

src/main/kotlin/com/example/onui/domain/user/service/UserServiceImpl.kt

@@ -1,33 +1,40 @@
 package com.example.onui.domain.user.service
 
 import com.example.onui.domain.user.entity.User
+import com.example.onui.domain.user.exception.ThemeNotFoundException
 import com.example.onui.domain.user.presentation.dto.response.UserProfileResponse
+import com.example.onui.domain.user.repository.ThemeRepository
 import com.example.onui.domain.user.repository.UserRepository
 import com.example.onui.global.common.facade.UserFacade
+import org.springframework.data.repository.findByIdOrNull
 import org.springframework.stereotype.Service
 import org.springframework.transaction.annotation.Transactional
 
 @Service
 @Transactional(readOnly = true)
 class UserServiceImpl(
     private val userRepository: UserRepository,
-    private val userFacade: UserFacade
+    private val userFacade: UserFacade,
+    private val themeRepository: ThemeRepository
 ) : UserService {
 
     @Transactional
     override fun rename(name: String): UserProfileResponse {
 
         val user = userFacade.getCurrentUser()
 
-        return userRepository.save(
-            User(
-                user.sub,
-                name,
-                user.theme,
-                user.id
-            )
-        ).toResponse()
+        return userRepository.save(User(user.sub, name, user.theme, user.id)).toResponse()
     }
 
     override fun getProfile(): UserProfileResponse = userFacade.getCurrentUser().toResponse()
+
+    @Transactional
+    override fun changeTheme(themeId: String): UserProfileResponse {
+
+        val user = userFacade.getCurrentUser()
+
+        val theme = themeRepository.findByIdOrNull(themeId) ?: throw ThemeNotFoundException
+
+        return userRepository.save(User(user.sub, user.name, theme, user.id, user.role)).toResponse()
+    }
 }

src/main/kotlin/com/example/onui/global/config/error/data/ErrorCode.kt

@@ -24,6 +24,7 @@ enum class ErrorCode(
     // 404
     DIARY_NOT_FOUND(HttpStatus.NOT_FOUND, "감정 기록을 찾을 수 없습니다."),
     TIMELINE_NOT_FOUND(HttpStatus.NOT_FOUND, "타임라인을 찾을 수 없습니다."),
+    THEME_NOT_FOUND(HttpStatus.NOT_FOUND, "테마를 찾을 수 없습니다."),
 
     // 500
     INTERNAL_SERVER_ERROR(HttpStatus.INTERNAL_SERVER_ERROR, "서버 내부 에러")

src/main/kotlin/com/example/onui/global/config/jwt/TokenProvider.kt

@@ -72,7 +72,7 @@ class TokenProvider(
 
         val authDetails = authDetailsService.loadUserByUsername(subject) as AuthDetails
 
-        return UsernamePasswordAuthenticationToken(authDetails, "", authDetails.authorities)
+        return UsernamePasswordAuthenticationToken(authDetails, null, authDetails.authorities)
     }
 
     fun reissue(token: String): TokenResponse {