Merge pull request #13768 from SORMAS-Foundation/bugfix-aggregate_report_no_session

raulbob · web-flow · commit 470016660f3e · 2025-12-09T16:12:14.000+01:00
Fixed issue with transactions leading to no session error in aggregate report
diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/user/UserService.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/user/UserService.java
@@ -40,6 +40,7 @@
 import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Root;
 import javax.persistence.criteria.Subquery;
+import javax.transaction.Transactional;
 
 import org.apache.commons.collections4.CollectionUtils;
 
@@ -922,6 +923,7 @@ public void syncUserAsync(User user) {
 		}
 	}
 
+	@Transactional(Transactional.TxType.REQUIRED)
 	public boolean isPortHealthUser() {
 		User user = getCurrentUser();
 		Set<UserRoleDto> userRoleDtos = user.getUserRoles().stream().map(UserRoleFacadeEjb::toDto).collect(Collectors.toSet());

Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,7 @@`
`40`	`40`	`import javax.persistence.criteria.Predicate;`
`41`	`41`	`import javax.persistence.criteria.Root;`
`42`	`42`	`import javax.persistence.criteria.Subquery;`
	`43`	`+import javax.transaction.Transactional;`
`43`	`44`
`44`	`45`	`import org.apache.commons.collections4.CollectionUtils;`
`45`	`46`
`@@ -922,6 +923,7 @@ public void syncUserAsync(User user) {`
`922`	`923`	`}`
`923`	`924`	`}`
`924`	`925`
	`926`	`+ @Transactional(Transactional.TxType.REQUIRED)`
`925`	`927`	`public boolean isPortHealthUser() {`
`926`	`928`	`User user = getCurrentUser();`
`927`	`929`	`Set<UserRoleDto> userRoleDtos = user.getUserRoles().stream().map(UserRoleFacadeEjb::toDto).collect(Collectors.toSet());`