Merge branch 'develop' into refactoring/#100/voice-room-data-save

build.gradle

@@ -35,7 +35,7 @@ dependencies {
 	testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
 	implementation 'org.springframework.boot:spring-boot-starter-data-jpa' // JPA 스타터 추가
 	runtimeOnly 'com.h2database:h2'		// test용 db인 h2Database 추가
-	implementation 'com.github.gavlyukovskiy:p6spy-spring-boot-starter:1.9.0'		// p6spy 설정 추가
+//	implementation 'com.github.gavlyukovskiy:p6spy-spring-boot-starter:1.9.0'		// p6spy 설정 추가
 	implementation 'org.springframework.boot:spring-boot-starter-validation'		// validation 추가
 	implementation 'org.springframework.boot:spring-boot-starter-security'
 	implementation 'org.springframework.boot:spring-boot-starter-websocket'			// webSocket 추가

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,9 +61,9 @@ 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")
-                .exposedHeaders("location")
+                        "https://kuit-space.github.io/", "https://kuit-space-front.vercel.app/")
+                .allowedMethods("GET", "POST", "PUT", "DELETE", "PATCH")
+                .exposedHeaders("location", "Authorization")
                 .allowedHeaders("*")
                 .allowCredentials(true);
     }

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;
+    }
 }

src/main/java/space/space_spring/config/filter/RequestCachingFilter.java

@@ -0,0 +1,21 @@
+package space.space_spring.config.filter;
+
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import org.springframework.stereotype.Component;
+import org.springframework.web.filter.OncePerRequestFilter;
+import org.springframework.web.util.ContentCachingRequestWrapper;
+
+import java.io.IOException;
+@Component
+public class RequestCachingFilter extends OncePerRequestFilter {
+
+    @Override
+    protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain)
+            throws ServletException, IOException {
+        ContentCachingRequestWrapper wrappedRequest = new ContentCachingRequestWrapper(request);
+        filterChain.doFilter(wrappedRequest, response);
+    }
+}

src/main/java/space/space_spring/config/InterceptorURL.java → src/main/java/space/space_spring/config/interceptorURL/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;
     }
 }

src/main/java/space/space_spring/config/UserSpaceValidationInterceptorURL.java → src/main/java/space/space_spring/config/interceptorURL/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;

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);
+        }
+    }
 }

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();

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

@@ -0,0 +1,56 @@
+package space.space_spring.controller;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+import space.space_spring.argumentResolver.jwtLogin.JwtLoginAuth;
+import space.space_spring.response.BaseResponse;
+import space.space_spring.service.LikeService;
+
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/space/{spaceId}/board/post/{postId}")
+@Slf4j
+public class LikeController {
+
+    private final LikeService likeService;
+
+    // 게시글 좋아요
+    @PostMapping("/like")
+    public BaseResponse<String> likePost(
+            @JwtLoginAuth Long userId,
+            @PathVariable Long spaceId,
+            @PathVariable Long postId
+    ) {
+        // TODO 1: 유저가 스페이스에 속하는지 검증
+        likeService.validateUserInSpace(userId, spaceId);
+
+        // TODO 2: 유저가 해당 게시글에 이미 좋아요를 눌렀는지 검증
+        likeService.validateAlreadyLiked(userId, postId);
+
+        // TODO 3: 좋아요 로직 수행
+        likeService.likePost(userId, postId);
+
+        return new BaseResponse<>("게시글에 좋아요를 눌렀습니다.");
+    }
+
+
+    // 게시글 좋아요 취소
+    @DeleteMapping("/like")
+    public BaseResponse<String> unlikePost(
+            @JwtLoginAuth Long userId,
+            @PathVariable Long spaceId,
+            @PathVariable Long postId
+    ) {
+        // TODO 1: 유저가 스페이스에 속하는지 검증
+        likeService.validateUserInSpace(userId, spaceId);
+
+        // TODO 2: 유저가 해당 게시글에 좋아요를 눌렀는지 검증
+        likeService.validateNotLikedYet(userId, postId);
+
+        // TODO 3: 좋아요 취소 로직 수행
+        likeService.unlikePost(userId, postId);
+
+        return new BaseResponse<>("게시글에 좋아요를 취소하였습니다.");
+    }
+}