Omoguceno adminu brisanje korisnika.

3 files changed, 53 insertions, 0 deletions

diff --git a/src/main/java/database/Database.java b/src/main/java/database/Database.java
index 7e0997f..ee07fac 100644
--- a/src/main/java/database/Database.java
+++ b/src/main/java/database/Database.java
@@ -240,5 +240,43 @@ public class Database {
 		return monster;
 		
 	}
+	public ArrayList<User> getAllUsers(){
+		ArrayList<User> users=new ArrayList<User>();
+		try {
+			String sql="SELECT * FROM user";
+			Statement statement = conn.createStatement();
+			ResultSet res=statement.executeQuery(sql);
+			while(res.next()) {
+				User tempUser=new User();
+				tempUser=new User();
+				tempUser.setId(res.getLong("id"));
+				tempUser.setAdmin(res.getBoolean("admin"));
+				tempUser.setUsername(res.getString("username"));
+				if(res.getObject("pokemonId")!=null)
+					tempUser.setmonsterId(res.getLong("pokemonId"));
+				else 
+					tempUser.setmonsterId(-1);
+				users.add(tempUser);
+			}
+			
+		} catch (SQLException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		
+		return users;
+		
+	}
+	public void deleteUser(long id) {
+		String sql="DELETE FROM user WHERE id=?";
+		try {
+			PreparedStatement preStatement=conn.prepareStatement(sql);
+			preStatement.setLong(1, id);
+			preStatement.executeUpdate();
+		} catch (SQLException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+	}
 
 }
diff --git a/src/main/java/pokemon/IService.java b/src/main/java/pokemon/IService.java
index 538dacd..30ca93c 100644
--- a/src/main/java/pokemon/IService.java
+++ b/src/main/java/pokemon/IService.java
@@ -18,5 +18,7 @@ public interface IService extends Remote {
 	public Monster getUserMonster(String username) throws RemoteException;
 	public void addMonsterToUser(long id,long monsterId)throws RemoteException;
 	public MonsterViewModel getMonsterViewModel(long id)throws RemoteException;
+	public ArrayList<User> getAllUsers()throws RemoteException;
+	public void deleteUser(long id)throws RemoteException;
 
 }
diff --git a/src/main/java/pokemon/Service.java b/src/main/java/pokemon/Service.java
index cfdc076..91e8dae 100644
--- a/src/main/java/pokemon/Service.java
+++ b/src/main/java/pokemon/Service.java
@@ -64,6 +64,19 @@ public class Service extends UnicastRemoteObject implements IService  {
 		Database db=Database.getInstance();
 		return db.getMonsterViewModel(id);
 	}
+
+	@Override
+	public ArrayList<User> getAllUsers() throws RemoteException {
+		Database db=Database.getInstance();
+		return db.getAllUsers();
+	}
+
+	@Override
+	public void deleteUser(long id) throws RemoteException {
+		Database db=Database.getInstance();
+		db.deleteUser(id);
+		
+	}
 	
 
 }