3 files changed, 56 insertions, 0 deletions
diff --git a/src/main/java/database/Database.java b/src/main/java/database/Database.java
index 6488a5a..80307db 100644
--- a/src/main/java/database/Database.java
+++ b/src/main/java/database/Database.java
@@ -159,5 +159,46 @@ public class Database {
 		}
 		return monsters;
 	}
+	public Monster getUserMonster(String username) {
+		Monster monster=null;
+		String sql="SELECT * FROM monster m JOIN user u ON u.username=? AND u.pokemonId=m.id";
+		try {
+			PreparedStatement statement = conn.prepareStatement(sql);
+			statement.setString(1, username);
+			ResultSet res=statement.executeQuery();
+			if(res.next()) {
+				 monster=new Monster();
+				 monster.setId(res.getLong("m.id"));
+				 monster.setName(res.getString("m.name"));
+				 monster.setDescription(res.getString("m.description"));
+				 monster.setHp(res.getInt("m.hp"));
+				 monster.setBase64Image(res.getString("m.base64Image"));
+			}
+			
+		} catch (SQLException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		
+		
+		return monster;
+		
+	}
+	public void addMonsterToUser(long id,long monsterId) {
+		
+		String sql="UPDATE user set pokemonId=?  where id=?;";
+		
+		try {
+			PreparedStatement ps=conn.prepareStatement(sql);
+			ps=conn.prepareStatement(sql);
+			ps.setLong(1,monsterId);
+			ps.setLong(2, id);
+			ps.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 c99271c..172c392 100644
--- a/src/main/java/pokemon/IService.java
+++ b/src/main/java/pokemon/IService.java
@@ -14,5 +14,7 @@ public interface IService extends Remote {
 	public long addMonster(Monster monster)throws RemoteException;
 	public boolean addAbility(Ability ability)throws RemoteException;
 	public ArrayList<Monster> getMonsters()throws RemoteException;
+	public Monster getUserMonster(String username) throws RemoteException;
+	public void addMonsterToUser(long id,long monsterId)throws RemoteException;
 
 }
diff --git a/src/main/java/pokemon/Service.java b/src/main/java/pokemon/Service.java
index 0931a0f..579a0c4 100644
--- a/src/main/java/pokemon/Service.java
+++ b/src/main/java/pokemon/Service.java
@@ -44,6 +44,19 @@ public class Service extends UnicastRemoteObject implements IService  {
 		Database db=Database.getInstance();
 		return db.getMonsters();
 	}
+
+	@Override
+	public Monster getUserMonster(String username) throws RemoteException {
+		Database db=Database.getInstance();
+		return db.getUserMonster(username);
+	}
+
+	@Override
+	public void addMonsterToUser(long id, long monsterId) throws RemoteException {
+		Database db=Database.getInstance();
+		db.addMonsterToUser(id, monsterId);
+		
+	}
 	
 
 }