Merge branch 'develop' into feat/#66/exception-handler

src/main/java/space/space_spring/config/WebSocketConfig.java

@@ -1,14 +1,21 @@
 package space.space_spring.config;
 
+import lombok.RequiredArgsConstructor;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.messaging.simp.config.ChannelRegistration;
 import org.springframework.messaging.simp.config.MessageBrokerRegistry;
 import org.springframework.web.socket.config.annotation.EnableWebSocketMessageBroker;
 import org.springframework.web.socket.config.annotation.StompEndpointRegistry;
 import org.springframework.web.socket.config.annotation.WebSocketMessageBrokerConfigurer;
+import space.space_spring.interceptor.jwtSocket.JwtChannelInterceptor;
 
 @Configuration
 @EnableWebSocketMessageBroker
+@RequiredArgsConstructor
 public class WebSocketConfig implements WebSocketMessageBrokerConfigurer {
+
+    private final JwtChannelInterceptor jwtChannelInterceptor;
+
     @Override
     public void registerStompEndpoints(StompEndpointRegistry registry) {
         // stomp 접속 주소 url = ws://localhost:8080/ws
@@ -23,6 +30,11 @@ public void configureMessageBroker(MessageBrokerRegistry registry) {
         registry.enableSimpleBroker("/topic");
 
         // 메세지 발행(송신) 요청의 엔드 포인트
-        registry.setApplicationDestinationPrefixes("/app");
+        registry.setApplicationDestinationPrefixes("/app", "/topic");
+    }
+
+    @Override
+    public void configureClientInboundChannel(ChannelRegistration registration) {
+        registration.interceptors(jwtChannelInterceptor);
     }
 }

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

@@ -0,0 +1,56 @@
+package space.space_spring.controller;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.context.event.EventListener;
+import org.springframework.messaging.handler.annotation.*;
+import org.springframework.messaging.simp.annotation.SubscribeMapping;
+import org.springframework.messaging.simp.stomp.StompHeaderAccessor;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.socket.messaging.SessionDisconnectEvent;
+import space.space_spring.dto.chat.request.ChatMessageRequest;
+import space.space_spring.dto.chat.response.ChatMessageLogResponse;
+import space.space_spring.dto.chat.response.ChatMessageResponse;
+import space.space_spring.service.ChattingService;
+import space.space_spring.service.UserChatRoomService;
+
+import java.util.Map;
+
+@Slf4j
+@RestController
+@RequiredArgsConstructor
+public class ChattingController {
+
+    private final ChattingService chattingService;
+
+    private final UserChatRoomService userChatRoomService;
+
+    @MessageMapping("/chat/{chatRoomId}") // {chatRoomId} 채팅방으로 보낸 메세지 매핑
+    @SendTo("/topic/chat/{chatRoomId}") // {chatRoomId} 채팅방을 구독한 곳들로 메세지 전송
+    public ChatMessageResponse sendChatMessage (@Payload ChatMessageRequest chatMessageRequest, @DestinationVariable Long chatRoomId,
+                                                @Header("simpSessionAttributes") Map<String, Object> sessionAttributes) {
+        Long senderId = (Long) sessionAttributes.get("userId");
+//        log.info(senderId + " 님이 " + chatRoomId + " 채팅방으로 " + chatMessageRequest.getContent() + " 전송");
+
+        return chattingService.sendChatMessage(senderId, chatMessageRequest, chatRoomId);
+    }
+
+    @SubscribeMapping("/chat/{chatRoomId}") // {chatRoomId} 채팅방을 구독
+    public ChatMessageLogResponse subscribeChatRoom (@DestinationVariable Long chatRoomId, @Header("simpSessionAttributes") Map<String, Object> sessionAttributes) {
+//        log.info(chatRoomId + " 채팅방 구독");
+        sessionAttributes.put("chatRoomId", chatRoomId);
+        return chattingService.readChatMessageLog(chatRoomId);
+    }
+
+    // socket disconnect 시 호출
+    @EventListener
+    public void handleWebSocketDisconnectListener(SessionDisconnectEvent event) {
+        StompHeaderAccessor headerAccessor = StompHeaderAccessor.wrap(event.getMessage());
+        Map<String, Object> sessionAttributes = headerAccessor.getSessionAttributes();
+
+        Long userId = (Long) sessionAttributes.get("userId");
+        Long chatRoomId = (Long) sessionAttributes.get("chatRoomId");
+
+        userChatRoomService.saveLastReadTime(userId, chatRoomId);
+    }
+}

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

@@ -6,10 +6,11 @@
 import space.space_spring.argument_resolver.jwtLogin.JwtLoginAuth;
 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.GetPayViewResponse;
-import space.space_spring.dto.pay.response.GetRecentPayRequestBankInfoResponse;
-import space.space_spring.dto.pay.response.GetRequestPayViewResponse;
+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;
@@ -66,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로 받지 않음
@@ -102,4 +121,31 @@ public BaseResponse<String> createPay(@JwtLoginAuth Long userId, @PathVariable L
 
         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

@@ -7,6 +7,7 @@
 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.GetSpaceJoinDto;
 import space.space_spring.dto.space.response.GetUserInfoBySpaceResponse;
 import space.space_spring.dto.space.request.PostSpaceCreateRequest;
 
@@ -15,6 +16,7 @@
 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;
 
@@ -31,6 +33,7 @@ public class SpaceController {
     private final SpaceService spaceService;
     private final S3Uploader s3Uploader;
     private final String spaceImgDirName = "spaceImg";
+    private final UserSpaceUtils userSpaceUtils;
 
     @PostMapping("")
     public BaseResponse<String> createSpace(@JwtLoginAuth Long userId, @Validated @ModelAttribute PostSpaceCreateRequest postSpaceCreateRequest, BindingResult bindingResult) throws IOException {
@@ -71,4 +74,23 @@ public BaseResponse<GetUserInfoBySpaceResponse> getAllUserInfoBySpace(@PathVaria
         return new BaseResponse<>(spaceService.findUserInfoBySpace(spaceId));
     }
 
+    /**
+     * 스페이스 가입 view를 위한 데이터 조회
+     */
+    @GetMapping("/{spaceId}/join")
+    public BaseResponse<GetSpaceJoinDto.Response> getSpaceJoin(@JwtLoginAuth Long userId, @PathVariable Long spaceId) {
+
+        // TODO 1. 유저가 이미 스페이스에 가입되어 있는 유저인지를 검증
+        validateIsUserAlreadySpaceMember(userId, spaceId);
+
+        // TODO 2. 초대할 스페이스의 정보를 return
+        return new BaseResponse<>(spaceService.findSpaceJoin(spaceId));
+    }
+
+    private void validateIsUserAlreadySpaceMember(Long userId, Long spaceId) {
+        // 유저가 이미 스페이스의 멤버일 경우 exception 발생
+        // exception 을 발생시키는 것이 아니라 response에 유저가 스페이스에 가입된 유저인지에 대한 정보를 포함하는게 더 좋을까??
+        userSpaceUtils.isUserAlreadySpaceMember(userId, spaceId);
+    }
+
 }

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

@@ -1,18 +1,10 @@
 package space.space_spring.controller;
 
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.messaging.handler.annotation.DestinationVariable;
-import org.springframework.messaging.handler.annotation.MessageMapping;
-import org.springframework.messaging.handler.annotation.Payload;
-import org.springframework.messaging.handler.annotation.SendTo;
-import org.springframework.messaging.simp.annotation.SubscribeMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
 import space.space_spring.argument_resolver.jwtLogin.JwtLoginAuth;
 
-import space.space_spring.dao.PayDao;
-import space.space_spring.dto.chat.request.ChatTestRequest;
-import space.space_spring.dto.chat.response.ChatTestResponse;
 import space.space_spring.response.BaseResponse;
 
 @RestController
@@ -30,16 +22,4 @@ public BaseResponse<String> jwtLoginTest(@JwtLoginAuth Long userId) {
         return new BaseResponse<>("jwt login test 성공");
     }
 
-    @MessageMapping("/chat/{spaceChatId}") // {spaceChatId} 채팅방으로 보낸 메세지 매핑
-    @SendTo("/topic/chat/{spaceChatId}") // {spaceChatId} 채팅방을 구독한 곳들로 메세지 전송
-    public ChatTestResponse sendMsgTest(@Payload ChatTestRequest chat, @DestinationVariable String spaceChatId) {
-        log.info(spaceChatId + " 채팅방으로 " + chat.getMsg() + " 전송");
-        return ChatTestResponse.of(chat.getMsg());
-    }
-
-    @SubscribeMapping("/topic/chat/{spaceChatId}") // {spaceChatId} 채팅방을 구독
-    public void subscribeTest(@DestinationVariable String spaceChatId) {
-        log.info(spaceChatId + " 채팅방 구독");
-    }
-
 }

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

@@ -4,7 +4,9 @@
 import jakarta.persistence.PersistenceContext;
 import jakarta.persistence.TypedQuery;
 import org.springframework.stereotype.Repository;
+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;
@@ -87,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

@@ -3,6 +3,7 @@
 import jakarta.persistence.EntityManager;
 import jakarta.persistence.PersistenceContext;
 import org.springframework.stereotype.Repository;
+import space.space_spring.dto.space.GetSpaceJoinDto;
 import space.space_spring.entity.Space;
 
 @Repository
@@ -22,5 +23,4 @@ public Space saveSpace(String spaceName, String spaceImgUrl) {
     public Space findSpaceBySpaceId(Long spaceId) {
         return em.find(Space.class, spaceId);
     }
-
 }

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

@@ -31,7 +31,7 @@ public UserSpace createUserSpace(User manager, Space saveSpace) {
 
     public Optional<UserSpace> findUserSpaceByUserAndSpace(User user, Space space) {
         TypedQuery<UserSpace> query = em.createQuery(
-                "SELECT us FROM UserSpace us WHERE us.user = :user AND us.space = :space", UserSpace.class);
+                "SELECT us FROM UserSpace us WHERE us.user = :user AND us.space = :space AND us.status = 'ACTIVE'", UserSpace.class);
         query.setParameter("user", user);
         query.setParameter("space", space);
 
@@ -108,4 +108,11 @@ private List<UserInfoInSpace> mapToUserInfoInSpace(List<Object[]> results) {
         return userInfoInSpaceList;
     }
 
+    public int calculateSpaceMemberNum(Space space) {
+        String jpql = "SELECT COUNT(us) FROM UserSpace us WHERE us.space = :space AND us.status = 'ACTIVE'";
+        TypedQuery<Long> query = em.createQuery(jpql, Long.class);
+        query.setParameter("space", space);
+
+        return query.getSingleResult().intValue();
+    }
 }

src/main/java/space/space_spring/dao/chat/ChattingDao.java

@@ -0,0 +1,17 @@
+package space.space_spring.dao.chat;
+
+import org.springframework.data.mongodb.repository.MongoRepository;
+import org.springframework.stereotype.Repository;
+import space.space_spring.entity.document.ChatMessage;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+@Repository
+public interface ChattingDao extends MongoRepository<ChatMessage, String> {
+    List<ChatMessage> findByChatRoomId(Long chatRoomId);
+
+    ChatMessage findTopByChatRoomIdOrderByCreatedAtDesc(Long chatRoomId);
+
+    int countByChatRoomIdAndCreatedAtBetween(Long chatRoomId, LocalDateTime lastReadTime, LocalDateTime lastUpdateTime);
+}

src/main/java/space/space_spring/dao/chat/UserChatRoomDao.java

@@ -1,8 +1,11 @@
 package space.space_spring.dao.chat;
 
 import org.springframework.data.jpa.repository.JpaRepository;
+import space.space_spring.entity.ChatRoom;
+import space.space_spring.entity.User;
 import space.space_spring.entity.UserChatRoom;
 
 
 public interface UserChatRoomDao extends JpaRepository<UserChatRoom, Long> {
+    UserChatRoom findByUserAndChatRoom(User userByUserId, ChatRoom chatRoomByChatRoomId);
 }

src/main/java/space/space_spring/dto/chat/request/ChatMessageRequest.java

@@ -0,0 +1,22 @@
+package space.space_spring.dto.chat.request;
+
+import jakarta.validation.constraints.NotBlank;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import space.space_spring.entity.enumStatus.ChatMessageType;
+
+import java.util.HashMap;
+
+@Getter
+@NoArgsConstructor
+public class ChatMessageRequest {
+
+    @NotBlank(message = "메시지 내용은 공백일 수 없습니다.")
+    private HashMap<String, String> content;
+
+    @NotBlank(message = "스페이스 아이디는 공백일 수 없습니다.")
+    private Long spaceId;
+
+    @NotBlank(message = "메시지 타입은 공백일 수 없습니다.")
+    private ChatMessageType messageType;
+}

src/main/java/space/space_spring/dto/chat/request/CreateChatRoomRequest.java

@@ -20,6 +20,5 @@ public class CreateChatRoomRequest {
 
     private MultipartFile img;
 
-    // TODO: member 조회 API 개발 시 수정 예정
-    private List<String> memberList;
+    private List<Long> memberList;
 }

src/main/java/space/space_spring/dto/chat/response/ChatMessageLogResponse.java

@@ -0,0 +1,18 @@
+package space.space_spring.dto.chat.response;
+
+import lombok.Builder;
+import lombok.Getter;
+
+import java.util.List;
+
+@Getter
+@Builder
+public class ChatMessageLogResponse {
+    private List<ChatMessageResponse> chatMessageLog;
+
+    public static ChatMessageLogResponse of(List<ChatMessageResponse> chatMessageList) {
+        return ChatMessageLogResponse.builder()
+                .chatMessageLog(chatMessageList)
+                .build();
+    }
+}