From c0adf205fa669b96e7569d517a4188329b62f01e Mon Sep 17 00:00:00 2001 From: rivkode Date: Mon, 29 Apr 2024 16:52:09 +0900 Subject: [PATCH] =?UTF-8?q?#82=20fix=20:=20=ED=8C=80=EC=9E=A5=20=EA=B2=80?= =?UTF-8?q?=EC=A6=9D=20parameter=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/apply/controller/ApplyController.java | 12 ++++++------ .../domain/apply/service/ApplyMapperEntityToDto.java | 8 ++++++-- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/seoultech/synergybe/domain/apply/controller/ApplyController.java b/src/main/java/com/seoultech/synergybe/domain/apply/controller/ApplyController.java index 44916a92..52eb2526 100644 --- a/src/main/java/com/seoultech/synergybe/domain/apply/controller/ApplyController.java +++ b/src/main/java/com/seoultech/synergybe/domain/apply/controller/ApplyController.java @@ -22,7 +22,7 @@ public class ApplyController { @Operation(summary = "프로젝트 지원 생성", description = "프로젝트와 user가 매핑되어 지원됩니다.") @PostMapping(value = "/{projectId}") - public ResponseEntity createApply(@PathVariable("projectId") String projectId, @LoginUser String userId) { + public ResponseEntity createApply(@PathVariable("projectId") String projectId, @LoginUser String userId) { return ResponseEntity.status(HttpStatus.CREATED).body(applyService.createApply(userId, projectId)); } @@ -30,22 +30,22 @@ public ResponseEntity createApply(@PathVariable("projectId") String proj @Operation(summary = "프로젝트 지원 삭제", description = "지원이 삭제됩니다.") @DeleteMapping(value = "/{applyId}") public ResponseEntity deleteApply(@PathVariable("applyId") String applyId, @LoginUser String userId) { - applyService.deleteApply(applyId); + applyService.deleteApply(userId, applyId); return ResponseEntity.noContent().build(); } @Operation(summary = "프로젝트 지원 수락", description = "프로젝트의 팀장이 지원을 수락합니다.") @PostMapping(value = "/accept/{projectId}") - public ResponseEntity acceptApply(@PathVariable("projectId") String projectId, @Valid @RequestBody CreateApplyRequest request) { - applyService.updateApplyStatusToAccept(request.userId(), projectId); + public ResponseEntity acceptApply(@PathVariable("projectId") String projectId, @RequestParam("applyUserId") String applyUserId, @LoginUser String leaderId) { + applyService.updateApplyStatusToAccept(leaderId, applyUserId, projectId); return ResponseEntity.noContent().build(); } @Operation(summary = "프로젝트 지원 거절", description = "프로젝트의 팀장이 지원을 거절합니다.") @DeleteMapping("/reject/{projectId}") - public ResponseEntity rejectApply(@PathVariable("projectId") String projectId, @Valid @RequestBody CreateApplyRequest request) { - applyService.updateApplyStatusToReject(request.userId(), projectId); + public ResponseEntity rejectApply(@PathVariable("projectId") String projectId, @RequestParam("applyUserId") String applyUserId, @LoginUser String leaderId) { + applyService.updateApplyStatusToReject(leaderId, applyUserId, projectId); return ResponseEntity.noContent().build(); } diff --git a/src/main/java/com/seoultech/synergybe/domain/apply/service/ApplyMapperEntityToDto.java b/src/main/java/com/seoultech/synergybe/domain/apply/service/ApplyMapperEntityToDto.java index 244b9250..7cb9c82b 100644 --- a/src/main/java/com/seoultech/synergybe/domain/apply/service/ApplyMapperEntityToDto.java +++ b/src/main/java/com/seoultech/synergybe/domain/apply/service/ApplyMapperEntityToDto.java @@ -5,9 +5,11 @@ import com.seoultech.synergybe.domain.apply.dto.response.GetApplyUserResponse; import com.seoultech.synergybe.domain.apply.dto.response.GetListApplyResponse; import com.seoultech.synergybe.domain.apply.dto.response.GetListApplyUserResponse; +import com.seoultech.synergybe.domain.common.PageInfo; import com.seoultech.synergybe.domain.user.User; import lombok.AccessLevel; import lombok.NoArgsConstructor; +import org.springframework.data.domain.Pageable; import java.util.List; @@ -21,7 +23,8 @@ public static GetListApplyResponse applyListToResponse( result.getId(), result.getStatus())) .toList(); - return new GetListApplyResponse(getApplyResponses); + PageInfo pageInfo = PageInfo.of(applyList.size()); + return new GetListApplyResponse(getApplyResponses, pageInfo); } public static GetListApplyUserResponse userListToResponse( @@ -30,6 +33,7 @@ public static GetListApplyUserResponse userListToResponse( List getApplyUserResponses = userList.stream() .map(GetApplyUserResponse::new) .toList(); - return new GetListApplyUserResponse(getApplyUserResponses); + PageInfo pageInfo = PageInfo.of(getApplyUserResponses.size()); + return new GetListApplyUserResponse(getApplyUserResponses, pageInfo); } }