Merge pull request #169 from prgrms-web-devcourse-final-project/refactor/#167

[User] 로그인 및 사용자 조회 응답에 role 정보 추가

Author: larama-C

src/main/java/com/back/web7_9_codecrete_be/domain/auth/dto/response/LoginResponse.java

@@ -1,5 +1,6 @@
 package com.back.web7_9_codecrete_be.domain.auth.dto.response;
 
+import com.back.web7_9_codecrete_be.domain.users.entity.Role;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
@@ -8,4 +9,5 @@
 public class LoginResponse {
     private Long userId;
     private String nickname;
+    private Role role;
 }

src/main/java/com/back/web7_9_codecrete_be/domain/auth/service/AuthService.java

@@ -75,7 +75,7 @@ public LoginResponse login(LoginRequest req) {
         }
         tokenService.issueTokens(user);
 
-        return new LoginResponse(user.getId(), user.getNickname());
+        return new LoginResponse(user.getId(), user.getNickname(), user.getRole());
     }
 
     // 이메일 인증코드 전송
@@ -154,7 +154,7 @@ public LoginResponse kakaoLogin(String code) {
         // 5. 토큰 발급
         tokenService.issueTokens(user);
 
-        return new LoginResponse(user.getId(), user.getNickname());
+        return new LoginResponse(user.getId(), user.getNickname(), user.getRole());
     }
 
     private User registerKakaoUser(KakaoUserInfo info) {
@@ -195,7 +195,7 @@ public LoginResponse googleLogin(String code) {
         // 5. 토큰 발급
         tokenService.issueTokens(user);
 
-        return new LoginResponse(user.getId(), user.getNickname());
+        return new LoginResponse(user.getId(), user.getNickname(), user.getRole());
     }
 
     private User registerGoogleUser(GoogleUserInfo info) {

src/main/java/com/back/web7_9_codecrete_be/domain/users/dto/response/UserResponse.java

@@ -1,5 +1,6 @@
 package com.back.web7_9_codecrete_be.domain.users.dto.response;
 
+import com.back.web7_9_codecrete_be.domain.users.entity.Role;
 import com.back.web7_9_codecrete_be.domain.users.entity.User;
 import lombok.Builder;
 import lombok.Getter;
@@ -15,6 +16,7 @@ public class UserResponse {
     private LocalDate birthdate;
     private String profileImageUrl;
     private String status;
+    private Role role;
 
     public static UserResponse from(User user) {
         return UserResponse.builder()
@@ -24,6 +26,7 @@ public static UserResponse from(User user) {
                 .birthdate(user.getBirth())
                 .profileImageUrl(user.getProfileImage())
                 .status(user.getStatus().name())
+                .role(user.getRole())
                 .build();
     }
 }