로그인 response에 userId, groupId 추가

로그인 response에 userId, groupId 추가

Author: jinsol24

src/main/java/com/okagaka/OkaGaka/domain/user/controller/AuthController.java

@@ -18,8 +18,20 @@ public class AuthController {
     @PostMapping("/login")
     public ResponseEntity<ApiResponse<LoginResponse>> login(@RequestBody LoginRequest request) {
         System.out.println("요청 들어옴: name=" + request.getName() + ", phone=" + request.getPhoneNumber());
-        String token = userService.login(request.getName(), request.getPhoneNumber());
-        return ResponseEntity.ok(ApiResponse.success(new LoginResponse(token)));
+//        String token = userService.login(request.getName(), request.getPhoneNumber());
+//        return ResponseEntity.ok(ApiResponse.success(new LoginResponse(token)));
+        // 1. UserService로부터 3가지 정보가 담긴 LoginResult 객체를 받음
+        UserService.LoginResult loginResult = userService.login(request.getName(), request.getPhoneNumber());
+
+        // 2. LoginResult 객체의 정보로 최종 응답 객체인 LoginResponse를 생성
+        LoginResponse response = new LoginResponse(
+                loginResult.token(),
+                loginResult.userId(),
+                loginResult.groupId()
+        );
+
+        // 3. 성공 응답 반환
+        return ResponseEntity.ok(ApiResponse.success(response));
     }
 }
 

src/main/java/com/okagaka/OkaGaka/domain/user/dto/LoginResponse.java

@@ -4,7 +4,10 @@
 import lombok.*;
 
 @Getter
-@AllArgsConstructor
+//@AllArgsConstructor
+@RequiredArgsConstructor
 public class LoginResponse {
-    private String accessToken;
+    private final String accessToken;
+    private final Long userId;
+    private final Long groupId;
 }

src/main/java/com/okagaka/OkaGaka/domain/user/service/UserService.java

@@ -16,12 +16,33 @@ public class UserService {
     private final UserRepository userRepository;
     private final JwtTokenProvider jwtTokenProvider;
 
-    public String login(String name, String phoneNumber) {
-        System.out.println(phoneNumber);
+    // 1. 반환 타입을 위한 record 정의 (UserService 내부에 선언하거나 별도 파일로 생성 가능)
+    public record LoginResult(String token, Long userId, Long groupId) {}
+
+    // 2. login 메소드 수정
+    public LoginResult login(String name, String phoneNumber) {
         User user = userRepository.findByNameAndPhoneNumber(name, phoneNumber)
                 .orElseThrow(() -> new CustomException(ErrorCode.USER_NOT_FOUND));
 
-        return jwtTokenProvider.createToken(user.getId(), user.getName());
+        // 토큰 생성
+        String token = jwtTokenProvider.createToken(user.getId(), user.getName());
+
+        // userId 추출
+        Long userId = user.getId();
+
+        // groupId 추출 (그룹이 없을 경우 null 처리)
+        Long groupId = (user.getFamilyGroup() != null) ? user.getFamilyGroup().getId() : null;
+
+        // 모든 정보를 담은 LoginResult 객체 반환
+        return new LoginResult(token, userId, groupId);
     }
+
+//    public String login(String name, String phoneNumber) {
+//        System.out.println(phoneNumber);
+//        User user = userRepository.findByNameAndPhoneNumber(name, phoneNumber)
+//                .orElseThrow(() -> new CustomException(ErrorCode.USER_NOT_FOUND));
+//
+//        return jwtTokenProvider.createToken(user.getId(), user.getName());
+//    }
 }
 

src/main/resources/static/stomp_test2.html

@@ -40,7 +40,7 @@ <h1>WebSocket Location Test</h1>
 
 <script>
     let stompClient = null;
-    const WS_URL = 'ws://localhost:8080/ws-location';
+    const WS_URL = 'ws://13.209.57.96:8080/ws-location';
     const TOPIC_PREFIX = '/topic/group/';
     const APP_PREFIX = '/app/location/update';
 
@@ -67,7 +67,7 @@ <h1>WebSocket Location Test</h1>
                 log('✅ Connected: ' + frame);
 
                 // 구독할 그룹 ID를 사용자에게 입력받거나, 테스트용으로 고정
-                const groupId = 1;
+                const groupId = 2;
                 stompClient.subscribe(TOPIC_PREFIX + groupId, function(message) {
                     const locationData = JSON.parse(message.body);
                     log(`Received location update for group ${groupId}: User ${locationData.userId}, Lat: ${locationData.latitude}, Lng: ${locationData.longitude}`);