Feat/#52/요청받은 정산 관련 api 개발

src/main/java/space/space_spring/controller/PayController.java

@@ -4,14 +4,18 @@
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
 import space.space_spring.argument_resolver.jwtLogin.JwtLoginAuth;
-import space.space_spring.dto.pay.*;
-import space.space_spring.entity.UserSpace;
+import space.space_spring.dto.pay.dto.PayReceiveInfoDto;
+import space.space_spring.dto.pay.dto.PayRequestInfoDto;
+import space.space_spring.dto.pay.dto.PayTargetInfoDto;
+import space.space_spring.dto.pay.dto.TotalPayInfoDto;
+import space.space_spring.dto.pay.request.PostPayCompleteRequest;
+import space.space_spring.dto.pay.request.PostPayCreateRequest;
+import space.space_spring.dto.pay.response.*;
 import space.space_spring.response.BaseResponse;
 import space.space_spring.service.PayService;
 import space.space_spring.util.userSpace.UserSpaceUtils;
 
 import java.util.List;
-import java.util.Optional;
 
 @RestController
 @RequiredArgsConstructor
@@ -47,7 +51,7 @@ private void validateIsUserInSpace(Long userId, Long spaceId) {
     }
 
     /**
-     * 내가 요청한 정산 view
+     * 내가 요청한 정산 조회
      */
     @GetMapping("/space/{spaceId}/pay/request")
     public BaseResponse<GetRequestPayViewResponse> showRequestPayListForUser(@JwtLoginAuth Long userId, @PathVariable Long spaceId) {
@@ -63,6 +67,24 @@ public BaseResponse<GetRequestPayViewResponse> showRequestPayListForUser(@JwtLog
         return new BaseResponse<>(new GetRequestPayViewResponse(payRequestInfoDtoListInComplete, payRequestInfoDtoListComplete));
     }
 
+    /**
+     * 내가 요청받은 정산 조회
+     */
+    @GetMapping("/space/{spaceId}/pay/receive")
+    public BaseResponse<GetReceivePayViewResponse> showReceivePayListForUser(@JwtLoginAuth Long userId, @PathVariable Long spaceId) {
+        // TODO 1. 유저가 스페이스에 속하는 지 검증 -> 추후에 인터셉터에서 처리하게끔 리펙토링 필요
+        validateIsUserInSpace(userId, spaceId);
+
+        // TODO 2. 유저가 요청받은 정산 중 현재 진행중인 정산 리스트 get -> 정산 타겟 유저가 정산 안했을 경우 : isComplete = false
+        List<PayReceiveInfoDto> payReceiveInfoDtoListInComplete = payService.getPayReceiveInfoForUser(userId, spaceId, false);
+
+        // TODO 3. 유저가 요청받은 정산 중 완료한 정산 리스트 get -> 정산 타겟 유저가 정산 했을 경우 : isComplete = true
+        List<PayReceiveInfoDto> payReceiveInfoDtoListComplete = payService.getPayReceiveInfoForUser(userId, spaceId, true);
+
+        return new BaseResponse<>(new GetReceivePayViewResponse(payReceiveInfoDtoListInComplete, payReceiveInfoDtoListComplete));
+    }
+
+
     /**
      * 유저가 최근 정산받은 은행 계좌 정보 조회
      * 해당 api는 유저가 속한 스페이스의 정보가 필요없다고 판단해서 spaceId 를 request로 받지 않음
@@ -92,11 +114,38 @@ public BaseResponse<String> createPay(@JwtLoginAuth Long userId, @PathVariable L
         }
 
         // TODO 3. PostPayCreateRequest의 bankName, bankAccountNum 검증
-        // 이거 해야할까?? 프론트단 분들과 논의 필요
+        // 만약 이걸 해야할 경우, @RequestBody 를 validate 하는 방식으로 검증 수행해야 할 듯
 
         // TODO 4. 정산 생성
         payService.createPay(userId, spaceId, postPayCreateRequest);
 
         return new BaseResponse<>("정산 생성 성공");
     }
+
+    /**
+     * 하나의 정산에 대한 상세정보 조회
+     */
+    @GetMapping("/space/{spaceId}/pay/{payRequestId}")
+    public BaseResponse<TotalPayInfoDto> showTotalPayInfo(@JwtLoginAuth Long userId, @PathVariable Long spaceId, @PathVariable Long payRequestId) {
+
+        // TODO 1. 유저가 스페이스에 속하는 지 검증
+        validateIsUserInSpace(userId, spaceId);
+
+        // TODO 2. 정산 상세 정보 조회
+        return new BaseResponse<>(payService.getTotalPayInfo(spaceId, payRequestId));
+    }
+
+    /**
+     * 정산 타겟 유저의 정산 완료 처리
+     */
+    @PostMapping("/space/{spaceId}/pay/complete")
+    public BaseResponse<PostPayCompleteResponse> setPayComplete(@JwtLoginAuth Long userId, @PathVariable Long spaceId, @RequestBody PostPayCompleteRequest postPayCompleteRequest) {
+
+        // TODO 1. 유저가 스페이스에 속하는 지 검증
+        validateIsUserInSpace(userId, spaceId);
+
+        // TODO 2. 정산 타겟 유저의 정산 완료 처리
+        return new BaseResponse<>(payService.setPayRequestTargetToComplete(postPayCompleteRequest.getPayRequestTargetId()));
+    }
+
 }

src/main/java/space/space_spring/controller/SpaceController.java

@@ -5,22 +5,21 @@
 import org.springframework.validation.BindingResult;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 import space.space_spring.argument_resolver.jwtLogin.JwtLoginAuth;
-import space.space_spring.dto.space.GetUserInfoBySpaceResponse;
-import space.space_spring.dto.space.PostSpaceCreateRequest;
-import space.space_spring.dto.space.PostSpaceCreateResponse;
+import space.space_spring.dto.space.response.GetUserInfoBySpaceResponse;
+import space.space_spring.dto.space.request.PostSpaceCreateRequest;
 
-import space.space_spring.entity.UserSpace;
+import space.space_spring.exception.MultipartFileException;
 import space.space_spring.exception.SpaceException;
 import space.space_spring.response.BaseResponse;
 import space.space_spring.service.S3Uploader;
 import space.space_spring.service.SpaceService;
-import space.space_spring.util.userSpace.UserSpaceUtils;
 
 import java.io.IOException;
-import java.util.Optional;
 
 import static space.space_spring.response.status.BaseExceptionResponseStatus.INVALID_SPACE_CREATE;
+import static space.space_spring.response.status.BaseExceptionResponseStatus.IS_NOT_IMAGE_FILE;
 import static space.space_spring.util.bindingResult.BindingResultUtils.getErrorMessage;
 
 @RestController
@@ -30,33 +29,37 @@
 public class SpaceController {
 
     private final SpaceService spaceService;
-    private final UserSpaceUtils userSpaceUtils;
     private final S3Uploader s3Uploader;
     private final String spaceImgDirName = "spaceImg";
 
-    @PostMapping("/create")
-    public BaseResponse<PostSpaceCreateResponse> createSpace(@JwtLoginAuth Long userId, @Validated @ModelAttribute PostSpaceCreateRequest postSpaceCreateRequest, BindingResult bindingResult) throws IOException {
+    @PostMapping("")
+    public BaseResponse<String> createSpace(@JwtLoginAuth Long userId, @Validated @ModelAttribute PostSpaceCreateRequest postSpaceCreateRequest, BindingResult bindingResult) throws IOException {
         if (bindingResult.hasErrors()) {
             throw new SpaceException(INVALID_SPACE_CREATE, getErrorMessage(bindingResult));
         }
 
         // TODO 1. 스페이스 썸네일을 s3에 upload
-        String spaceImgUrl = s3Uploader.upload(postSpaceCreateRequest.getSpaceProfileImg(), spaceImgDirName);
+        String spaceImgUrl = processSpaceImage(postSpaceCreateRequest.getSpaceProfileImg());
 
         // TODO 2. s3에 저장하고 받은 이미지 url 정보와 spaceName 정보로 space create 작업 수행
-        return new BaseResponse<>(spaceService.createSpace(userId, postSpaceCreateRequest.getSpaceName(), spaceImgUrl));
+        spaceService.createSpace(userId, postSpaceCreateRequest.getSpaceName(), spaceImgUrl);
+
+        return new BaseResponse<>("스페이스 생성 성공");
     }
 
-    /**
-     * 테스트 용
-     */
-    @GetMapping("/{spaceId}")
-    public BaseResponse<String> getSpaceHome(@JwtLoginAuth Long userId, @PathVariable Long spaceId) {
-        Optional<UserSpace> userInSpace = userSpaceUtils.isUserInSpace(userId, spaceId);
-        log.info("userInSpace.get().getUserName() = {}", userInSpace.get().getUserName());
-        log.info("userInspace.get().getUserSpaceAuth() = {}", userInSpace.get().getUserSpaceAuth());
+    private String processSpaceImage(MultipartFile spaceProfileImg) throws IOException {
+        if (spaceProfileImg == null) {
+            return null;
+        }
+        validateImageFile(spaceProfileImg);
+        return s3Uploader.upload(spaceProfileImg, spaceImgDirName);
 
-        return new BaseResponse<>("스페이스에 속한 유저만 걸러내는 작업 테스트 성공");
+    }
+
+    private void validateImageFile(MultipartFile spaceProfileImg) {
+        if (!s3Uploader.isFileImage(spaceProfileImg)) {
+            throw new MultipartFileException(IS_NOT_IMAGE_FILE);
+        }
     }
 
     /**

src/main/java/space/space_spring/controller/UserController.java

@@ -7,14 +7,14 @@
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import space.space_spring.argument_resolver.jwtLogin.JwtLoginAuth;
-import space.space_spring.dto.user.*;
+import space.space_spring.dto.user.request.PostUserLoginRequest;
+import space.space_spring.dto.user.request.PostUserSignupRequest;
+import space.space_spring.dto.user.response.GetSpaceInfoForUserResponse;
 import space.space_spring.exception.UserException;
 import space.space_spring.response.BaseResponse;
 import space.space_spring.service.UserService;
 import space.space_spring.util.userSpace.UserSpaceUtils;
 
-import java.util.List;
-
 import static space.space_spring.response.status.BaseExceptionResponseStatus.*;
 import static space.space_spring.util.bindingResult.BindingResultUtils.getErrorMessage;
 
@@ -31,25 +31,29 @@ public class UserController {
      * 회원가입
      */
     @PostMapping("/signup")
-    public BaseResponse<PostUserSignupResponse> signup(@Validated @RequestBody PostUserSignupRequest postUserSignupRequest, BindingResult bindingResult) {
+    public BaseResponse<String> signup(@Validated @RequestBody PostUserSignupRequest postUserSignupRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             throw new UserException(INVALID_USER_SIGNUP, getErrorMessage(bindingResult));
         }
-        return new BaseResponse<>(userService.signup(postUserSignupRequest));
+
+        userService.signup(postUserSignupRequest);
+
+        return new BaseResponse<>("로컬 회원가입 성공");
     }
 
     /**
      * 로그인
      */
     @PostMapping("/login")
-    public BaseResponse<PostUserLoginResponse> login(@Validated @RequestBody PostUserLoginRequest postUserLoginRequest, BindingResult bindingResult, HttpServletResponse response) {
+    public BaseResponse<String> login(@Validated @RequestBody PostUserLoginRequest postUserLoginRequest, BindingResult bindingResult, HttpServletResponse response) {
         if (bindingResult.hasErrors()) {
             throw new UserException(INVALID_USER_LOGIN, getErrorMessage(bindingResult));
         }
 
         String jwtLogin = userService.login(postUserLoginRequest);
         response.setHeader("Authorization", "Bearer " + jwtLogin);
-        return new BaseResponse<>(new PostUserLoginResponse("로그인 성공"));
+
+        return new BaseResponse<>("로컬 로그인 성공");
     }
 
     /**
@@ -61,8 +65,6 @@ public BaseResponse<GetSpaceInfoForUserResponse> showUserSpaceList(@JwtLoginAuth
                                                                        @RequestParam int size,
                                                                        @RequestParam Long lastUserSpaceId) {
 
-        log.info("userId = {}", userId);
-
         return new BaseResponse<>(userService.getSpaceListForUser(userId, size, lastUserSpaceId));
     }
 

src/main/java/space/space_spring/dao/PayDao.java

@@ -4,13 +4,14 @@
 import jakarta.persistence.PersistenceContext;
 import jakarta.persistence.TypedQuery;
 import org.springframework.stereotype.Repository;
-import space.space_spring.dto.pay.RecentPayRequestBankInfoDto;
+import space.space_spring.dto.pay.dto.PayRequestInfoDto;
+import space.space_spring.dto.pay.dto.RecentPayRequestBankInfoDto;
+import space.space_spring.dto.pay.dto.TotalPayInfoDto;
 import space.space_spring.entity.PayRequest;
 import space.space_spring.entity.PayRequestTarget;
 import space.space_spring.entity.Space;
 import space.space_spring.entity.User;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -88,4 +89,14 @@ public PayRequestTarget createPayRequestTarget(PayRequest payRequest, Long targe
         em.persist(payRequestTarget);
         return payRequestTarget;
     }
+
+    public PayRequest findPayRequestById(Long payRequestId) {
+
+        return em.find(PayRequest.class, payRequestId);
+    }
+
+    public PayRequestTarget findPayRequestTargetById(Long payRequestTargetId) {
+        return em.find(PayRequestTarget.class, payRequestTargetId);
+    }
+
 }

src/main/java/space/space_spring/dao/SpaceDao.java

@@ -4,11 +4,6 @@
 import jakarta.persistence.PersistenceContext;
 import org.springframework.stereotype.Repository;
 import space.space_spring.entity.Space;
-import space.space_spring.entity.User;
-import space.space_spring.entity.UserSpace;
-import space.space_spring.dto.space.PostSpaceCreateRequest;
-
-import static space.space_spring.entity.enumStatus.UserSpaceAuth.MANAGER;
 
 @Repository
 public class SpaceDao {

src/main/java/space/space_spring/dao/UserDao.java

@@ -6,7 +6,6 @@
 import jakarta.persistence.TypedQuery;
 import org.springframework.stereotype.Repository;
 import space.space_spring.entity.User;
-import space.space_spring.dto.user.PostUserSignupRequest;
 import space.space_spring.entity.enumStatus.UserSignupType;
 
 @Repository