Merge Develop To Main

.github/ISSUE_TEMPLATE/🚌-기타-이슈.md

@@ -1,7 +1,7 @@
 ---
 name: "\U0001F68C 기타 이슈"
 about: 기타 작업을 위한 이슈 템플릿
-title: "[\U0001F68C Issue ] 작업 내용"
+title: "[\U0001F68C Issue] 작업 내용"
 labels: ''
 assignees: ''
 

.github/ISSUE_TEMPLATE/🛠️-리팩토링.md

@@ -0,0 +1,19 @@
+---
+name: "\U0001F6E0️ 리팩토링"
+about: 리팩토링을 위한 이슈 템플릿
+title: "[\U0001F6E0️ Refactor] "
+labels: refactor
+assignees: ''
+
+---
+
+## 변경할 내용
+- 변경 동기와 내용을 정의해주세요
+- As-Is와 To-Be를 설명해주세요
+
+## 할 일
+- [ ] 작업1
+- [ ] 작업2
+
+## 작업 완료 예정일
+- 0000.00.00 00시 00분

backend/application/admin/src/main/kotlin/io/raemian/admin/config/GlobalExceptionHandler.kt → backend/application/admin/src/main/kotlin/io/raemian/admin/config/GlobalExceptionConfig.kt

@@ -10,7 +10,7 @@ import org.springframework.web.bind.annotation.ExceptionHandler
 import org.springframework.web.bind.annotation.RestControllerAdvice
 
 @RestControllerAdvice
-class GlobalExceptionHandler {
+class GlobalExceptionConfig {
     private val log: Logger = LoggerFactory.getLogger(javaClass)
 
     @ExceptionHandler(CoreApiException::class)

backend/application/admin/src/main/kotlin/io/raemian/admin/config/SpringdocConfig.kt → backend/application/admin/src/main/kotlin/io/raemian/admin/config/SpringDocsConfig.kt

@@ -8,7 +8,7 @@ import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
 
 @Configuration
-class SpringdocConfig {
+class SpringDocsConfig {
 
     @Value("\${springdoc.server.url}")
     private lateinit var url: String

backend/application/admin/src/main/kotlin/io/raemian/admin/dashboard/controller/DashboardController.kt

@@ -1,6 +1,7 @@
 package io.raemian.admin.dashboard
 
-import io.raemian.admin.dashboard.controller.response.DashboardResponse
+import io.raemian.admin.dashboard.model.DashboardResult
+import io.raemian.admin.dashboard.service.DashboardService
 import io.raemian.admin.support.response.ApiResponse
 import io.swagger.v3.oas.annotations.Operation
 import org.springframework.http.ResponseEntity
@@ -15,6 +16,6 @@ class DashboardController(
 ) {
     @Operation(summary = "대시보드 통계 데이터 조회 API")
     @GetMapping
-    fun findAll(): ResponseEntity<ApiResponse<DashboardResponse>> =
+    fun findAll(): ResponseEntity<ApiResponse<DashboardResult>> =
         ResponseEntity.ok(ApiResponse.success(dashboardService.getDashBoard()))
 }

backend/application/admin/src/main/kotlin/io/raemian/admin/dashboard/dto/ActiveUserStatics.kt → backend/application/admin/src/main/kotlin/io/raemian/admin/dashboard/model/ActiveUserStatics.kt

@@ -1,4 +1,4 @@
-package io.raemian.admin.dashboard.dto
+package io.raemian.admin.dashboard.model
 
 data class ActiveUserStatics(
     val perTodayPercent: Double,

backend/application/admin/src/main/kotlin/io/raemian/admin/dashboard/model/DashboardResult.kt

@@ -0,0 +1,19 @@
+package io.raemian.admin.dashboard.model
+
+data class DashboardResult(
+    val userStatics: UserStatics,
+    val goalStatics: GoalStatics,
+    val taskStatics: TaskStatics,
+    val activeUserStatics: ActiveUserStatics,
+) {
+    companion object {
+        fun from(
+            userStatics: UserStatics,
+            goalStatics: GoalStatics,
+            taskStatics: TaskStatics,
+            activeUserStatics: ActiveUserStatics,
+        ): DashboardResult {
+            return DashboardResult(userStatics, goalStatics, taskStatics, activeUserStatics)
+        }
+    }
+}

backend/application/admin/src/main/kotlin/io/raemian/admin/dashboard/dto/GoalStatics.kt → backend/application/admin/src/main/kotlin/io/raemian/admin/dashboard/model/GoalStatics.kt

@@ -1,4 +1,4 @@
-package io.raemian.admin.dashboard.dto
+package io.raemian.admin.dashboard.model
 
 data class GoalStatics(
     val total: Long,

backend/application/admin/src/main/kotlin/io/raemian/admin/dashboard/dto/TaskStatics.kt → backend/application/admin/src/main/kotlin/io/raemian/admin/dashboard/model/TaskStatics.kt

@@ -1,4 +1,4 @@
-package io.raemian.admin.dashboard.dto
+package io.raemian.admin.dashboard.model
 
 data class TaskStatics(
     val total: Long,

backend/application/admin/src/main/kotlin/io/raemian/admin/dashboard/dto/UserStatics.kt → backend/application/admin/src/main/kotlin/io/raemian/admin/dashboard/model/UserStatics.kt

@@ -1,4 +1,4 @@
-package io.raemian.admin.dashboard.dto
+package io.raemian.admin.dashboard.model
 
 data class UserStatics(
     val total: Long,

backend/application/admin/src/main/kotlin/io/raemian/admin/dashboard/DashboardService.kt → backend/application/admin/src/main/kotlin/io/raemian/admin/dashboard/service/DashboardService.kt

@@ -1,10 +1,10 @@
-package io.raemian.admin.dashboard
+package io.raemian.admin.dashboard.service
 
-import io.raemian.admin.dashboard.controller.response.DashboardResponse
-import io.raemian.admin.dashboard.dto.ActiveUserStatics
-import io.raemian.admin.dashboard.dto.GoalStatics
-import io.raemian.admin.dashboard.dto.TaskStatics
-import io.raemian.admin.dashboard.dto.UserStatics
+import io.raemian.admin.dashboard.model.ActiveUserStatics
+import io.raemian.admin.dashboard.model.DashboardResult
+import io.raemian.admin.dashboard.model.GoalStatics
+import io.raemian.admin.dashboard.model.TaskStatics
+import io.raemian.admin.dashboard.model.UserStatics
 import io.raemian.storage.db.core.goal.Goal
 import io.raemian.storage.db.core.goal.GoalRepository
 import io.raemian.storage.db.core.log.UserLoginLogRepository
@@ -26,8 +26,8 @@ class DashboardService(
 ) {
 
     @Transactional(readOnly = true)
-    fun getDashBoard(): DashboardResponse {
-        return DashboardResponse.from(
+    fun getDashBoard(): DashboardResult {
+        return DashboardResult.from(
             getUserStatics(),
             getGoalStatics(),
             getTaskStatics(),

backend/application/admin/src/main/kotlin/io/raemian/admin/emoji/controller/EmojiController.kt

@@ -1,9 +1,9 @@
 package io.raemian.admin.emoji.controller
 
-import io.raemian.admin.emoji.EmojiService
 import io.raemian.admin.emoji.controller.request.CreateEmojiRequest
 import io.raemian.admin.emoji.controller.request.UpdateEmojiRequest
-import io.raemian.admin.emoji.controller.response.EmojiResponse
+import io.raemian.admin.emoji.model.EmojiResult
+import io.raemian.admin.emoji.service.EmojiService
 import io.raemian.admin.support.response.ApiResponse
 import io.swagger.v3.oas.annotations.Operation
 import org.springframework.http.MediaType
@@ -30,7 +30,7 @@ class EmojiController(
     @PostMapping(consumes = arrayOf(MediaType.MULTIPART_FORM_DATA_VALUE), produces = arrayOf(MediaType.APPLICATION_JSON_VALUE))
     fun create(
         @ModelAttribute createEmojiRequest: CreateEmojiRequest,
-    ): ResponseEntity<ApiResponse<EmojiResponse>> {
+    ): ResponseEntity<ApiResponse<EmojiResult>> {
         val response = emojiService.create(createEmojiRequest)
 
         return ResponseEntity
@@ -40,12 +40,12 @@ class EmojiController(
 
     @Operation(summary = "이모지 전체 조회 API")
     @GetMapping
-    fun findAll(): ResponseEntity<ApiResponse<List<EmojiResponse>>> =
+    fun findAll(): ResponseEntity<ApiResponse<List<EmojiResult>>> =
         ResponseEntity.ok(ApiResponse.success(emojiService.findAll()))
 
     @Operation(summary = "이모지 단건 조회 API")
     @GetMapping("/{emojiId}")
-    fun find(@PathVariable emojiId: Long): ResponseEntity<ApiResponse<EmojiResponse>> =
+    fun find(@PathVariable emojiId: Long): ResponseEntity<ApiResponse<EmojiResult>> =
         ResponseEntity.ok(ApiResponse.success(emojiService.find(emojiId)))
 
     @Operation(summary = "이모지 수정 API")

backend/application/admin/src/main/kotlin/io/raemian/admin/emoji/model/EmojiResult.kt

@@ -0,0 +1,16 @@
+package io.raemian.admin.emoji.model
+
+import io.raemian.storage.db.core.emoji.Emoji
+
+data class EmojiResult(
+    val id: Long?,
+    val name: String,
+    val url: String,
+) {
+
+    companion object {
+        fun from(emoji: Emoji): EmojiResult {
+            return EmojiResult(emoji.id, emoji.name, emoji.url)
+        }
+    }
+}

backend/application/admin/src/main/kotlin/io/raemian/admin/emoji/EmojiService.kt → backend/application/admin/src/main/kotlin/io/raemian/admin/emoji/service/EmojiService.kt

@@ -1,8 +1,8 @@
-package io.raemian.admin.emoji
+package io.raemian.admin.emoji.service
 
 import io.raemian.admin.emoji.controller.request.CreateEmojiRequest
 import io.raemian.admin.emoji.controller.request.UpdateEmojiRequest
-import io.raemian.admin.emoji.controller.response.EmojiResponse
+import io.raemian.admin.emoji.model.EmojiResult
 import io.raemian.admin.support.error.CoreApiException
 import io.raemian.admin.support.error.ErrorType
 import io.raemian.image.enums.FileExtensionType
@@ -22,7 +22,7 @@ class EmojiService(
     @Transactional
     fun create(
         createEmojiRequest: CreateEmojiRequest,
-    ): EmojiResponse {
+    ): EmojiResult {
         val fileName = createEmojiRequest.image.originalFilename
         validateFileName(fileName)
 
@@ -33,22 +33,22 @@ class EmojiService(
         )
 
         val emoji = Emoji(createEmojiRequest.name, url)
-        return EmojiResponse.from(emojiRepository.save(emoji))
+        return EmojiResult.from(emojiRepository.save(emoji))
     }
 
     @Transactional(readOnly = true)
-    fun findAll(): List<EmojiResponse> =
-        emojiRepository.findAll().map(EmojiResponse::from)
+    fun findAll(): List<EmojiResult> =
+        emojiRepository.findAll().map(EmojiResult::from)
 
     @Transactional(readOnly = true)
-    fun find(emojiId: Long): EmojiResponse =
-        EmojiResponse.from(emojiRepository.getById(emojiId))
+    fun find(emojiId: Long): EmojiResult =
+        EmojiResult.from(emojiRepository.getById(emojiId))
 
     @Transactional
     fun update(
         emojiId: Long,
         updateEmojiRequest: UpdateEmojiRequest,
-    ): EmojiResponse {
+    ): EmojiResult {
         val newFileName = updateEmojiRequest.image.originalFilename
         validateFileName(newFileName)
 
@@ -61,7 +61,7 @@ class EmojiService(
         )
 
         emoji.updateNameAndUrl(updateEmojiRequest.name, url)
-        return EmojiResponse.from(emojiRepository.save(emoji))
+        return EmojiResult.from(emojiRepository.save(emoji))
     }
 
     @Transactional

backend/application/admin/src/main/kotlin/io/raemian/admin/lifemap/controller/LifeMapController.kt

@@ -1,7 +1,7 @@
 package io.raemian.admin.lifemap.controller
 
-import io.raemian.admin.lifemap.LifeMapService
-import io.raemian.admin.lifemap.controller.response.LifeMapResponse
+import io.raemian.admin.lifemap.model.LifeMapResult
+import io.raemian.admin.lifemap.service.LifeMapService
 import io.raemian.admin.support.response.ApiResponse
 import io.swagger.v3.oas.annotations.Operation
 import org.springframework.http.ResponseEntity
@@ -17,6 +17,6 @@ class LifeMapController(
 ) {
     @Operation(summary = "유저 인생 지도 조회 API")
     @GetMapping
-    fun findAllByUsername(@RequestParam userId: Long): ResponseEntity<ApiResponse<LifeMapResponse>> =
+    fun findAllByUsername(@RequestParam userId: Long): ResponseEntity<ApiResponse<LifeMapResult>> =
         ResponseEntity.ok(ApiResponse.success(lifeMapService.findByUserId(userId)))
 }

backend/application/admin/src/main/kotlin/io/raemian/admin/lifemap/controller/response/GoalResponse.kt → backend/application/admin/src/main/kotlin/io/raemian/admin/lifemap/model/GoalResult.kt

@@ -1,10 +1,10 @@
-package io.raemian.admin.lifemap.controller.response
+package io.raemian.admin.lifemap.model
 
 import io.raemian.storage.db.core.goal.Goal
 import io.raemian.storage.db.core.tag.Tag
 import io.raemian.storage.db.core.task.Task
 
-data class GoalResponse(
+data class GoalResult(
     val title: String,
     val description: String,
     val deadline: String,
@@ -19,7 +19,7 @@ data class GoalResponse(
         goal.deadline.toString(),
         goal.sticker.url,
         TagInfo(goal.tag),
-        goal.tasks.map(::TaskInfo),
+        goal.tasks.map(GoalResult::TaskInfo),
     )
 
     data class TagInfo(

backend/application/admin/src/main/kotlin/io/raemian/admin/lifemap/controller/response/LifeMapResponse.kt → backend/application/admin/src/main/kotlin/io/raemian/admin/lifemap/model/LifeMapResult.kt

@@ -1,19 +1,19 @@
-package io.raemian.admin.lifemap.controller.response
+package io.raemian.admin.lifemap.model
 
 import io.raemian.storage.db.core.lifemap.LifeMap
 
-data class LifeMapResponse(
+data class LifeMapResult(
     val id: Long,
     val isPublic: Boolean,
-    val goals: List<GoalResponse>,
+    val goals: List<GoalResult>,
     val goalsCount: Int,
     val viewCount: Long,
     val cheeringCount: Long,
 ) {
     constructor(lifeMap: LifeMap, lifeMapCount: Long, cheeringCount: Long) : this(
         id = lifeMap.id!!,
         isPublic = lifeMap.isPublic,
-        goals = lifeMap.goals.map(::GoalResponse),
+        goals = lifeMap.goals.map(::GoalResult),
         goalsCount = lifeMap.goals.size,
         viewCount = lifeMapCount,
         cheeringCount = cheeringCount,

backend/application/admin/src/main/kotlin/io/raemian/admin/lifemap/LifeMapService.kt → backend/application/admin/src/main/kotlin/io/raemian/admin/lifemap/service/LifeMapService.kt

@@ -1,6 +1,6 @@
-package io.raemian.admin.lifemap
+package io.raemian.admin.lifemap.service
 
-import io.raemian.admin.lifemap.controller.response.LifeMapResponse
+import io.raemian.admin.lifemap.model.LifeMapResult
 import io.raemian.storage.db.core.cheer.CheeringRepository
 import io.raemian.storage.db.core.lifemap.LifeMapCountRepository
 import io.raemian.storage.db.core.lifemap.LifeMapRepository
@@ -14,7 +14,7 @@ class LifeMapService(
     private val lifeMapCountRepository: LifeMapCountRepository,
 ) {
     @Transactional(readOnly = true)
-    fun findByUserId(userId: Long): LifeMapResponse {
+    fun findByUserId(userId: Long): LifeMapResult {
         val lifeMap = lifeMapRepository.findFirstByUserId(userId)
             ?: throw NoSuchElementException("존재하지 않는 유저입니다. $userId")
 
@@ -24,7 +24,7 @@ class LifeMapService(
 
         val cheeringCount = getCheeringCount(lifeMap.id!!)
 
-        return LifeMapResponse(lifeMap, viewCount, cheeringCount)
+        return LifeMapResult(lifeMap, viewCount, cheeringCount)
     }
 
     @Transactional(readOnly = true)