1 files changed, 5 insertions, 30 deletions
diff --git a/src/main/java/org/openslx/imagemaster/db/mappers/DbUser.java b/src/main/java/org/openslx/imagemaster/db/mappers/DbUser.java
index 349b023..9cde273 100644
--- a/src/main/java/org/openslx/imagemaster/db/mappers/DbUser.java
+++ b/src/main/java/org/openslx/imagemaster/db/mappers/DbUser.java
@@ -24,13 +24,12 @@ public class DbUser
 	private static final Logger LOGGER = Logger.getLogger( DbUser.class );
 
 	private static final String localUserSql = "SELECT"
-			+ " user.userid, user.login, user.password, user.organizationid, user.firstname, user.lastname, user.email,"
-			+ " organization.address FROM user"
-			+ " LEFT JOIN organization USING (organizationid)";
+			+ " user.userid, user.password, user.organizationid, user.firstname, user.lastname, user.email"
+			+ " FROM user";
 
 	private static LocalUser localFromRs( ResultSet rs ) throws SQLException
 	{
-		return new LocalUser( rs.getInt( "userid" ), rs.getString( "login" ), rs.getString( "password" ),
+		return new LocalUser( rs.getString( "userid" ), rs.getString( "password" ),
 				rs.getString( "organizationid" ), rs.getString( "firstname" ), rs.getString( "lastname" ), rs.getString( "email" ),
 				Role.TUTOR );
 	}
@@ -47,8 +46,8 @@ public class DbUser
 	{
 		try ( MysqlConnection connection = Database.getConnection() ) {
 			MysqlStatement stmt = connection.prepareStatement( localUserSql
-					+ " WHERE user.login = :login" );
-			stmt.setString( "login", login );
+					+ " WHERE user.userid = :userid" );
+			stmt.setString( "userid", login );
 			ResultSet rs = stmt.executeQuery();
 			if ( !rs.next() )
 				return null;
@@ -67,30 +66,6 @@ public class DbUser
 		return user.toUserInfo();
 	}
 
-	/**
-	 * Query database for user with given userId
-	 * 
-	 * @param userid
-	 * @return instance of DbUser for matching entry from DB, or null if not
-	 *         found
-	 * @throws SQLException
-	 */
-	public static LocalUser forLogin( final int userId ) throws SQLException
-	{
-		try ( MysqlConnection connection = Database.getConnection() ) {
-			MysqlStatement stmt = connection.prepareStatement( localUserSql
-					+ " WHERE user.userid = :userid" );
-			stmt.setInt( "userid", userId );
-			ResultSet rs = stmt.executeQuery();
-			if ( !rs.next() )
-				return null;
-			return localFromRs( rs );
-		} catch ( SQLException e ) {
-			LOGGER.error( "Query failed in DbUser.forLogin()", e );
-			throw e;
-		}
-	}
-
 	public static LocalUser forLogin( String login, String password ) throws SQLException
 	{
 		LocalUser user = forLogin( login );