Merge pull request #150 from CLAT-Project/feat-social_join

feat : 소셜 가입 로직 수정
CLAT-Project · Jan 25, 2025 · c584b3c · c584b3c
2 parents 43b07ea + bf2ef99
commit c584b3c
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 8 deletions.
diff --git 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
@@ -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
@@ -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가 존재합니다.");
         }