Revision 60602
Added by Konstantinos Triantafyllou about 3 years ago
NotificationService.java | ||
---|---|---|
29 | 29 |
return notificationDAO.findByOrderByDateDesc(); |
30 | 30 |
} |
31 | 31 |
|
32 |
public List<Notification> getMyNotifications(String userId, String service, List<String> roles) { |
|
33 |
logger.info("Getting notifications of user " + userId); |
|
32 |
public List<Notification> getMyNotifications(String userId, String email, String service, List<String> roles) {
|
|
33 |
logger.info("Getting notifications of user " + userId + ", " + email);
|
|
34 | 34 |
Set<String> services = new HashSet<>(); |
35 | 35 |
services.add(service); |
36 | 36 |
services.add("all"); |
37 | 37 |
Set<String> groups = new HashSet<>(roles); |
38 |
groups.add(userId);
|
|
38 |
groups.add(email.toLowerCase());
|
|
39 | 39 |
groups.add("all"); |
40 | 40 |
List<Notification> notifications = notificationDAO.findByUserNotAndServicesInAndGroupsInOrderByDateDesc(userId, services, groups); |
41 | 41 |
User user = userDAO.findById(userId); |
Also available in: Unified diff
[Notificaton Service | Trunk]: Fix a bug user email on groups