Merge pull request #310 from Modagbul/hotfix

hotfix: 업데이트 푸시알림 + FCM SDK 업데이트
Modagbul · Sep 10, 2024 · e130587 · e130587
2 parents 88ccc3b + 46943aa
commit e130587
Show file tree

Hide file tree

Showing 13 changed files with 93 additions and 35 deletions.
diff --git a/.github/workflows/CD-prod.yml b/.github/workflows/CD-prod.yml
@@ -18,7 +18,7 @@ jobs:
 
     steps:
       # 소스 코드 체크아웃
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       # JDK 11 설정
       - name: Set up JDK 11
@@ -29,7 +29,7 @@ jobs:
 
       # Gradle 패키지 캐시
       - name: Cache Gradle packages
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: |
             ~/.gradle/caches
@@ -49,17 +49,17 @@ jobs:
           echo "${{env.APPLE_KEY}}" > ./apple-key.p8
 
       # 설정 파일을 작업공간에 저장
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         with:
           name: application.yml
           path: ./src/main/resources/application.yml
 
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         with:
           name: firebase-key.json
           path: ./src/main/resources/firebase-key.json
 
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         with:
           name: apple-key.p8
           path: ./src/main/resources/apple-key.p8

diff --git a/.github/workflows/CI-dev.yml b/.github/workflows/CI-dev.yml
@@ -19,18 +19,18 @@ jobs:
 
     steps:
       # 소스 코드 체크아웃
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       # JDK 11 설정
       - name: Set up JDK 11
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v4
         with:
           java-version: '11'
           distribution: 'adopt'
 
       # Gradle 패키지 캐시
       - name: Cache Gradle packages
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: |
             ~/.gradle/caches
@@ -50,17 +50,17 @@ jobs:
           echo "${{env.APPLE_KEY}}" > ./apple-key.p8
 
       # 설정 파일을 작업공간에 저장
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         with:
           name: application.yml
           path: ./src/main/resources/application.yml
 
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         with:
           name: firebase-key.json
           path: ./src/main/resources/firebase-key.json
 
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         with:
           name: apple-key.p8
           path: ./src/main/resources/apple-key.p8

diff --git a/.github/workflows/CI-prod.yml b/.github/workflows/CI-prod.yml
@@ -19,18 +19,18 @@ jobs:
 
     steps:
       # 소스 코드 체크아웃
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       # JDK 11 설정
       - name: Set up JDK 11
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v4
         with:
           java-version: '11'
           distribution: 'adopt'
 
       # Gradle 패키지 캐시
       - name: Cache Gradle packages
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: |
             ~/.gradle/caches
@@ -50,17 +50,17 @@ jobs:
           echo "${{env.APPLE_KEY}}" > ./apple-key.p8
 
       # 설정 파일을 작업공간에 저장
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         with:
           name: application.yml
           path: ./src/main/resources/application.yml
 
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         with:
           name: firebase-key.json
           path: ./src/main/resources/firebase-key.json
 
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         with:
           name: apple-key.p8
           path: ./src/main/resources/apple-key.p8

diff --git a/build.gradle b/build.gradle
@@ -54,7 +54,7 @@ dependencies {
 	implementation 'com.google.code.gson:gson:2.8.7'
 
 	// Push Alarm
-	implementation 'com.google.firebase:firebase-admin:8.2.0'
+	implementation 'com.google.firebase:firebase-admin:9.2.0'
 	implementation 'com.google.firebase:firebase-messaging:23.0.0'
 
 	// RestDocs

diff --git a/src/main/java/com/moing/backend/domain/history/presentation/AlarmHistoryController.java b/src/main/java/com/moing/backend/domain/history/presentation/AlarmHistoryController.java
@@ -23,6 +23,7 @@ public class AlarmHistoryController {
 
     private final GetAlarmHistoryUseCase getAlarmHistoryUseCase;
     private final ReadAlarmHistoryUseCase readAlarmHistoryUseCase;
+
     /**
      * 알림 전체 조회
      * [GET] api/history/alarm
@@ -52,4 +53,6 @@ public ResponseEntity<SuccessResponse> readAlarmHistory(@AuthenticationPrincipal
     public ResponseEntity<SuccessResponse<GetAlarmCountResponse>> getUnreadAlarmCount(@AuthenticationPrincipal User user) {
         return ResponseEntity.ok(SuccessResponse.create(GET_UNREAD_ALARM_HISTORY.getMessage(), getAlarmHistoryUseCase.getUnreadAlarmCount(user.getSocialId())));
     }
+
+
 }
diff --git a/...in/java/com/moing/backend/domain/member/application/service/UpdateRemindAlarmUseCase.java b/...in/java/com/moing/backend/domain/member/application/service/UpdateRemindAlarmUseCase.java
@@ -38,23 +38,29 @@ public class UpdateRemindAlarmUseCase {
     String REMIND_NAME = "미션 리마인드";
 
 
-    public Boolean sendUpdateAppPushAlarm() {
+    public void sendUpdateAppPushAlarm(String title, String message) {
 
-        String title = "MOING 업데이트 소식";
-        String message = "이제 누구나 미션을 만들 수 있어요. 지금 업데이트하고 다른 소식도 확인해보세요!";
+//        String title = "MOING 업데이트 소식";
+//        String message = "이제 누구나 미션을 만들 수 있어요. 지금 업데이트하고 다른 소식도 확인해보세요!";
 
-        List<Member> allMemberOfPushAlarm = memberGetService.getAllMemberOfPushAlarm();
+        long count = memberGetService.getAllMemberOfPushAlarm(0L, Long.MAX_VALUE).size();
 
-        Optional<List<MemberIdAndToken>> memberIdAndTokens = mapToMemberAndToken(allMemberOfPushAlarm);
-        Optional<List<MemberIdAndToken>> pushMemberIdAndToken = isPushMemberIdAndToken(allMemberOfPushAlarm);
+        for (Long offset = 0L; offset < count; offset += 499) {
 
-        if (pushMemberIdAndToken.isPresent() && !pushMemberIdAndToken.get().isEmpty()) {
-            multiMessageSender.send(new MultiRequest(pushMemberIdAndToken.get(), title, message, "", REMIND_NAME, AlarmType.REMIND, PagePath.MISSION_ALL_PTAH.getValue()));
-        }
-        if (memberIdAndTokens.isPresent() && !memberIdAndTokens.get().isEmpty()) {
-            saveMultiAlarmHistoryUseCase.saveAlarmHistories(AlarmHistoryMapper.getMemberIds(memberIdAndTokens.get()), "", title, message, REMIND_NAME, AlarmType.REMIND, PagePath.MISSION_ALL_PTAH.getValue());
+            Long limit = offset+499;
+
+            List<Member> allMemberOfPushAlarm = memberGetService.getAllMemberOfPushAlarm(offset, limit);
+
+            Optional<List<MemberIdAndToken>> memberIdAndTokens = mapToMemberAndToken(allMemberOfPushAlarm);
+            Optional<List<MemberIdAndToken>> pushMemberIdAndToken = isPushMemberIdAndToken(allMemberOfPushAlarm);
+
+            if (pushMemberIdAndToken.isPresent() && !pushMemberIdAndToken.get().isEmpty()) {
+                multiMessageSender.send(new MultiRequest(pushMemberIdAndToken.get(), title, message, "", REMIND_NAME, AlarmType.REMIND, PagePath.MISSION_ALL_PTAH.getValue()));
+            }
+            if (memberIdAndTokens.isPresent() && !memberIdAndTokens.get().isEmpty()) {
+                saveMultiAlarmHistoryUseCase.saveAlarmHistories(AlarmHistoryMapper.getMemberIds(memberIdAndTokens.get()), "", title, message, REMIND_NAME, AlarmType.REMIND, PagePath.MISSION_ALL_PTAH.getValue());
+            }
         }
-        return true;
 
 
     }

diff --git a/src/main/java/com/moing/backend/domain/member/domain/repository/MemberCustomRepository.java b/src/main/java/com/moing/backend/domain/member/domain/repository/MemberCustomRepository.java
@@ -13,5 +13,6 @@ public interface MemberCustomRepository {
     Optional<Member> findNotDeletedByMemberId(Long id);
     Long getTodayNewMembers();
     Long getYesterdayNewMembers();
-    Optional<List<Member>> findAllMemberOnPushAlarm();
+
+    Optional<List<Member>> findAllMemberOnPushAlarm(Long offset, Long limit);
 }
diff --git a/...in/java/com/moing/backend/domain/member/domain/repository/MemberCustomRepositoryImpl.java b/...in/java/com/moing/backend/domain/member/domain/repository/MemberCustomRepositoryImpl.java
@@ -88,14 +88,16 @@ public Long getYesterdayNewMembers() {
     }
 
     @Override
-    public Optional<List<Member>> findAllMemberOnPushAlarm() {
+    public Optional<List<Member>> findAllMemberOnPushAlarm(Long offset, Long limit) {
         return Optional.ofNullable(
                 queryFactory.selectFrom(member)
                         .where(
                                 member.isDeleted.eq(false),
                                 member.isRemindPush.eq(true),
                                 member.isSignOut.eq(false)
                                 )
+                        .offset(offset)
+                        .limit(limit)
                         .fetch()
         );
     }

diff --git a/src/main/java/com/moing/backend/domain/member/domain/repository/MemberRepository.java b/src/main/java/com/moing/backend/domain/member/domain/repository/MemberRepository.java
@@ -2,5 +2,7 @@
 
 import com.moing.backend.domain.member.domain.entity.Member;
 import org.springframework.data.jpa.repository.JpaRepository;
+
 public interface MemberRepository extends JpaRepository<Member, Long>, MemberCustomRepository {
+
 }
diff --git a/src/main/java/com/moing/backend/domain/member/domain/service/MemberGetService.java b/src/main/java/com/moing/backend/domain/member/domain/service/MemberGetService.java
@@ -33,7 +33,7 @@ public Long getYesterdayNewMembers(){
     }
 
 
-    public List<Member> getAllMemberOfPushAlarm() {
-        return memberRepository.findAllMemberOnPushAlarm().orElseThrow(NotFoundRemindAlarmException::new);
+    public List<Member> getAllMemberOfPushAlarm(Long offset, Long limit) {
+        return memberRepository.findAllMemberOnPushAlarm(offset,limit).orElseThrow(NotFoundRemindAlarmException::new);
     }
 }
diff --git a/src/main/java/com/moing/backend/domain/member/dto/request/PostUpdatePushAlarm.java b/src/main/java/com/moing/backend/domain/member/dto/request/PostUpdatePushAlarm.java
@@ -0,0 +1,14 @@
+package com.moing.backend.domain.member.dto.request;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Getter
+@AllArgsConstructor
+@NoArgsConstructor
+public class PostUpdatePushAlarm {
+
+    private String title;
+    private String message;
+}
diff --git a/src/main/java/com/moing/backend/domain/member/presentation/RemindAlarmController.java b/src/main/java/com/moing/backend/domain/member/presentation/RemindAlarmController.java
@@ -0,0 +1,29 @@
+package com.moing.backend.domain.member.presentation;
+
+import com.moing.backend.domain.member.application.service.UpdateRemindAlarmUseCase;
+import com.moing.backend.domain.member.dto.request.PostUpdatePushAlarm;
+import com.moing.backend.global.config.security.dto.User;
+import com.moing.backend.global.response.SuccessResponse;
+import lombok.AllArgsConstructor;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@AllArgsConstructor
+@RequestMapping("/api/remind/alarm")
+public class RemindAlarmController {
+
+    private final UpdateRemindAlarmUseCase updateRemindAlarmUseCase;
+
+
+    @PostMapping("/update")
+    public ResponseEntity<SuccessResponse<Void>> postUpdateRemindAlarm(@AuthenticationPrincipal User user , @RequestBody PostUpdatePushAlarm postUpdatePushAlarm) {
+        updateRemindAlarmUseCase.sendUpdateAppPushAlarm(postUpdatePushAlarm.getTitle(), postUpdatePushAlarm.getMessage());
+        return ResponseEntity.ok(SuccessResponse.create("remindAlarm Done"));
+    }
+
+}
diff --git a/src/main/java/com/moing/backend/global/config/fcm/service/MultiMessageSender.java b/src/main/java/com/moing/backend/global/config/fcm/service/MultiMessageSender.java
@@ -70,7 +70,8 @@ public void send(MultiRequest request) {
                 .build();
 
         try {
-            BatchResponse response = firebaseMessaging.sendMulticast(message);
+//            BatchResponse response = firebaseMessaging.sendMulticast(message);
+            BatchResponse response = firebaseMessaging.sendEachForMulticast(message);
 
 
             List<String> failedTokens = new ArrayList<>();