Merge pull request #195 from kdh-92/be-refactor/#192-separate-dto

Be refactor/#192 separate dto

Author: kdh-92

backend/tiggle-root/tiggle/src/main/kotlin/com/side/tiggle/domain/category/api/CategoryApiController.kt

@@ -1,7 +1,8 @@
 package com.side.tiggle.domain.category.api
 
-import com.side.tiggle.domain.category.dto.CategoryCreateDto
-import com.side.tiggle.domain.category.dto.CategoryDto
+import com.side.tiggle.domain.category.dto.req.CategoryCreateReqDto
+import com.side.tiggle.domain.category.dto.req.CategoryUpdateReqDto
+import com.side.tiggle.domain.category.dto.resp.CategoryListRespDto
 import com.side.tiggle.domain.category.dto.resp.CategoryRespDto
 import com.side.tiggle.domain.category.service.CategoryService
 import org.springframework.http.HttpStatus
@@ -17,53 +18,34 @@ class CategoryApiController(
 
     @PostMapping
     fun createCategory(
-        @RequestBody categoryCreateDto: CategoryCreateDto,
+        @RequestBody categoryCreateReqDto: CategoryCreateReqDto,
         @RequestHeader(name = HttpHeaders.MEMBER_ID) memberId: Long
     ): ResponseEntity<CategoryRespDto> {
-        return ResponseEntity(
-            CategoryRespDto.fromEntity(
-                categoryService.createCategory(categoryCreateDto, memberId
-                )
-            ), HttpStatus.CREATED
-        )
-    }
-
-    @GetMapping("/all")
-    fun getAllCategory(): ResponseEntity<List<CategoryRespDto>> {
-        return ResponseEntity(
-            categoryService.getAllCategory()
-                .map { CategoryRespDto.fromEntity(it) }
-            , HttpStatus.OK
-        )
+        val createdCategory = categoryService.createCategory(categoryCreateReqDto, memberId)
+        return ResponseEntity(createdCategory, HttpStatus.CREATED)
     }
 
     @GetMapping()
     fun getCategoryByMemberIdOrDefaults(
         @RequestHeader(name = HttpHeaders.MEMBER_ID) memberId: Long
-    ): ResponseEntity<List<CategoryRespDto>> {
-        return ResponseEntity(
-            categoryService.getCategoryByMemberIdOrDefaults(memberId)
-                .map { CategoryRespDto.fromEntity(it) }
-            , HttpStatus.OK
-        )
+    ): ResponseEntity<CategoryListRespDto> {
+        val categories = categoryService.getCategoryByMemberIdOrDefaults(memberId)
+        return ResponseEntity(categories, HttpStatus.OK)
     }
 
     @PutMapping("/{id}")
     fun updateCategory(
         @PathVariable("id") categoryId: Long,
-        @RequestBody dto: CategoryDto
+        @RequestBody dto: CategoryUpdateReqDto
     ): ResponseEntity<CategoryRespDto> {
-        return ResponseEntity(
-            CategoryRespDto.fromEntity(
-                categoryService.updateCategory(categoryId, dto)
-            ), HttpStatus.OK
-        )
+        val updatedCategory = categoryService.updateCategory(categoryId, dto)
+        return ResponseEntity(updatedCategory, HttpStatus.OK)
     }
 
     @DeleteMapping("/{id}")
     fun deleteCategory(
         @PathVariable("id") categoryId: Long
-    ): ResponseEntity<Nothing> {
+    ): ResponseEntity<Void> {
         categoryService.deleteCategory(categoryId)
         return ResponseEntity(null, HttpStatus.OK)
     }

backend/tiggle-root/tiggle/src/main/kotlin/com/side/tiggle/domain/category/dto/CategoryDto.kt

@@ -1,9 +1,9 @@
-package com.side.tiggle.domain.category.dto
+package com.side.tiggle.domain.category.dto.req
 
 import com.side.tiggle.domain.category.model.Category
 import com.side.tiggle.domain.member.model.Member
 
-data class CategoryCreateDto (
+data class CategoryCreateReqDto (
     val name : String
 ) {
     fun toEntity(member: Member): Category {

…domain/category/dto/CategoryCreateDto.kt …category/dto/req/CategoryCreateReqDto.ktbackend/tiggle-root/tiggle/src/main/kotlin/com/side/tiggle/domain/category/dto/CategoryCreateDto.kt renamed to backend/tiggle-root/tiggle/src/main/kotlin/com/side/tiggle/domain/category/dto/req/CategoryCreateReqDto.kt backend/tiggle-root/tiggle/src/main/kotlin/com/side/tiggle/domain/category/dto/CategoryCreateDto.kt renamed to backend/tiggle-root/tiggle/src/main/kotlin/com/side/tiggle/domain/category/dto/req/CategoryCreateReqDto.kt

@@ -0,0 +1,5 @@
+package com.side.tiggle.domain.category.dto.req
+
+data class CategoryUpdateReqDto (
+    val name : String
+)

backend/tiggle-root/tiggle/src/main/kotlin/com/side/tiggle/domain/category/dto/req/CategoryUpdateReqDto.kt

@@ -0,0 +1,5 @@
+package com.side.tiggle.domain.category.dto.resp
+
+data class CategoryListRespDto(
+    val categories: List<CategoryRespDto>
+)

backend/tiggle-root/tiggle/src/main/kotlin/com/side/tiggle/domain/category/dto/resp/CategoryListRespDto.kt

@@ -9,26 +9,18 @@ data class CategoryRespDto(
 ) {
     companion object {
         fun fromEntity(category: Category?): CategoryRespDto {
-            return try {
-                if (category != null) {
-                    CategoryRespDto(
-                        id = category.id!!,
-                        name = category.name,
-                        defaults = category.defaults
-                    )
-                } else {
-                    CategoryRespDto(
-                        id = null,
-                        name = "카테고리 없음",
-                        defaults = false
-                    )
-                }
-            } catch (e: Exception) {
-                CategoryRespDto(
+            return when {
+                category == null -> CategoryRespDto(
                     id = null,
-                    name = "삭제된 카테고리",
+                    name = "카테고리 없음",
                     defaults = false
                 )
+
+                else -> CategoryRespDto(
+                    id = category.id,
+                    name = category.name,
+                    defaults = category.defaults
+                )
             }
         }
     }

backend/tiggle-root/tiggle/src/main/kotlin/com/side/tiggle/domain/category/dto/resp/CategoryRespDto.kt

@@ -1,7 +1,9 @@
 package com.side.tiggle.domain.category.service
 
-import com.side.tiggle.domain.category.dto.CategoryCreateDto
-import com.side.tiggle.domain.category.dto.CategoryDto
+import com.side.tiggle.domain.category.dto.req.CategoryCreateReqDto
+import com.side.tiggle.domain.category.dto.req.CategoryUpdateReqDto
+import com.side.tiggle.domain.category.dto.resp.CategoryListRespDto
+import com.side.tiggle.domain.category.dto.resp.CategoryRespDto
 import com.side.tiggle.domain.category.model.Category
 import com.side.tiggle.domain.category.repository.CategoryRepository
 import com.side.tiggle.domain.member.service.MemberService
@@ -14,46 +16,43 @@ class CategoryService(
     private val categoryRepository: CategoryRepository,
     private val memberService: MemberService
 ) {
-    fun createCategory(dto: CategoryCreateDto, memberId: Long): Category {
-        val member = memberService.getMember(memberId);
-        return categoryRepository.save(dto.toEntity(member))
+    fun createCategory(dto: CategoryCreateReqDto, memberId: Long): CategoryRespDto {
+        val member = memberService.getMemberOrThrow(memberId)
+        val category = dto.toEntity(member)
+        return CategoryRespDto.fromEntity(categoryRepository.save(category))
     }
 
     fun getCategory(categoryId: Long): Category {
         return categoryRepository.findById(categoryId)
             .orElseThrow { NotFoundException() }
     }
 
-    fun getAllCategory(): List<Category> {
-        return categoryRepository.findAll()
+    fun getCategoryByMemberIdOrDefaults(memberId: Long): CategoryListRespDto {
+        val categories = categoryRepository.findCategoryByMemberIdOrDefaults(memberId, true)
+        val dtoList = categories.map { CategoryRespDto.fromEntity(it) }
+        return CategoryListRespDto(dtoList)
     }
 
-    fun getCategoryByMemberIdOrDefaults(memberId: Long): List<Category> {
-        //기본 카테코리 = true , memberId가 일치하는 카테고리 = false라서 or로 설정했습니다.
-        return categoryRepository.findCategoryByMemberIdOrDefaults(memberId, true)
-    }
-
-    fun updateCategory(id: Long, dto: CategoryDto): Category {
+    fun updateCategory(id: Long, dto: CategoryUpdateReqDto): CategoryRespDto {
         val category = categoryRepository.findById(id)
             .orElseThrow { NotFoundException() }
+
         category.apply {
             name = dto.name
-            defaults = dto.defaults
         }
-        return categoryRepository.save(category)
+
+        return CategoryRespDto.fromEntity(categoryRepository.save(category))
     }
 
-    fun deleteCategory(categoryId: Long): Category {
+    fun deleteCategory(categoryId: Long) {
         val category = categoryRepository.findById(categoryId)
             .orElseThrow { NotFoundException() }
+
         category.apply {
             deleted = true
             deletedAt = LocalDateTime.now()
         }
-        return categoryRepository.save(category)
-    }
-//    fun deleteCategory(categoryId: Long) {
 
-//        categoryRepository.deleteById(categoryId)
-//    }
+        categoryRepository.save(category)
+    }
 }

backend/tiggle-root/tiggle/src/main/kotlin/com/side/tiggle/domain/category/service/CategoryService.kt

@@ -2,14 +2,14 @@ package com.side.tiggle.domain.comment.api
 
 import com.side.tiggle.domain.comment.dto.req.CommentCreateReqDto
 import com.side.tiggle.domain.comment.dto.req.CommentUpdateReqDto
+import com.side.tiggle.domain.comment.dto.resp.CommentPageRespDto
 import com.side.tiggle.domain.comment.dto.resp.CommentRespDto
 import com.side.tiggle.domain.comment.service.CommentService
 import com.side.tiggle.global.common.constants.HttpHeaders
 import io.swagger.v3.oas.annotations.Operation
 import io.swagger.v3.oas.annotations.Parameter
 import io.swagger.v3.oas.annotations.security.SecurityRequirement
 import io.swagger.v3.oas.annotations.tags.Tag
-import org.springframework.data.domain.Page
 import org.springframework.http.HttpStatus
 import org.springframework.http.ResponseEntity
 import org.springframework.web.bind.annotation.*
@@ -27,19 +27,18 @@ class CommentApiController(
         @PathVariable id: Long?,
         @RequestParam(name = "index", defaultValue = "0") page: Int,
         @RequestParam(name = "pageSize", defaultValue = "5") size: Int
-    ): ResponseEntity<Page<CommentRespDto>> {
+    ): ResponseEntity<CommentPageRespDto> {
         val pagedComments = commentService.getChildrenByParentId(id, page, size)
-        val pagedResult = CommentRespDto.fromEntityPage(pagedComments, commentService)
-        return ResponseEntity(pagedResult, HttpStatus.OK)
+        return ResponseEntity(pagedComments, HttpStatus.OK)
     }
 
     @PostMapping
     @Operation(summary = "코멘트 작성", security = [SecurityRequirement(name = "bearer-key")])
     fun createComment(
         @Parameter(hidden = true) @RequestHeader(name = HttpHeaders.MEMBER_ID) memberId: Long,
         @RequestBody commentDto: @Valid CommentCreateReqDto): ResponseEntity<CommentRespDto> {
-        val respDto = CommentRespDto.fromEntity(commentService.createComment(memberId, commentDto))
-        return ResponseEntity(respDto, HttpStatus.CREATED)
+        val createComment = commentService.createComment(memberId, commentDto)
+        return ResponseEntity(createComment, HttpStatus.CREATED)
     }
 
     @PutMapping("/{id}")
@@ -49,7 +48,7 @@ class CommentApiController(
         @RequestHeader(name = HttpHeaders.MEMBER_ID) memberId: Long,
         @PathVariable("id") commentId: Long,
         @RequestBody dto: CommentUpdateReqDto): ResponseEntity<CommentRespDto> {
-        val respDto = CommentRespDto.fromEntity(commentService.updateComment(memberId, commentId, dto.content))
+        val respDto = commentService.updateComment(memberId, commentId, dto)
         return ResponseEntity(respDto, HttpStatus.OK)
     }
 
@@ -61,4 +60,19 @@ class CommentApiController(
         commentService.deleteComment(memberId, commentId)
         return ResponseEntity(null, HttpStatus.NO_CONTENT)
     }
+
+    @GetMapping("/{id}/comments")
+    fun getAllCommentsByTx(
+        @PathVariable id: Long,
+        @RequestParam(name = "pageSize", defaultValue = DEFAULT_PAGE_SIZE) pageSize: Int,
+        @RequestParam(name = "index", defaultValue = DEFAULT_INDEX) index: Int
+    ): ResponseEntity<CommentPageRespDto> {
+        val pagedResult = commentService.getParentsByTxId(id, index, pageSize)
+        return ResponseEntity(pagedResult, HttpStatus.OK)
+    }
+
+    companion object {
+        private const val DEFAULT_INDEX = "0"
+        private const val DEFAULT_PAGE_SIZE = "5"
+    }
 }

backend/tiggle-root/tiggle/src/main/kotlin/com/side/tiggle/domain/comment/api/CommentApiController.kt

@@ -1,6 +1,5 @@
 package com.side.tiggle.domain.comment.dto.req
 
-import com.side.tiggle.domain.comment.dto.CommentDto
 import com.side.tiggle.domain.comment.model.Comment
 import com.side.tiggle.domain.member.model.Member
 import com.side.tiggle.domain.transaction.model.Transaction