Merge pull request #63 from PSR-Co/refactor/#55-list-response

[refactor] 문의 목록 조회 response 형태 변경
PSR-Co · Aug 5, 2023 · befa2cb · befa2cb
2 parents 470f024 + c246e0f
commit befa2cb
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 20 deletions.
diff --git a/src/main/kotlin/com/psr/psr/inquiry/controller/InquiryController.kt b/src/main/kotlin/com/psr/psr/inquiry/controller/InquiryController.kt
@@ -24,14 +24,13 @@ class InquiryController(
 
         // 문의하기 상세 조회
         @GetMapping("/{inquiryId}")
-        fun getInquiryDetails (@AuthenticationPrincipal userAccount: UserAccount, @PathVariable inquiryId: Long
-        ) : BaseResponse<InquiryRes> {
+        fun getInquiryDetails (@AuthenticationPrincipal userAccount: UserAccount, @PathVariable inquiryId: Long) : BaseResponse<InquiryRes> {
                 return BaseResponse(inquiryService.getInquiryDetails(userAccount.getUser(), inquiryId))
         }
 
         // 문의하기 목록 조회
         @GetMapping
-        fun getInquiryList (@AuthenticationPrincipal userAccount: UserAccount, @RequestParam status: String) : BaseResponse<List<InquiryListRes>> {
+        fun getInquiryList (@AuthenticationPrincipal userAccount: UserAccount, @RequestParam status: String) : BaseResponse<InquiryListRes?> {
                 return BaseResponse(inquiryService.getInquiryList(userAccount.getUser(), status))
         }
 

diff --git a/src/main/kotlin/com/psr/psr/inquiry/dto/InquiryAssembler.kt b/src/main/kotlin/com/psr/psr/inquiry/dto/InquiryAssembler.kt
@@ -14,11 +14,9 @@ class InquiryAssembler {
         )
     }
 
-    fun toListDto(inquiry: Inquiry): InquiryListRes {
-        return InquiryListRes(
-            inquiryId = inquiry.id!!,
-            title = inquiry.title!!
-        )
+    fun toListDto(inquiryList: List<InquiryRes>): InquiryListRes {
+        if (inquiryList.isEmpty()) return InquiryListRes(null)
+        return InquiryListRes(inquiryList)
     }
 
     fun toDto(inquiry: Inquiry): InquiryRes {
@@ -29,4 +27,13 @@ class InquiryAssembler {
             answer = inquiry.answer
         )
     }
+
+    fun toPrepareListDto(inquiry: Inquiry): InquiryRes {
+        return InquiryRes(
+            inquiryId = inquiry.id!!,
+            title = inquiry.title!!,
+            content = null,
+            answer = null
+        )
+    }
 }
diff --git a/src/main/kotlin/com/psr/psr/inquiry/dto/InquiryListRes.kt b/src/main/kotlin/com/psr/psr/inquiry/dto/InquiryListRes.kt
@@ -1,6 +1,5 @@
 package com.psr.psr.inquiry.dto
 
 data class InquiryListRes (
-    val inquiryId: Long,
-    val title: String
+    val inquiries: List<InquiryRes>?
 )
diff --git a/src/main/kotlin/com/psr/psr/inquiry/dto/InquiryRes.kt b/src/main/kotlin/com/psr/psr/inquiry/dto/InquiryRes.kt
@@ -1,8 +1,12 @@
 package com.psr.psr.inquiry.dto
 
+import com.fasterxml.jackson.annotation.JsonInclude
+
 data class InquiryRes (
     val inquiryId: Long,
     val title: String,
-    val content: String,
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    val content: String?,
+    @JsonInclude(JsonInclude.Include.NON_NULL)
     val answer: String?
 )
diff --git a/src/main/kotlin/com/psr/psr/inquiry/repository/InquiryRepository.kt b/src/main/kotlin/com/psr/psr/inquiry/repository/InquiryRepository.kt
@@ -8,7 +8,7 @@ import org.springframework.stereotype.Repository
 
 @Repository
 interface InquiryRepository: JpaRepository<Inquiry, Long> {
-    fun findByUserAndInquiryStatusAndStatus(user: User, inquiryStatus: InquiryStatus, status: String): List<Inquiry>?
-    fun findByInquiryStatusAndStatus(inquiryStatus: InquiryStatus, status: String): List<Inquiry>?
+    fun findByUserAndInquiryStatusAndStatus(user: User, inquiryStatus: InquiryStatus, status: String): List<Inquiry>
+    fun findByInquiryStatusAndStatus(inquiryStatus: InquiryStatus, status: String): List<Inquiry>
     fun findByIdAndStatus(inquiryId: Long, status: String): Inquiry?
 }
diff --git a/src/main/kotlin/com/psr/psr/inquiry/service/InquiryService.kt b/src/main/kotlin/com/psr/psr/inquiry/service/InquiryService.kt
@@ -29,17 +29,16 @@ class InquiryService(
     }
 
     // 문의 목록 조회
-    fun getInquiryList(user: User, status: String): List<InquiryListRes> {
+    fun getInquiryList(user: User, status: String): InquiryListRes {
         val inquiryStatus: InquiryStatus = InquiryStatus.findByName(status)
-        val inquiries: List<Inquiry> =
-            if (user.type == Type.MANAGER)
+        val inquiries: List<InquiryRes> =
+            (if (user.type == Type.MANAGER)
                 inquiryRepository.findByInquiryStatusAndStatus(inquiryStatus, ACTIVE_STATUS)
-                    ?: throw BaseException(BaseResponseCode.NOT_FOUND_INQUIRY)
             else
-                inquiryRepository.findByUserAndInquiryStatusAndStatus(user, inquiryStatus, ACTIVE_STATUS)
-                    ?: throw BaseException(BaseResponseCode.NOT_FOUND_INQUIRY)
+                inquiryRepository.findByUserAndInquiryStatusAndStatus(user, inquiryStatus, ACTIVE_STATUS))
+                .map { inquiry: Inquiry -> inquiryAssembler.toPrepareListDto(inquiry) }
 
-        return inquiries.map { inquiry: Inquiry -> inquiryAssembler.toListDto(inquiry) }
+        return inquiryAssembler.toListDto(inquiries)
     }
 
     // 문의 답변 등록