Merge pull request #82 from grida-diary/main

Prod
grida-diary · Jul 29, 2024 · 8a3df79 · 8a3df79
2 parents 01a0d7e + 3479566
commit 8a3df79
Show file tree

Hide file tree

Showing 20 changed files with 245 additions and 57 deletions.
diff --git a/grida-core/core-api/src/main/kotlin/org/grida/presentation/v1/diary/DiaryController.kt b/grida-core/core-api/src/main/kotlin/org/grida/presentation/v1/diary/DiaryController.kt
@@ -3,10 +3,14 @@ package org.grida.presentation.v1.diary
 import io.wwan13.wintersecurity.resolve.RequestUserId
 import org.grida.api.ApiResponse
 import org.grida.api.dto.IdResponse
+import org.grida.domain.diary.DiaryScope
 import org.grida.domain.diary.DiaryService
+import org.grida.presentation.v1.diary.dto.DiaryModifyRequest
 import org.grida.presentation.v1.diary.dto.DiaryRequest
 import org.grida.presentation.v1.diary.dto.DiaryResponse
+import org.grida.presentation.v1.diary.dto.DiaryScopeRequest
 import org.springframework.web.bind.annotation.GetMapping
+import org.springframework.web.bind.annotation.PatchMapping
 import org.springframework.web.bind.annotation.PathVariable
 import org.springframework.web.bind.annotation.PostMapping
 import org.springframework.web.bind.annotation.RequestBody
@@ -38,4 +42,35 @@ class DiaryController(
         val response = DiaryResponse.from(diary)
         return ApiResponse.success(response)
     }
+
+    @PatchMapping("/{diaryId}")
+    fun modifyDiary(
+        @RequestUserId userId: Long,
+        @PathVariable diaryId: Long,
+        @RequestBody request: DiaryModifyRequest
+    ): ApiResponse<IdResponse> {
+        val modifiedDiaryId = diaryService.modify(
+            diaryId,
+            userId,
+            request.content,
+            DiaryScope.valueOf(request.scope)
+        )
+        val response = IdResponse(modifiedDiaryId)
+        return ApiResponse.success(response)
+    }
+
+    @PatchMapping("/{diaryId}/scope")
+    fun modifyDiaryScope(
+        @RequestUserId userId: Long,
+        @PathVariable diaryId: Long,
+        @RequestBody request: DiaryScopeRequest
+    ): ApiResponse<IdResponse> {
+        val modifiedDiaryId = diaryService.modifyScope(
+            diaryId,
+            userId,
+            DiaryScope.valueOf(request.scope)
+        )
+        val response = IdResponse(modifiedDiaryId)
+        return ApiResponse.success(response)
+    }
 }
diff --git a/...a-core/core-api/src/main/kotlin/org/grida/presentation/v1/diary/dto/DiaryModifyRequest.kt b/...a-core/core-api/src/main/kotlin/org/grida/presentation/v1/diary/dto/DiaryModifyRequest.kt
@@ -0,0 +1,6 @@
+package org.grida.presentation.v1.diary.dto
+
+data class DiaryModifyRequest(
+    val content: String,
+    val scope: String
+)
diff --git a/grida-core/core-api/src/main/kotlin/org/grida/presentation/v1/diary/dto/DiaryScopeRequest.kt b/grida-core/core-api/src/main/kotlin/org/grida/presentation/v1/diary/dto/DiaryScopeRequest.kt
@@ -0,0 +1,5 @@
+package org.grida.presentation.v1.diary.dto
+
+data class DiaryScopeRequest(
+    val scope: String
+)
diff --git a/grida-core/core-api/src/main/kotlin/org/grida/support/requestlogger/LogFilter.kt b/grida-core/core-api/src/main/kotlin/org/grida/support/requestlogger/LogFilter.kt
@@ -1,5 +1,6 @@
 package org.grida.support.requestlogger
 
+import com.fasterxml.jackson.databind.ObjectMapper
 import mu.KotlinLogging
 import org.springframework.web.filter.OncePerRequestFilter
 import org.springframework.web.util.ContentCachingRequestWrapper
@@ -10,7 +11,9 @@ import javax.servlet.http.HttpServletResponse
 
 private val log = KotlinLogging.logger {}
 
-class LogFilter : OncePerRequestFilter() {
+class LogFilter(
+    private val objectMapper: ObjectMapper
+) : OncePerRequestFilter() {
 
     override fun doFilterInternal(
         request: HttpServletRequest,
@@ -26,7 +29,7 @@ class LogFilter : OncePerRequestFilter() {
         val requestElapsed = (requestCompleted - requestOccurred) / 1000.0
 
         val logContext = RequestLogContext.of(requestWrapper, responseWrapper, requestElapsed)
-        log.info(logContext.toLogMessage())
+        log.info(logContext.toLogMessage(objectMapper))
         responseWrapper.copyBodyToResponse()
     }
 

diff --git a/grida-core/core-api/src/main/kotlin/org/grida/support/requestlogger/LogFilterRegistrar.kt b/grida-core/core-api/src/main/kotlin/org/grida/support/requestlogger/LogFilterRegistrar.kt
@@ -1,14 +1,17 @@
 package org.grida.support.requestlogger
 
+import com.fasterxml.jackson.databind.ObjectMapper
 import org.springframework.boot.web.servlet.FilterRegistrationBean
 import org.springframework.context.annotation.Bean
 
 class LogFilterRegistrar {
 
     @Bean
-    fun logFilter(): FilterRegistrationBean<LogFilter> {
+    fun logFilter(
+        objectMapper: ObjectMapper
+    ): FilterRegistrationBean<LogFilter> {
         val filterRegistration = FilterRegistrationBean<LogFilter>()
-        filterRegistration.filter = LogFilter()
+        filterRegistration.filter = LogFilter(objectMapper)
         filterRegistration.order = 0
         return filterRegistration
     }

diff --git a/grida-core/core-api/src/main/kotlin/org/grida/support/requestlogger/RequestLogContext.kt b/grida-core/core-api/src/main/kotlin/org/grida/support/requestlogger/RequestLogContext.kt
@@ -1,49 +1,34 @@
 package org.grida.support.requestlogger
 
+import com.fasterxml.jackson.databind.ObjectMapper
 import org.springframework.http.HttpStatus
 import org.springframework.web.util.ContentCachingRequestWrapper
 import org.springframework.web.util.ContentCachingResponseWrapper
-
-fun ContentCachingRequestWrapper.getRequestHeaders(): String {
-    val headers = this.headerNames.toList().map { "\"$it\":\"${this.getHeader(it)}\"" }
-    val joinedHeaders = headers.joinToString(", ")
-    return "[$joinedHeaders]"
-}
-
-fun ContentCachingRequestWrapper.getRequestParams(): String {
-    val params = this.parameterNames.toList().map { "\"$it\":\"${this.getParameter(it)}\"" }
-    val joinedHeaders = params.joinToString(", ")
-    return "[$joinedHeaders]"
-}
-
-fun String.trimSpaceAndNewLine(): String {
-    return this.replace("\\n".toRegex(), "").replace(" ", "")
-}
+import java.util.Enumeration
 
 data class RequestLogContext(
     val method: String,
     val uri: String,
     val status: HttpStatus,
     val elapsed: Double,
-    val requestHeaders: String,
-    val requestParams: String,
+    val requestHeaders: Map<String, String>,
+    val requestParams: Map<String, String>,
     val requestBody: String,
     val responseBody: String
 ) {
 
-    fun toLogMessage(): String {
+    fun toLogMessage(objectMapper: ObjectMapper): String {
         return """
             |
             |$method $uri - $status ($elapsed s)
             |>> REQUEST HEADERS : $requestHeaders
             |>> REQUEST PARAMS : $requestParams
-            |>> REQUEST BODY : $requestBody
-            |>> RESPONSE BODY : $responseBody
+            |>> REQUEST BODY : ${objectMapper.readTree(requestBody.ifBlank { "{}" })}
+            |>> RESPONSE BODY : ${objectMapper.readTree(responseBody)}
         """.trimMargin()
     }
 
     companion object {
-
         fun of(
             request: ContentCachingRequestWrapper,
             response: ContentCachingResponseWrapper,
@@ -54,11 +39,22 @@ data class RequestLogContext(
                 uri = request.requestURI,
                 status = HttpStatus.valueOf(response.status),
                 elapsed = elapsed,
-                requestHeaders = request.getRequestHeaders(),
-                requestParams = request.getRequestParams(),
-                requestBody = String(request.contentAsByteArray).trimSpaceAndNewLine(),
-                responseBody = String(response.contentAsByteArray).trimSpaceAndNewLine(),
+                requestHeaders = extractAsMap(request, request.headerNames),
+                requestParams = extractAsMap(request, request.parameterNames),
+                requestBody = String(request.contentAsByteArray),
+                responseBody = String(response.contentAsByteArray),
             )
         }
+
+        private fun extractAsMap(
+            request: ContentCachingRequestWrapper,
+            names: Enumeration<String>
+        ): Map<String, String> {
+            val result = mutableMapOf<String, String>()
+            names.asIterator().forEach {
+                result.put(it, request.getHeader(it))
+            }
+            return result
+        }
     }
 }
diff --git a/grida-core/core-api/src/test/kotlin/org/grida/docs/diary/DiaryApiDocsTest.kt b/grida-core/core-api/src/test/kotlin/org/grida/docs/diary/DiaryApiDocsTest.kt
@@ -14,7 +14,9 @@ import org.grida.domain.diary.Diary
 import org.grida.domain.diary.DiaryScope
 import org.grida.domain.diary.DiaryService
 import org.grida.presentation.v1.diary.DiaryController
+import org.grida.presentation.v1.diary.dto.DiaryModifyRequest
 import org.grida.presentation.v1.diary.dto.DiaryRequest
+import org.grida.presentation.v1.diary.dto.DiaryScopeRequest
 import org.junit.jupiter.api.Test
 import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest
 import java.time.LocalDate
@@ -90,4 +92,60 @@ class DiaryApiDocsTest(
             )
         }
     }
+
+    @Test
+    fun `일기 수정 API`() {
+        every { diaryService.modify(any(), any(), any(), any()) } returns 1L
+
+        val api = api.patch("/api/v1/diary/{diaryId}", 1L) {
+            withBearerToken()
+            requestBody(
+                DiaryModifyRequest(
+                    content = "수정할 일기 콘텐츠",
+                    scope = "PUBLIC"
+                )
+            )
+        }
+
+        documentFor(api, "modify-diary") {
+            summary("일기 생성 API")
+            requestHeaders(
+                "Authorization" whichMeans "인증 토큰"
+            )
+            requestFields(
+                "content" isTypeOf STRING whichMeans "수정할 일기 콘텐츠",
+                "scope" isTypeOf ENUM(DiaryScope::class) whichMeans "일기 공개 범위"
+            )
+            responseFields(
+                "data.id" isTypeOf NUMBER whichMeans "수정돤 일기 ID"
+            )
+        }
+    }
+
+    @Test
+    fun `일기 공개 범위 수정 API`() {
+        every { diaryService.modifyScope(any(), any(), any()) } returns 1L
+
+        val api = api.patch("/api/v1/diary/{diaryId}/scope", 1L) {
+            withBearerToken()
+            requestBody(
+                DiaryScopeRequest(
+                    scope = "PUBLIC"
+                )
+            )
+        }
+
+        documentFor(api, "modify-diary") {
+            summary("일기 생성 API")
+            requestHeaders(
+                "Authorization" whichMeans "인증 토큰"
+            )
+            requestFields(
+                "scope" isTypeOf ENUM(DiaryScope::class) whichMeans "일기 공개 범위"
+            )
+            responseFields(
+                "data.id" isTypeOf NUMBER whichMeans "수정돤 일기 ID"
+            )
+        }
+    }
 }
diff --git a/grida-core/core-domain/src/main/kotlin/org/grida/domain/diary/DiaryAppender.kt b/grida-core/core-domain/src/main/kotlin/org/grida/domain/diary/DiaryAppender.kt
@@ -2,13 +2,15 @@ package org.grida.domain.diary
 
 import org.grida.domain.user.UserReader
 import org.springframework.stereotype.Component
+import org.springframework.transaction.annotation.Transactional
 
 @Component
 class DiaryAppender(
     private val diaryRepository: DiaryRepository,
     private val userReader: UserReader
 ) {
 
+    @Transactional
     fun append(
         diary: Diary
     ): Long {

diff --git a/grida-core/core-domain/src/main/kotlin/org/grida/domain/diary/DiaryModifier.kt b/grida-core/core-domain/src/main/kotlin/org/grida/domain/diary/DiaryModifier.kt
@@ -0,0 +1,38 @@
+package org.grida.domain.diary
+
+import org.springframework.stereotype.Component
+import org.springframework.transaction.annotation.Transactional
+
+@Component
+class DiaryModifier(
+    private val diaryRepository: DiaryRepository,
+    private val diaryReader: DiaryReader,
+    private val diaryValidator: DiaryValidator
+) {
+
+    @Transactional
+    fun modify(
+        diaryId: Long,
+        userId: Long,
+        content: String,
+        scope: DiaryScope
+    ) {
+        val diary = diaryReader.read(diaryId)
+        diaryValidator.validateIsOwner(diary, userId)
+
+        diaryRepository.updateContent(diaryId, content)
+        diaryRepository.updateScope(diaryId, scope)
+    }
+
+    @Transactional
+    fun modifyScope(
+        diaryId: Long,
+        userId: Long,
+        scope: DiaryScope
+    ) {
+        val diary = diaryReader.read(diaryId)
+        diaryValidator.validateIsOwner(diary, userId)
+
+        diaryRepository.updateScope(diaryId, scope)
+    }
+}
diff --git a/grida-core/core-domain/src/main/kotlin/org/grida/domain/diary/DiaryReader.kt b/grida-core/core-domain/src/main/kotlin/org/grida/domain/diary/DiaryReader.kt
@@ -9,7 +9,7 @@ class DiaryReader(
 ) {
 
     @Transactional(readOnly = true)
-    fun read(diaryId: Long, userId: Long): Diary {
+    fun read(diaryId: Long): Diary {
         return diaryRepository.findById(diaryId)
     }
 }
diff --git a/grida-core/core-domain/src/main/kotlin/org/grida/domain/diary/DiaryRepository.kt b/grida-core/core-domain/src/main/kotlin/org/grida/domain/diary/DiaryRepository.kt
@@ -10,4 +10,8 @@ interface DiaryRepository {
     fun findById(id: Long): Diary
 
     fun existsByUserIdAndTargetDate(userId: Long, targetDate: LocalDate): Boolean
+
+    fun updateContent(diaryId: Long, content: String): Long
+
+    fun updateScope(diaryId: Long, scope: DiaryScope): Long
 }
diff --git a/grida-core/core-domain/src/main/kotlin/org/grida/domain/diary/DiaryService.kt b/grida-core/core-domain/src/main/kotlin/org/grida/domain/diary/DiaryService.kt
@@ -6,6 +6,7 @@ import org.springframework.stereotype.Service
 class DiaryService(
     private val diaryAppender: DiaryAppender,
     private val diaryReader: DiaryReader,
+    private val diaryModifier: DiaryModifier,
     private val diaryValidator: DiaryValidator
 ) {
 
@@ -16,10 +17,32 @@ class DiaryService(
         return diaryAppender.append(diary)
     }
 
-    fun readDiary(diaryId: Long, userId: Long): Diary {
-        val diary = diaryReader.read(diaryId, userId)
+    fun readDiary(
+        diaryId: Long,
+        userId: Long
+    ): Diary {
+        val diary = diaryReader.read(diaryId)
         diaryValidator.validateCanAccess(diary, userId)
 
         return diary
     }
+
+    fun modify(
+        diaryId: Long,
+        userId: Long,
+        content: String,
+        scope: DiaryScope
+    ): Long {
+        diaryModifier.modify(diaryId, userId, content, scope)
+        return diaryId
+    }
+
+    fun modifyScope(
+        diaryId: Long,
+        userId: Long,
+        scope: DiaryScope
+    ): Long {
+        diaryModifier.modifyScope(diaryId, userId, scope)
+        return diaryId
+    }
 }
diff --git a/grida-core/core-domain/src/main/kotlin/org/grida/domain/diary/DiaryValidator.kt b/grida-core/core-domain/src/main/kotlin/org/grida/domain/diary/DiaryValidator.kt
@@ -43,7 +43,7 @@ class DiaryValidator(
         throw GridaException(AccessFailed)
     }
 
-    private fun validateIsOwner(diary: Diary, userId: Long) {
+    fun validateIsOwner(diary: Diary, userId: Long) {
         if (!diary.isOwner(userId)) {
             throw GridaException(AccessFailed)
         }