SORMAS-Foundation#3212 block messages to be sent to inactive users

danRosca · danRosca · commit d7ec6cb977ae · 2020-10-26T15:02:46.000+02:00
diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/common/MessagingService.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/common/MessagingService.java
@@ -95,7 +95,7 @@ public void sendMessage(User recipient, String subject, String messageContent, M
 		throws NotificationDeliveryFailedException {
 
 		// Don't send notifications to users that initiated an action
-		if (recipient.equals(userService.getCurrentUser())) {
+		if (recipient.equals(userService.getCurrentUser()) || !recipient.isActive()) {
 			return;
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ public void sendMessage(User recipient, String subject, String messageContent, M`
`95`	`95`	`throws NotificationDeliveryFailedException {`
`96`	`96`
`97`	`97`	`// Don't send notifications to users that initiated an action`
`98`		`- if (recipient.equals(userService.getCurrentUser())) {`
	`98`	`+ if (recipient.equals(userService.getCurrentUser()) \|\| !recipient.isActive()) {`
`99`	`99`	`return;`
`100`	`100`	`}`
`101`	`101`