Merge pull request #323 from Team-Smeme/fix/#322-fcm-token-update

fix: 푸시알림 부재 이슈 대응
Team-Smeme · Jul 16, 2024 · eea5818 · eea5818
2 parents d91e2ce + a3d5545
commit eea5818
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 7 deletions.
diff --git a/smeem-application/src/main/java/com/smeem/application/domain/auth/AuthService.java b/smeem-application/src/main/java/com/smeem/application/domain/auth/AuthService.java
@@ -28,7 +28,10 @@ public class AuthService implements AuthUseCase {
     public SignInResponse signIn(String socialAccessToken, SignInRequest request) {
         val social = oauthPort.login(request.socialType(), socialAccessToken);
         val signedMember = signIn(social, request);
-        memberPort.update(signedMember.updateSmeemToken(tokenGenerator.generateRefreshToken(signedMember.getId())));
+        signedMember.updateTokenInLogin(
+                tokenGenerator.generateRefreshToken(signedMember.getId()),
+                request.fcmToken());
+        memberPort.update(signedMember);
         return SignInResponse.of(tokenGenerator.generateAccessToken(signedMember.getId()), signedMember);
     }
 

diff --git a/smeem-application/src/main/java/com/smeem/application/domain/member/Member.java b/smeem-application/src/main/java/com/smeem/application/domain/member/Member.java
@@ -44,12 +44,16 @@ public void visit() {
         this.visitDays++;
     }
 
+    public boolean signUp() {
+        return this.username == null;
+    }
+
     /**
      * update
      */
-    public Member updateSmeemToken(String refreshToken) {
+    public void updateTokenInLogin(String refreshToken, String fcmToken) {
         this.refreshToken = refreshToken;
-        return this;
+        this.fcmToken = fcmToken;
     }
 
     public Member updateDiaryComboCount(boolean diaryWrittenYesterday) {

diff --git a/smeem-application/src/main/java/com/smeem/application/domain/member/MemberService.java b/smeem-application/src/main/java/com/smeem/application/domain/member/MemberService.java
@@ -39,7 +39,6 @@ public class MemberService implements MemberUseCase {
     @Transactional
     public UpdateMemberResponse updateMember(long memberId, UpdateMemberRequest request) {
         val foundMember = memberPort.findById(memberId);
-        val isSignIn = foundMember.getUsername() == null;
         val acquiredBadges = new ArrayList<Badge>();
 
         if (request.username() != null) {
@@ -50,7 +49,8 @@ public UpdateMemberResponse updateMember(long memberId, UpdateMemberRequest requ
         }
         memberPort.update(foundMember);
 
-        if (isSignIn) {
+        if (foundMember.signUp()) {
+            acquiredBadges.add(badgePort.saveWelcomeBadgeToMember(foundMember.getId()));
             hookLogger.send(LoggingMessage.signIn(request.username(), memberPort.countAll()));
         }
 

diff --git a/smeem-input-http/src/main/java/com/smeem/http/controller/AuthApi.java b/smeem-input-http/src/main/java/com/smeem/http/controller/AuthApi.java
@@ -39,15 +39,15 @@ public SmeemResponse<GenerateTokenResponse> generateToken(Principal principal) {
         return SmeemResponse.of(authUseCase.generateToken(memberId), SmeemMessage.GENERATE_TOKEN);
     }
 
-    @ResponseStatus(HttpStatus.NO_CONTENT)
+    @ResponseStatus(HttpStatus.OK)
     @PostMapping("/sign-out")
     public SmeemResponse<?> signOut(Principal principal) {
         val memberId = smeemConverter.toMemberId(principal);
         authUseCase.signOut(memberId);
         return SmeemResponse.of(SmeemMessage.SIGNED_OUT);
     }
 
-    @ResponseStatus(HttpStatus.NO_CONTENT)
+    @ResponseStatus(HttpStatus.OK)
     @DeleteMapping
     public SmeemResponse<?> withdraw(Principal principal, @RequestBody(required = false) WithdrawRequest request) {
         val memberId = smeemConverter.toMemberId(principal);