Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Hotfix : FCM 발송 제한으로 500명씩 나눠서 보내기 #294

Merged
merged 2 commits into from
Jun 5, 2024
Merged

Hotfix : FCM 발송 제한으로 500명씩 나눠서 보내기 #294

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7805b8d
hotfix : FCM 발송 제한으로 500명씩 나눠서 보내기
seungueonn Jun 5, 2024
a63c1c3
Merge branch 'hotfix' of https://github.com/Modagbul/MOING_server_rel…
seungueonn Jun 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 20 additions & 3 deletions ...in/java/com/moing/backend/domain/member/application/service/UpdateRemindAlarmUseCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,17 +45,34 @@ public Boolean sendUpdateAppPushAlarm() {

List<Member> allMemberOfPushAlarm = memberGetService.getAllMemberOfPushAlarm();

Optional<List<MemberIdAndToken>> memberIdAndTokens = mapToMemberAndToken(allMemberOfPushAlarm);
Optional<List<MemberIdAndToken>> pushMemberIdAndToken = isPushMemberIdAndToken(allMemberOfPushAlarm);
// TODO : 500명 단위 배치처리

// FCM 제한으로 500명씩 나눠서 보내기 (0~498)
List<Member> firstMembers = allMemberOfPushAlarm.subList(0, 498);

Optional<List<MemberIdAndToken>> memberIdAndTokens = mapToMemberAndToken(firstMembers);
Optional<List<MemberIdAndToken>> pushMemberIdAndToken = isPushMemberIdAndToken(firstMembers);

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;

// FCM 제한으로 500명씩 나눠서 보내기 (498~)
List<Member> remainMembers = allMemberOfPushAlarm.subList(499, allMemberOfPushAlarm.size());

Optional<List<MemberIdAndToken>> memberIdAndTokens2 = mapToMemberAndToken(remainMembers);
Optional<List<MemberIdAndToken>> pushMemberIdAndToken2 = isPushMemberIdAndToken(remainMembers);

if (pushMemberIdAndToken2.isPresent() && !pushMemberIdAndToken2.get().isEmpty()) {
multiMessageSender.send(new MultiRequest(pushMemberIdAndToken2.get(), title, message, "", REMIND_NAME, AlarmType.REMIND, PagePath.MISSION_ALL_PTAH.getValue()));
}
if (memberIdAndTokens2.isPresent() && !memberIdAndTokens2.get().isEmpty()) {
saveMultiAlarmHistoryUseCase.saveAlarmHistories(AlarmHistoryMapper.getMemberIds(memberIdAndTokens2.get()), "", title, message, REMIND_NAME, AlarmType.REMIND, PagePath.MISSION_ALL_PTAH.getValue());
}
return true;

}

Expand Down
4 changes: 2 additions & 2 deletions ...ain/java/com/moing/backend/domain/mission/application/service/MissionScheduleUseCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ public void MissionRemindAlarm() {
missionRemindAlarmUseCase.sendRemindMissionAlarm();
}

@Scheduled(cron = "0 0 11 * * *")
@Scheduled(cron = "0 0 14 * * *")
public void UpdateRemindAlarm() {
updateRemindAlarmUseCase.sendUpdateAppPushAlarm();
}
}
}
Loading