Add FtpUsers are now in sync with DB

2 files changed, 17 insertions, 9 deletions

diff --git a/src/main/java/org/openslx/imagemaster/db/DbFtpUser.java b/src/main/java/org/openslx/imagemaster/db/DbFtpUser.java
index ea8a79f..088109e 100644
--- a/src/main/java/org/openslx/imagemaster/db/DbFtpUser.java
+++ b/src/main/java/org/openslx/imagemaster/db/DbFtpUser.java
@@ -1,5 +1,6 @@
 package org.openslx.imagemaster.db;
 
+import java.sql.Timestamp;
 import java.util.List;
 
 
@@ -9,28 +10,38 @@ public class DbFtpUser
 	public final String password;
 	public final String mode;
 	public final String filename;
+	public final String sessionId;
+	public final Timestamp timestamp;
 	
-	public DbFtpUser(String username, String password, String mode, String filename)
+	public DbFtpUser(String username, String password, String mode, String filename, String sessionId, Timestamp timestamp)
 	{
 		this.username = username;
 		this.password = password;
 		this.mode = mode;
 		this.filename = filename;
+		this.sessionId = sessionId;
+		this.timestamp = timestamp;
 	}
 	
 	public static List<DbFtpUser> getAllUsers()
 	{
-		return MySQL.findAll( DbFtpUser.class, "SELECT username, password, mode, filename from ftpUser" );
+		return MySQL.findAll( DbFtpUser.class, "SELECT username, password, mode, filename, sessionid, timestamp from ftpUser" );
 	}
 	
 	public static void addUser(DbFtpUser user)
 	{
-		MySQL.update( "INSERT INTO ftpUser username, password, mode, filename VALUES (? , ?, ?, ?)",
-				user.username, user.password, user.mode, user.filename); 
+		MySQL.update( "INSERT INTO ftpUser (username, password, mode, filename, sessionid, timestamp) VALUES (?, ?, ?, ?, ?, ?)",
+				user.username, user.password, user.mode, user.filename, user.sessionId, user.timestamp); 
 	}
 	
 	public static DbFtpUser getUserByName(String username)
 	{
-		return MySQL.findUniqueOrNull( DbFtpUser.class, "SELECT username, password, mode, filename FROM ftpUser WHERE username=?", username );
+		return MySQL.findUniqueOrNull( DbFtpUser.class, "SELECT username, password, mode, filename, sessionid, timestamp FROM ftpUser WHERE username=?", username );
+	}
+	
+	public static boolean removeUserByName(String username)
+	{
+		int result = MySQL.update( "DELETE FROM ftpUser WHERE username=? LIMIT 1", username );
+		return result == 1;
 	}
 }
diff --git a/src/main/java/org/openslx/imagemaster/db/DbImage.java b/src/main/java/org/openslx/imagemaster/db/DbImage.java
index 2cf3922..59701e4 100644
--- a/src/main/java/org/openslx/imagemaster/db/DbImage.java
+++ b/src/main/java/org/openslx/imagemaster/db/DbImage.java
@@ -24,7 +24,6 @@ public class DbImage
 	public final String longDescription;
 	public final Timestamp timestamp;
 	public final String ftpUser;
-	public final String ftpPassword;
 	public final long fileSize;
 	
 
@@ -44,14 +43,13 @@ public class DbImage
 		this.longDescription = null;
 		this.timestamp = new Timestamp( 0 );
 		this.ftpUser = null;
-		this.ftpPassword = null;
 		this.fileSize = 0;
 	}
 	
 	public DbImage(String UUID, int imageVersion, String imageName, String imagePath,
 			Timestamp imageCreateTime, Timestamp imageUpdateTime, int imageOwner, String contentOperatingSystem,
 			boolean isValid, boolean isDeleted, String shortDescription, String longDescription,
-			Timestamp timestamp, String ftpUser, String ftpPassword, long fileSize)
+			Timestamp timestamp, String ftpUser, long fileSize)
 	{
 		this.UUID = UUID;
 		this.imageVersion = imageVersion;
@@ -67,7 +65,6 @@ public class DbImage
 		this.longDescription = longDescription;
 		this.timestamp = timestamp;
 		this.ftpUser = ftpUser;
-		this.ftpPassword = ftpPassword;
 		this.fileSize = fileSize;
 	}