Omoguceno adminu dodavanje pokemona sa abilitijima.

3 files changed, 70 insertions, 0 deletions

diff --git a/src/main/java/models/PokemonAddModel.java b/src/main/java/models/PokemonAddModel.java
new file mode 100644
index 0000000..a16b425
--- /dev/null
+++ b/src/main/java/models/PokemonAddModel.java
@@ -0,0 +1,46 @@
+package models;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+
+public class PokemonAddModel implements Serializable{
+	public String name;
+	public String description;
+	public int hp;
+	public String getName() {
+		return name;
+	}
+	public void setName(String name) {
+		this.name = name;
+	}
+	public String getDescription() {
+		return description;
+	}
+	public void setDescription(String description) {
+		this.description = description;
+	}
+	public int getHp() {
+		return hp;
+	}
+	public void setHp(int hp) {
+		this.hp = hp;
+	}
+	public String getBase64Image() {
+		return base64Image;
+	}
+	public void setBase64Image(String base64Image) {
+		this.base64Image = base64Image;
+	}
+	public ArrayList<Ability> getAbilities() {
+		return abilities;
+	}
+	public void setAbilities(ArrayList<Ability> abilities) {
+		this.abilities = abilities;
+	}
+	public String base64Image;
+	public ArrayList<Ability> abilities;
+	public PokemonAddModel() {
+		super();
+	}
+
+}
diff --git a/src/main/java/pokemon/IService.java b/src/main/java/pokemon/IService.java
index 30ca93c..32b49b3 100644
--- a/src/main/java/pokemon/IService.java
+++ b/src/main/java/pokemon/IService.java
@@ -7,6 +7,7 @@ import java.util.ArrayList;
 import models.Ability;
 import models.Monster;
 import models.MonsterViewModel;
+import models.PokemonAddModel;
 import models.User;
 
 public interface IService extends Remote {
@@ -20,5 +21,6 @@ public interface IService extends Remote {
 	public MonsterViewModel getMonsterViewModel(long id)throws RemoteException;
 	public ArrayList<User> getAllUsers()throws RemoteException;
 	public void deleteUser(long id)throws RemoteException;
+	public boolean addPokemonWithAbilities(PokemonAddModel pokemon)throws RemoteException;
 
 }
diff --git a/src/main/java/pokemon/Service.java b/src/main/java/pokemon/Service.java
index 91e8dae..180af9e 100644
--- a/src/main/java/pokemon/Service.java
+++ b/src/main/java/pokemon/Service.java
@@ -8,6 +8,7 @@ import database.Database;
 import models.Ability;
 import models.Monster;
 import models.MonsterViewModel;
+import models.PokemonAddModel;
 import models.User;
 
 public class Service extends UnicastRemoteObject implements IService  {
@@ -77,6 +78,27 @@ public class Service extends UnicastRemoteObject implements IService  {
 		db.deleteUser(id);
 		
 	}
+	public boolean addPokemonWithAbilities(PokemonAddModel pokemon)throws RemoteException {
+		boolean res=false;
+		Database db=Database.getInstance();
+		long monsterId=db.addMonster(addModelToMonster(pokemon));
+		for(Ability a:pokemon.abilities) {
+			a.monsterId=monsterId;
+			db.addAbility(a);
+		}
+		res=true;
+		return res;
+		
+	}
+	public Monster addModelToMonster(PokemonAddModel pokemon) {
+		Monster newMonster=new Monster();
+		newMonster.setName(pokemon.getName());
+		newMonster.setDescription(pokemon.getDescription());
+		newMonster.setHp(pokemon.getHp());
+		newMonster.setBase64Image(pokemon.getBase64Image());
+		return newMonster;
+		
+	}
 	
 
 }