Merge pull request SORMAS-Foundation#3284 from hzi-braunschweig/#3212Non-active-user-accounts-should-not-get-notifications

MateStrysewske · web-flow · commit 94e437b7d1c8 · 2020-10-27T10:14:14.000+01:00
SORMAS-Foundation#3212 block messages to be sent to inactive users
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
@@ -88,7 +88,7 @@ public void sendMessage(User recipient, MessageSubject subject, String messageCo
 		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;
 		}
 		// Don't send notifications if the feature is disabled for the current MessageSubject

Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ public void sendMessage(User recipient, MessageSubject subject, String messageCo`
`88`	`88`	`throws NotificationDeliveryFailedException {`
`89`	`89`
`90`	`90`	`// Don't send notifications to users that initiated an action`
`91`		`- if (recipient.equals(userService.getCurrentUser())) {`
	`91`	`+ if (recipient.equals(userService.getCurrentUser()) \|\| !recipient.isActive()) {`
`92`	`92`	`return;`
`93`	`93`	`}`
`94`	`94`	`// Don't send notifications if the feature is disabled for the current MessageSubject`