Skip to content

Commit 3e96a16

Browse files
committed
Feat: 사용자 상태 기능 추가
1 parent 2640dd7 commit 3e96a16

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/main/java/cmf/commitField/domain/user/entity/User.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,12 @@ public enum Role {
4949
@OneToMany(mappedBy = "user", fetch = FetchType.LAZY, cascade = CascadeType.PERSIST)
5050
private List<Pet> pets = new ArrayList<>();
5151

52-
public User(String username, String email, String nickname, String avatarUrl, List<ChatRoom> cr, List<UserChatRoom> ucr, List<ChatMsg> cmsg){
52+
public User(String username, String email, String nickname, String avatarUrl, Boolean status, List<ChatRoom> cr, List<UserChatRoom> ucr, List<ChatMsg> cmsg){
5353
this.username=username;
5454
this.email=email;
5555
this.nickname=nickname;
5656
this.avatarUrl=avatarUrl;
57+
this.status= status;
5758
this.role = Role.USER;
5859
this.chatRooms = cr;
5960
this.userChatRooms = ucr;

src/main/java/cmf/commitField/domain/user/service/CustomOAuth2UserService.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,8 @@
2323
public class CustomOAuth2UserService extends DefaultOAuth2UserService {
2424
private final UserRepository userRepository;
2525
private final PetRepository petRepository;
26-
private final HttpServletRequest request; // HttpServletRequest를 주입받습니다.
26+
private final HttpServletRequest request; // HttpServletRequest를 주입 받음.
2727
private final CommitCacheService commitCacheService;
28-
private final HttpServletRequest request; // HttpServletRequest를 주입받습니다.
2928

3029
@Override
3130
public OAuth2User loadUser(OAuth2UserRequest userRequest) {
@@ -56,7 +55,7 @@ public OAuth2User loadUser(OAuth2UserRequest userRequest) {
5655
} else {
5756
//유저 정보가 db에 존재하지 않을 경우 회원가입 시킨다.
5857
//유저 생성 및 펫 생성
59-
user = new User(username, email, name, avatarUrl, new ArrayList<>(), new ArrayList<>(), new ArrayList<>());
58+
user = new User(username, email, name, avatarUrl,true, new ArrayList<>(), new ArrayList<>(), new ArrayList<>());
6059
userRepository.save(user);
6160

6261
pet = new Pet("알알", user); // 변경 필요

0 commit comments

Comments
 (0)