jiazhizhong/OpenIsle
1
0
Fork 0
mirror of https://github.com/nagisa77/OpenIsle.git synced 2026-02-24 07:00:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update milk tea redeem dialog and notifications

Browse Source
This commit is contained in:
Tim
2025-07-28 15:59:09 +08:00
parent 54bf778977
commit de7a2c5b80
4 changed files with 63 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/openisle/service/ActivityService.java
View File

@@ -39,10 +39,7 @@ public class ActivityService {
public void redeem(Activity activity, User user, String contact) {
String content = user.getUsername() + " contact: " + contact;
for (User admin : userRepository.findByRole(Role.ADMIN)) {
notificationService.createNotification(admin, NotificationType.ACTIVITY_REDEEM,
null, null, null, user, null, content);
}
notificationService.createActivityRedeemNotifications(user, content);
activity.getParticipants().add(user);
activityRepository.save(activity);
}

13
src/main/java/com/openisle/service/NotificationService.java
View File

@@ -46,6 +46,19 @@ public class NotificationService {
}
}
/**
* Create notifications for all admins when a user redeems an activity.
* Old redeem notifications from the same user are removed first.
*/
@org.springframework.transaction.annotation.Transactional
public void createActivityRedeemNotifications(User user, String content) {
notificationRepository.deleteByTypeAndFromUser(NotificationType.ACTIVITY_REDEEM, user);
for (User admin : userRepository.findByRole(Role.ADMIN)) {
createNotification(admin, NotificationType.ACTIVITY_REDEEM, null, null,
null, user, null, content);
}
}
public List<Notification> listNotifications(String username, Boolean read) {
User user = userRepository.findByUsername(username)
.orElseThrow(() -> new com.openisle.exception.NotFoundException("User not found"));