Added modifications droped by branch reset and fix for no session errors

- Included fix for no session errors in the backend
- Included fix for pathogen related errors #13526

Author: raulbob

sormas-backend/src/main/java/de/symeda/sormas/backend/user/CurrentUserService.java

@@ -8,7 +8,6 @@
 import javax.ejb.LocalBean;
 import javax.ejb.SessionContext;
 import javax.ejb.Stateless;
-import javax.enterprise.context.RequestScoped;
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
 import javax.persistence.TypedQuery;
@@ -23,16 +22,21 @@
 
 import org.hibernate.Hibernate;
 import org.hibernate.proxy.HibernateProxy;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import de.symeda.sormas.api.audit.AuditIgnore;
 import de.symeda.sormas.api.user.UserRight;
+import de.symeda.sormas.backend.location.Location;
 import de.symeda.sormas.backend.util.ModelConstants;
 
 @Stateless
 @LocalBean
 @AuditIgnore
 public class CurrentUserService {
 
+	private final Logger logger = LoggerFactory.getLogger(getClass());
+
 	@Resource
 	private SessionContext context;
 
@@ -50,7 +54,8 @@ public CurrentUserService() {
 	 *
 	 * @TransactionScoped would be better for performance, but is not supported by the CDI based testing framework
 	 */
-	@RequestScoped
+	//@RequestScoped
+	@Transactional(Transactional.TxType.REQUIRED)
 	public User getCurrentUser() {
 		final String currentUsername = context.getCallerPrincipal().getName();
 
@@ -60,6 +65,8 @@ public User getCurrentUser() {
 
 		User cachedUser = userCache.get(currentUsername);
 		if (cachedUser != null) {
+			unProxyUserAddress(cachedUser);
+
 			return cachedUser;
 		}
 
@@ -73,6 +80,7 @@ public User getCurrentUser() {
 		if (currentUser == null) {
 			return null;
 		} else {
+
 			userCache.put(currentUsername, currentUser);
 			return currentUser;
 		}
@@ -134,11 +142,28 @@ User fetchUser(String userName) {
 			unproxy(currentUser.getPointOfEntry());
 			unproxy(currentUser.getLaboratory());
 			unproxy(currentUser.getAssociatedOfficer());
+
+			unProxyUserAddress(currentUser);
+
 		}
 
 		return currentUser;
 	}
 
+	private void unProxyUserAddress(User currentUser) {
+		if (currentUser.getAddress() != null) {
+			Location deProxiedAddress = unproxy(currentUser.getAddress());
+			deProxiedAddress.setContinent(unproxy(deProxiedAddress.getContinent()));
+			deProxiedAddress.setSubcontinent(unproxy(deProxiedAddress.getSubcontinent()));
+			deProxiedAddress.setCountry(unproxy(deProxiedAddress.getCountry()));
+			deProxiedAddress.setRegion(unproxy(deProxiedAddress.getRegion()));
+			deProxiedAddress.setDistrict(unproxy(deProxiedAddress.getDistrict()));
+			deProxiedAddress.setCommunity(unproxy(deProxiedAddress.getCommunity()));
+			deProxiedAddress.setFacility(unproxy(deProxiedAddress.getFacility()));
+			currentUser.setAddress(deProxiedAddress);
+		}
+	}
+
 	public static <T> T unproxy(T proxied) {
 		if (proxied instanceof HibernateProxy) {
 			Hibernate.initialize(proxied);

sormas-ui/src/main/java/de/symeda/sormas/ui/samples/PathogenTestController.java

@@ -29,6 +29,7 @@
 import java.util.stream.Collectors;
 
 import de.symeda.sormas.api.DiseaseHelper;
+import de.symeda.sormas.api.event.EventReferenceDto;
 import de.symeda.sormas.api.sample.PathogenTestType;
 import org.apache.commons.collections4.CollectionUtils;
 
@@ -119,10 +120,25 @@ public CommitDiscardWrapperComponent<PathogenTestForm> getPathogenTestCreateComp
 		int caseSampleCount,
 		Consumer<PathogenTestDto> onSavedPathogenTest,
 		boolean suppressNavigateToCase) {
-        CaseDataDto caseDataDto = FacadeProvider.getCaseFacade().getByUuid(sampleDto.getAssociatedCase().getUuid());
-		PathogenTestForm createForm = new PathogenTestForm(sampleDto, true, caseSampleCount, false, true, caseDataDto.getDisease()); // Valid because jurisdiction doesn't matter for entities that are about to be created
+		// Pathogen tests can be created for a sample that is associated with a case, event participant or contact.
+		Disease associatedEventOrCaseOrContactDisease = null;
+		if (sampleDto.getAssociatedCase() != null) {
+			CaseDataDto caseDataDto = FacadeProvider.getCaseFacade().getByUuid(sampleDto.getAssociatedCase().getUuid());
+			associatedEventOrCaseOrContactDisease = caseDataDto.getDisease();
+		}
+		if (associatedEventOrCaseOrContactDisease == null && sampleDto.getAssociatedEventParticipant() != null) {
+			EventParticipantDto eventParticipant = FacadeProvider.getEventParticipantFacade().getEventParticipantByUuid(sampleDto.getAssociatedEventParticipant().getUuid());
+			EventReferenceDto eventDto = eventParticipant.getEvent();
+			EventDto participantEvent = FacadeProvider.getEventFacade().getEventByUuid(eventDto.getUuid(), false);
+			associatedEventOrCaseOrContactDisease = participantEvent.getDisease();
+		}
+		if (associatedEventOrCaseOrContactDisease == null && sampleDto.getAssociatedContact() != null) {
+			ContactDto contact = FacadeProvider.getContactFacade().getByUuid(sampleDto.getAssociatedContact().getUuid());
+			associatedEventOrCaseOrContactDisease = contact.getDisease();
+		}
+		PathogenTestForm createForm = new PathogenTestForm(sampleDto, true, caseSampleCount, false, true, associatedEventOrCaseOrContactDisease); // Valid because jurisdiction doesn't matter for entities that are about to be created
 		// Defaulting the case disease as tested disease
-		pathogenTest.setTestedDisease(caseDataDto.getDisease());
+		pathogenTest.setTestedDisease(associatedEventOrCaseOrContactDisease);
 		createForm.setValue(pathogenTest);
 		final CommitDiscardWrapperComponent<PathogenTestForm> editView =
 			new CommitDiscardWrapperComponent<>(createForm, UiUtil.permitted(UserRight.PATHOGEN_TEST_CREATE), createForm.getFieldGroup());