✨feat: add room not exist socket exception

Youth-Garden-School · Nov 10, 2024 · 90cd17d · 90cd17d
1 parent 447b7eb
commit 90cd17d
Show file tree

Hide file tree

Showing 8 changed files with 68 additions and 43 deletions.
diff --git a/src/main/java/com/videocall/server/config/SecurityConfig.java b/src/main/java/com/videocall/server/config/SecurityConfig.java
@@ -1,8 +1,7 @@
 package com.videocall.server.config;
 
-import lombok.AccessLevel;
-import lombok.RequiredArgsConstructor;
-import lombok.experimental.FieldDefaults;
+import java.util.List;
+
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.http.HttpMethod;
@@ -19,7 +18,9 @@
 import org.springframework.web.cors.CorsConfigurationSource;
 import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
 
-import java.util.List;
+import lombok.AccessLevel;
+import lombok.RequiredArgsConstructor;
+import lombok.experimental.FieldDefaults;
 
 @Configuration
 @RequiredArgsConstructor
@@ -34,13 +35,12 @@ public class SecurityConfig {
     public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception {
         return http.csrf(AbstractHttpConfigurer::disable)
                 .cors(cor -> cor.configurationSource(corsConfigurationSource()))
-                .authorizeHttpRequests(
-                        author -> author
-                                .requestMatchers(HttpMethod.POST, PUBLIC_ENDPOINTS)
-                                .permitAll()
-                                .requestMatchers("/websocket/**").permitAll()
-                                .anyRequest()
-                                .authenticated())
+                .authorizeHttpRequests(author -> author.requestMatchers(HttpMethod.POST, PUBLIC_ENDPOINTS)
+                        .permitAll()
+                        .requestMatchers("/websocket/**")
+                        .permitAll()
+                        .anyRequest()
+                        .authenticated())
                 .sessionManagement(session -> session.sessionCreationPolicy(SessionCreationPolicy.STATELESS))
                 .oauth2ResourceServer(oauth2 -> oauth2.jwt(jwtConfigurer -> jwtConfigurer
                                 .decoder(customJwtDecoder)
@@ -65,9 +65,6 @@ JwtAuthenticationConverter jwtAuthenticationConverter() {
         return jwtAuthenticationConverter;
     }
 
-
-
-
     @Bean
     CorsConfigurationSource corsConfigurationSource() {
         CorsConfiguration configuration = new CorsConfiguration();

diff --git a/src/main/java/com/videocall/server/config/WebSocketConfig.java b/src/main/java/com/videocall/server/config/WebSocketConfig.java
@@ -18,7 +18,8 @@ public void configureMessageBroker(MessageBrokerRegistry config) {
     @Override
     public void registerStompEndpoints(StompEndpointRegistry registry) {
         registry.addEndpoint("/websocket")
-                .setAllowedOrigins("http://127.0.0.1:5500/", "http://localhost:3000/", "https://wemeet-client.vercel.app")
+                .setAllowedOrigins(
+                        "http://127.0.0.1:5500/", "http://localhost:3000/", "https://wemeet-client.vercel.app")
                 .withSockJS();
     }
 }
diff --git a/src/main/java/com/videocall/server/controller/RoomController.java b/src/main/java/com/videocall/server/controller/RoomController.java
@@ -3,8 +3,7 @@
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 
-import com.videocall.server.exception.AppException;
-import com.videocall.server.exception.ErrorCode;
+import com.videocall.server.exception.SocketException;
 import org.json.JSONObject;
 import org.springframework.messaging.handler.annotation.MessageMapping;
 import org.springframework.messaging.simp.SimpMessagingTemplate;
@@ -15,6 +14,8 @@
 
 import com.videocall.server.dto.ApiResponse;
 import com.videocall.server.dto.response.RoomResponse;
+import com.videocall.server.exception.AppException;
+import com.videocall.server.exception.ErrorCode;
 import com.videocall.server.service.RoomService;
 
 import lombok.AccessLevel;
@@ -47,8 +48,7 @@ public void join(String join) {
         String roomId = jsonObject.getString("roomId");
         String userId = jsonObject.getString("userId");
 
-        Boolean isExist = roomService.exist(roomId);
-        if(!isExist) throw new AppException(ErrorCode.ROOM_NOT_EXISTED);
+        if (!roomService.exist(roomId)) throw new SocketException(ErrorCode.ROOM_NOT_EXISTED, userId);
 
         rooms.computeIfAbsent(roomId, s -> new HashSet<>()).add(userId);
         Set<String> roomUsers = rooms.get(roomId);
@@ -67,8 +67,12 @@ public void join(String join) {
     public void call(String call) {
         JSONObject jsonObject = new JSONObject(call);
         log.info("Calling to: {} | Call from: {}", jsonObject.get("callTo"), jsonObject.get("callFrom"));
-        log.info("Calling to class: {} | Call from class: {}", jsonObject.get("callTo").getClass(), jsonObject.get("callFrom").getClass());
-        simpMessagingTemplate.convertAndSendToUser(jsonObject.getString("callTo"), "/topic/call", jsonObject.get("callFrom"));
+        log.info(
+                "Calling to class: {} | Call from class: {}",
+                jsonObject.get("callTo").getClass(),
+                jsonObject.get("callFrom").getClass());
+        simpMessagingTemplate.convertAndSendToUser(
+                jsonObject.getString("callTo"), "/topic/call", jsonObject.get("callFrom"));
     }
 
     @MessageMapping("/offer")
@@ -103,6 +107,4 @@ public void candidate(String candidate) {
         simpMessagingTemplate.convertAndSendToUser(jsonObject.getString("toUser"), "/topic/candidate", candidate);
         log.info("Candidate sent");
     }
-
-
 }
diff --git a/src/main/java/com/videocall/server/entity/Room.java b/src/main/java/com/videocall/server/entity/Room.java
@@ -1,15 +1,14 @@
 package com.videocall.server.entity;
 
+import java.security.SecureRandom;
+
 import jakarta.persistence.*;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 
 import lombok.*;
 import lombok.experimental.FieldDefaults;
 
-import java.security.SecureRandom;
-import java.util.UUID;
-
 @Entity
 @Getter
 @Setter

diff --git a/src/main/java/com/videocall/server/exception/ErrorCode.java b/src/main/java/com/videocall/server/exception/ErrorCode.java
@@ -18,8 +18,7 @@ public enum ErrorCode {
     PASSWORD_IS_REQUIRED(1009, "Mật khẩu không được để trống", HttpStatus.BAD_REQUEST),
     PASSWORD_IS_NOT_CORRECT(1010, "Mật khẩu không chính xác", HttpStatus.BAD_REQUEST),
 
-
-    //ROOM
+    // ROOM
     ROOM_NOT_EXISTED(2001, "Phòng không tồn tại", HttpStatus.BAD_REQUEST),
     ;
 
@@ -29,8 +28,6 @@ public enum ErrorCode {
         this.statusCode = statusCode;
     }
 
-
-
     private final int code;
     private final String message;
     private final HttpStatusCode statusCode;

diff --git a/src/main/java/com/videocall/server/exception/GlobalSocketExceptionHandler.java b/src/main/java/com/videocall/server/exception/GlobalSocketExceptionHandler.java
@@ -1,23 +1,34 @@
 package com.videocall.server.exception;
 
-import com.videocall.server.dto.ApiResponse;
+import lombok.AccessLevel;
+import lombok.RequiredArgsConstructor;
+import lombok.experimental.FieldDefaults;
 import org.springframework.http.ResponseEntity;
 import org.springframework.messaging.handler.annotation.MessageExceptionHandler;
-import org.springframework.messaging.simp.annotation.SendToUser;
+import org.springframework.messaging.simp.SimpMessagingTemplate;
 import org.springframework.web.bind.annotation.ControllerAdvice;
 
+import com.videocall.server.dto.ApiResponse;
+
 @ControllerAdvice
+@RequiredArgsConstructor
+@FieldDefaults(level = AccessLevel.PRIVATE, makeFinal = true)
 public class GlobalSocketExceptionHandler {
+    SimpMessagingTemplate simpMessagingTemplate;
 
-
-    @MessageExceptionHandler(AppException.class)
-    @SendToUser("/topic/errors")
-    public ResponseEntity<ApiResponse> handleAppException(AppException e) {
+    @MessageExceptionHandler(SocketException.class)
+    public ResponseEntity<ApiResponse> handleAppException(SocketException e) {
         ErrorCode errorCode = e.getErrorCode();
 
-        return ResponseEntity.status(errorCode.getCode()).body(ApiResponse.builder()
+        // Tạo thông báo lỗi
+        ApiResponse errorResponse = ApiResponse.builder()
                 .message(e.getMessage())
                 .code(errorCode.getCode())
-                .build());
+                .build();
+
+        // Gửi thông báo lỗi tới /user/{userId}/topic/errors
+        simpMessagingTemplate.convertAndSendToUser(e.getUserId(), "/topic/errors", errorResponse);
+
+        return ResponseEntity.badRequest().body(errorResponse);
     }
 }
diff --git a/src/main/java/com/videocall/server/exception/SocketException.java b/src/main/java/com/videocall/server/exception/SocketException.java
@@ -0,0 +1,18 @@
+package com.videocall.server.exception;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class SocketException extends RuntimeException {
+
+    public SocketException(ErrorCode errorCode, String userId) {
+        super(errorCode.getMessage());
+        this.errorCode = errorCode;
+        this.userId = userId;
+    }
+
+    private ErrorCode errorCode;
+    private String userId;
+}
diff --git a/src/main/java/com/videocall/server/service/implement/RoomServiceImp.java b/src/main/java/com/videocall/server/service/implement/RoomServiceImp.java
@@ -1,12 +1,12 @@
 package com.videocall.server.service.implement;
 
-import com.videocall.server.exception.AppException;
-import com.videocall.server.exception.ErrorCode;
 import org.springframework.stereotype.Service;
 
 import com.videocall.server.dto.response.RoomResponse;
 import com.videocall.server.entity.Room;
 import com.videocall.server.entity.User;
+import com.videocall.server.exception.AppException;
+import com.videocall.server.exception.ErrorCode;
 import com.videocall.server.repository.RoomRepository;
 import com.videocall.server.repository.UserRepository;
 import com.videocall.server.service.RoomService;
@@ -26,7 +26,9 @@ public class RoomServiceImp implements RoomService {
     @Override
     public RoomResponse create() {
         String currentUserName = UserUtils.getCurrentUserName();
-        User user = userRepository.findById(currentUserName).orElseThrow(() -> new AppException(ErrorCode.USER_NOT_EXISTED));
+        User user = userRepository
+                .findById(currentUserName)
+                .orElseThrow(() -> new AppException(ErrorCode.USER_NOT_EXISTED));
         Room room = roomRepository.save(Room.builder().user(user).build());
         return RoomResponse.builder().id(room.getId()).build();
     }
@@ -35,6 +37,4 @@ public RoomResponse create() {
     public Boolean exist(String roomId) {
         return roomRepository.existsById(roomId);
     }
-
-
 }