Merge pull request #135 from Hanaro-trip-together-bank/feature/dues_paid

feat: member login fcmToken추가
Hanaro-trip-together-bank · Jun 5, 2024 · 6bb506d · 6bb506d
2 parents 26ce878 + 0dba8b2
commit 6bb506d
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 6 deletions.
diff --git a/src/main/java/com/hanaro/triptogether/member/controller/MemberController.java b/src/main/java/com/hanaro/triptogether/member/controller/MemberController.java
@@ -27,7 +27,7 @@ public LoginResDto login(@RequestBody LoginReqDto loginReqDto, HttpServletReques
         HttpSession session = request.getSession();
         session.setAttribute("loginUserIdx",loginReqDto.getMemberIdx());
 
-        return memberService.login(memberIdx, memberLoginPw);
+        return memberService.login(memberIdx, memberLoginPw, loginReqDto.getFcmToken());
     }
 
     // 알림설정 (on/off)

diff --git a/src/main/java/com/hanaro/triptogether/member/domain/Member.java b/src/main/java/com/hanaro/triptogether/member/domain/Member.java
@@ -43,4 +43,8 @@ public class Member {
     public void updateAlarm(Boolean alarmStatus) {
         this.alarmStatus = alarmStatus;
     }
+
+    public void setFcmToken(String fcmToken) {
+        this.fcmToken = fcmToken;
+    }
 }
diff --git a/src/main/java/com/hanaro/triptogether/member/dto/request/LoginReqDto.java b/src/main/java/com/hanaro/triptogether/member/dto/request/LoginReqDto.java
@@ -6,4 +6,5 @@
 public class LoginReqDto {
     private Long memberIdx;
     private String memberLoginPw;
+    private String fcmToken;
 }
diff --git a/src/main/java/com/hanaro/triptogether/member/service/MemberService.java b/src/main/java/com/hanaro/triptogether/member/service/MemberService.java
@@ -5,7 +5,7 @@
 
 public interface MemberService {
     // 간편 로그인
-    LoginResDto login(Long memberIdx, String memberLoginPw);
+    LoginResDto login(Long memberIdx, String memberLoginPw,String fcmToken);
     //멤머 아이디로 멤버 검색
     Member findByMemberIdx(Long memberIdx);
     // 알림설정 (on/off)

diff --git a/src/main/java/com/hanaro/triptogether/member/service/impl/MemberServiceImpl.java b/src/main/java/com/hanaro/triptogether/member/service/impl/MemberServiceImpl.java
@@ -18,9 +18,9 @@ public class MemberServiceImpl implements MemberService {
     // 간편 로그인
     @Transactional
     @Override
-    public LoginResDto login(Long memberIdx, String memberLoginPw) {
+    public LoginResDto login(Long memberIdx, String memberLoginPw,String fcmToken) {
         Member member = memberRepository.findMemberByMemberIdxAndMemberLoginPw(memberIdx, memberLoginPw);
-
+        member.setFcmToken(fcmToken);
         if(member == null) {
             return LoginResDto.builder()
                     .message("비밀번호가 맞지 않습니다.")

diff --git a/src/test/java/com/hanaro/triptogether/MemberServiceTests.java b/src/test/java/com/hanaro/triptogether/MemberServiceTests.java
@@ -46,7 +46,7 @@ void testLoginSuccess() {
         when(memberRepository.findMemberByMemberIdxAndMemberLoginPw(1L, "123456")).thenReturn(member);
 
         // When
-        LoginResDto result = memberService.login(1L, "123456");
+        LoginResDto result = memberService.login(1L, "123456","");
 
         // Then
         assertEquals("로그인이 완료되었습니다!", result.getMessage());
@@ -60,7 +60,7 @@ void testLoginIncorrectPw() {
         when(memberRepository.findMemberByMemberIdxAndMemberLoginPw(1L, "123456")).thenReturn(member);
 
         // When
-        LoginResDto result = memberService.login(1L, "456789");
+        LoginResDto result = memberService.login(1L, "456789","");
 
         // Then
         assertEquals("비밀번호가 맞지 않습니다.", result.getMessage());