Merge pull request #44 from StudyFlexUMC5th/yeeun2

Yeeun2
StudyFlexUMC5th · Jan 13, 2024 · 7a013bc · 7a013bc
2 parents 2cb1984 + 6619ff2
commit 7a013bc
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/src/main/java/com/umc/StudyFlexBE/service/MemberService.java b/src/main/java/com/umc/StudyFlexBE/service/MemberService.java
@@ -15,10 +15,7 @@
 import com.umc.StudyFlexBE.dto.response.BaseResponseStatus;
 import com.umc.StudyFlexBE.dto.response.LoginRes;
 import com.umc.StudyFlexBE.dto.response.GetParticipationStudyRes;
-import com.umc.StudyFlexBE.entity.KaKaoOAuthToken;
-import com.umc.StudyFlexBE.entity.Member;
-import com.umc.StudyFlexBE.entity.OAuthProfile;
-import com.umc.StudyFlexBE.entity.StudyParticipation;
+import com.umc.StudyFlexBE.entity.*;
 import com.umc.StudyFlexBE.repository.MemberRepository;
 import com.umc.StudyFlexBE.repository.StudyParticipationRepository;
 import jakarta.mail.internet.MimeMessage;
@@ -87,6 +84,7 @@ public void signUpOAUth(SignUpOAuthDto signUpOAuthDto) {
             member.setEmail(signUpOAuthDto.getEmail());
             member.setName(signUpOAuthDto.getName());
             member.setPassword(passwordEncoder.encode("12345"));
+            member.setMember_type(MemberType.kakao);
             member.setSchool(signUpOAuthDto.getSchool());
             memberRepository.save(member);
         } else{

diff --git a/src/main/java/com/umc/StudyFlexBE/service/NaverService.java b/src/main/java/com/umc/StudyFlexBE/service/NaverService.java
@@ -4,6 +4,7 @@
 import com.umc.StudyFlexBE.dto.response.APICallException;
 import com.umc.StudyFlexBE.dto.response.InvalidAuthorizationCodeException;
 import com.umc.StudyFlexBE.entity.Member;
+import com.umc.StudyFlexBE.entity.MemberType;
 import com.umc.StudyFlexBE.entity.Role;
 import com.umc.StudyFlexBE.repository.MemberRepository;
 import lombok.RequiredArgsConstructor;
@@ -137,6 +138,7 @@ public Member registerOrAuthenticate(NaverDto naverUser) {
         newMember.setName(naverUser.getName());
         newMember.setPassword(passwordEncoder.encode("defaultPassword"));
         newMember.setRole(Role.ROLE_USER);
+        newMember.setMember_type(MemberType.naver);
         newMember.setNewUser(true); // 새로운 사용자 표시하기
 
         memberRepository.save(newMember);

diff --git a/src/main/java/com/umc/StudyFlexBE/service/StudyService.java b/src/main/java/com/umc/StudyFlexBE/service/StudyService.java
@@ -67,7 +67,7 @@ public List<StudyMainPageResponseDto> getLatestStudies() {
     }
 
     public List<StudyMainPageResponseDto> getOpenStudies() {
-        List<Study> openedStudies = studyRepository.findByStatus(StudyStatus.valueOf("RECRUITING"));
+        List<Study> openedStudies = studyRepository.findByStatus(StudyStatus.RECRUITING);
 
         return openedStudies.stream()
                 .map(study -> StudyMainPageResponseDto.builder()