diff --git a/src/main/java/team_project/clat/dto/request/SocialJoinReqDTO.java b/src/main/java/team_project/clat/dto/request/SocialJoinReqDTO.java index 57e5b8cb..5ba2f145 100644 --- a/src/main/java/team_project/clat/dto/request/SocialJoinReqDTO.java +++ b/src/main/java/team_project/clat/dto/request/SocialJoinReqDTO.java @@ -9,8 +9,12 @@ @Setter public class SocialJoinReqDTO { + private String name; + private String username; + private String email; + @NotBlank(message = "학교/기관은 필수 입력값입니다.") private String schoolName; diff --git a/src/main/java/team_project/clat/service/CustomOAuth2UserService.java b/src/main/java/team_project/clat/service/CustomOAuth2UserService.java index a4e8026f..a5910654 100644 --- a/src/main/java/team_project/clat/service/CustomOAuth2UserService.java +++ b/src/main/java/team_project/clat/service/CustomOAuth2UserService.java @@ -45,11 +45,11 @@ else if (registrationId.equals("google")) { Member existMember = memberRepository.findByUsername(username); if(existMember == null){ - Member member = Member.builder() + /*Member member = Member.builder() .username(username) .email(oAuth2Response.getEmail()) .name(oAuth2Response.getName()).build(); - memberRepository.save(member); + memberRepository.save(member);*/ OAuthMemberReqDTO authMemberReqDTO = new OAuthMemberReqDTO(); authMemberReqDTO.setUsername(username); diff --git a/src/main/java/team_project/clat/service/JoinService.java b/src/main/java/team_project/clat/service/JoinService.java index d22ade9c..9f5e7394 100644 --- a/src/main/java/team_project/clat/service/JoinService.java +++ b/src/main/java/team_project/clat/service/JoinService.java @@ -96,6 +96,8 @@ public JoinResDTO SocialJoinProcess(SocialJoinReqDTO socialJoinReqDTO, Multipart String username = socialJoinReqDTO.getUsername(); String schoolName = socialJoinReqDTO.getSchoolName(); UserType userType = socialJoinReqDTO.getUserType(); + String email = socialJoinReqDTO.getEmail(); + String name = socialJoinReqDTO.getName(); Boolean isExist = memberRepository.existsByUsername(username); @@ -110,14 +112,18 @@ public JoinResDTO SocialJoinProcess(SocialJoinReqDTO socialJoinReqDTO, Multipart file.transferTo(new File(fullPath)); } - Member existMember = memberRepository.findByUsername(username); - existMember.memberSchoolNameSet(schoolName); - existMember.memberFilePathSet(fullPath); - existMember.memberUserTypeSet(userType); - existMember.memberUserStatusSet(UserStatus.ACTIVE); + Member member = Member.builder() + .email(email) + .name(name) + .username(username) + .filePath(fullPath) + .schoolName(schoolName) + .userType(userType) + .userStatus(UserStatus.ACTIVE) + .build(); try { - memberRepository.save(existMember); + memberRepository.save(member); }catch (DataIntegrityViolationException e){ throw new UsernameDataIntegrityViolationException("중복된 ID가 존재합니다."); }