Merge pull request #114 from KUSITMS-29th-TEAM-B/refactor/flight-113

refactor : 자기소개서 조회 API 응답값 수정
KUSITMS-29th-TEAM-B · May 20, 2024 · 7ce2db2 · 7ce2db2
2 parents 51cd663 + 5a334be
commit 7ce2db2
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 13 deletions.
diff --git a/Api-Module/src/docs/asciidoc/Auth.adoc b/Api-Module/src/docs/asciidoc/Auth.adoc
@@ -19,5 +19,5 @@ operation::AuthControllerTest/reissueToken[snippets='http-request,http-response,
 [[Auth-Logout]]
 === 로그아웃
 
-operation::AuthControllerTest/logout[snippets='http-request,http-response,request-fields']
+operation::AuthControllerTest/logout[snippets='http-request,request-headers,http-response']
 
diff --git a/.../main/kotlin/com/bamyanggang/apimodule/domain/jobDescription/application/dto/ApplyInfo.kt b/.../main/kotlin/com/bamyanggang/apimodule/domain/jobDescription/application/dto/ApplyInfo.kt
@@ -1,5 +1,7 @@
 package com.bamyanggang.apimodule.domain.jobDescription.application.dto
 
+import com.bamyanggang.domainmodule.domain.jobDescription.enums.WriteStatus
+
 class ApplyInfo {
 
     sealed class Request {
@@ -10,7 +12,8 @@ class ApplyInfo {
     }
 
     data class Response(
-        val applyContentList: List<ContentInfo>
+        val applyContentList: List<ContentInfo>,
+        val writeStatus: WriteStatus
     )
 
     data class ContentInfo(

diff --git a/...om/bamyanggang/apimodule/domain/jobDescription/application/service/ApplyInfoGetService.kt b/...om/bamyanggang/apimodule/domain/jobDescription/application/service/ApplyInfoGetService.kt
@@ -2,25 +2,24 @@ package com.bamyanggang.apimodule.domain.jobDescription.application.service
 
 import com.bamyanggang.apimodule.domain.jobDescription.application.dto.ApplyInfo
 import com.bamyanggang.domainmodule.domain.jobDescription.service.ApplyReader
+import com.bamyanggang.domainmodule.domain.jobDescription.service.JobDescriptionReader
 import org.springframework.stereotype.Service
 import org.springframework.transaction.annotation.Transactional
 import java.util.*
 
 @Service
 class ApplyInfoGetService(
-    private val applyReader: ApplyReader
+    private val applyReader: ApplyReader,
+    private val jobDescriptionReader: JobDescriptionReader
 ) {
 
     @Transactional(readOnly = true)
     fun getApplyInfo(jobDescriptionId: UUID): ApplyInfo.Response {
-        return applyReader.readApplyByJobDescriptionId(jobDescriptionId).contents.map {
-            ApplyInfo.ContentInfo(
-                it.question,
-                it.answer
-            )
-        }.let {
-            ApplyInfo.Response(it)
+        val jobDescription = jobDescriptionReader.readJobDescriptionById(jobDescriptionId)
+        val contents = applyReader.readApplyByJobDescriptionId(jobDescriptionId).contents.map {
+            ApplyInfo.ContentInfo(it.question, it.answer)
         }
+        return ApplyInfo.Response(contents, jobDescription.writeStatus)
     }
 
 }
diff --git a/...lication/ApplicationInfoGetServiceTest.kt → ...on/application/ApplyInfoGetServiceTest.kt b/...lication/ApplicationInfoGetServiceTest.kt → ...on/application/ApplyInfoGetServiceTest.kt
@@ -2,14 +2,16 @@ package com.bamyanggang.apimodule.domain.jobDescription.application
 
 import com.bamyanggang.apimodule.domain.jobDescription.application.service.ApplyInfoGetService
 import com.bamyanggang.domainmodule.domain.jobDescription.service.ApplyReader
+import com.bamyanggang.domainmodule.domain.jobDescription.service.JobDescriptionReader
 import io.kotest.core.spec.style.BehaviorSpec
 import io.mockk.mockk
 import io.mockk.verify
 import java.util.UUID
 
-class ApplicationInfoGetServiceTest: BehaviorSpec({
+class ApplyInfoGetServiceTest: BehaviorSpec({
     val mockApplyReader = mockk<ApplyReader>(relaxed = true)
-    val service =  ApplyInfoGetService(mockApplyReader)
+    val mockJobDescriptionReader = mockk<JobDescriptionReader>(relaxed = true)
+    val service =  ApplyInfoGetService(mockApplyReader, mockJobDescriptionReader)
 
     given("ApplyInfoGetService.getApplyInfo") {
         val jobDescriptionId: UUID = UUID.randomUUID()

diff --git a/.../bamyanggang/apimodule/domain/jobDescription/presentation/JobDescriptionControllerTest.kt b/.../bamyanggang/apimodule/domain/jobDescription/presentation/JobDescriptionControllerTest.kt
@@ -408,7 +408,8 @@ class JobDescriptionControllerTest : BaseRestDocsTest() {
                     ),
                     responseFields(
                         fieldWithPath("applyContentList[].question").description("질문"),
-                        fieldWithPath("applyContentList[].answer").description("답변")
+                        fieldWithPath("applyContentList[].answer").description("답변"),
+                        fieldWithPath("writeStatus").description("작성 상태. NOT_APPLIED(칩 없음, 작성 전), WRITING(작성 중), WRITTEN(작성 완료), CLOSED(마감)")
                     )
                 )
             )