Merge pull request #110 from KUIT-Space/develop

24.08.16 배포
KUIT-Space · Aug 16, 2024 · 1c0a7a8 · 1c0a7a8
2 parents 868cb9b + 44e459a
commit 1c0a7a8
Show file tree

Hide file tree

Showing 19 changed files with 321 additions and 79 deletions.
diff --git a/src/main/java/space/space_spring/config/WebConfig.java b/src/main/java/space/space_spring/config/WebConfig.java
@@ -8,9 +8,10 @@
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 import space.space_spring.argumentResolver.jwtLogin.JwtLoginAuthHandlerArgumentResolver;
-import space.space_spring.argumentResolver.userSpace.UserSpaceAuth;
 import space.space_spring.argumentResolver.userSpace.UserSpaceAuthHandlerArgumentResolver;
 import space.space_spring.argumentResolver.userSpace.UserSpaceIdHandlerArgumentResolver;
+import space.space_spring.config.interceptorURL.JwtLoginInterceptorURL;
+import space.space_spring.config.interceptorURL.UserSpaceValidationInterceptorURL;
 import space.space_spring.interceptor.UserSpaceValidationInterceptor;
 import space.space_spring.interceptor.jwtLogin.JwtLoginAuthInterceptor;
 
@@ -34,7 +35,7 @@ public void addInterceptors(InterceptorRegistry registry) {
                 registry.addInterceptor(jwtLoginAuthInterceptor)
                 .order(1);
 
-        for (InterceptorURL interceptorURL : InterceptorURL.values()) {
+        for (JwtLoginInterceptorURL interceptorURL : JwtLoginInterceptorURL.values()) {
             registration.addPathPatterns(interceptorURL.getUrlPattern());
         }
 
@@ -60,8 +61,8 @@ public void addCorsMappings(CorsRegistry registry) {
         registry.addMapping("/**")
                 .allowedOriginPatterns("http://localhost:3000/", "http://localhost:5173/", "https://localhost:5173/",
                         "http://localhost:5173/KUIT-Space-Front/", "https://localhost:5173/KUIT-Space-Front/",
-                        "https://kuit-space.github.io/KUIT-Space-front/")
-                .allowedMethods("GET", "POST", "PUT", "DELETE")
+                        "https://kuit-space.github.io/", "https://kuit-space-front.vercel.app/")
+                .allowedMethods("GET", "POST", "PUT", "DELETE", "PATCH")
                 .exposedHeaders("location", "Authorization")
                 .allowedHeaders("*")
                 .allowCredentials(true);

diff --git a/src/main/java/space/space_spring/config/WebSocketConfig.java b/src/main/java/space/space_spring/config/WebSocketConfig.java
@@ -1,12 +1,15 @@
 package space.space_spring.config;
 
 import lombok.RequiredArgsConstructor;
+import org.springframework.context.annotation.Bean;
 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 org.springframework.web.socket.config.annotation.WebSocketTransportRegistration;
+import org.springframework.web.socket.server.standard.ServletServerContainerFactoryBean;
 import space.space_spring.interceptor.jwtSocket.JwtChannelInterceptor;
 
 @Configuration
@@ -24,6 +27,7 @@ public void registerStompEndpoints(StompEndpointRegistry registry) {
                 .withSockJS();
     }
 
+
     @Override
     public void configureMessageBroker(MessageBrokerRegistry registry) {
         // 메세지 구독(수신) 요청의 엔드포인트
@@ -37,4 +41,21 @@ public void configureMessageBroker(MessageBrokerRegistry registry) {
     public void configureClientInboundChannel(ChannelRegistration registration) {
         registration.interceptors(jwtChannelInterceptor);
     }
+
+    @Override
+    public void configureWebSocketTransport(WebSocketTransportRegistration registration) {
+        registration.setMessageSizeLimit(50 * 1024 * 1024);  // 50MB
+        registration.setSendBufferSizeLimit(50 * 1024 * 1024);  // 50MB
+        registration.setSendTimeLimit(20 * 10000);  // 더 긴 시간 제한 설정
+    }
+
+    @Bean
+    public ServletServerContainerFactoryBean createServletServerContainerFactoryBean() {
+        ServletServerContainerFactoryBean factoryBean = new ServletServerContainerFactoryBean();
+        factoryBean.setMaxTextMessageBufferSize(50 * 1028 * 1024);
+        factoryBean.setMaxBinaryMessageBufferSize(50 * 1028 * 1024);
+        factoryBean.setMaxSessionIdleTimeout(20 * 10000L);
+        factoryBean.setAsyncSendTimeout(20 * 10000L);
+        return factoryBean;
+    }
 }
diff --git a/...e/space_spring/config/InterceptorURL.java → ...nterceptorURL/JwtLoginInterceptorURL.java b/...e/space_spring/config/InterceptorURL.java → ...nterceptorURL/JwtLoginInterceptorURL.java
@@ -1,9 +1,9 @@
-package space.space_spring.config;
+package space.space_spring.config.interceptorURL;
 
 import lombok.Getter;
 
 @Getter
-public enum InterceptorURL {
+public enum JwtLoginInterceptorURL {
     SPACE("/space/**"),
     TEST("/test/**"),
     SPACE_LIST_FOR_USER("/user/space-choice"),
@@ -12,7 +12,7 @@ public enum InterceptorURL {
 
     private final String urlPattern;
 
-    InterceptorURL(String urlPattern) {
+    JwtLoginInterceptorURL(String urlPattern) {
         this.urlPattern = urlPattern;
     }
 }
diff --git a/...ig/UserSpaceValidationInterceptorURL.java → ...RL/UserSpaceValidationInterceptorURL.java b/...ig/UserSpaceValidationInterceptorURL.java → ...RL/UserSpaceValidationInterceptorURL.java
@@ -1,12 +1,14 @@
-package space.space_spring.config;
+package space.space_spring.config.interceptorURL;
 
 import lombok.Getter;
 
 @Getter
 public enum UserSpaceValidationInterceptorURL {
     //SPACE("/space/**"),
     TEST("/space/{spaceId}/test/**"),
-    VOICEROOM("/space/{spaceId}/voiceRoom/**")
+//    VOICEROOM("/space/{spaceId}/voiceRoom/**"),
+//    CHATROOM("/space/{spaceId}/chat/**")
+    SPACE("/space/{spaceId}/**")
     ;
 
     private final String urlPattern;

diff --git a/src/main/java/space/space_spring/controller/ChatRoomController.java b/src/main/java/space/space_spring/controller/ChatRoomController.java
@@ -5,6 +5,7 @@
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import space.space_spring.argumentResolver.jwtLogin.JwtLoginAuth;
+import space.space_spring.argumentResolver.userSpace.UserSpaceAuth;
 import space.space_spring.dto.chat.request.CreateChatRoomRequest;
 import space.space_spring.dto.chat.request.JoinChatRoomRequest;
 import space.space_spring.dto.chat.response.ChatSuccessResponse;
@@ -19,6 +20,7 @@
 
 import java.io.IOException;
 
+import static space.space_spring.entity.enumStatus.UserSpaceAuth.MANAGER;
 import static space.space_spring.response.status.BaseExceptionResponseStatus.*;
 import static space.space_spring.util.bindingResult.BindingResultUtils.getErrorMessage;
 
@@ -45,17 +47,16 @@ public BaseResponse<ReadChatRoomResponse> readChatRooms(@JwtLoginAuth Long userI
     public BaseResponse<CreateChatRoomResponse> createChatRoom(
             @JwtLoginAuth Long userId,
             @PathVariable Long spaceId,
+            @UserSpaceAuth String userSpaceAuth,
             @Validated @ModelAttribute CreateChatRoomRequest createChatRoomRequest,
             BindingResult bindingResult) throws IOException {
 
-        if (!userSpaceUtils.isUserManager(userId, spaceId)) {
-            throw new CustomException(UNAUTHORIZED_USER);
-        }
-
         if (bindingResult.hasErrors()) {
             throw new CustomException(INVALID_CHATROOM_CREATE, getErrorMessage(bindingResult));
         }
 
+        validateManagerPermission(userSpaceAuth);
+
         String chatRoomDirName = "chatRoomImg";
         String chatRoomImgUrl = s3Uploader.upload(createChatRoomRequest.getImg(), chatRoomDirName);
 
@@ -66,11 +67,13 @@ public BaseResponse<CreateChatRoomResponse> createChatRoom(
      * 특정 채팅방의 모든 유저 정보 조회
      */
     @GetMapping("/{chatRoomId}/member")
-    public BaseResponse<ReadChatRoomMemberResponse> readChatRoomMembers(@JwtLoginAuth Long userId, @PathVariable Long spaceId, @PathVariable Long chatRoomId) {
+    public BaseResponse<ReadChatRoomMemberResponse> readChatRoomMembers(
+            @JwtLoginAuth Long userId,
+            @PathVariable Long spaceId,
+            @PathVariable Long chatRoomId,
+            @UserSpaceAuth String userSpaceAuth) {
 
-        if (!userSpaceUtils.isUserManager(userId, spaceId)) {
-            throw new CustomException(UNAUTHORIZED_USER);
-        }
+        validateManagerPermission(userSpaceAuth);
 
         return new BaseResponse<>(chatRoomService.readChatRoomMembers(spaceId, chatRoomId));
     }
@@ -83,17 +86,16 @@ public BaseResponse<ChatSuccessResponse> joinChatRoom(
             @JwtLoginAuth Long userId,
             @PathVariable Long spaceId,
             @PathVariable Long chatRoomId,
+            @UserSpaceAuth String userSpaceAuth,
             @RequestBody JoinChatRoomRequest joinChatRoomRequest,
             BindingResult bindingResult) {
 
-        if (!userSpaceUtils.isUserManager(userId, spaceId)) {
-            throw new CustomException(UNAUTHORIZED_USER);
-        }
-
         if(bindingResult.hasErrors()){
             throw new CustomException(INVALID_CHATROOM_JOIN,getErrorMessage(bindingResult));
         }
 
+        validateManagerPermission(userSpaceAuth);
+
         return new BaseResponse<>(chatRoomService.joinChatRoom(chatRoomId, joinChatRoomRequest));
     }
 
@@ -105,11 +107,10 @@ public BaseResponse<ChatSuccessResponse> modifyChatRoomName(
             @JwtLoginAuth Long userId,
             @PathVariable Long spaceId,
             @PathVariable Long chatRoomId,
-            @RequestParam String name) {
+            @RequestParam String name,
+            @UserSpaceAuth String userSpaceAuth) {
 
-        if (!userSpaceUtils.isUserManager(userId, spaceId)) {
-            throw new CustomException(UNAUTHORIZED_USER);
-        }
+        validateManagerPermission(userSpaceAuth);
 
         return new BaseResponse<>(chatRoomService.modifyChatRoomName(chatRoomId, name));
     }
@@ -132,12 +133,17 @@ public BaseResponse<ChatSuccessResponse> exitChatRoom(
     public BaseResponse<ChatSuccessResponse> deleteChatRoom(
             @JwtLoginAuth Long userId,
             @PathVariable Long spaceId,
-            @PathVariable Long chatRoomId) {
+            @PathVariable Long chatRoomId,
+            @UserSpaceAuth String userSpaceAuth) {
 
-        if (!userSpaceUtils.isUserManager(userId, spaceId)) {
-            throw new CustomException(UNAUTHORIZED_USER);
-        }
+        validateManagerPermission(userSpaceAuth);
 
         return new BaseResponse<>(chatRoomService.deleteChatRoom(chatRoomId));
     }
+
+    private void validateManagerPermission(String userSpaceAuth){
+        if(!userSpaceAuth.equals(MANAGER.getAuth())){
+            throw new CustomException(UNAUTHORIZED_USER);
+        }
+    }
 }
diff --git a/src/main/java/space/space_spring/controller/ChattingController.java b/src/main/java/space/space_spring/controller/ChattingController.java
@@ -8,12 +8,14 @@
 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.argumentResolver.userSpace.CheckUserSpace;
 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.io.IOException;
 import java.util.Map;
 
 @Slf4j
@@ -27,15 +29,17 @@ public class ChattingController {
 
     @MessageMapping("/chat/{chatRoomId}") // {chatRoomId} 채팅방으로 보낸 메세지 매핑
     @SendTo("/topic/chat/{chatRoomId}") // {chatRoomId} 채팅방을 구독한 곳들로 메세지 전송
+    @CheckUserSpace(required = false)
     public ChatMessageResponse sendChatMessage (@Payload ChatMessageRequest chatMessageRequest, @DestinationVariable Long chatRoomId,
-                                                @Header("simpSessionAttributes") Map<String, Object> sessionAttributes) {
+                                                @Header("simpSessionAttributes") Map<String, Object> sessionAttributes) throws IOException {
         Long senderId = (Long) sessionAttributes.get("userId");
 //        log.info(senderId + " 님이 " + chatRoomId + " 채팅방으로 " + chatMessageRequest.getContent() + " 전송");
 
         return chattingService.sendChatMessage(senderId, chatMessageRequest, chatRoomId);
     }
 
     @SubscribeMapping("/chat/{chatRoomId}") // {chatRoomId} 채팅방을 구독
+    @CheckUserSpace(required = false)
     public ChatMessageLogResponse subscribeChatRoom (@DestinationVariable Long chatRoomId, @Header("simpSessionAttributes") Map<String, Object> sessionAttributes) {
 //        log.info(chatRoomId + " 채팅방 구독");
         sessionAttributes.put("chatRoomId", chatRoomId);
@@ -44,6 +48,7 @@ public ChatMessageLogResponse subscribeChatRoom (@DestinationVariable Long chatR
 
     // socket disconnect 시 호출
     @EventListener
+    @CheckUserSpace(required = false)
     public void handleWebSocketDisconnectListener(SessionDisconnectEvent event) {
         StompHeaderAccessor headerAccessor = StompHeaderAccessor.wrap(event.getMessage());
         Map<String, Object> sessionAttributes = headerAccessor.getSessionAttributes();

diff --git a/src/main/java/space/space_spring/controller/SpaceController.java b/src/main/java/space/space_spring/controller/SpaceController.java
@@ -7,6 +7,11 @@
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import space.space_spring.argumentResolver.jwtLogin.JwtLoginAuth;
+import space.space_spring.argumentResolver.userSpace.UserSpaceAuth;
+import space.space_spring.argumentResolver.userSpace.UserSpaceId;
+import space.space_spring.dto.pay.dto.PayReceiveInfoDto;
+import space.space_spring.dto.pay.dto.PayRequestInfoDto;
+import space.space_spring.dto.space.GetSpaceHomeDto;
 import space.space_spring.dto.space.GetSpaceJoinDto;
 import space.space_spring.dto.space.PostSpaceJoinDto;
 import space.space_spring.dto.space.request.PostSpaceCreateDto;
@@ -17,11 +22,14 @@
 import space.space_spring.entity.Space;
 import space.space_spring.exception.CustomException;
 import space.space_spring.response.BaseResponse;
+import space.space_spring.service.PayService;
+import space.space_spring.service.PostService;
 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.List;
 import java.util.Optional;
 
 import static space.space_spring.response.status.BaseExceptionResponseStatus.*;
@@ -38,6 +46,8 @@ public class SpaceController {
     private final String spaceImgDirName = "spaceImg";
     private final String userProfileImgDirName = "userProfileImg";
     private final UserSpaceUtils userSpaceUtils;
+    private final PayService payService;
+    private final PostService postService;
 
     @PostMapping("")
     public BaseResponse<PostSpaceCreateDto.Response> createSpace(@JwtLoginAuth Long userId, @Validated @ModelAttribute PostSpaceCreateDto.Request postSpaceCreateRequest, BindingResult bindingResult) throws IOException {
@@ -162,7 +172,7 @@ private String processUserProfileImage(MultipartFile userProfileImg) throws IOEx
      * 유저의 스페이스 가입 처리
      */
     @PostMapping("/{spaceId}/join")
-    BaseResponse<String> joinUserToSpace(@JwtLoginAuth Long userId, @PathVariable Long spaceId, @Validated @ModelAttribute PostSpaceJoinDto.Request request, BindingResult bindingResult) throws IOException {
+    public BaseResponse<String> joinUserToSpace(@JwtLoginAuth Long userId, @PathVariable Long spaceId, @Validated @ModelAttribute PostSpaceJoinDto.Request request, BindingResult bindingResult) throws IOException {
         if (bindingResult.hasErrors()) {
             throw new CustomException(INVALID_SPACE_JOIN_REQUEST, getErrorMessage(bindingResult));
         }
@@ -184,4 +194,36 @@ BaseResponse<String> joinUserToSpace(@JwtLoginAuth Long userId, @PathVariable Lo
 
         return new BaseResponse<>("유저의 스페이스 가입 처리 성공");
     }
+
+    /**
+     * 스페이스 홈 화면
+     */
+    @GetMapping("/{spaceId}")
+    public BaseResponse<GetSpaceHomeDto.Response> showSpaceHome(@JwtLoginAuth Long userId, @PathVariable Long spaceId, @UserSpaceId Long userSpaceId, @UserSpaceAuth String userAuth) {
+        log.info("userId = {}, spaceId = {}, userSpaceID = {}, userAuth = {}", userId, spaceId, userSpaceId, userAuth);
+
+        // TODO 1. 스페이스 정보 get
+        GetSpaceHomeDto.SpaceInfoForHome spaceInfoForHome = spaceService.getSpaceInfoForHome(spaceId);
+
+        // TODO 2. 해당 스페이스에서의 유저 정산 정보 get
+        // 유저가 요청한 정산 중 현재 진행중인 정산 리스트
+        // AND
+        // 유저가 요청받은 정산 중 현재 진행중인 정산 리스트
+        List<PayRequestInfoDto> payRequestInfoForUser = payService.getPayRequestInfoForUser(userId, spaceId, false);
+        List<PayReceiveInfoDto> payReceiveInfoForUser = payService.getPayReceiveInfoForUser(userId, spaceId, false);
+
+        // TODO 3. 해당 스페이스의 공지사항 get
+        List<GetSpaceHomeDto.SpaceHomeNotice> noticeInfoForHome = postService.getNoticeInfoForHome(spaceId);
+
+        // TODO 4. return
+        return new BaseResponse<>(new GetSpaceHomeDto.Response(
+                spaceInfoForHome.getSpaceName(),
+                spaceInfoForHome.getSpaceProfileImg(),
+                payRequestInfoForUser,
+                payReceiveInfoForUser,
+                noticeInfoForHome,
+                spaceInfoForHome.getMemberNum(),
+                userAuth
+        ));
+    }
 }
diff --git a/src/main/java/space/space_spring/controller/VoiceRoomController.java b/src/main/java/space/space_spring/controller/VoiceRoomController.java
@@ -185,7 +185,7 @@ private boolean validateVoiceRoomInSpace(long spaceId,long voiceRoomId){
     private boolean validateManagerPermission(String userSpaceAuth){
         //해당 유저가 현재 space에 대해 관리자 권한을 갖고 있는지 확인
         if(!userSpaceAuth.equals(MANAGER.getAuth())){
-            throw new CustomException(VOICEROOM_DO_NOT_HAVE_PERMISSION);
+            throw new CustomException(UNAUTHORIZED_USER);
         }
         return true;
     }

diff --git a/src/main/java/space/space_spring/dao/PostDao.java b/src/main/java/space/space_spring/dao/PostDao.java
@@ -1,5 +1,6 @@
 package space.space_spring.dao;
 
+import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
@@ -20,4 +21,7 @@ public interface PostDao extends JpaRepository<Post, Long> {
             "FROM PostLike l WHERE l.post.postId = :postId AND l.user.userId = :userId")
     boolean isUserLikedPost(@Param("postId") Long postId, @Param("userId") Long userId);
 
+    @Query("SELECT p FROM Post p WHERE p.space = :space AND p.type = :type AND p.status = 'ACTIVE' ORDER BY p.createdAt DESC")
+    List<Post> findBySpaceAndTypeSortedByNewest(@Param("space") Space space, @Param("type") String type, Pageable pageable);
+
 }