Skip to content

[Feat/#108] 습관 등록 알림 문구 수정 및 부모->자녀 알림 신규 추가 #109

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

Merged
yunmi-dev merged 2 commits into from
Apr 7, 2026
Merged

[Feat/#108] 습관 등록 알림 문구 수정 및 부모->자녀 알림 신규 추가 #109

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
11d6581
[Feat/#108] 습관 등록 알림 문구 수정 및 부모->자녀 알림 신규 추가
yunmi-dev Apr 6, 2026
5c033b6
[Feat/#108] 닉네임 null 방어 처리 추가
yunmi-dev Apr 6, 2026
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
28 changes: 27 additions & 1 deletion src/main/java/com/swyp/server/domain/habit/service/HabitService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,12 +65,38 @@ public Habit createHabit(Long userId, HabitCreateRequest request) {
.map(User::getId)
.toList();
if (!parentIds.isEmpty()) {
String childNickname = user.getNickname() != null ? user.getNickname() : "자녀";
TransactionSynchronizationManager.registerSynchronization(
new TransactionSynchronization() {
@Override
public void afterCommit() {
notificationService.sendToUsers(
parentIds, "해봄", "새로운 보상이 추가됐어요! 지금 바로 수락해 볼까요?", Map.of());
parentIds,
"해봄",
childNickname + "(이)가 새 습관을 추가했어요. 보상을 확인해 볼까요?",
Map.of());
}
});
}
}

if (user.getUserType() == UserType.PARENT) {
List<Long> childIds =
familyRelationService.getConnectedMembers(userId).stream()
.filter(m -> m.getUserType() == UserType.CHILD)
.map(User::getId)
.toList();
if (!childIds.isEmpty()) {
String parentNickname = user.getNickname() != null ? user.getNickname() : "부모";
TransactionSynchronizationManager.registerSynchronization(
new TransactionSynchronization() {
@Override
public void afterCommit() {
notificationService.sendToUsers(
childIds,
"해봄",
parentNickname + "님이 새 습관을 추가했어요. 함께 힘내볼까요?",
Map.of());
}
});
}
Expand Down