Bugfix:

Database Session management

1 files changed, 56 insertions, 14 deletions

diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/ConfigurationDBRead.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/ConfigurationDBRead.java
index 7a6efc5ac..80d95628e 100644
--- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/ConfigurationDBRead.java
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/ConfigurationDBRead.java
@@ -8,6 +8,7 @@ import javax.persistence.EntityManager;
 
 import at.gv.egovernment.moa.id.commons.db.dao.config.MOAIDConfiguration;
 import at.gv.egovernment.moa.id.commons.db.dao.config.OnlineApplication;
+import at.gv.egovernment.moa.id.commons.db.dao.config.UserDatabase;
 
 import at.gv.egovernment.moa.logging.Logger;
 import at.gv.egovernment.moa.util.MiscUtil;
@@ -16,8 +17,11 @@ public class ConfigurationDBRead {
 
       private static Map<String, String> QUERIES = new HashMap<String, String>();    	
       static {
-    	  QUERIES.put("getOnlineApplicationWithID", "select onlineapplication from OnlineApplication onlineapplication where onlineapplication.publicURLPrefix like SUBSTRING(:id, 1, LENGTH(onlineapplication.publicURLPrefix))");
+    	  QUERIES.put("getOnlineApplicationWithID", "select onlineapplication from OnlineApplication onlineapplication where onlineapplication.publicURLPrefix like SUBSTRING(:id, 1, LENGTH(onlineapplication.publicURLPrefix)) and  onlineapplication.isActive = '1'");
     	  QUERIES.put("getMOAIDConfiguration", "select moaidconfiguration from MOAIDConfiguration moaidconfiguration");
+    	  QUERIES.put("getAllOnlineApplications", "select onlineapplication from OnlineApplication onlineapplication");
+    	  QUERIES.put("getUserWithUserID", "select userdatabase from UserDatabase userdatabase where userdatabase.id = :id");
+    	  
       }
       
 	  @SuppressWarnings("rawtypes")
@@ -26,20 +30,21 @@ public class ConfigurationDBRead {
 		Logger.trace("Getting OnlineApplication with ID " + id + " from database.");
 		
 		List result;
-	  	EntityManager session = ConfigurationDBUtils.getCurrentSession();
-		  	
-	  	javax.persistence.Query query = session.createQuery(QUERIES.get("getOnlineApplicationWithID"));  	
-		//query.setParameter("id", id+"%");
-	  	query.setParameter("id", id);
-		result = query.getResultList();
+  		EntityManager session = ConfigurationDBUtils.getCurrentSession();
 	  	
-	    Logger.trace("Found entries: " + result.size());
-	    
-	    if (result.size() == 0) {
-	    	Logger.trace("No entries found.");
-	    	return null;
-	    }
-	    return (OnlineApplication) result.get(0);
+  		javax.persistence.Query query = session.createQuery(QUERIES.get("getOnlineApplicationWithID"));  	
+  		//query.setParameter("id", id+"%");
+  		query.setParameter("id", id);
+  		result = query.getResultList();
+  	
+  		Logger.trace("Found entries: " + result.size());
+    
+  		if (result.size() == 0) {
+  			Logger.trace("No entries found.");
+  			return null;
+  		}
+  		  		
+  		return (OnlineApplication) result.get(0);
 	  }
 	
 	  public static MOAIDConfiguration getMOAIDConfiguration() {
@@ -57,8 +62,45 @@ public class ConfigurationDBRead {
 		    	Logger.trace("No entries found.");
 		    	return null;
 		    }
+		    		    
 		    return (MOAIDConfiguration) result.get(0);
 	  }
 	  
+	  public static List<OnlineApplication> getAllOnlineApplications() {
+			Logger.trace("Get All OnlineApplications from database.");
+			
+			List<OnlineApplication> result;
+		  	EntityManager session = ConfigurationDBUtils.getCurrentSession();
+			  	
+		  	javax.persistence.Query query = session.createQuery(QUERIES.get("getAllOnlineApplications"));  	
+			result = query.getResultList();
+		  	
+		    Logger.trace("Found entries: " + result.size());
+		    
+		    if (result.size() == 0) {
+		    	Logger.trace("No entries found.");
+		    	return null;
+		    }
+		    return result;
+	  }
 	  
+	  public static UserDatabase getUserWithID(long id) {
+		  	MiscUtil.assertNotNull(id, "UserID");
+			Logger.trace("Getting Userinformation with ID " + id + " from database.");
+			
+			List<UserDatabase> result;
+		  	EntityManager session = ConfigurationDBUtils.getCurrentSession();
+			  	
+		  	javax.persistence.Query query = session.createQuery(QUERIES.get("getUserWithUserID"));  	
+		  	query.setParameter("id", id);
+			result = query.getResultList();
+		  	
+		    Logger.trace("Found entries: " + result.size());
+		    
+		    if (result.size() == 0) {
+		    	Logger.trace("No entries found.");
+		    	return null;
+		    }
+		    return (UserDatabase) result.get(0);
+		  }
 }