/stats + /score + Performace Bugfixes + Removed unused + completed doc + Battle Bugfixes + other bugs

.gitignore

@@ -10,7 +10,7 @@
 # Mobile Tools for Java (J2ME)
 .mtj.tmp/
 
-# at.reisinger.Package Files #
+# at.reisinger.obj.Package Files #
 *.jar
 *.war
 *.nar

README.md

@@ -1,2 +1,2 @@
 # SWE1-MTCG
-Monster Trading at.reisinger.Card Game
+Monster Trading at.reisinger.obj.Card Game

src/main/java/at/reisinger/Battle.java

@@ -1,4 +0,0 @@
-package at.reisinger;
-
-public class Battle {
-}

src/main/java/at/reisinger/Card.java

@@ -1,206 +0,0 @@
-package at.reisinger;
-
-import com.fasterxml.jackson.annotation.*;
-
-/**
- * Object einer at.reisinger.Card
- */
-@JsonAutoDetect
-public class Card {
-    @JsonProperty
-    private String name;
-    @JsonProperty
-    private double damage;
-    @JsonProperty
-    private ElementTyp elementTyp;
-    @JsonProperty
-    private CardType cardType;
-
-    /**
-     * Erstellt eine neue at.reisinger.Card mit gegebenen Eigenschaften
-     * @param name Name der at.reisinger.Card
-     * @param damage Damage den die at.reisinger.Card macht
-     * @param elementTyp ElementType der at.reisinger.Card
-     * @param cardType at.reisinger.CardType der at.reisinger.Card
-     */
-    public Card(String name, double damage, ElementTyp elementTyp, CardType cardType) {
-        this.name = name;
-        this.damage = damage;
-        this.elementTyp = elementTyp;
-        this.cardType = cardType;
-    }
-
-    /**
-     * Erstellt eine neue Card mit, anhand des cardNamen werden der ElementType und der CardType automatisch bestimmt
-     * @param name Name der Card (ID)
-     * @param elementCardTyp ElementTyp und CardType in einem String. Beide Enums werden durch diesen String gewählt.
-     *                       Wird kein passender Typ gefunden, dann bleibt diese Eigenschaft auf null
-     * @param damage Damage der Card
-     */
-    @JsonCreator
-    public Card(@JsonProperty("Id") String name, @JsonProperty("Name") String elementCardTyp, @JsonProperty("Damage") double damage){
-        ElementTyp tmpElement = stringToElementType(elementCardTyp);
-        if(tmpElement == null){
-            tmpElement = ElementTyp.UNDEF;
-        }
-        CardType tmpCard = stringToCardType(elementCardTyp);
-        if(tmpCard == null){
-            tmpCard = CardType.UNDEF;
-        }
-        this.name = name;
-        this.damage = damage;
-        this.elementTyp = tmpElement;
-        this.cardType = tmpCard;
-    }
-
-    /**
-     * Wenn ein String als ElementType vorhanden ist, dann gibt er den passenden ElementType zurück
-     * @param elementTypeString elementType als String
-     * @return Passender Element Type oder null falls nicht gefunden
-     */
-    private ElementTyp stringToElementType(String elementTypeString){
-        for (ElementTyp e : ElementTyp.values()) {
-            System.out.println(e.toString().toLowerCase());
-            System.out.println(elementTypeString.toLowerCase().contains(e.name().toLowerCase()));
-            if (elementTypeString.toLowerCase().contains(e.name().toLowerCase())) {
-                System.out.println("\n\n\n");
-                System.out.println("####Element####, me.name() : elementTypeString");
-                System.out.println(e.name().toLowerCase());
-                System.out.print(" : ");
-                System.out.println(elementTypeString.toLowerCase());
-                System.out.println("\n\n\n");
-                return e;
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Wenn ein String als cardType vorhanden ist, dann gibt er den passenden cardType zurück
-     * @param cardTypeString cardType als String
-     * @return Passender Card Type oder null falls nicht gefunden
-     */
-    private CardType stringToCardType(String cardTypeString){
-        System.out.println("\n\n\n");
-        System.out.println("###CARD###, me.name() : cardTypeString\n");
-        for (CardType me : CardType.values()) {
-            System.out.println("\n\n\n");
-            System.out.print(me.name().toLowerCase());
-            System.out.print(" : ");
-            System.out.println(cardTypeString.toLowerCase());
-            System.out.println("\n\n\n");
-            if (cardTypeString.toLowerCase().contains(me.toString().toLowerCase())) {
-                System.out.println("\n\n\n");
-                System.out.print(me.name().toLowerCase());
-                System.out.print(" : ");
-                System.out.println(cardTypeString.toLowerCase());
-                System.out.println("\n\n\n");
-                return me;
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Holt den Namen der at.reisinger.Card
-     * @return Name der at.reisinger.Card
-     */
-    @JsonGetter
-    public String getName() {
-        return this.name;
-    }
-
-    /**
-     * Holt den Damage der at.reisinger.Card
-     * @return Damage der at.reisinger.Card
-     */
-    @JsonGetter
-    public double getDamage() {
-        return this.damage;
-    }
-
-    /**
-     * Holt den ElementType der at.reisinger.Card
-     * @return ElementType der at.reisinger.Card
-     */
-    @JsonGetter
-    public ElementTyp getElementTyp() {
-        return this.elementTyp;
-    }
-
-    /**
-     * Holt den at.reisinger.CardType der at.reisinger.Card
-     * @return at.reisinger.CardType der at.reisinger.Card
-     */
-    @JsonGetter
-    public CardType getCardType() {
-        return this.cardType;
-    }
-
-    /**
-     * Berechnet die Wirksamkeit gegen eine Andere card. Die at.reisinger.Card im Parameter wird angegriffen
-     * @param toCeck at.reisinger.Card gegen welche die Wirksamkeit geprüft werden soll
-     * @return Gibt die Wirksamkeit zurück
-     * @throws InternalError Wenn die Effectifeness von den 2 at.reisinger.Cards nicht berechnet werden kann
-     */
-    @JsonGetter
-    public EffectivnessType getEffectivenessAgainst(Card toCeck) {
-        if(toCeck.getCardType() == CardType.MONSTER){
-            if(this.cardType == CardType.MONSTER){
-                return EffectivnessType.NOEFFECT;
-            }else if (this.cardType == CardType.SPELL){
-
-            }
-        }else if (toCeck.getCardType() == CardType.SPELL){
-            if ((toCeck.getElementTyp() == ElementTyp.FIRE && this.elementTyp == ElementTyp.WATER) || (toCeck.getElementTyp() == ElementTyp.NORMAL && this.elementTyp == ElementTyp.FIRE) || (toCeck.getElementTyp() == ElementTyp.WATER && this.elementTyp == ElementTyp.NORMAL)){
-                return EffectivnessType.EFFECTIVE;
-            }else if (this.elementTyp == ElementTyp.FIRE && toCeck.getElementTyp() == ElementTyp.WATER){
-                return EffectivnessType.NOTEFFECTIVE;
-            }else if ((toCeck.getElementTyp() == ElementTyp.NORMAL && this.cardType == CardType.MONSTER && this.elementTyp == ElementTyp.NORMAL)){
-                return EffectivnessType.NOEFFECT;
-            }
-        }
-        throw new InternalError("Konnte die Effectiveness von den at.reisinger.Cards nicht berechnen");
-    }
-
-    /**
-     * Setztden namen der at.reisinger.Card
-     * @param neuerName Name der at.reisinger.Card
-     */
-    @JsonSetter
-    public void setName(String neuerName) {
-        this.name = neuerName;
-    }
-
-    /**
-     * Setzt den Damage der at.reisinger.Card
-     * @param damage Der Damage
-     */
-    @JsonSetter
-    public void setDamage(int damage) {
-        this.damage = damage;
-    }
-
-    /**
-     * Setzt den ElementType der at.reisinger.Card
-     * @param elementTyp Der ElementType
-     */
-    @JsonSetter
-    public void setElementType(ElementTyp elementTyp) {
-        this.elementTyp = elementTyp;
-    }
-
-    /**
-     * Testet ob die beiden Karten gleich sind
-     * @param card at.reisinger.Card die geprüft werden soll
-     * @return True wenn die Karten übereinstimmen
-     */
-    public boolean equals(Card card){
-        if(card == null) return false;
-        if(this.name == card.getName() && this.cardType == card.getCardType() && this.elementTyp == card.getElementTyp() && this.damage == card.getDamage()){
-            return true;
-        }else {
-            return false;
-        }
-    }
-}

src/main/java/at/reisinger/CardType.java

@@ -1,5 +0,0 @@
-package at.reisinger;
-
-public enum CardType {
-    MONSTER, SPELL, UNDEF, GOBLIN, TROLL, ELF, KNIGHT
-}

src/main/java/at/reisinger/Cards.java

@@ -1,79 +0,0 @@
-package at.reisinger;
-
-import java.util.ArrayList;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-/**
- * Verwaltet eine Liste vo at.reisinger.Cards
- */
-public class Cards {
-    private ArrayList<Card> cards;
-
-    /**
-     * Erstellt ein nues obj mit gegebenen Karten
-     * @param cardsArrayList Die at.reisinger.Cards zum erstellen des Obj
-     */
-    public Cards(ArrayList<Card> cardsArrayList) {
-        this.cards = cardsArrayList;
-    }
-
-
-
-    /**
-     * Fügt eine neue at.reisinger.Card hinzu
-     * @param newCard neue at.reisinger.Card
-     */
-    public void addCard(Card newCard) {
-        this.cards.add(newCard);
-    }
-
-    /**
-     * Holt alle at.reisinger.Cards
-     * @return Alle at.reisinger.Cards
-     */
-    public ArrayList<Card> getCards() {
-        return this.cards;
-    }
-
-    /**
-     * Löscht die gegebene at.reisinger.Card
-     * @param delCard at.reisinger.Card zum löschen
-     */
-    public void delCard(Card delCard) {
-        this.cards.removeIf(obj -> obj.equals(delCard));
-    }
-
-    /**
-     * Prüft ob eine at.reisinger.Card in den at.reisinger.Cards vorhanden ist
-     * @param toCeck at.reisinger.Card nach der in den at.reisinger.Cards gesucht werden soll
-     * @return True wenn die at.reisinger.Card in den at.reisinger.Cards ist
-     */
-    public boolean containsCard(Card toCeck){
-        AtomicBoolean returnval = new AtomicBoolean(false);
-        this.cards.forEach(item -> {
-            if(item.getElementTyp().equals(toCeck.getElementTyp()) && item.getCardType().equals(toCeck.getCardType()) && item.getName().equals(toCeck.getName()) && item.getDamage() == toCeck.getDamage()){
-                returnval.set(true);
-            }else{
-                returnval.set(false);
-            }
-        });
-        return returnval.get();
-    }
-
-    /**
-     * Vergleicht 2 at.reisinger.Cards Obj miteinander
-     * @param toCompare at.reisinger.Cards zum vergleichen
-     * @return True wenn es aus den selben at.reisinger.Cards besteht
-     */
-    public boolean equals(Cards toCompare){
-        if (this.cards == null && toCompare.getCards() == null){
-            return true;
-        }else if ((this.cards == null && toCompare.getCards() != null) || (this.cards != null && toCompare.getCards() == null)){
-            return false;
-        }else if(this.cards.containsAll(toCompare.getCards()) && toCompare.getCards().containsAll(this.cards)){
-            return true;
-        }else {
-            return false;
-        }
-    }
-}

src/main/java/at/reisinger/DBConnection.java

@@ -1,311 +0,0 @@
-package at.reisinger;
-
-import java.sql.*;
-import java.util.ArrayList;
-
-/**
- * Stellt die Verbindung zur "Datenbank" her
- * Die "Datenbank" sind hier nur beispieldaten.
- */
-public class DBConnection {
-    private ArrayList<TradingDeal> tradingDeals;
-    private ArrayList<Package> packages;
-    private Connection c;
-    private Statement stmt;
-
-    private Connection con() {
-        this.c = null;
-        try {
-            Class.forName("org.postgresql.Driver");
-            this.c = DriverManager
-                    .getConnection("jdbc:postgresql://postgres.dergeorg.at:5432/mtcg",
-                            "user", "user");
-        } catch (Exception e) {
-            e.printStackTrace();
-            System.err.println(e.getClass().getName() + ": " + e.getMessage());
-            System.exit(0);
-        }
-        return c;
-    }
-
-    /**
-     * Erstellt alle Beispieldaten und simuliert somit den
-     * Verbindungsaufbau zu einer DB
-     */
-    public DBConnection() {
-        this.c = con();
-    }
-
-    /**
-     * Erstellt alle Tabellen die für den Betrieb der Software bennötigt werden
-     *
-     * @throws SQLException
-     */
-    public void init() {
-        this.c = con();
-        try {
-            stmt = this.c.createStatement();
-            String sql = "CREATE TABLE IF NOT EXISTS USERS " +
-                    "(username       TEXT PRIMARY KEY     NOT NULL," +
-                    " nachname           TEXT    NOT NULL, " +
-                    " email            TEXT     NOT NULL, " +
-                    " password        TEXT NOT NULL)";
-            stmt.executeUpdate(sql);
-            stmt.close();
-            this.c.close();
-        } catch (Exception e) {
-            System.err.println(e.getClass().getName() + ": " + e.getMessage());
-            System.exit(0);
-        }
-        System.out.println("User Table created");
-
-        this.c = con();
-        try {
-            stmt = this.c.createStatement();
-            String sql = "CREATE TABLE IF NOT EXISTS CARD(NAME TEXT not null,DAMAGE FLOAT not null,ELEMENTTYP TEXT not null,CARDTYPE TEXT not null, PRIMARY KEY (\"name\"));";
-            stmt.executeUpdate(sql);
-            stmt.close();
-            this.c.close();
-        } catch (Exception e) {
-            System.err.println(e.getClass().getName() + ": " + e.getMessage());
-            System.exit(0);
-        }
-        this.c = con();
-        try {
-            stmt = this.c.createStatement();
-            String sql = "create unique index IF NOT EXISTS card_name_uindex on CARD (NAME);";
-            stmt.executeUpdate(sql);
-            stmt.close();
-            this.c.close();
-        } catch (Exception e) {
-            System.err.println(e.getClass().getName() + ": " + e.getMessage());
-            System.exit(0);
-        }
-        System.out.println("Card Table created");
-
-        this.c = con();
-        try {
-            stmt = this.c.createStatement();
-            String sql = "create table IF NOT EXISTS package" +
-                    "(" +
-                    "    \"ID\" varchar(255) not null," +
-                    "    name varchar(255) not null" +
-                    "        constraint name" +
-                    "            references card," +
-                    "    i    serial       not null" +
-                    "        constraint package_i" +
-                    "            primary key" +
-                    ");";
-            stmt.executeUpdate(sql);
-            stmt.close();
-            this.c.close();
-        } catch (Exception e) {
-            System.err.println(e.getClass().getName() + ": " + e.getMessage());
-            System.exit(0);
-        }
-        System.out.println("Package Table created");
-    }
-
-    /**
-     * Überprüft anhand des Namen der Karte, ob es schon eine solche Karte gibt
-     *
-     * @param name Name der zu prüfen ist
-     * @return True falls die Karte bereits existiert
-     */
-    public boolean cardExists(String name) {
-        this.c = con();
-        int count = 0;
-        try {
-            stmt = this.c.createStatement();
-            ResultSet rs = stmt.executeQuery("select count(*) from card where name = \'" + name + "\';");
-            while (rs.next()) {
-                count = rs.getInt("count");
-                System.out.println("Count: ");
-                System.out.print(count);
-            }
-            rs.close();
-            stmt.close();
-            this.c.close();
-        } catch (Exception e) {
-            System.err.println(e.getClass().getName() + ": " + e.getMessage());
-            System.exit(0);
-        }
-        if (count == 1) {
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * Fügt eine Karte der DB hinzu
-     * @param card Card die hinzugefügt werden soll
-     * @return true bei erfolg, false bei error
-     */
-    public boolean addCard(Card card) {
-        this.c = con();
-        try{
-            stmt = this.c.createStatement();
-            String sql = "insert into card (NAME, DAMAGE, ELEMENTTYP, CARDTYPE) values (\'" + card.getName() +"\',\'" + card.getDamage() + "\',\'" + card.getElementTyp().name() + "\',\'" + card.getCardType().name() + "\')";
-            System.out.println(sql);
-            stmt.executeUpdate(sql);
-            stmt.close();
-            this.c.close();
-        } catch ( Exception e ) {
-            System.err.println( e.getClass().getName()+": "+ e.getMessage() );
-            return false;
-        }
-        System.out.println("Card added");
-        return true;
-    }
-
-    /**
-     * Ermittelt die nächste Package ID
-     * @return Die Nächste Package id, wenn 0, dann ist ein error
-     */
-    public int nextPackageId(){
-        this.c = con();
-        String id = "";
-        try{
-            stmt = this.c.createStatement();
-            ResultSet rs = stmt.executeQuery( "select max(\"ID\") from package;");
-            while ( rs.next() ) {
-                id = rs.getString("max");
-            }
-            if (id == null){
-                id = "0";
-            }
-            rs.close();
-            stmt.close();
-            this.c.close();
-        } catch ( Exception e ) {
-            System.err.println( e.getClass().getName()+": "+ e.getMessage() );
-            return 0;
-        }
-        System.out.println("Package Next id is: ");
-        System.out.print(id);
-        return Integer.parseInt(id) + 1;
-    }
-
-    /**
-     * Fügt eine Package der DB hinzu,
-     * wenn eine Karte aus dem Package noch nicht in der Db ist,
-     * dann wird es automatisch hinzugefuegt
-     * @param pack Pack welches hinzugefügt werden soll
-     * @return True bei erfolg, false bei fehler
-     */
-    public boolean addPackage(Package pack) {
-        for (Card ca : pack.getCards()) {
-            if (!cardExists(ca.getName())) {
-                if(!addCard(ca)){
-                    return false;
-                }
-            }
-            this.c = con();
-            try {
-                stmt = this.c.createStatement();
-                String sql = "INSERT INTO package (\"ID\", \"name\") values (\'" + pack.getName() + "\',\'" + ca.getName() + "\');";
-                System.out.println(sql);
-                stmt.executeUpdate(sql);
-                stmt.close();
-                this.c.close();
-            } catch (Exception e) {
-                System.err.println(e.getClass().getName() + ": " + e.getMessage());
-                return false;
-            }
-            System.out.println("Card zu Package hinzugefügt");
-        }
-        return true;
-    }
-
-    /**
-     * Fügt einen User der DB hinzu
-     * @param username Username des Users
-     * @param password Passwort des Users
-     * @param nachname nachname des Users
-     * @param email Email des Users
-     * @return True wenn alles erfolgreich war, false wenn es nicht erfolgreich war
-     */
-    public boolean addUser(String username, String password, String nachname, String email){
-        this.c = con();
-        try{
-            stmt = this.c.createStatement();
-            String sql = "INSERT INTO users (username, nachname, email, password) values (\'" + username +"\',\'" + nachname + "\',\'" + email + "\',\'" + password + "\')";
-            System.out.println(sql);
-            stmt.executeUpdate(sql);
-            stmt.close();
-            this.c.close();
-        } catch ( Exception e ) {
-            System.err.println( e.getClass().getName()+": "+ e.getMessage() );
-            return false;
-        }
-        System.out.println("User added");
-        return true;
-    }
-
-    /**
-     * Sucht einen User anhand des Usernamens.
-     * Gibt ein User Objekt zurück
-     * @param uname Username der zu suchen ist
-     * @return User als User Objekt
-     * @throws SQLException Fehler bei der Suche in der DB
-     */
-    public User getUser(String uname) throws SQLException {
-        this.c = con();
-        String username="", password="", email ="", nachname = "";
-        try{
-        stmt = this.c.createStatement();
-        ResultSet rs = stmt.executeQuery( "SELECT * FROM users where username = \'" + uname + "\';" );
-        while ( rs.next() ) {
-            username = rs.getString("username");
-            nachname = rs.getString("nachname");
-            email = rs.getString("email");
-            password = rs.getString("password");
-            System.out.println( "username = " + username );
-            System.out.println( "nachname = " + nachname );
-            System.out.println( "email = " + email );
-            System.out.println( "password = " + password );
-            System.out.println();
-        }
-        rs.close();
-        stmt.close();
-        this.c.close();
-        } catch ( Exception e ) {
-            System.err.println( e.getClass().getName()+": "+ e.getMessage() );
-            System.exit(0);
-        }
-          System.out.println("Operation done successfully");
-        return new User(new Credentials(username, password), username, username, email, new Coins(20));
-    }
-    /**
-     * Holt alle verfügbaren TradingDeals
-     * @return Alle Trading Deals
-     */
-    public ArrayList<TradingDeal> getAllTradingDeals(){
-        return this.tradingDeals;
-    }
-
-    /**
-     * Holt alle verfügbaren Packages
-     * @return Alle Packages
-     */
-    public ArrayList<Package> getAllPackages(){
-        return this.packages;
-    }
-
-    /**
-     * Fügt einen neuen Tradingdeal zum at.reisinger.Store hinzu
-     * @param tradingDeal Der neue Deal
-     */
-    public void addTradingDeal(TradingDeal tradingDeal){
-        this.tradingDeals.add(tradingDeal);
-    }
-
-//    /**
-//     * Fügt ein neues at.reisinger.Package zu dem at.reisinger.Store hinzu
-//     * @param packageDeal Das neue at.reisinger.Package
-//     */
-//    public void addPackage(at.reisinger.Package packageDeal){
-//        this.packages.add(packageDeal);
-//    }
-}

src/main/java/at/reisinger/EffectivnessType.java

@@ -1,7 +0,0 @@
-package at.reisinger;
-
-public enum EffectivnessType {
-    EFFECTIVE,
-    NOTEFFECTIVE,
-    NOEFFECT
-}

src/main/java/at/reisinger/ElementTyp.java

@@ -1,5 +0,0 @@
-package at.reisinger;
-
-public enum ElementTyp {
-    WATER, FIRE, NORMAL, UNDEF, REGULAR, GOBLIN, KNIGHT
-}

src/main/java/at/reisinger/MonsterCard.java

@@ -1,7 +0,0 @@
-package at.reisinger;
-
-public class MonsterCard extends Card{
-    public MonsterCard(String name, double damage, ElementTyp elementTyp, CardType cardType) {
-        super(name, damage, elementTyp, cardType);
-    }
-}

src/main/java/at/reisinger/NegativAmountException.java

@@ -1,17 +0,0 @@
-package at.reisinger;
-
-/**
- * Wenn ein negativer wert eingegeben wird aber ein Positiver erwartet wird, dann kann diese Exception geworfen werden
- */
-public class NegativAmountException extends Exception {
-
-    /**
-     * Aufruf des Constructors der Super class Exception
-     * @param message Fehler Nachrichgt
-     * @param cause Fehler Ursache
-     */
-    public NegativAmountException(String message){
-        super(message);
-    }
-
-}

src/main/java/at/reisinger/SpellCard.java

@@ -1,7 +0,0 @@
-package at.reisinger;
-
-public class SpellCard extends Card{
-    public SpellCard(String name, double damage, ElementTyp elementTyp, CardType cardType) {
-        super(name, damage, elementTyp, cardType);
-    }
-}

src/main/java/at/reisinger/Stack.java

@@ -1,50 +0,0 @@
-package at.reisinger;
-
-/**
- * Erweitert at.reisinger.Cards insofern, dass es im at.reisinger.Stack auch ein Deck gibt
- */
-public class Stack extends Cards{
-    private Cards deck;
-
-    /**
-     * Erstellt einen neuen at.reisinger.Stack aus den at.reisinger.User at.reisinger.Cards und seinem Deck
-     * @param cards Alle at.reisinger.Cards des Users
-     * @param deck Sein Deck
-     */
-    public Stack(Cards cards, Cards deck) {
-        super(cards.getCards());
-        this.deck = deck;
-    }
-
-    /**
-     * Fügt ein neues Deck in den at.reisinger.Stack ein
-     * @param newCards Gesamtes Deck
-     */
-    public void addDeck(Cards newCards) {
-        this.deck = newCards;
-    }
-
-    /**
-     * Holt das gesamte Deck
-     * @return Gesamtes Deck
-     */
-    public Cards getDeck() {
-        return this.deck;
-    }
-
-    /**
-     * Löscht eine at.reisinger.Card aus dem Deck
-     * @param toDel at.reisinger.Card zum löschen
-     */
-    public void delDeck(Card toDel) {
-        this.deck.delCard(toDel);
-    }
-
-//    /**
-//     * Fügt dem deck eine neue at.reisinger.Card ein
-//     * @param toAdd Neue at.reisinger.Card
-//     */
-//    public void addDeckCard(at.reisinger.Card toAdd){
-//        this.deck.addCard(toAdd);
-//    }
-}

src/main/java/at/reisinger/Store.java

@@ -1,15 +0,0 @@
-package at.reisinger;
-
-import java.util.ArrayList;
-
-public interface Store {
-    //DBConnection db = new DBConnection();
-
-    void addTradingDeal(TradingDeal tradingDeal);
-
-    ArrayList<TradingDeal> getTradingDeals();
-
-    boolean doTrading(TradingDeal tradingDeal1, TradingDeal tradingDeal2);
-
-    ArrayList<TradingDeal> getPossibleTradingDeals(Card toTrade);
-}

src/main/java/at/reisinger/TradingDeal.java

@@ -1,143 +0,0 @@
-package at.reisinger;
-
-/**
- * Ein einzelner Trading deal wird hier verwaltet.
- */
-public class TradingDeal {
-    //private User tradingUser;
-    private Card cardToTrade;
-    private ElementTyp requiredElementType;
-    private double requiredMinDamage;
-    private CardType requiredCardType;
-
-    /**
-     * Ein at.reisinger.TradingDeal wird  erstellt
-     * @param user at.reisinger.User des Deals
-     * @param cardToTrade at.reisinger.Card die getauscht werden soll
-     * @param requiredElementType Req ElementType für den Tausch
-     * @param requiredMinDamage Req min damage für den Tausch
-     * @param requiredCardType Req at.reisinger.Card Type für den Tausch
-     */
-    public TradingDeal(User user, Card cardToTrade, ElementTyp requiredElementType, double requiredMinDamage, CardType requiredCardType) {
-        //this.tradingUser = user;
-        this.cardToTrade = cardToTrade;
-        this.requiredElementType = requiredElementType;
-        this.requiredMinDamage = requiredMinDamage;
-        this.requiredCardType = requiredCardType;
-    }
-
-    /**
-     * Holt den Trading at.reisinger.User
-     * @return at.reisinger.User der den Trade erstellt hat
-
-    public User getTradingUser() {
-        return this.tradingUser;
-    }
-*/
-    /**
-     * at.reisinger.Card die getraded werden soll
-     * @return at.reisinger.Card die getradet werden soll
-     */
-    public Card getCardToTrade() {
-        return this.cardToTrade;
-    }
-
-    /**
-     * Req Element type holen
-     * @return Req Element Type
-     */
-    public ElementTyp getRequiredElementType() {
-        return this.requiredElementType;
-    }
-
-    /**
-     * Req min damage holen
-     * @return Req min damage
-     */
-    public double getRequiredMinDamage() {
-        return this.requiredMinDamage;
-    }
-
-    /**
-     * Hole req cardtype
-     * @return Req at.reisinger.CardType
-     */
-    public CardType getRequiredCardType() {
-        return this.requiredCardType;
-    }
-
-    /**
-     * Setzt den at.reisinger.User des Trades
-     * @param tradingUser at.reisinger.User der Traded
-
-    public void setTradingUser(User tradingUser) {
-        this.tradingUser = tradingUser;
-    }
-*/
-    /**
-     * Setzt die Karte die Getradet werden soll
-     * @param cardToTrade at.reisinger.Card zum tauschen
-     */
-    public void setCardToTrade(Card cardToTrade) {
-        this.cardToTrade = cardToTrade;
-    }
-
-    /**
-     * Setzt req elementType
-     * @param requiredElementType Der Req elementType
-     */
-    public void setRequiredElementType(ElementTyp requiredElementType) {
-        this.requiredElementType = requiredElementType;
-    }
-
-    /**
-     * Setzt die req Min damage
-     * @param requiredMinDamage Die req min gamage
-     */
-    public void setRequiredMinDamage(double requiredMinDamage) {
-        this.requiredMinDamage = requiredMinDamage;
-    }
-
-    /**
-     * Setzt req cardType
-     * @param requiredCardType Der Req at.reisinger.CardType
-     */
-    public void setRequiredCardType(CardType requiredCardType) {
-        this.requiredCardType = requiredCardType;
-    }
-
-    /**
-     * Vom deal im Parameter wird die at.reisinger.Card mit den Requirements von THIS verglichen
-     * @param checkDeal Von diesem Deal wird die CardToTrade geprüft
-     * @return True wenn der Deal passt
-     */
-    public boolean dealOk(TradingDeal checkDeal){
-        return this.cardOk(checkDeal.getCardToTrade());
-    }
-
-    /**
-     * Von der at.reisinger.Card im Parameter wird die at.reisinger.Card mit den Requirements von THIS verglichen
-     * @param checkCard at.reisinger.Card die mit dem Deal verglichen wird
-     * @return True wenn der Deal passt
-     */
-    public boolean cardOk(Card checkCard){
-        System.out.println(checkCard.getCardType().equals(this.requiredCardType));
-        System.out.println(checkCard.getCardType().toString());
-        System.out.println(this.requiredCardType.toString());
-        System.out.println(" ");
-        System.out.println(checkCard.getElementTyp().equals(this.requiredElementType));
-        System.out.println(checkCard.getElementTyp().toString());
-        System.out.println(this.requiredElementType);
-        System.out.println(" ");
-        System.out.println(checkCard.getDamage() >= this.requiredMinDamage);
-        System.out.println(checkCard.getDamage());
-        System.out.println(this.requiredMinDamage);
-        if(checkCard.getCardType().equals(this.requiredCardType) && checkCard.getElementTyp().equals(this.requiredElementType) && checkCard.getDamage() >= this.requiredMinDamage){
-            System.out.println("Da simma true");
-            return true;
-        }else {
-            System.out.println("da simma false");
-            return false;
-        }
-    }
-}

src/main/java/at/reisinger/User.java

@@ -1,266 +0,0 @@
-package at.reisinger;
-
-import com.fasterxml.jackson.annotation.*;
-
-import java.util.ArrayList;
-
-/**
- * at.reisinger.User & at.reisinger.Store Logik
- */
-@JsonAutoDetect
-public class User implements Store{
-    @JsonProperty
-    private String name, nachname, email;
-    /*
-    @JsonProperty
-    private Stack stack;
-    */
-    //private DBConnection db;
-    @JsonProperty
-    private Credentials credentials;
-    @JsonProperty
-    private Coins coins;
-
-    /*
-     * Erstellt einen neuen at.reisinger.User
-     * @param credentials Zugangsdaten des Users
-     * @param name Name des Users
-     * @param nachname Nachname des Users
-     * @param email Email des Users
-     * @param stack Alle Karten des Users
-     * @param coins Alle Münzen des Users
-
-    @JsonCreator
-    public User(@JsonProperty Credentials credentials,@JsonProperty String name,@JsonProperty String nachname,@JsonProperty String email,@JsonProperty Stack stack,@JsonProperty Coins coins) {
-        this.credentials = credentials;
-        this.name = name;
-        this.nachname = nachname;
-        this.email = email;
-        this.stack = stack;
-        this.coins = coins;
-        //this.db = new at.reisinger.DBConnection();
-    }
-*/
-    @JsonCreator
-    public User(@JsonProperty Credentials credentials,@JsonProperty String name,@JsonProperty String nachname,@JsonProperty String email,@JsonProperty Coins coins) {
-        this.credentials = credentials;
-        this.name = name;
-        this.nachname = nachname;
-        this.email = email;
-        //this.stack = null;
-        this.coins = coins;
-        //this.db = new at.reisinger.DBConnection();
-    }
-
-    /**
-     * Holt den at.reisinger.Stack des Users
-     * @return at.reisinger.Stack des Users
-
-    @JsonGetter
-    public Stack getStack() {
-        return stack;
-    }
-
-    /**
-     * Setzt den at.reisinger.Stack eines Users
-     * @param stack Der neue at.reisinger.Stack des Users
-
-    @JsonSetter
-    public void setStack(Stack stack) {
-        this.stack = stack;
-    }
-
-    /**
-     * Holt das DB Obj
-     * @return Das DB Obj
-
-    @JsonGetter
-    public DBConnection getDb() {
-        return new DBConnection();
-    }
-
-    /**
-     * Setzt ein neues DB Obj
-     * @param db Das neue DB Obj
-
-
-    @JsonSetter
-    public void setDb(DBConnection db) {
-        this.db = db;
-    }
-
-    */
-
-    /**
-     * Holt die eindeutigen Logindaten des Users
-     * @return Eindeutige Logindaten
-     */
-    @JsonGetter
-    public Credentials getCredentials() {
-        return credentials;
-    }
-
-    /**
-     * Setzt die eindeutigen Logindaten
-     * @param credentials Die neuen at.reisinger.Credentials des Users
-     */
-    @JsonSetter
-    public void setCredentials(Credentials credentials) {
-        this.credentials = credentials;
-    }
-
-    /**
-     * Holt alle at.reisinger.Coins des Users
-     * @return at.reisinger.Coins des Users
-     */
-    @JsonGetter
-    public Coins getCoins() {
-        return coins;
-    }
-
-    /**
-     * Setzt alle at.reisinger.Coins des Users
-     * @param coins Neue at.reisinger.Coins des Users
-     */
-    @JsonSetter
-    public void setCoins(Coins coins) {
-        this.coins = coins;
-    }
-
-    /**
-     * Get Name of at.reisinger.User
-     * @return Name of at.reisinger.User
-     */
-    @JsonGetter
-    public String getName() {
-        return this.name;
-    }
-
-    /**
-     * Get Nachname of at.reisinger.User
-     * @return Nachname of at.reisinger.User
-     */
-    @JsonGetter
-    public String getNachname() {
-        return this.nachname;
-    }
-
-    /**
-     * Email of at.reisinger.User
-     * @return Email of at.reisinger.User
-     */
-    @JsonGetter
-    public String getEmail() {
-        return this.email;
-    }
-
-    /**
-     * Setzt den Namen des Users
-     * @param name Neuer Name des Users
-     */
-    @JsonSetter
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    /**
-     * Setzt den Nachnamen
-     * @param nachname Neuer Nachname
-     */
-    @JsonSetter
-    public void setNachname(String nachname) {
-        this.nachname = nachname;
-    }
-
-    /**
-     * Setzt die Email des Users
-     * @param email Neue Email des Users
-     */
-    @JsonSetter
-    public void setEmail(String email) {
-        this.email = email;
-    }
-
-    //at.reisinger.Store Methoden
-
-    /**
-     * Kauft ein at.reisinger.Package
-     * @param mypackage at.reisinger.Package welches gekauft werden soll
-     * @return Alle Karten des neuen at.reisinger.Package
-     * @throws NegativAmountException Wenn ein negativer Preis im at.reisinger.Package gesetzt wird.
-     */
-    public ArrayList<Card> buyPackage(Package mypackage) throws NegativAmountException {
-        //ArrayList<Package> availablePackages = new DBConnection().getAllPackages();
-        //availablePackages.removeIf(obj -> obj.equals(mypackage));
-        this.coins.removeCoin(mypackage.getPrice());
-        return mypackage.getCards();
-    }
-
-    /**
-     * Fügt dem at.reisinger.Store einen neuen Tradingdeal hinzu
-     * @param tradingDeal Der neue Tradingdeal
-     */
-    public void addTradingDeal(TradingDeal tradingDeal) {
-        new DBConnection().addTradingDeal(tradingDeal);
-    }
-
-    /**
-     * Holt alle verfügbaren Tradingdeals
-     * @return Alle verfügbaren Deals
-     */
-    public ArrayList<TradingDeal> getTradingDeals() {
-        return new DBConnection().getAllTradingDeals();
-    }
-
-    @Override
-    public boolean doTrading(TradingDeal tradingDeal1, TradingDeal tradingDeal2) {
-        return false;
-    }
-
-    /**
-     * Startet ein Trading zw 2 TradingDeals
-     * @param myTradingDeal Wenn der Deal passt, wird diese Karte aus dem at.reisinger.Stack entfernt
-     * @param storeTradingDeal Wenn der Deal passt, wird diese Karte dem at.reisinger.Stack hinzugefügt
-     * @return True wenn erfolgreich, False wenn die Deals nicht zusammenpassen
-
-    public boolean doTrading(TradingDeal myTradingDeal, TradingDeal storeTradingDeal) {
-        if (storeTradingDeal.dealOk(myTradingDeal)){
-            stack.delCard(myTradingDeal.getCardToTrade());
-            stack.addCard(storeTradingDeal.getCardToTrade());
-            return true;
-        }
-        return false;
-    }
-    */
-
-    /**
-     * Gibt alle Möglichen Trading Deals zurück
-     * @param toTrade Prüft nach diesem Deal
-     * @return
-     */
-    @Override
-    public ArrayList<TradingDeal> getPossibleTradingDeals(Card toTrade) {
-        ArrayList<TradingDeal> storeList = new DBConnection().getAllTradingDeals();
-        ArrayList<TradingDeal> possible = new ArrayList<TradingDeal>();
-        storeList.forEach(item -> {
-            if(item.cardOk(toTrade)){
-                System.out.println("ADDED ein item");
-                possible.add(item);
-            }
-        });
-        return possible;
-    }
-
-    /**
-     * Checkt ob es sich um den selben at.reisinger.User handelt
-     * @param toCheck Mit diesem at.reisinger.User wird verglichen
-     * @return True wenn es der selbe at.reisinger.User ist
-     */
-    public boolean equals(User toCheck){
-        if (toCheck.getCredentials().getUsername() == this.credentials.getUsername() && toCheck.getCredentials().getPasswort() == this.credentials.getPasswort()){
-            return true;
-        }else {
-            return false;
-        }
-    }
-}

src/main/java/at/reisinger/enums/CardType.java

@@ -0,0 +1,5 @@
+package at.reisinger.enums;
+
+public enum CardType {
+    MONSTER, SPELL, UNDEF, GOBLIN, TROLL, ELF, KNIGHT, DRAGON, WIZZARD, ORK, KRAKEN, FIREELVES
+}

src/main/java/at/reisinger/enums/ElementTyp.java

@@ -0,0 +1,5 @@
+package at.reisinger.enums;
+
+public enum ElementTyp {
+    WATER, FIRE, NORMAL, UNDEF, REGULAR, FEUER, WASSER
+}

src/main/java/at/reisinger/obj/Battle.java

@@ -0,0 +1,493 @@
+package at.reisinger.obj;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Objects;
+
+public class Battle {
+
+    private final User player1;
+    private User player2;
+    private int scorePlayer1;
+    private int scorePlayer2;
+    private final int id;
+    private Cards deckPlayer1;
+    private Cards deckPlayer2;
+    private final Cards deckPlayer1Init;
+    private Cards deckPlayer2Init;
+    private final ArrayList<String> log = new ArrayList<>();
+
+
+    /**
+     * Erstellt ein neues Battle, im zustand offenes battle
+     * @param id Id des Battles
+     * @param player1 Player 1 des Battles
+     * @param deckPlayer1 Deck vom Player 1 als json
+     */
+    public Battle(int id, User player1, Cards deckPlayer1){
+        this.id = id;
+        this.player1 = player1;
+        this.deckPlayer1 = deckPlayer1;
+        this.scorePlayer1 = 100;
+        this.scorePlayer2 = 100;
+        this.deckPlayer2 = null;
+        this.deckPlayer1Init = deckPlayer1;
+        this.deckPlayer2Init = null;
+    }
+
+    /**
+     * Startet einen Kampf zw den beiden Playern
+     * @return true bei erfolg, sonst false
+     */
+    public boolean doFight(){
+        System.out.println(player1.getName() + " |vs|" + player2.getName());
+
+        if(deckPlayer1.getCards().size() == 4 && deckPlayer2.getCards().size() == 4) {
+            //SHUFFLE DECK
+            ArrayList<Card> d1 = deckPlayer1.getCards();
+            ArrayList<Card> d2 = deckPlayer2.getCards();
+            Collections.shuffle(d1);
+            Collections.shuffle(d2);
+            deckPlayer1.setCards(d1);
+            deckPlayer1.setCards(d2);
+
+            //Runden
+            int maxroundcount = 100, counter = 0, counter2 = 0;
+            while(counter<maxroundcount) {
+                counter++;
+                counter2++;
+                if(counter2 < d1.size()-1 || counter2 < d2.size()-1){
+                    counter2 = 0;
+                }
+                if (d1.size() > 0 && d2.size() > 0 && counter<=maxroundcount) {
+                    System.out.println("Runde: " + counter);
+                    System.out.println("deck 1 size: " + d1.size() + " Deck 2 size: " + d2.size() + " counter2: " + counter2);
+                    Card c1 = d1.get(counter2);
+                    Card c2 = d2.get(counter2);
+                    System.out.println("Card 1: " + c1.getElementTyp() + c1.getCardType() + "\nCard 2: " + c2.getElementTyp() + c2.getCardType());
+                    //GLEICHER TYP Monster
+                    if (!c1.getCardType().name().equalsIgnoreCase("SPELL") && !c2.getCardType().name().equalsIgnoreCase("SPELL")) {
+                        System.out.println("Same Monster");
+                        //Check ob eine der beiden Carten ein Dragon ist
+                        if ((c1.getCardType().name().equalsIgnoreCase("DRANGON") && !c2.getCardType().name().equalsIgnoreCase("DRANGON") || (!c1.getCardType().name().equalsIgnoreCase("DRANGON") && c2.getCardType().name().equalsIgnoreCase("DRANGON")))) {
+                            //Eine der Karten is Dragon
+                            System.out.println("Eine ist ein dragon");
+                            Card dragon;
+                            int dragonOwner;
+                            if (c1.getCardType().name().equalsIgnoreCase("DRAGON")) {
+                                dragon = c1;
+                                dragonOwner = 1;
+                            } else if (c2.getCardType().name().equalsIgnoreCase("DRAGON")) {
+                                dragon = c2;
+                                dragonOwner = 2;
+                            } else {
+                                System.out.println("KEIN DRAGON GEFUNDEN");
+                                return false;
+                            }
+                            if ((c1.getCardType().name().equalsIgnoreCase("GOBLIN") && !c2.getCardType().name().equalsIgnoreCase("GOBLIN") || (!c1.getCardType().name().equalsIgnoreCase("GOBLIN") && c2.getCardType().name().equalsIgnoreCase("GOBLIN")))) {
+                                //Eine der Karten ist Goblin
+                                System.out.println("Andere ist ein goblin");
+                                Card goblin;
+                                if (c1.getCardType().name().equalsIgnoreCase("GOBLIN")) {
+                                    goblin = c1;
+                                } else if (c2.getCardType().name().equalsIgnoreCase("GOBLIN")) {
+                                    goblin = c2;
+                                } else {
+                                    System.out.println("KEIN GOBLIN GEFUNDEN");
+                                    return false;
+                                }
+                                if (dragon.getDamage() > goblin.getDamage()) {
+                                    //Drache ist stärker
+                                    if (dragonOwner == 1) {
+                                        d1.add(c2);
+                                        d2.remove(c2);
+                                        this.scorePlayer1 += 3;
+                                        this.scorePlayer2 -= 5;
+                                    } else {
+                                        d2.add(c1);
+                                        d1.remove(c1);
+                                        this.scorePlayer1 -= 5;
+                                        this.scorePlayer2 += 3;
+                                    }
+                                    log.add("Player " + dragonOwner + " gewinnt!\nDrache ist stärker! Drache: " + dragon.getDamage() + " vs Goblin: " + goblin.getDamage() + "\nPlayer 1 score: " + scorePlayer1 + "\nPlayer 2 score: " + scorePlayer2);
+                                } else {
+                                    System.out.println("DRAW: Drache zu schwach um anzugreifen und GOBLIN zu feige.");
+                                }
+                            } else if ((c1.getCardType().name().equalsIgnoreCase("ELF") && c1.getElementTyp().name().equalsIgnoreCase("FIRE") && !c2.getCardType().name().equalsIgnoreCase("ELF") || (!c1.getCardType().name().equalsIgnoreCase("ELF") && c2.getElementTyp().name().equalsIgnoreCase("FIRE") && c2.getCardType().name().equalsIgnoreCase("ELF")))) {
+                                //Eine der Karten ist der Fire Elf die andere Karte ist der drache
+                                System.out.println("Andere ist ein elf");
+                                Card fireelf;
+                                if (dragonOwner == 1) {
+                                    fireelf = c2;
+                                } else {
+                                    fireelf = c1;
+                                }
+
+                                if (fireelf.getDamage() > dragon.getDamage()) {
+                                    //Fireelf ist stärker
+                                    if (dragonOwner == 1) {
+                                        d2.add(c1);
+                                        d1.remove(c1);
+                                        this.scorePlayer2 += 3;
+                                        this.scorePlayer1 -= 5;
+                                    } else {
+                                        d1.add(c2);
+                                        d2.remove(c2);
+                                        this.scorePlayer2 -= 5;
+                                        this.scorePlayer1 += 3;
+                                    }
+                                    log.add("Player " + dragonOwner + " gewinnt!\nWizzard ist stärker! Drache: " + dragon.getDamage() + " vs FireElves: " + fireelf.getDamage() + "\nPlayer 1 score: " + scorePlayer1 + "\nPlayer 2 score: " + scorePlayer2);
+                                }
+                                //Sonst nix tun, weil der drache den elf ned angreifen kann
+                            } else {
+                                if (c1.getDamage() > c2.getDamage()) {
+                                    d1.add(c2);
+                                    d2.remove(c2);
+                                    this.scorePlayer1 += 3;
+                                    this.scorePlayer2 -= 5;
+                                    log.add("Player 1 gewinnt!\n" + c1.getElementTyp() + c1.getCardType() + " ist stärker! " + c1.getElementTyp() + c1.getCardType() + ": " + c1.getDamage() + " vs " + c2.getElementTyp() + c2.getCardType() + ": " + c2.getDamage() + "\nPlayer 1 score: " + scorePlayer1 + "\nPlayer 2 score: " + scorePlayer2);
+                                } else if (c1.getDamage() < c2.getDamage()) {
+                                    d2.add(c1);
+                                    d1.remove(c1);
+                                    this.scorePlayer2 += 3;
+                                    this.scorePlayer1 -= 5;
+                                    log.add("Player 2 gewinnt!\n" + c2.getElementTyp() + c2.getCardType() + " ist stärker! " + c2.getElementTyp() + c2.getCardType() + ": " + c2.getDamage() + " vs " + c1.getElementTyp() + c1.getCardType() + ": " + c1.getDamage() + "\nPlayer 1 score: " + scorePlayer1 + "\nPlayer 2 score: " + scorePlayer2);
+                                }
+                            }
+
+                            //Checkt ob eine der beiden karten ein wizzard ist und der andere ein ork
+                        } else if ((c1.getCardType().name().equalsIgnoreCase("WIZZARD") && c2.getCardType().name().equalsIgnoreCase("ORK") || (c2.getCardType().name().equalsIgnoreCase("WIZZARD") && c1.getCardType().name().equalsIgnoreCase("ORK")))) {
+                            System.out.println("Eine wizzard Andere ist ein ork");
+                            Card wizzard = null;
+                            Card ork = null;
+                            int wizzardOwner = 0;
+                            if (c1.getCardType().name().equalsIgnoreCase("WIZZARD")) {
+                                wizzardOwner = 1;
+                                wizzard = c1;
+                                ork = c2;
+                            } else if (c2.getCardType().name().equalsIgnoreCase("WIZZARD")) {
+                                wizzardOwner = 2;
+                                wizzard = c2;
+                                ork = c1;
+                            }
+                            if (wizzard != null && wizzard.getDamage() > ork.getDamage()) {
+                                if (wizzardOwner == 1) {
+                                    d1.add(c2);
+                                    d2.remove(c2);
+                                    this.scorePlayer1 += 3;
+                                    this.scorePlayer2 -= 5;
+                                } else {
+                                    d2.add(c1);
+                                    d1.remove(c1);
+                                    this.scorePlayer2 += 3;
+                                    this.scorePlayer1 -= 5;
+                                }
+
+                                log.add("Player " + wizzardOwner + " gewinnt!\nWizzard ist stärker! Wizzard: " + wizzard.getDamage() + " vs Ork: " + ork.getDamage() + "\nPlayer 1 score: " + scorePlayer1 + "\nPlayer 2 score: " + scorePlayer2);
+                            }
+                            //Sonst nix tun, weil der ork dem wizzard keinen schaden machen kann
+                        } else {
+                            //PURE MONSTER
+                            if (c1.getDamage() > c2.getDamage()) {
+                                d1.add(c2);
+                                d2.remove(c2);
+                                this.scorePlayer1 += 3;
+                                this.scorePlayer2 -= 5;
+                                log.add("Player 1 gewinnt!\n" + c1.getElementTyp() + c1.getCardType() + " ist stärker! " + c1.getElementTyp() + c1.getCardType() + ": " + c1.getDamage() + " vs " + c2.getElementTyp() + c2.getCardType() + ": " + c2.getDamage() + "\nPlayer 1 score: " + scorePlayer1 + "\nPlayer 2 score: " + scorePlayer2);
+                            } else if (c1.getDamage() < c2.getDamage()) {
+                                d2.add(c1);
+                                d1.remove(c1);
+                                this.scorePlayer2 += 3;
+                                this.scorePlayer1 -= 5;
+                                log.add("Player 2 gewinnt!\n" + c2.getElementTyp() + c2.getCardType() + " ist stärker! " + c2.getElementTyp() + c2.getCardType() + ": " + c2.getDamage() + " vs " + c1.getElementTyp() + c1.getCardType() + ": " + c1.getDamage() + "\nPlayer 1 score: " + scorePlayer1 + "\nPlayer 2 score: " + scorePlayer2);
+                            }
+                            //sonst nix weil bei gleichen damage --> draw
+                        }
+                    } else {//PURE SPELL & mixed
+                        double damagePlayer1 = -1, damagePlayer2 = -1;
+
+                        if (c1.getCardType().name().equalsIgnoreCase("KNIGHT") || c2.getCardType().name().equalsIgnoreCase("KNIGHT")) {
+                            //Mixed mit "Spezialeffekt" KNIGHT
+                            System.out.println("Spell und knight");
+                            Card knight = null, other = null;
+                            int knightOwner = 0;
+                            if (c1.getCardType().name().equalsIgnoreCase("KNIGHT")) {
+                                knight = c1;
+                                other = c2;
+                                knightOwner = 1;
+                            } else if (c2.getCardType().name().equalsIgnoreCase("KNIGHT")) {
+                                knight = c2;
+                                other = c1;
+                                knightOwner = 2;
+                            }
+                            double damageKnight = -1, damageOther = -1;
+                            if (Objects.requireNonNull(other).getElementTyp().name().equalsIgnoreCase("WATER")) {
+                                //tot
+                                damageKnight = 0;
+                                damageOther = other.getDamage();
+                            } else if (other.getElementTyp().name().equalsIgnoreCase("FIRE") && Objects.requireNonNull(knight).getElementTyp().name().equals("REGULAR")) {
+                                //not effective
+                                damageKnight = knight.getDamage() / 2;
+                                //effective
+                                damageOther = other.getDamage() * 2;
+                            } else if (other.getElementTyp().name().equalsIgnoreCase("FIRE") && Objects.requireNonNull(knight).getElementTyp().name().equals("FIRE")) {
+                                //no effect
+                                damageKnight = knight.getDamage();
+                                //no effect
+                                damageOther = other.getDamage();
+                            } else if (other.getElementTyp().name().equalsIgnoreCase("FIRE") && Objects.requireNonNull(knight).getElementTyp().name().equals("WATER")) {
+                                //effective
+                                damageKnight = knight.getDamage() * 2;
+                                //not effective
+                                damageOther = other.getDamage() / 2;
+                            } else if (other.getElementTyp().name().equalsIgnoreCase("REGULAR") && Objects.requireNonNull(knight).getElementTyp().name().equals("REGULAR")) {
+                                //no effect
+                                damageKnight = knight.getDamage();
+                                //no effect
+                                damageOther = other.getDamage();
+                            } else if (other.getElementTyp().name().equalsIgnoreCase("REGULAR") && Objects.requireNonNull(knight).getElementTyp().name().equals("FIRE")) {
+                                //effective
+                                damageKnight = knight.getDamage() * 2;
+                                //not effective
+                                damageOther = other.getDamage() / 2;
+                            } else if (other.getElementTyp().name().equalsIgnoreCase("REGULAR") && Objects.requireNonNull(knight).getElementTyp().name().equals("WATER")) {
+                                //not effective
+                                damageKnight = knight.getDamage() / 2;
+                                //effective
+                                damageOther = other.getDamage() * 2;
+                            }
+                            if (damageKnight > damageOther) {
+                                if (knightOwner == 1) {
+                                    d1.add(c2);
+                                    d2.remove(c2);
+                                    this.scorePlayer1 += 3;
+                                    this.scorePlayer2 -= 5;
+                                    log.add("Player 1 gewinnt!\n" + c1.getElementTyp() + c1.getCardType() + " ist stärker! " + c1.getElementTyp() + c1.getCardType() + ": " + damageKnight + " vs " + c2.getElementTyp() + c2.getCardType() + ": " + damageOther + "\nPlayer 1 score: " + scorePlayer1 + "\nPlayer 2 score: " + scorePlayer2);
+                                } else {
+                                    d2.add(c1);
+                                    d1.remove(c1);
+                                    this.scorePlayer2 += 3;
+                                    this.scorePlayer1 -= 5;
+                                    log.add("Player 2 gewinnt!\n" + c2.getElementTyp() + c2.getCardType() + " ist stärker! " + c2.getElementTyp() + c2.getCardType() + ": " + damageKnight + " vs " + c1.getElementTyp() + c1.getCardType() + ": " + damageOther + "\nPlayer 1 score: " + scorePlayer1 + "\nPlayer 2 score: " + scorePlayer2);
+                                }
+                            } else if (damageKnight < damageOther) {
+                                if (knightOwner == 2) {
+                                    d1.add(c2);
+                                    d2.remove(c2);
+                                    this.scorePlayer1 += 3;
+                                    this.scorePlayer2 -= 5;
+                                    log.add("Player 1 gewinnt!\n" + c1.getElementTyp() + c1.getCardType() + " ist stärker! " + c1.getElementTyp() + c1.getCardType() + ": " + damageOther + " vs " + c2.getElementTyp() + c2.getCardType() + ": " + damageKnight + "\nPlayer 1 score: " + scorePlayer1 + "\nPlayer 2 score: " + scorePlayer2);
+                                } else {
+                                    d2.add(c1);
+                                    d1.remove(c1);
+                                    this.scorePlayer2 += 3;
+                                    this.scorePlayer1 -= 5;
+                                    log.add("Player 2 gewinnt!\n" + c2.getElementTyp() + c2.getCardType() + " ist stärker! " + c2.getElementTyp() + c2.getCardType() + ": " + damageOther + " vs " + c1.getElementTyp() + c1.getCardType() + ": " + damageKnight + "\nPlayer 1 score: " + scorePlayer1 + "\nPlayer 2 score: " + scorePlayer2);
+                                }
+                            }
+                        } else if (c1.getCardType().name().equalsIgnoreCase("KRAKEN") || c2.getCardType().name().equalsIgnoreCase("KRAKEN")) {
+                            //Mixed mit "Spezialeffekt" KRAKEN
+                            if (c1.getCardType().name().equalsIgnoreCase("KRAKEN")) {
+                                d1.add(c2);
+                                d2.remove(c2);
+                                this.scorePlayer1 += 3;
+                                this.scorePlayer2 -= 5;
+                                log.add("Player 1 gewinnt!\n" + c1.getElementTyp() + c1.getCardType() + " ist stärker! " + c1.getElementTyp() + c1.getCardType() + ": " + c1.getDamage() + " vs " + c2.getElementTyp() + c2.getCardType() + ": 0\nPlayer 1 score: " + scorePlayer1 + "\nPlayer 2 score: " + scorePlayer2);
+                            } else if (c2.getCardType().name().equalsIgnoreCase("KRAKEN")) {
+                                d2.add(c1);
+                                d1.remove(c1);
+                                this.scorePlayer2 += 3;
+                                this.scorePlayer1 -= 5;
+                                log.add("Player 2 gewinnt!\n" + c2.getElementTyp() + c2.getCardType() + " ist stärker! " + c2.getElementTyp() + c2.getCardType() + ": " + c2.getDamage() + " vs " + c1.getElementTyp() + c1.getCardType() + ": 0\nPlayer 1 score: " + scorePlayer1 + "\nPlayer 2 score: " + scorePlayer2);
+                            }
+                        } else {
+                            ////PURE SPELL & mixed mit elementen
+                            System.out.println("Spell und mixed mit elementen");
+                            //Player 1 Damage berechnen
+                            switch (c1.getElementTyp().name().toUpperCase()) {
+                                case "FIRE":
+                                    switch (c2.getElementTyp().name().toUpperCase()) {
+                                        case "REGULAR":
+                                            //effective
+                                            damagePlayer1 = c1.getDamage() * 2;
+                                            break;
+                                        case "WATER":
+                                            //not effective
+                                            damagePlayer1 = c1.getDamage() / 2;
+                                            break;
+                                        case "FIRE":
+                                            //no effect
+                                            damagePlayer1 = c1.getDamage();
+                                            break;
+                                    }
+                                    break;
+                                case "WATER":
+                                    switch (c2.getElementTyp().name().toUpperCase()) {
+                                        case "FIRE":
+                                            //effective
+                                            damagePlayer1 = c1.getDamage() * 2;
+                                            break;
+                                        case "WATER":
+                                            //no effect
+                                            damagePlayer1 = c1.getDamage();
+                                            break;
+                                        case "REGULAR":
+                                            //not effective
+                                            damagePlayer1 = c1.getDamage() / 2;
+                                            break;
+                                    }
+                                    break;
+                                case "REGULAR":
+                                    switch (c2.getElementTyp().name().toUpperCase()) {
+                                        case "WATER":
+                                            //effective
+                                            damagePlayer1 = c1.getDamage() * 2;
+                                            break;
+                                        case "FIRE":
+                                            //not effective
+                                            damagePlayer1 = c1.getDamage() / 2;
+                                            break;
+                                        case "REGULAR":
+                                            //no effect
+                                            damagePlayer1 = c1.getDamage();
+                                            break;
+                                    }
+                                    break;
+                            }
+                            //P2 damage
+                            switch (c2.getElementTyp().name().toUpperCase()) {
+                                case "FIRE":
+                                    switch (c1.getElementTyp().name().toUpperCase()) {
+                                        case "REGULAR":
+                                            //effective
+                                            damagePlayer2 = c2.getDamage() * 2;
+                                            break;
+                                        case "WATER":
+                                            //not effective
+                                            damagePlayer2 = c2.getDamage() / 2;
+                                            break;
+                                        case "FIRE":
+                                            //no effect
+                                            damagePlayer2 = c2.getDamage();
+                                            break;
+                                    }
+                                    break;
+                                case "WATER":
+                                    switch (c1.getElementTyp().name().toUpperCase()) {
+                                        case "FIRE":
+                                            //effective
+                                            damagePlayer2 = c2.getDamage() * 2;
+                                            break;
+                                        case "WATER":
+                                            //no effect
+                                            damagePlayer2 = c2.getDamage();
+                                            break;
+                                        case "REGULAR":
+                                            //not effective
+                                            damagePlayer2 = c2.getDamage() / 2;
+                                            break;
+                                    }
+                                    break;
+                                case "REGULAR":
+                                    switch (c1.getElementTyp().name().toUpperCase()) {
+                                        case "WATER":
+                                            //effective
+                                            damagePlayer2 = c2.getDamage() * 2;
+                                            break;
+                                        case "FIRE":
+                                            //not effective
+                                            damagePlayer2 = c2.getDamage() / 2;
+                                            break;
+                                        case "REGULAR":
+                                            //no effect
+                                            damagePlayer2 = c2.getDamage();
+                                            break;
+                                    }
+                                    break;
+                            }
+
+                            if (damagePlayer1 > -1 && damagePlayer2 > -1) {
+                                if (damagePlayer1 > damagePlayer2) {
+                                    d1.add(c2);
+                                    d2.remove(c2);
+                                    this.scorePlayer1 += 3;
+                                    this.scorePlayer2 -= 5;
+                                    log.add("Player 1 gewinnt!\n" + c1.getElementTyp() + c1.getCardType() + " ist stärker! " + c1.getElementTyp() + c1.getCardType() + ": " + damagePlayer1 + " vs " + c2.getElementTyp() + c2.getCardType() + ": " + damagePlayer2 + "\nPlayer 1 score: " + scorePlayer1 + "\nPlayer 2 score: " + scorePlayer2);
+                                } else if (damagePlayer2 > damagePlayer1) {
+                                    d2.add(c1);
+                                    d1.remove(c1);
+                                    this.scorePlayer2 += 3;
+                                    this.scorePlayer1 -= 5;
+                                    log.add("Player 2 gewinnt!\n" + c2.getElementTyp() + c2.getCardType() + " ist stärker! " + c2.getElementTyp() + c2.getCardType() + ": " + damagePlayer2 + " vs " + c1.getElementTyp() + c1.getCardType() + ": " + damagePlayer1 + "\nPlayer 1 score: " + scorePlayer1 + "\nPlayer 2 score: " + scorePlayer2);
+                                }
+                            } else {
+                                System.out.println("Damage konnte nicht berechnet werden");
+                                return false;
+                            }
+                        }
+                    }
+                }else {
+                    return true;
+                }
+            }
+            this.deckPlayer1 = new Cards(d1);
+            this.deckPlayer2 = new Cards(d2);
+        }else{
+            System.out.println("Einer der Spieler hat zu wenige Karten im Deck");
+            return false;
+        }
+        return true;
+    }
+
+    public ArrayList<String> getLog() {
+        return log;
+    }
+
+
+    public int getId() {
+        return id;
+    }
+
+    public User getPlayer1() {
+        return player1;
+    }
+
+    public User getPlayer2() {
+        return player2;
+    }
+
+    public void setPlayer2(User player2) {
+        this.player2 = player2;
+    }
+
+    public int getScorePlayer1() {
+        return scorePlayer1;
+    }
+
+
+    public int getScorePlayer2() {
+        return scorePlayer2;
+    }
+
+    public Cards getDeckPlayer1() {
+        return deckPlayer1;
+    }
+
+
+    public Cards getDeckPlayer2() {
+        return deckPlayer2;
+    }
+
+    public void setDeckPlayer2(Cards deckPlayer2) {
+        this.deckPlayer2 = deckPlayer2;
+        this.deckPlayer2Init = deckPlayer2;
+    }
+
+    public Cards getDeckPlayer1Init() {
+        return deckPlayer1Init;
+    }
+
+    public Cards getDeckPlayer2Init() {
+        return deckPlayer2Init;
+    }
+}

src/main/java/at/reisinger/obj/Card.java

@@ -0,0 +1,176 @@
+package at.reisinger.obj;
+
+import at.reisinger.enums.CardType;
+import at.reisinger.enums.ElementTyp;
+import at.reisinger.server.helper.EnumHelper;
+import com.fasterxml.jackson.annotation.*;
+
+import java.util.Objects;
+
+/**
+ * Object einer at.reisinger.obj.Card
+ */
+@JsonAutoDetect
+public class Card {
+    @JsonProperty
+    private String name;
+    @JsonProperty
+    private double damage;
+    @JsonProperty
+    private ElementTyp elementTyp;
+    @JsonProperty
+    private final CardType cardType;
+    @JsonProperty
+    private boolean locked;
+
+    /**
+     * Erstellt eine neue at.reisinger.obj.Card mit gegebenen Eigenschaften
+     * @param name Name der at.reisinger.obj.Card
+     * @param damage Damage den die at.reisinger.obj.Card macht
+     * @param elementTyp ElementType der at.reisinger.obj.Card
+     * @param cardType at.reisinger.enums.CardType der at.reisinger.obj.Card
+     */
+    public Card(String name, double damage, ElementTyp elementTyp, CardType cardType) {
+        this.name = name;
+        this.damage = damage;
+        this.elementTyp = elementTyp;
+        this.cardType = cardType;
+    }
+
+    /**
+     * Erstellt eine neue Card mit, anhand des cardNamen werden der ElementType und der CardType automatisch bestimmt
+     * @param name Name der Card (ID)
+     * @param elementCardTyp ElementTyp und CardType in einem String. Beide Enums werden durch diesen String gewählt.
+     *                       Wird kein passender Typ gefunden, dann bleibt diese Eigenschaft auf null
+     * @param damage Damage der Card
+     */
+    @JsonCreator
+    public Card(@JsonProperty("Id") String name, @JsonProperty("Name") String elementCardTyp, @JsonProperty("Damage") double damage){
+        CardType tmpCard = EnumHelper.stringToCardType(elementCardTyp);
+        ElementTyp tmpElement = null;
+        if(tmpCard == null){
+            tmpCard = CardType.UNDEF;
+        }
+
+        //Spezialkarten die kein element besitzen, bekommen hier ihr natürliches element zugewiesen
+        switch (tmpCard.name().toLowerCase()) {
+            case "dragon":
+            case "fireelves":
+                tmpElement = ElementTyp.FIRE;
+                break;
+            case "ork":
+            case "wizzard":
+            case "knight":
+            case "troll":
+            case "goblin":
+            case "elf":
+                tmpElement = ElementTyp.REGULAR;
+                break;
+            case "kraken":
+                tmpElement = ElementTyp.WATER;
+                break;
+        }
+
+        if(tmpElement == null){
+            tmpElement = EnumHelper.stringToElementType(elementCardTyp);
+            //Deutsch übersetzung
+            switch (Objects.requireNonNull(tmpElement).name().toLowerCase()) {
+                case "feuer":
+                    tmpElement = ElementTyp.FIRE;
+                    break;
+                case "wasser":
+                    tmpElement = ElementTyp.WATER;
+                    break;
+                case "normal":
+                    tmpElement = ElementTyp.REGULAR;
+                    break;
+            }
+        }
+        this.name = name;
+        this.damage = damage;
+        this.elementTyp = tmpElement;
+        this.cardType = tmpCard;
+    }
+
+
+    public boolean isLocked() {
+        return locked;
+    }
+
+    public void setLocked(boolean locked) {
+        this.locked = locked;
+    }
+
+    /**
+     * Holt den Namen der at.reisinger.obj.Card
+     * @return Name der at.reisinger.obj.Card
+     */
+    @JsonGetter
+    public String getName() {
+        return this.name;
+    }
+
+    /**
+     * Holt den Damage der at.reisinger.obj.Card
+     * @return Damage der at.reisinger.obj.Card
+     */
+    @JsonGetter
+    public double getDamage() {
+        return this.damage;
+    }
+
+    /**
+     * Holt den ElementType der at.reisinger.obj.Card
+     * @return ElementType der at.reisinger.obj.Card
+     */
+    @JsonGetter
+    public ElementTyp getElementTyp() {
+        return this.elementTyp;
+    }
+
+    /**
+     * Holt den at.reisinger.enums.CardType der at.reisinger.obj.Card
+     * @return at.reisinger.enums.CardType der at.reisinger.obj.Card
+     */
+    @JsonGetter
+    public CardType getCardType() {
+        return this.cardType;
+    }
+
+    /**
+     * Setztden namen der at.reisinger.obj.Card
+     * @param neuerName Name der at.reisinger.obj.Card
+     */
+    @JsonSetter
+    public void setName(String neuerName) {
+        this.name = neuerName;
+    }
+
+    /**
+     * Setzt den Damage der at.reisinger.obj.Card
+     * @param damage Der Damage
+     */
+    @JsonSetter
+    public void setDamage(int damage) {
+        this.damage = damage;
+    }
+
+    /**
+     * Setzt den ElementType der at.reisinger.obj.Card
+     * @param elementTyp Der ElementType
+     */
+    @JsonSetter
+    public void setElementType(ElementTyp elementTyp) {
+        this.elementTyp = elementTyp;
+    }
+
+    /**
+     * Testet ob die beiden Karten gleich sind
+     * @param card at.reisinger.obj.Card die geprüft werden soll
+     * @return True wenn die Karten übereinstimmen
+     */
+    public boolean equals(Card card){
+        if(card == null) return false;
+        return this.name.equals(card.getName()) && this.cardType == card.getCardType() && this.elementTyp == card.getElementTyp() && this.damage == card.getDamage();
+    }
+}

src/main/java/at/reisinger/obj/Cards.java

@@ -0,0 +1,84 @@
+package at.reisinger.obj;
+
+import com.fasterxml.jackson.annotation.*;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+
+import java.util.ArrayList;
+import java.util.Objects;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+/**
+ * Verwaltet eine Liste vo at.reisinger.obj.Cards
+ */
+@JsonAutoDetect
+public class Cards {
+    @JsonDeserialize(as = ArrayList.class, contentAs = Card.class)
+    private ArrayList<Card> cards;
+
+    /**
+     * Erstellt ein nues obj mit gegebenen Karten
+     * @param cardsArrayList Die at.reisinger.obj.Cards zum erstellen des Obj
+     */
+    @JsonCreator
+    public Cards(@JsonProperty("cards") ArrayList<Card> cardsArrayList) {
+        this.cards = cardsArrayList;
+    }
+
+    /**
+     * Setzt die Carten
+     * @param cards Cards in einer ArrayList die gesetzt werden sollen
+     */
+    public void setCards(ArrayList<Card> cards) {
+        this.cards = cards;
+    }
+
+    /**
+     * Fügt eine neue at.reisinger.obj.Card hinzu
+     * @param newCard neue at.reisinger.obj.Card
+     */
+    @JsonSetter
+    public void addCard(Card newCard) {
+        this.cards.add(newCard);
+    }
+
+    /**
+     * Holt alle at.reisinger.obj.Cards
+     * @return Alle at.reisinger.obj.Cards
+     */
+    @JsonGetter
+    public ArrayList<Card> getCards() {
+        return this.cards;
+    }
+
+    /**
+     * Löscht die gegebene at.reisinger.obj.Card
+     * @param delCard at.reisinger.obj.Card zum löschen
+     */
+    public void delCard(Card delCard) {
+        this.cards.removeIf(obj -> obj.equals(delCard));
+    }
+
+    /**
+     * Prüft ob eine at.reisinger.obj.Card in den at.reisinger.obj.Cards vorhanden ist
+     * @param toCeck at.reisinger.obj.Card nach der in den at.reisinger.obj.Cards gesucht werden soll
+     * @return True wenn die at.reisinger.obj.Card in den at.reisinger.obj.Cards ist
+     */
+    public boolean containsCard(String toCeck){
+        AtomicBoolean returnval = new AtomicBoolean(false);
+        this.cards.forEach(item -> returnval.set(item.getName().equals(toCeck)));
+        return returnval.get();
+    }
+
+    /**
+     * Vergleicht 2 at.reisinger.obj.Cards Obj miteinander
+     * @param toCompare at.reisinger.obj.Cards zum vergleichen
+     * @return True wenn es aus den selben at.reisinger.obj.Cards besteht
+     */
+    public boolean equals(Cards toCompare){
+        if (this.cards == null && toCompare.getCards() == null){
+            return true;
+        }else if ((this.cards == null && toCompare.getCards() != null) || (this.cards != null && toCompare.getCards() == null)){
+            return false;
+        }else return Objects.requireNonNull(this.cards).containsAll(toCompare.getCards()) && toCompare.getCards().containsAll(this.cards);
+    }
+}

src/main/java/at/reisinger/obj/Coins.java

@@ -1,4 +1,4 @@
-package at.reisinger;
+package at.reisinger.obj;
 
 /**
  * Alle coins eines Users
@@ -25,12 +25,9 @@ public class Coins {
     /**
      * Fügt münzen hinzu
      * @param coins Münzen die hinzugefügt werden -> Positiv
-     * @throws NegativAmountException Wenn negative münzen hinzugefüght werden
      */
-    public void addCoin(int coins) throws NegativAmountException{
+    public void addCoin(int coins){
-        if(coins < 0) {
+        if(coins > 0) {
-            throw new NegativAmountException("Es kann kein negativer amount an at.reisinger.Coins hinzugefügt werden");
-        }else {
             this.amount += coins;
         }
     }
@@ -39,11 +36,10 @@ public class Coins {
      * Entfernt münzen
      * @param coins Münzen die entfernt werden sollen, muss positiv sein
      * @return True wenn erfolgreich
-     * @throws NegativAmountException Wenn ein negativer betrag abgezogen werden soll
      */
-    public boolean removeCoin(int coins) throws NegativAmountException{
+    public boolean removeCoin(int coins){
         if(coins < 0) {
-            throw new NegativAmountException("Es kann kein negativer amount an at.reisinger.Coins hinzugefügt werden");
+            return false;
         }else {
             this.amount -= coins;
             return true;
@@ -54,11 +50,10 @@ public class Coins {
      * Ändert den Absoluten Coin amount
      * @param coins Neue Coin anzahl, muss positiv sein
      * @return true wenn erfolgreich
-     * @throws NegativAmountException Wenn ein negativer wert eingegeben wird
      */
-    public boolean changeCoinAmmount(int coins) throws NegativAmountException{
+    public boolean changeCoinAmmount(int coins){
         if(coins < 0) {
-            throw new NegativAmountException("Es kann kein negativer amount an at.reisinger.Coins hinzugefügt werden");
+            return false;
         }else {
             this.amount = coins;
             return true;

src/main/java/at/reisinger/obj/Credentials.java

@@ -1,13 +1,14 @@
-package at.reisinger;
+package at.reisinger.obj;
 
 /**
- * at.reisinger.User Login Daten
+ * at.reisinger.obj.User Login Daten
  */
 public class Credentials {
-    private String passwort, username;
+    private final String passwort;
+    private final String username;
 
     /**
-     * Startet einen neuen at.reisinger.User mit folgenden Daten
+     * Startet einen neuen at.reisinger.obj.User mit folgenden Daten
      * @param username Diesem Usernamen
      * @param passwort Diesem Passwort
      */
@@ -24,14 +25,6 @@ public class Credentials {
         return passwort;
     }
 
-//    /**
-//     * Setzt das at.reisinger.User Passwort
-//     * @param passwort Neues Passwort
-//     */
-//    public void setPasswort(String passwort) {
-//        this.passwort = passwort;
-//    }
-
     /**
      * Holt den Usernamen des Users
      * @return Username
@@ -40,11 +33,4 @@ public class Credentials {
         return username;
     }
 
-//    /**
-//     * Setzt einen neuen Usernamen
-//     * @param username Neuer Username
-//     */
-//    public void setUsername(String username) {
-//        this.username = username;
-//    }
 }

src/main/java/at/reisinger/obj/Package.java

@@ -1,20 +1,20 @@
-package at.reisinger;
+package at.reisinger.obj;
 
 import com.fasterxml.jackson.annotation.*;
 
 /**
- * at.reisinger.Package besteht aus 4 Karten. Ist eine Erweiterung der at.reisinger.Cards, zeigt für 4 at.reisinger.Cards den Preis und einen Packagenamen an
+ * at.reisinger.obj.Package besteht aus 4 Karten. Ist eine Erweiterung der at.reisinger.obj.Cards, zeigt für 4 at.reisinger.obj.Cards den Preis und einen Packagenamen an
  */
 @JsonAutoDetect
 public class Package extends Cards{
     @JsonProperty
     private String name;
     @JsonProperty
-    private int price;
+    private final int price;
 
     /**
-     * Erstellt ein neues at.reisinger.Package mit den gegebenen Stats
+     * Erstellt ein neues at.reisinger.obj.Package mit den gegebenen Stats
-     * @param stack at.reisinger.Cards des Packages
+     * @param stack at.reisinger.obj.Cards des Packages
      * @param name Name des Packages
      * @param price Price des Packages
      */

src/main/java/at/reisinger/obj/TradingDeal.java

@@ -0,0 +1,158 @@
+package at.reisinger.obj;
+
+import at.reisinger.enums.CardType;
+import at.reisinger.enums.ElementTyp;
+import at.reisinger.server.helper.EnumHelper;
+import com.fasterxml.jackson.annotation.*;
+
+/**
+ * Ein einzelner Trading deal wird hier verwaltet.
+ */
+@JsonAutoDetect
+public class TradingDeal {
+    @JsonProperty
+    private final String id;
+    @JsonProperty
+    private final String username;
+    @JsonProperty
+    private Card cardToTrade;
+    @JsonProperty
+    private ElementTyp requiredElementType;
+    @JsonProperty
+    private double requiredMinDamage;
+    @JsonProperty
+    private CardType requiredCardType;
+
+    /**
+     * Ein TradingDeal wird  erstellt
+     * @param id Id des Trading deals
+     * @param cardToTrade at.reisinger.obj.Card die getauscht werden soll
+     * @param requiredElementType Req ElementType für den Tausch
+     * @param requiredMinDamage Req min damage für den Tausch
+     * @param requiredCardType Req at.reisinger.obj.Card Type für den Tausch
+     */
+    public TradingDeal(String id, Card cardToTrade, ElementTyp requiredElementType, double requiredMinDamage, CardType requiredCardType, String username) {
+        this.id = id;
+        this.cardToTrade = cardToTrade;
+        if(requiredElementType == null){
+            requiredElementType = ElementTyp.UNDEF;
+        }
+        if(requiredCardType == null) {
+            requiredCardType = CardType.UNDEF;
+        }
+        this.requiredElementType = requiredElementType;
+        this.requiredMinDamage = requiredMinDamage;
+        this.requiredCardType = requiredCardType;
+        this.username = username;
+    }
+
+    /**
+     * Ein TradingDeal wird  erstellt, anhand des type werden der ElementType und der CardType automatisch bestimmt
+     * @param id Id des Trading deals
+     * @param cardToTrade at.reisinger.obj.Card die getauscht werden soll
+     * @param type ElementTyp und CardType in einem String. Beide Enums werden durch diesen String gewählt.
+     *             Wird kein passender Typ gefunden, dann bleibt diese Eigenschaft auf null
+     */
+    @JsonCreator
+    public TradingDeal(@JsonProperty("Id") String id, @JsonProperty("CardToTrade") Card cardToTrade, @JsonProperty("MinimumDamage") double requiredMinDamage, @JsonProperty("Type") String type, String username) {
+        this(id, cardToTrade, EnumHelper.stringToElementType(type), requiredMinDamage, EnumHelper.stringToCardType(type), username);
+    }
+
+    /**
+     * Holt die ID des Trading deals
+     * @return Id des Trading Deals
+     */
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * Holt den usernamen
+     * @return Der username als String
+     */
+    @JsonGetter
+    public String getUsername() {
+        return username;
+    }
+
+    /**
+     * at.reisinger.obj.Card die getraded werden soll
+     * @return at.reisinger.obj.Card die getradet werden soll
+     */
+    @JsonGetter
+    public Card getCardToTrade() {
+        return this.cardToTrade;
+    }
+
+    /**
+     * Req Element type holen
+     * @return Req Element Type
+     */
+    @JsonGetter
+    public ElementTyp getRequiredElementType() {
+        return this.requiredElementType;
+    }
+
+    /**
+     * Req min damage holen
+     * @return Req min damage
+     */
+    @JsonGetter
+    public double getRequiredMinDamage() {
+        return this.requiredMinDamage;
+    }
+
+    /**
+     * Hole req cardtype
+     * @return Req at.reisinger.enums.CardType
+     */
+    @JsonGetter
+    public CardType getRequiredCardType() {
+        return this.requiredCardType;
+    }
+
+    /**
+     * Setzt die Karte die Getradet werden soll
+     * @param cardToTrade at.reisinger.obj.Card zum tauschen
+     */
+    @JsonSetter
+    public void setCardToTrade(Card cardToTrade) {
+        this.cardToTrade = cardToTrade;
+    }
+
+    /**
+     * Setzt req elementType
+     * @param requiredElementType Der Req elementType
+     */
+    @JsonSetter
+    public void setRequiredElementType(ElementTyp requiredElementType) {
+        this.requiredElementType = requiredElementType;
+    }
+
+    /**
+     * Setzt die req Min damage
+     * @param requiredMinDamage Die req min gamage
+     */
+    @JsonSetter
+    public void setRequiredMinDamage(double requiredMinDamage) {
+        this.requiredMinDamage = requiredMinDamage;
+    }
+
+    /**
+     * Setzt req cardType
+     * @param requiredCardType Der Req at.reisinger.enums.CardType
+     */
+    @JsonSetter
+    public void setRequiredCardType(CardType requiredCardType) {
+        this.requiredCardType = requiredCardType;
+    }
+
+    /**
+     * Von der at.reisinger.obj.Card im Parameter wird die at.reisinger.obj.Card mit den Requirements von THIS verglichen
+     * @param checkCard at.reisinger.obj.Card die mit dem Deal verglichen wird
+     * @return True wenn der Deal passt
+     */
+    public boolean cardOk(Card checkCard){
+        return checkCard.getCardType().equals(this.requiredCardType) && (checkCard.getElementTyp().equals(this.requiredElementType) || this.requiredElementType.name().equalsIgnoreCase("undef")) && checkCard.getDamage() >= this.requiredMinDamage;
+    }
+}

src/main/java/at/reisinger/obj/User.java

@@ -0,0 +1,163 @@
+package at.reisinger.obj;
+
+import com.fasterxml.jackson.annotation.*;
+
+import java.util.ArrayList;
+
+/**
+ * at.reisinger.obj.User & at.reisinger.Store Logik
+ */
+@JsonAutoDetect
+public class User{
+    @JsonProperty
+    private String name, nachname, email, bio, image;
+    //private DBConnection db;
+    @JsonProperty
+    private final Credentials credentials;
+    @JsonProperty
+    private final Coins coins;
+
+    /*
+     * Erstellt einen neuen at.reisinger.obj.User
+     * @param credentials Zugangsdaten des Users
+     * @param name Name des Users
+     * @param nachname Nachname des Users
+     * @param email Email des Users
+     * @param stack Alle Karten des Users
+     * @param coins Alle Münzen des Users
+
+    @JsonCreator
+    public User(@JsonProperty Credentials credentials,@JsonProperty String name,@JsonProperty String nachname,@JsonProperty String email,@JsonProperty Stack stack,@JsonProperty Coins coins) {
+        this.credentials = credentials;
+        this.name = name;
+        this.nachname = nachname;
+        this.email = email;
+        this.stack = stack;
+        this.coins = coins;
+        //this.db = new at.reisinger.server.DBConnection();
+    }
+*/
+    @JsonCreator
+    public User(@JsonProperty Credentials credentials,@JsonProperty String name,@JsonProperty String nachname,@JsonProperty String email,@JsonProperty Coins coins, @JsonProperty String bio, @JsonProperty String image) {
+        this.credentials = credentials;
+        this.name = name;
+        this.nachname = nachname;
+        this.email = email;
+        //this.stack = null;
+        this.coins = coins;
+        this.bio = bio;
+        this.image = image;
+        //this.db = new at.reisinger.server.DBConnection();
+    }
+
+    /**
+     * Holt die Bio vom User
+     * @return Bio des Users
+     */
+    @JsonGetter
+    public String getBio() {
+        return bio;
+    }
+
+    /**
+     * Setzt die Bio vom User
+     * @param bio Bio des Users
+     */
+    @JsonSetter
+    public void setBio(String bio) {
+        this.bio = bio;
+    }
+
+    /**
+     * Holt das image vom user
+     * @return Image vom user
+     */
+    @JsonGetter
+    public String getImage() {
+        return image;
+    }
+
+    /**
+     * Setzt das image vom user
+     * @param image Image vom user
+     */
+    @JsonSetter
+    public void setImage(String image) {
+        this.image = image;
+    }
+
+    /**
+     * Holt die eindeutigen Logindaten des Users
+     * @return Eindeutige Logindaten
+     */
+    @JsonGetter
+    public Credentials getCredentials() {
+        return credentials;
+    }
+
+    /**
+     * Get Name of at.reisinger.obj.User
+     * @return Name of at.reisinger.obj.User
+     */
+    @JsonGetter
+    public String getName() {
+        return this.name;
+    }
+
+    /**
+     * Get Nachname of at.reisinger.obj.User
+     * @return Nachname of at.reisinger.obj.User
+     */
+    @JsonGetter
+    public String getNachname() {
+        return this.nachname;
+    }
+
+    /**
+     * Email of at.reisinger.obj.User
+     * @return Email of at.reisinger.obj.User
+     */
+    @JsonGetter
+    public String getEmail() {
+        return this.email;
+    }
+
+    /**
+     * Setzt den Namen des Users
+     * @param name Neuer Name des Users
+     */
+    @JsonSetter
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    /**
+     * Setzt den Nachnamen
+     * @param nachname Neuer Nachname
+     */
+    @JsonSetter
+    public void setNachname(String nachname) {
+        this.nachname = nachname;
+    }
+
+    /**
+     * Setzt die Email des Users
+     * @param email Neue Email des Users
+     */
+    @JsonSetter
+    public void setEmail(String email) {
+        this.email = email;
+    }
+
+    //at.reisinger.Store Methoden
+
+    /**
+     * Kauft ein at.reisinger.obj.Package
+     * @param mypackage at.reisinger.obj.Package welches gekauft werden soll
+     * @return Alle Karten des neuen at.reisinger.obj.Package
+     */
+    public ArrayList<Card> buyPackage(Package mypackage){
+        this.coins.removeCoin(mypackage.getPrice());
+        return mypackage.getCards();
+    }
+}

src/main/java/at/reisinger/server/DBConnection.java

@@ -0,0 +1,792 @@
+package at.reisinger.server;
+
+import at.reisinger.obj.*;
+import at.reisinger.obj.Package;
+import at.reisinger.server.helper.JsonHelper;
+import at.reisinger.server.helper.PostgresHelper;
+
+import java.sql.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Stellt die Verbindung zur "Datenbank" her
+ * Die "Datenbank" sind hier nur beispieldaten.
+ */
+public class DBConnection {
+    private Connection c;
+    private Statement stmt;
+
+
+    /**
+     * Erstellt alle Beispieldaten und simuliert somit den
+     * Verbindungsaufbau zu einer DB
+     */
+    public DBConnection() {
+        this.c = null;
+    }
+
+    /**
+     * Erstellt alle Tabellen die für den Betrieb der Software bennötigt werden
+     */
+    public void init() {
+        PostgresHelper.executeUpdateMessage("CREATE TABLE IF NOT EXISTS USERS (username TEXT PRIMARY KEY NOT NULL, nachname TEXT NOT NULL, email TEXT NOT NULL, password TEXT NOT NULL, bio TEXT, image TEXT, coins integer default 20 not null)", "User Table created");
+        PostgresHelper.executeUpdate("CREATE TABLE IF NOT EXISTS CARD(NAME TEXT not null,DAMAGE FLOAT not null,ELEMENTTYP TEXT not null,CARDTYPE TEXT not null, PRIMARY KEY (\"name\"));");
+        PostgresHelper.executeUpdateMessage("create unique index IF NOT EXISTS card_name_uindex on CARD (NAME);", "Card Table created");
+        PostgresHelper.executeUpdateMessage("create table IF NOT EXISTS package(\"ID\" varchar(255) not null,name varchar(255) not null constraint name references card, i serial not null constraint package_i primary key );", "Package Table created");
+        PostgresHelper.executeUpdateMessage("create table IF NOT EXISTS user_cards(username TEXT not null constraint user_cards_users_username_fk references users,name text not null, gesperrt boolean not null);", "UserCards Table created");
+        PostgresHelper.executeUpdateMessage("create table IF NOT EXISTS user_deck(username text not null constraint user_deck_users_username_fk references users,cardname text not null);", "UserDeck Table created");
+        PostgresHelper.executeUpdateMessage("create table IF NOT EXISTS trading(username text not null constraint trading_users_username_fk references users,id text not null constraint trading_pk primary key, cardtotrade text not null constraint trading_card_name_fk references card, mindamage float not null,reqcardtype text not null,reqelement text not null);", "Trading Table created");
+        PostgresHelper.executeUpdate("create table if not exists battle(usernamecreator text not null constraint battle_users_username_fk references users,usernameplayer text constraint battle_users_username_fk_2 references users, battleid serial, deckcreator text not null);");
+        PostgresHelper.executeUpdateMessage("create unique index if not exists battle_battleid_uindex on battle (battleid);", "Battle Table created");
+        PostgresHelper.executeUpdate("create table IF NOT EXISTS battle_log(id int not null constraint battle_log_pk primary key, playerone text not null,playertwo text not null,playeronescore text not null,playertwoscore text not null,log varchar(10485760));");
+        PostgresHelper.executeUpdateMessage("create unique index IF NOT EXISTS battle_log_id_uindex on battle_log (id);", "Battle_lgo Table created");
+    }
+
+    /**
+     * Holt alle BattleIds an denen der User beteiligt war
+     * @param username User der zu prüfen ist
+     * @return Null bei fehler, sonst eine List aus den IDs
+     */
+    public ArrayList<String> getAllBattleIdUser(String username){
+        this.c = PostgresHelper.con();
+        int id;
+        ArrayList<String> battleIds = new ArrayList<>();
+        try {
+            stmt = this.c.createStatement();
+            ResultSet rs = stmt.executeQuery("select id from battle_log where playerone = '" + username + "' or playertwo = '" + username + "';");
+            while (rs.next()) {
+                id = rs.getInt("id");
+                if (id > 0) {
+                    System.out.println("BATTLE ID: " + id);
+                    battleIds.add(id + "");
+                }else {
+                    return null;
+                }
+            }
+            rs.close();
+            stmt.close();
+            this.c.close();
+            return battleIds;
+        } catch (Exception e) {
+            System.err.println(e.getClass().getName() + ": " + e.getMessage());
+            return null;
+        }
+    }
+
+    /**
+     * Holt die Letzte BattleId eines users
+     * @param username Userid die geprüft werden soll
+     * @return -1 bei error, sonst die letzte battleid des users
+     */
+    public int getLastBattleIdUser(String username){
+        this.c = PostgresHelper.con();
+        int id;
+        try {
+            stmt = this.c.createStatement();
+            ResultSet rs = stmt.executeQuery("select max(id) from battle_log where playerone = '" + username + "' or playertwo = '" + username + "';");
+            while (rs.next()) {
+                id = rs.getInt("max");
+                System.out.println("select max(id) from battle_log where playerone = '" + username + "' or playerone = '" + username + "';");
+                System.out.println("PREEEE IF ID: " + id);
+                if (id > 0) {
+                    System.out.println("LAST BATTLE ID: " + id);
+                    return id;
+                }else {
+                    return -1;
+                }
+            }
+            rs.close();
+            stmt.close();
+            this.c.close();
+        } catch (Exception e) {
+            System.err.println(e.getClass().getName() + ": " + e.getMessage());
+            return -1;
+        }
+        return -1;
+    }
+
+    /**
+     * Holt das Battellog eines Bestimmten Battles
+     * @param battleId Id des battles
+     * @return Eine Map mit namen von player1 und player2, player1Score und player2Score und log
+     */
+    public Map<String, String> getBattleLog(String battleId){
+        this.c = PostgresHelper.con();
+        String playerone, playertwo, score1, score2, log;
+        int id;
+        try {
+            stmt = this.c.createStatement();
+            ResultSet rs = stmt.executeQuery("select * from battle_log where id = " + battleId + ";");
+            while (rs.next()) {
+                id = rs.getInt("id");
+                playerone = rs.getString("playerone");
+                playertwo = rs.getString("playertwo");
+                score1 = rs.getString("playeronescore");
+                score2 = rs.getString("playertwoscore");
+                log = rs.getString("log");
+                if (id > 0 && !playerone.isEmpty() && !playertwo.isEmpty() && !score1.isEmpty() && !score2.isEmpty() && !log.isEmpty()){
+                    Map<String, String> map = new java.util.HashMap<>(Collections.emptyMap());
+                    map.put("playerone", playerone);
+                    map.put("playertwo", playertwo);
+                    map.put("playeronescore", score1);
+                    map.put("playertwoscore", score2);
+                    map.put("log", log);
+                    map.put("id", id+"");
+                    return map;
+                }else{
+                    System.out.println("GET BATTLE LOG WAS EMPTY");
+                    return null;
+                }
+
+            }
+            rs.close();
+            stmt.close();
+            this.c.close();
+        } catch (Exception e) {
+            System.err.println(e.getClass().getName() + ": " + e.getMessage());
+            return null;
+        }
+        return null;
+    }
+
+
+    /**
+     * Fügt der Battle tabelle ein battle hinzu
+     * @return True bei erfolg, sonst false
+     */
+    public boolean addBattle(String usernamecreator){
+        ArrayList<String> decknamen = getDeck(usernamecreator);
+        if(decknamen != null && !decknamen.isEmpty()){
+            Cards deck = getCardsFromIDList(decknamen);
+            if(deck != null && !deck.getCards().isEmpty()){
+                String deckJson = JsonHelper.objToJson(deck.getCards());
+                if (deckJson != null && !deckJson.isEmpty()){
+                    return PostgresHelper.executeUpdateMessage("insert into battle (usernamecreator, deckcreator) VALUES ('" + usernamecreator + "','" + deckJson + "');", "Battle created");
+                }else {
+                    return false;
+                }
+            }else {
+                return false;
+            }
+        }else{
+            return false;
+        }
+    }
+
+    /**
+     * Sucht ein verfügbares open battle aus der DB und löscht gleichzeitig das open battle
+     * @return Null falls keines verfügbar ist oder ein erir auftritt
+     */
+    public Battle getOpenBattle(){
+        this.c = PostgresHelper.con();
+        int battleid;
+        String usernamecreator;
+        try {
+            stmt = this.c.createStatement();
+            ResultSet rs = stmt.executeQuery("select * from battle limit 1;");
+            while (rs.next()) {
+                battleid = rs.getInt("battleid");
+                usernamecreator = rs.getString("usernamecreator");
+                User player1 = new DBConnection().getUser(usernamecreator);
+                if(player1 != null){
+                    ArrayList<String> deckPlayer1Arr = new DBConnection().getDeck(usernamecreator);
+                    if (deckPlayer1Arr != null){
+                        Cards deckPlayer1 = new DBConnection().getCardsFromIDList(deckPlayer1Arr);
+                        if(deckPlayer1 != null){
+                            if(delBattleEinladung(battleid+"")){
+                                return new Battle(battleid, player1, deckPlayer1);
+                            }else{
+                                return null;
+                            }
+                        }else{
+                            return null;
+                        }
+                    }else {
+                        return null;
+                    }
+                }else{
+                    return null;
+                }
+            }
+            rs.close();
+            stmt.close();
+            this.c.close();
+        } catch (SQLException throwables) {
+            throwables.printStackTrace();
+            return null;
+        }
+        return null;
+    }
+
+    /**
+     * Löscht die Battle einladung eines einzelnen spielers
+     * @param battleid Id die zu löschen ist
+     * @return true bei erfolg sonst false
+     */
+    public boolean delBattleEinladung(String battleid){
+        return PostgresHelper.executeUpdateMessage("delete from battle where battleid = '" + battleid + "';", "Battle req deleted");
+    }
+
+
+    /**
+     * Nach einem Battle wird das log eingefügt, dabei wird die selbe id wie beim battle verwendet
+     * @param id Id des Battles
+     * @param playerone Name vom Player 1
+     * @param playertwo Name vom Player 2
+     * @param playeronescore Score vom Player 1
+     * @param playertwoscore Score vom Player 2
+     * @return true bei erfolg sonst false
+     */
+    public boolean addBattleLog(String id, String playerone, String playertwo, String playeronescore, String playertwoscore, String log){
+        return PostgresHelper.executeUpdate("insert into battle_log (id, playerone, playertwo, playeronescore, playertwoscore, log) VALUES ("+id+ ",'" +playerone+ "','" +playertwo+ "','" +playeronescore+ "','" +playertwoscore+ "','" +log+ "');");
+    }
+
+
+
+
+    /**
+     * Updated den Lock einer user card
+     * @param name Name der Card
+     * @param lock Zustand des Locks
+     * @return true bei erfolg, sonst false
+     */
+    public boolean updateCardLock(String name, boolean lock){
+        return PostgresHelper.executeUpdate("Update user_cards set gesperrt = " + lock + " where name = '" + name + "';");
+    }
+
+
+    /**
+     * Prüft ob eine Card für das Deck gesperrt ist
+     * @param name Name der Card die zu prüfen ist
+     * @return True falls gesperrt, ansonst false
+     * @throws SQLException Locked Cards konnten nicht aus der DB geholt werden
+     */
+    public boolean getCardLock(String name) throws SQLException {
+        this.c = PostgresHelper.con();
+        boolean locked = false;
+        stmt = this.c.createStatement();
+        ResultSet rs = stmt.executeQuery("select gesperrt from user_cards where name = '" + name + "';");
+        while (rs.next()) {
+            locked = rs.getBoolean("gesperrt");
+        }
+        rs.close();
+        stmt.close();
+        this.c.close();
+        return locked;
+    }
+
+    /**
+     * Löscht einen Trading Deal aus der Datenbank
+     * @param id Id des deals der gelöscht werden soll
+     * @return True bei erfolg, sonst false
+     */
+    public boolean deleteTradingDeal(String id){
+        return PostgresHelper.executeUpdate("delete from trading where id = '" + id + "';");
+    }
+
+    /**
+     * Fügt der DB einen Trading deal hinzu
+     * @param username User der den Trade hinzufügt
+     * @param id Id des Trades
+     * @param mindamage Min damage der für den trade benötigt wird
+     * @param reqcardtype Req Card Type der für den trade benötigt wird
+     * @param reqelement Req Element Typ der für den trade benötigt wird
+     * @param cardtotrade Card die zum Traden ist
+     * @return True bei erfolg, sonst false
+     */
+    public boolean addTradingdeal(String username, String id, double mindamage, String reqcardtype, String reqelement, String cardtotrade){
+        return PostgresHelper.executeUpdate("INSERT INTO public.trading (username, id, cardtotrade, mindamage, reqcardtype, reqelement) VALUES ('" + username + "','" + id + "','" + cardtotrade + "','" + mindamage + "','" + reqcardtype + "','" + reqelement + "');");
+    }
+
+    /**
+     * Holt alle Trading Deals aus der DB
+     * @return Null bei error
+     */
+    public ArrayList<TradingDeal> getAllTradingDeals(){
+        this.c = PostgresHelper.con();
+        ArrayList<TradingDeal> tradingDeals = new ArrayList<>();
+        try {
+            stmt = this.c.createStatement();
+            ResultSet rs = stmt.executeQuery("select * from trading;");
+            while (rs.next()) {
+                String username, id, cardtotrade, reqcardtype, reqelement;
+                int mindamage;
+                username = rs.getString("username");
+                id = rs.getString("id");
+                cardtotrade = rs.getString("cardtotrade");
+                reqcardtype = rs.getString("reqcardtype");
+                reqelement = rs.getString("reqelement");
+                mindamage = rs.getInt("mindamage");
+
+                Card card = new DBConnection().getCardFromID(cardtotrade);
+                if(card != null){
+                    TradingDeal tmp = new TradingDeal(id, card, mindamage, reqcardtype +reqelement, username);
+                    tradingDeals.add(tmp);
+                }else{
+                    return null;
+                }
+
+
+            }
+            rs.close();
+            stmt.close();
+            this.c.close();
+        } catch (Exception e) {
+            System.err.println(e.getClass().getName() + ": " + e.getMessage());
+            return null;
+        }
+        return tradingDeals;
+    }
+
+    /**
+     * Setzt das Deck eines Users
+     * @param username Username von dem das Deck gesetzt werden soll
+     * @param deck Die ID´s des Decks in der Form einer ArrayList<String>
+     * @return True bei erfolg, sonst false
+     */
+    public boolean setDeck(String username, List<String> deck){
+        for (String st :deck) {
+            try {
+                if(getCardLock(st)){
+                    return false;
+                }
+            } catch (SQLException throwables) {
+                throwables.printStackTrace();
+                return false;
+            }
+        }
+        Cards allCards = getCards(username);
+        Cards deckCards = new Cards(new ArrayList<>());
+        int count = 0;
+        if(allCards != null && deck.size() == 4){
+            for (String st : deck) {
+                for (Card ca: allCards.getCards()) {
+                    if(ca.getName().equals(st) && count < 4){
+                        if(deckCards.getCards().size() == 0){
+                            if (!delDeck(username)){
+                                return false;
+                            }
+                        }
+                        deckCards.addCard(ca);
+                        if(deckCards.getCards().size() == 4){
+                            int c = 0;
+                            for(Card cardtmp : deckCards.getCards()){
+                                c++;
+                                if(!PostgresHelper.executeUpdateMessage("INSERT INTO public.user_deck (username, cardname) VALUES ('" +username+ "', '" +cardtmp.getName()+ "');", "Card #"+c+" added to Deck")){
+                                    return false;
+                                }
+                            }
+                            return true;
+                        }
+                    }
+                }
+                count++;
+            }
+            return false;
+        }
+        return false;
+    }
+
+    /**
+     * Holt alle Card namen aus dem Deck eines Users
+     * @param username user von dem die Deck namen geholt werden soll
+     * @return null bedeuted error
+     */
+    public ArrayList<String> getDeck(String username){
+        this.c = PostgresHelper.con();
+        String cardname;
+        ArrayList<String> cardnamenarray = new ArrayList<>();
+        try {
+            stmt = this.c.createStatement();
+            ResultSet rs = stmt.executeQuery("select * from user_deck where username = '" + username + "';");
+            while (rs.next()) {
+                cardname = rs.getString("cardname");
+                cardnamenarray.add(cardname);
+            }
+            rs.close();
+            stmt.close();
+            this.c.close();
+        } catch (Exception e) {
+            System.err.println(e.getClass().getName() + ": " + e.getMessage());
+            return null;
+        }
+        return cardnamenarray;
+    }
+
+    /**
+     * Löscht den gesammten inhalt des Decks eines users
+     * @param username Username von dem das Deck gelöscht werden soll
+     * @return True bei erfolg, sonst false
+     */
+    public boolean delDeck(String username){
+        return PostgresHelper.executeUpdateMessage("delete from user_deck where username = '" + username + "';", "User Deck: " + username + ", deleted");
+    }
+
+
+    /**
+     * Holt ein Random package aus dem Shop
+     *
+     * @param username User der das Package haben möchte
+     * @return Das Package aus dem Shop, null falls ein Fehler auftritt
+     */
+    public Package userAcquirePackage(String username) {
+        int coins = checkCoins(username);
+        if (!(coins - 5 >= 0)) {
+            return null;
+        }
+        if(!updateCoins(coins - 5, username)){
+            return null;
+        }
+
+        this.c = PostgresHelper.con();
+        String id = "";
+        try {
+            stmt = this.c.createStatement();
+            ResultSet rs = stmt.executeQuery("select \"ID\" as id from package LIMIT 1;");
+            while (rs.next()) {
+                id = rs.getString("id");
+            }
+            rs.close();
+            stmt.close();
+            this.c.close();
+        } catch (Exception e) {
+            System.err.println(e.getClass().getName() + ": " + e.getMessage());
+            return null;
+        }
+        this.c = PostgresHelper.con();
+        String packagename = "", cardname, elementtyp, cardtype;
+        int damage;
+        Cards cards = new Cards(new ArrayList<>());
+        try {
+            stmt = this.c.createStatement();
+            ResultSet rs = stmt.executeQuery("select  i as zeilennummer,  package.\"ID\" as id, package.name as packagename, c.name as cardname, c.DAMAGE as damage, c.ELEMENTTYP as elementtyp, c.CARDTYPE as cardtype from package join card c on c.name = package.name where \"ID\" = '" + id + "';");
+            while (rs.next()) {
+                id = rs.getString("id");
+                packagename = rs.getString("packagename");
+                cardname = rs.getString("cardname");
+                elementtyp = rs.getString("elementtyp");
+                cardtype = rs.getString("cardtype");
+                damage = rs.getInt("damage");
+                Card newCard = new Card(cardname, elementtyp + cardtype, damage);
+                cards.addCard(newCard);
+                if(!addUserCard(username, newCard.getName())){
+                    return null;
+                }
+            }
+            rs.close();
+            stmt.close();
+            this.c.close();
+        } catch (Exception e) {
+            System.err.println(e.getClass().getName() + ": " + e.getMessage());
+            return null;
+        }
+        if(!deletePackage(id)){
+            return null;
+        }
+
+        if (cards.getCards().size() != 0) {
+            return new at.reisinger.obj.Package(cards, packagename, 5);
+        } else {
+            return null;
+        }
+    }
+
+    /**
+     * Löscht eine user card aus der DB
+     * @param username Card löschen von
+     * @param cardname Card die vom user zu löschen ist
+     * @return True bei erfolg, sonst false
+     */
+    public boolean delUserCard(String username, String cardname){
+        return PostgresHelper.executeUpdate("delete from user_cards where username = '" +username+ "' and name = '" +cardname+ "';");
+    }
+
+    /**
+     * Fügt eine Card zu den User_Cards hinzu
+     * @param username Username der die Card bekommt
+     * @param cardName Card die der User bekommt
+     * @return True bei erfolg, sonst false
+     */
+    public boolean addUserCard(String username, String cardName){
+        Connection b = PostgresHelper.con();
+        try {
+            stmt = b.createStatement();
+            String sql = "INSERT INTO public.user_cards (username, name, gesperrt) VALUES ( '" + username + "','" + cardName + "', 'false');";
+            stmt.executeUpdate(sql);
+            stmt.close();
+            b.close();
+        } catch (Exception e) {
+            System.err.println(e.getClass().getName() + ": " + e.getMessage());
+            return false;
+        }
+        return true;
+    }
+    /**
+     * Löscht ein Package anhand des Namens
+     *
+     * @param name Name des Packages das gelöscht werden soll
+     * @return True bei erfolg, sonst false
+     */
+    public boolean deletePackage(String name) {
+        return PostgresHelper.executeUpdateMessage("DELETE FROM package WHERE \"ID\" = '" + name + "';", "Package deleted successfully");
+    }
+
+
+    /**
+     * Coins setzten
+     *
+     * @param coins Anzahl die zu setzten ist
+     * @return True bei erfolg, sonst false
+     */
+    public boolean updateCoins(int coins, String username) {
+        return PostgresHelper.executeUpdateMessage("UPDATE users SET coins = " + coins + " WHERE username = '" + username + "';", "Coins Updated");
+    }
+
+    /**
+     * Gibt die Anzahl an verfügbaren coins zurück
+     *
+     * @return Anzahl der Coins, -1 ist error
+     */
+    public int checkCoins(String username) {
+        this.c = PostgresHelper.con();
+        int coins = 0;
+        try {
+            stmt = this.c.createStatement();
+            ResultSet rs = stmt.executeQuery("Select coins from users where username = '" + username + "';");
+            while (rs.next()) {
+                coins = rs.getInt("coins");
+            }
+            rs.close();
+            stmt.close();
+            this.c.close();
+        } catch (Exception e) {
+            System.err.println(e.getClass().getName() + ": " + e.getMessage());
+            return -1;
+        }
+        return coins;
+    }
+
+    /**
+     * Überprüft anhand des Namen der Karte, ob es schon eine solche Karte gibt
+     *
+     * @param name Name der zu prüfen ist
+     * @return True falls die Karte bereits existiert
+     */
+    public boolean cardExists(String name) {
+        this.c = PostgresHelper.con();
+        int count = 0;
+        try {
+            stmt = this.c.createStatement();
+            ResultSet rs = stmt.executeQuery("select count(*) from card where name = '" + name + "';");
+            while (rs.next()) {
+                count = rs.getInt("count");
+            }
+            rs.close();
+            stmt.close();
+            this.c.close();
+        } catch (Exception e) {
+            System.err.println(e.getClass().getName() + ": " + e.getMessage());
+            System.exit(0);
+        }
+        return count == 1;
+    }
+
+    /**
+     * Fügt eine Karte der DB hinzu
+     *
+     * @param card Card die hinzugefügt werden soll
+     * @return true bei erfolg, false bei error
+     */
+    public boolean addCard(Card card) {
+        return PostgresHelper.executeUpdateMessage("insert into card (NAME, DAMAGE, ELEMENTTYP, CARDTYPE) values ('" + card.getName() + "','" + card.getDamage() + "','" + card.getElementTyp().name() + "','" + card.getCardType().name() + "')", "Card added");
+    }
+
+    /**
+     * Ermittelt die nächste Package ID
+     *
+     * @return Die Nächste Package id, wenn 0, dann ist ein error
+     */
+    public int nextPackageId() {
+        this.c = PostgresHelper.con();
+        String id = "";
+        try {
+            stmt = this.c.createStatement();
+            ResultSet rs = stmt.executeQuery("select max(\"ID\") from package;");
+            while (rs.next()) {
+                id = rs.getString("max");
+            }
+            if (id == null) {
+                id = "0";
+            }
+            rs.close();
+            stmt.close();
+            this.c.close();
+        } catch (Exception e) {
+            System.err.println(e.getClass().getName() + ": " + e.getMessage());
+            return 0;
+        }
+        return Integer.parseInt(id) + 1;
+    }
+
+    /**
+     * Fügt eine Package der DB hinzu,
+     * wenn eine Karte aus dem Package noch nicht in der Db ist,
+     * dann wird es automatisch hinzugefuegt
+     *
+     * @param pack Pack welches hinzugefügt werden soll
+     * @return True bei erfolg, false bei fehler
+     */
+    public boolean addPackage(at.reisinger.obj.Package pack) {
+        for (Card ca : pack.getCards()) {
+            if (!cardExists(ca.getName())) {
+                if (!addCard(ca)) {
+                    return false;
+                }
+            }
+            if(!PostgresHelper.executeUpdateMessage("INSERT INTO package (\"ID\", \"name\") values ('" + pack.getName() + "','" + ca.getName() + "');", "Card zu Package hinzugefügt")){
+                return false;
+            }
+        }
+        return true;
+    }
+
+    /**
+     * Fügt einen User der DB hinzu
+     *
+     * @param username Username des Users
+     * @param password Passwort des Users
+     * @param nachname nachname des Users
+     * @param email    Email des Users
+     * @return True wenn alles erfolgreich war, false wenn es nicht erfolgreich war
+     */
+    public boolean addUser(String username, String password, String nachname, String email, String bio, String image) {
+        return PostgresHelper.executeUpdateMessage("INSERT INTO users (username, nachname, email, password, bio, image) values ('" + username + "','" + nachname + "','" + email + "','" + password + "','" + bio + "','" + image + "')", "User added");
+    }
+
+    /**
+     * Updated den Nachnamen, Bio und das Image eines Users mit gegebenen usernamen
+     * @param username User der geändert werden soll
+     * @param bio Neue BIO
+     * @param image Neues Image
+     * @param name Neuer Nachname
+     * @return True bei erfolg, sonst false
+     */
+    public boolean updateUser(String username, String bio, String image, String name){
+        return PostgresHelper.executeUpdate("UPDATE public.users SET nachname = '" + name+ "', bio = '" +bio+ "', image = '" +image+ "' WHERE username LIKE '" +username+ "' ESCAPE '#'");
+    }
+
+    /**
+     * Sucht einen User anhand des Usernamens.
+     * Gibt ein User Objekt zurück
+     *
+     * @param uname Username der zu suchen ist
+     * @return User als User Objekt, null bei fehler
+     */
+    public User getUser(String uname){
+        this.c = PostgresHelper.con();
+        String username = "", password = "", email = "", bio="", image="";
+        try {
+            stmt = this.c.createStatement();
+            ResultSet rs = stmt.executeQuery("SELECT * FROM users where username = '" + uname + "';");
+            while (rs.next()) {
+                username = rs.getString("username");
+                email = rs.getString("email");
+                password = rs.getString("password");
+                bio = rs.getString("bio");
+                image = rs.getString("image");
+            }
+            rs.close();
+            stmt.close();
+            this.c.close();
+        } catch (Exception e) {
+            System.err.println(e.getClass().getName() + ": " + e.getMessage());
+            return null;
+        }
+        return new User(new Credentials(username, password), username, username, email, new Coins(20), bio, image);
+    }
+
+    /**
+     * Holt eine Card aus der DB, anhand der gegebenen Card Id
+     * @param id Id der Card die geholt werden soll
+     * @return Null bei error
+     */
+    public Card getCardFromID(String id){
+        Connection b = PostgresHelper.con();
+        Card toreturn = null;
+        try {
+            stmt = b.createStatement();
+            ResultSet rs = stmt.executeQuery("select * from card where NAME =  '" + id + "';");
+            while (rs.next()) {
+                int damage =rs.getInt("damage");
+                String elementtyp =rs.getString("elementtyp");
+                String cardtype=rs.getString("cardtype");
+                toreturn = new Card(id, elementtyp+cardtype, damage);
+            }
+            rs.close();
+            stmt.close();
+            b.close();
+        } catch (Exception e) {
+            System.err.println(e.getClass().getName() + ": " + e.getMessage());
+            return null;
+        }
+        return toreturn;
+    }
+
+    /**
+     * Holt alle Carten einer gegebenen Card ID List
+     * @param cardnamenarray Card IDs in einer Liste
+     * @return Falls null, dann war ein error
+     */
+    public Cards getCardsFromIDList(List<String> cardnamenarray){
+        Cards allCards = new Cards(new ArrayList<>());
+        for (String st : cardnamenarray) {
+            Connection b = PostgresHelper.con();
+            try {
+                stmt = b.createStatement();
+                ResultSet rs = stmt.executeQuery("select * from card where NAME =  '" + st + "';");
+                while (rs.next()) {
+                    int damage =rs.getInt("damage");
+                    String elementtyp =rs.getString("elementtyp");
+                    String cardtype=rs.getString("cardtype");
+                    allCards.addCard(new Card(st, elementtyp+cardtype, damage));
+                }
+                rs.close();
+                stmt.close();
+                b.close();
+            } catch (Exception e) {
+                System.err.println(e.getClass().getName() + ": " + e.getMessage());
+                return null;
+            }
+        }
+        return allCards;
+    }
+
+    /**
+     * Holt alle Karten eines Users
+     * @param username Username des Users
+     * @return Cards Object, falls es null ist, war ein fehler
+     */
+    public Cards getCards(String username){
+        this.c = PostgresHelper.con();
+        String cardname;
+        ArrayList<String> cardnamenarray = new ArrayList<>();
+        try {
+            stmt = this.c.createStatement();
+            ResultSet rs = stmt.executeQuery("select * from user_cards where username = '" + username + "';");
+            while (rs.next()) {
+                cardname = rs.getString("name");
+                cardnamenarray.add(cardname);
+            }
+            rs.close();
+            stmt.close();
+            this.c.close();
+        } catch (Exception e) {
+            System.err.println(e.getClass().getName() + ": " + e.getMessage());
+            return null;
+        }
+        return getCardsFromIDList(cardnamenarray);
+    }
+}

src/main/java/at/reisinger/server/Main.java

@@ -1,7 +1,5 @@
 package at.reisinger.server;
 
-import at.reisinger.DBConnection;
-import at.reisinger.server.msg.MsgHandler;
 import at.reisinger.server.objects.Request;
 import at.reisinger.server.objects.Response;
 
@@ -16,19 +14,15 @@ import java.net.Socket;
 public class Main {
     static final int port = 80;
     private Socket socket;
-    private int id;
-    private MsgHandler msgHandler;
 
     /**
      * Initial Start
      * @param args Nicht Verwendet
      */
     public static void main(String[] args) {
-        System.out.println("DB init");
         new DBConnection().init();
         System.out.println("\n\nStarte Server auf Port " + port + "\n\n");
         new Main(port);
-
     }
 
     /**
@@ -36,12 +30,9 @@ public class Main {
      * @param port Port auf dem der Server läuft
      */
     public Main(int port){
-        ServerSocket serverSocket = null;
+        ServerSocket serverSocket;
         try {
             serverSocket = new ServerSocket(port);
-
-            //this.msgHandler = new MsgHandler();
-            //this.id = 0;
             while (true){
                 this.socket = serverSocket.accept();
                 requestResponding();
@@ -56,12 +47,11 @@ public class Main {
      */
     public void requestResponding(){
         try{
-            System.out.println("Socket von Client #" + this.id + " wurde gestartet!");
+            System.out.println("Socket wurde gestartet!");
-            Request rq = new Request(this.socket, this.id);
+            Request rq = new Request(this.socket);
-            Response rp = new Response(this.id, rq.getUrl(), rq.getCmd(), rq.getOut(), rq.getAuthString(), rq.getPayload());
+            new Response(rq.getUrl(), rq.getCmd(), rq.getOut(), rq.getAuthString(), rq.getPayload());
-            //this.msgHandler = rp.getMsghandler();
             this.socket.close();
-            System.out.println("Socket von Client #" + this.id + " wurde geschlossen!");
+            System.out.println("Socket wurde geschlossen!");
         }catch (IOException e){
             e.printStackTrace();
         }

src/main/java/at/reisinger/server/helper/EnumHelper.java

@@ -0,0 +1,38 @@
+package at.reisinger.server.helper;
+
+import at.reisinger.enums.CardType;
+import at.reisinger.enums.ElementTyp;
+
+/**
+ * Hilft beim manipulieren von enums
+ */
+public class EnumHelper {
+
+    /**
+     * Wenn ein String als ElementType vorhanden ist, dann gibt er den passenden ElementType zurück
+     * @param elementTypeString elementType als String
+     * @return Passender Element Type oder null falls nicht gefunden
+     */
+    public static ElementTyp stringToElementType(String elementTypeString){
+        for (ElementTyp e : ElementTyp.values()) {
+            if (elementTypeString.toLowerCase().contains(e.name().toLowerCase())) {
+                return e;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Wenn ein String als cardType vorhanden ist, dann gibt er den passenden cardType zurück
+     * @param cardTypeString cardType als String
+     * @return Passender Card Type oder null falls nicht gefunden
+     */
+    public static CardType stringToCardType(String cardTypeString){
+        for (CardType me : CardType.values()) {
+            if (cardTypeString.toLowerCase().contains(me.toString().toLowerCase())) {
+                return me;
+            }
+        }
+        return null;
+    }
+}

src/main/java/at/reisinger/server/helper/JsonHelper.java

@@ -1,7 +1,77 @@
 package at.reisinger.server.helper;
 
+import at.reisinger.obj.User;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Hilfsfunktionen für Jackson Json
+ */
 public class JsonHelper {
 
+    /**
+     * Wandelt ein Objekt in ein Json um
+     * @param obj Objekt das in ein Json umgewandelt werden soll
+     * @return Json String des Packages
+     */
+    public static String objToJson(Object obj){
+        ObjectMapper objectMapper = new ObjectMapper();
+        String packageJson = "";
+        if(obj != null) {
+            try {
+                packageJson += objectMapper.writeValueAsString(obj);
+            } catch (JsonProcessingException e) {
+                packageJson = "Error: JsonProcessingException -> " + e.getMessage();
+            }
+            return packageJson;
+        }else{
+            return null;
+        }
+    }
 
+    /**
+     * Json zu List
+     * @param payload Json String
+     * @return List aus dem json, bei einer JsonProcessingException null
+     */
+    public static List<String> jsonPayloadToList(String payload){
+        ObjectMapper objectMapper = new ObjectMapper();
+        try {
+            return objectMapper.readValue(payload, new TypeReference<>() {
+            });
+        } catch (JsonProcessingException e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+
+    /**
+     * Json zu Map
+     * @param payload Json String
+     * @return Map aus dem json, bei einer JsonProcessingException null
+     */
+    public static Map<String, Object> jsonPayloadToMap(String payload){
+        ObjectMapper objectMapper = new ObjectMapper();
+        try {
+            return objectMapper.readValue(payload, new TypeReference<>() {
+            });
+        } catch (JsonProcessingException e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+
+    /**
+     * Wandelt ein Objekt in ein Json um
+     * @param user Objekt das in ein Json umgewandelt werden soll
+     * @return Json String des Packages
+     */
+    public static String userToJson(User user){
+        return objToJson(user);
+    }
 
 }

src/main/java/at/reisinger/server/helper/PostgresHelper.java

@@ -0,0 +1,59 @@
+package at.reisinger.server.helper;
+
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.Statement;
+
+/**
+ * Hilfsfunktionen für die verwendung der Postgres DB
+ */
+public class PostgresHelper {
+
+    /**
+     * Verbindet mit der Datenbank
+     * @return Das Connection Objekt
+     */
+    public static Connection con() {
+        Connection c = null;
+        try {
+            Class.forName("org.postgresql.Driver");
+            c = DriverManager
+                    .getConnection("jdbc:postgresql://postgres.dergeorg.at:5432/mtcg",
+                            "user", "user");
+        } catch (Exception e) {
+            e.printStackTrace();
+            System.err.println(e.getClass().getName() + ": " + e.getMessage());
+        }
+        return c;
+    }
+
+    /**
+     * Führt ein Sql statement ohne rückgabe aus, mit message nachricht
+     * @param sql Sql command
+     * @return True bei erfolg, sonst false
+     */
+    public static boolean executeUpdateMessage(String sql, String message){
+        System.out.println(message);
+        return executeUpdate(sql);
+    }
+
+    /**
+     * Führt ein Sql statement ohne rückgabe aus
+     * @param sql Sql command
+     * @return True bei erfolg, sonst false
+     */
+    public static boolean executeUpdate(String sql){
+        Connection c = con();
+        Statement stmt;
+        try {
+            stmt = c.createStatement();
+            stmt.executeUpdate(sql);
+            stmt.close();
+            c.close();
+        } catch (Exception e) {
+            System.err.println(e.getClass().getName() + ": " + e.getMessage());
+            return false;
+        }
+        return true;
+    }
+}

src/main/java/at/reisinger/server/helper/ResponseHelper.java

@@ -0,0 +1,23 @@
+package at.reisinger.server.helper;
+
+/**
+ * Einige helper Funktionen der Respone Class
+ */
+public class ResponseHelper {
+
+    public static StringBuilder logLineBreak(String log){
+        StringBuilder resString = new StringBuilder();
+        for (char lo: log.toCharArray()){
+            if(lo == ','){
+                resString.append("\n");
+            }else if(lo == '['){
+                resString.append("\n");
+            }else if(lo == ']'){
+                resString.append("\n");
+            }else {
+                resString.append(lo);
+            }
+        }
+        return resString;
+    }
+}

src/main/java/at/reisinger/server/msg/MsgHandler.java

@@ -1,89 +0,0 @@
-package at.reisinger.server.msg;
-
-import at.reisinger.server.objects.Msg;
-
-import java.util.HashMap;
-
-/**
- * Der Speicher der Nachrichten
- * Mit hilfe einer HashMap werden die MsgId und die Msg selbst gespeichert
- * @author Georg Reisinger
- */
-public class MsgHandler {
-    private HashMap<Integer , String> msgHashMap;
-    private int lastID;
-
-    /**
-     * Erstellt den MsgHandler mit standart Test Messages
-     */
-    public MsgHandler(){
-        msgHashMap = new HashMap<Integer, String>();
-        addMsg("Hallo");
-        addMsg("Wie");
-        addMsg("Geht");
-        addMsg("Es");
-        addMsg("Dir?");
-
-    }
-
-    /**
-     * Ermitelt die nächste freie Id
-     * @return Next ID
-     */
-    private int nextId(){
-        return this.lastID + 1;
-    }
-
-    /**
-     * Msg hinzufügen
-     * @param msg Message Text
-     */
-    public int addMsg(String msg){
-        int id = nextId();
-        msgHashMap.put(id, msg);
-        this.lastID = id;
-        return id;
-    }
-
-    /**
-     * Msg löschen
-     * @param id Message Id
-     */
-    public String delMsg(int id){
-        return msgHashMap.remove(id);
-    }
-
-    /**
-     * Msg bearbeiten
-     * @param id Message Id
-     * @param msg Message Text
-     */
-    public String editMsg(int id, String msg){
-        return msgHashMap.replace(id, msg);
-    }
-
-    /**
-     * Msg als Objekt holen
-     * @param id Message Id
-     * @return Message als Msg Objekt
-     */
-    public Msg getMsg(int id){
-        return new Msg(id, msgHashMap.get(id));
-    }
-
-    /**
-     * Alle Nachrichten werden in den Format Key, Value besorgt
-     * bsp: key: 1 value: Nachricht
-     * @return Alle nachrichten in einem String
-     */
-    public String getAllMsg(){
-        String returnStr = "";
-        // Print keys and values
-        for (Integer i : msgHashMap.keySet()) {
-            String item = "key: " + i + " value: " + msgHashMap.get(i) + "\n";
-            returnStr += item;
-        }
-        System.out.println(returnStr);
-        return returnStr;
-    }
-}

src/main/java/at/reisinger/server/objects/Msg.java

@@ -1,37 +0,0 @@
-package at.reisinger.server.objects;
-
-/**
- * Message Objekt beinmhaltet die MsgId und die Msg selbst
- * @author Georg Reisinger
- */
-public class Msg {
-    private int id;
-    private String msg;
-
-    /**
-     * Erstellt eine Message
-     */
-    public Msg(int id, String msg){
-        this.id = id;
-        this.msg = msg;
-    }
-
-
-    /**
-     * get field
-     *
-     * @return id Message Id
-     */
-    public int getId() {
-        return this.id;
-    }
-
-    /**
-     * get field
-     *
-     * @return msg Message String
-     */
-    public String getMsg() {
-        return this.msg;
-    }
-}

src/main/java/at/reisinger/server/objects/Request.java

@@ -6,6 +6,7 @@ import java.io.InputStreamReader;
 import java.io.PrintStream;
 import java.net.Socket;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -14,29 +15,23 @@ import java.util.List;
  */
 public class Request {
 
-    private final Socket socket;
+    private final PrintStream out;
-    private final int          id;
+    private final String       cmd;
-    private PrintStream out;
+    private final String       url;
-    private String       cmd;
+    private final String payload;
-    private String       url;
+    private final String authString;
-    private final StringBuilder rqBuilder;
-    private String payload;
-    private String authString;
 
     /**
-     * Get Request
+     * Besorgt alle nötigen infos aus dem request
      * @param socket Socket von dem der Request kommt
-     * @param id Thread ID
      */
-    public Request(Socket socket, int id) throws IOException {
+    public Request(Socket socket) throws IOException {
-        this.socket = socket;
+        StringBuilder rqBuilder = new StringBuilder();
-        this.rqBuilder = new StringBuilder();
+        this.out = new PrintStream(socket.getOutputStream());
-        this.id = id;
-        this.out = new PrintStream(this.socket.getOutputStream());
         BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(socket.getInputStream()));
         String line = bufferedReader.readLine();
         while (!line.isBlank()) {
-            rqBuilder.append(line + "\r\n");
+            rqBuilder.append(line).append("\r\n");
             line = bufferedReader.readLine();
             System.out.println(line);
         }
@@ -59,22 +54,26 @@ public class Request {
         this.url = path;
         this.cmd = method;
 
-        List<String> headers = new ArrayList<>();
+        List<String> headers = new ArrayList<>(Arrays.asList(requestsLines).subList(2, requestsLines.length));
-        for (int h = 2; h < requestsLines.length; h++) {
-            String header = requestsLines[h];
-            headers.add(header);
-        }
 
-        int authIndex = headers.toString().indexOf("Authorization");
-        String authString = headers.toString().substring(authIndex + 21);
-        int authIndexEnd = authString.indexOf(',');
-        authString = authString.substring(0, authIndexEnd);
 
-        this.authString = authString;
 
         String accessLog = String.format("Client %s, method %s, path %s, version %s, host %s, headers %s",
                 socket.toString(), method, path, version, host, headers.toString());
         System.out.println(accessLog);
+        if(headers.toString().contains("Authorization: Basic")) {
+            int authIndex = headers.toString().indexOf("Authorization: Basic");
+            String authString = headers.toString().substring(authIndex + 21);
+            int authIndexEnd = authString.indexOf(',');
+            if(authIndexEnd == -1){
+                authIndexEnd = authString.indexOf(']');
+            }
+            authString = authString.substring(0, authIndexEnd);
+
+            this.authString = authString;
+        }else{
+            this.authString = null;
+        }
     }
 
     /**

src/main/java/at/reisinger/server/objects/Response.java

@@ -1,89 +1,175 @@
 package at.reisinger.server.objects;
 
-import at.reisinger.*;
+import at.reisinger.obj.*;
-import at.reisinger.Package;
+import at.reisinger.obj.Package;
-import at.reisinger.server.msg.MsgHandler;
+import at.reisinger.server.DBConnection;
+import at.reisinger.server.helper.JsonHelper;
+import at.reisinger.server.helper.ResponseHelper;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 import java.io.PrintStream;
-import java.io.UnsupportedEncodingException;
+import java.util.*;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.Base64;
-import java.util.List;
-import java.util.Map;
 
 /**
  * Erstellt und sendet eine Response anhand des Requests
  * @author Georg Reisinger
  */
 public class Response {
-
+    private final PrintStream out;
-    //private final Socket socket;
+    private final String       url;
-    private final int          id;
+    private final String payload;
-    private PrintStream out;
+    private final String authString;
-    private String       cmd;
-    private String       url;
-    private String payload;
-    private String authString;
-    private MsgHandler msgHandler;
-    private StringBuilder rqBuilder;
 
     /**
      * Nimmt die Daten des requests und generiert eine Response
-     * @param id Thread Id
      * @param url Request Url
      * @param cmd Request CMD
      * @param out out Print Stream
      * @param authString Der MsgHandler
      * @param payload Payload des Requests
      */
-    public Response(int id, String url, String cmd, PrintStream out, String authString, String payload){
+    public Response(String url, String cmd, PrintStream out, String authString, String payload){
-        this.id = id;
         this.authString = authString;
         this.url = url;
-        this.cmd = cmd;
         this.out = out;
         this.payload = payload;
-        this.rqBuilder = new StringBuilder();
-        System.out.println(cmd);
         if (this.url != null) {
-            if (this.cmd.equals("GET")) {
+            switch (cmd) {
-                getMethodes();
+                case "GET":
-            }else if (this.cmd.equals("POST")){
+                    if (login()) {
-                try {
+                        getMethodes();
-                    postMethodes();
+                    } else {
-                } catch (JsonProcessingException e) {
+                        sendResponse("Login Error", "401");
-                    e.printStackTrace();
+                    }
-                }
+                    break;
-            }else if (this.cmd.equals("PUT")){
+                case "POST":
-                putMethodes();
+                    try {
-            }else if (this.cmd.equals("DELETE")){
+                        postMethodes();
-                deleteMethodes();
+                    } catch (JsonProcessingException e) {
-            }else{
+                        e.printStackTrace();
-                sendError("405");
+                    }
+                    break;
+                case "PUT":
+                    if (login()) {
+                        putMethodes();
+                    } else {
+                        sendResponse("Login Error", "401");
+                    }
+                    break;
+                case "DELETE":
+                    if (login()) {
+                        deleteMethodes();
+                    } else {
+                        sendResponse("Login Error", "401");
+                    }
+                    break;
+                default:
+                    sendResponse("", "405");
+                    break;
             }
         }
     }
 
+    /**
+     * Alle Get Methoden
+     * Nur für angemeldete user erreichbar
+     */
     private void getMethodes(){
-        if (this.url.startsWith("/messages")) {
+        if (this.url.startsWith("/users")) {
-            String lastBit = this.url.substring(this.url.lastIndexOf('/') + 1);
+            String username = this.url.substring(this.url.lastIndexOf('/') + 1);
-            System.out.println("Last Bit: " + lastBit);
+            User user;
-            if(lastBit.equals("messages")){
+            user = new DBConnection().getUser(username);
-                listAllMsg();
+            if (user != null){
-            }else{
+                String userJson = JsonHelper.userToJson(user);
-                String message = msgHandler.getMsg(Integer.parseInt(lastBit)).getMsg();
+                if(userJson != null && !userJson.isEmpty()){
-                if(message == null){
+                    sendResponse(userJson, "200");
-                    sendError("404");
-                }else {
-                    sendResponse(message, "200");
                 }
+            }else{
+                sendResponse("", "500");
             }
-        } else if (this.url.startsWith("/")) {
+        } else if (this.url.startsWith("/cards")) {
-            startseite();
+            String username = basicAuthGetUsername(this.authString);
+            Cards allCards = new DBConnection().getCards(username);
+            String jsonCards = JsonHelper.objToJson(allCards);
+            if (jsonCards != null && !jsonCards.isEmpty()){
+                sendResponse(jsonCards, "200");
+            }else{
+                sendResponse("", "500");
+            }
+        }else if(this.url.startsWith("/deck")) {
+            String format = this.url.substring(this.url.lastIndexOf('?') + 1);
+            String username = basicAuthGetUsername(this.authString);
+            ArrayList<String> allCards = new DBConnection().getDeck(username);
+            Cards deck;
+            Object tmp;
+            if(format.startsWith("format=plain")){
+                tmp = allCards;
+            }else{
+                deck = new DBConnection().getCardsFromIDList(allCards);
+                tmp = deck;
+            }
+            String jsonCards = JsonHelper.objToJson(tmp);
+            if (jsonCards != null && !jsonCards.isEmpty()) {
+                sendResponse(jsonCards, "200");
+            } else {
+                sendResponse("", "500");
+            }
+        }else if(this.url.startsWith("/tradings")) {
+            ArrayList<TradingDeal> allDeals = new DBConnection().getAllTradingDeals();
+            if(allDeals != null && !allDeals.isEmpty()){
+                String json = JsonHelper.objToJson(allDeals);
+                if(json != null && !json.equals("")){
+                    sendResponse(json, "200");
+                }else{
+                    sendResponse("", "500");
+                }
+            }else{
+                sendResponse("", "500");
+            }
+        }else if(this.url.startsWith("/score")) {
+            String username = basicAuthGetUsername(this.authString);
+            if (username != null && !username.isEmpty()){
+                int lastBallteId = new DBConnection().getLastBattleIdUser(username);
+                if (lastBallteId > -1){
+                    Map<String, String> map = new DBConnection().getBattleLog(lastBallteId + "");
+                    if(map != null && !map.isEmpty()){
+                        sendResponse("BATTLE #" + map.get("id") + "\nSCORE\n" + map.get("playerone") + "(#Player1) |vs| " + map.get("playertwo") + "(#Player2) \n" + map.get("playeronescore") + "(#Player1) |vs| " + map.get("playertwoscore") + "(#Player2) \nGame LOG:\n" + ResponseHelper.logLineBreak(map.get("log")), "200");
+                    }else {
+                        sendResponse("Konnte Battle log nicht holen", "500");
+                    }
+                }else {
+                    sendResponse("Last Battle ID error", "500");
+                }
+
+            }else{
+                sendResponse("Login Error", "401");
+            }
+        }else if(this.url.startsWith("/stats")) {
+            String username = basicAuthGetUsername(this.authString);
+            if (username != null && !username.isEmpty()) {
+                ArrayList<String> battleIds = new DBConnection().getAllBattleIdUser(username);
+                if (battleIds != null && !battleIds.isEmpty()){
+                    StringBuilder resString = new StringBuilder();
+                    for(String i : battleIds){
+                        Map<String, String> map = new DBConnection().getBattleLog(i + "");
+                        if(map != null && !map.isEmpty()){
+                            resString = new StringBuilder("BATTLE #" + map.get("id") + "\nSCORE\n" + map.get("playerone") + "(#Player1) |vs| " + map.get("playertwo") + "(#Player2) \n" + map.get("playeronescore") + "(#Player1) |vs| " + map.get("playertwoscore") + "(#Player2) \nGame LOG:\n");
+                            resString.append(ResponseHelper.logLineBreak(map.get("log")));
+                        }else {
+                            sendResponse("Konnte Battle log nicht holen", "500");
+                        }
+                    }
+                    sendResponse(resString.toString(), "200");
+                }else {
+                    sendResponse("Konnte Battle ids ned holen", "500");
+                }
+            }else{
+                sendResponse("Login Error", "401");
+            }
+        }else{
+            sendResponse("", "204");
         }
     }
 
@@ -96,172 +182,409 @@ public class Response {
      */
     private boolean basicAuth(String username, String password, String compareTo){
         String authStringEnc = basicAuthBase64(username, password);
-        if (compareTo.equals(authStringEnc)){
+        return compareTo.equals(authStringEnc);
-            return true;
-        }
-        return false;
     }
 
+    /**
+     * Erstellt den basicAuth Base64 Token aus Username und Passwort
+     * @param username Username für den Token
+     * @param password Passwort für den Token
+     * @return Der Base64 BasicAtuth String
+     */
     private String basicAuthBase64(String username, String password){
         String authString = username + ":" + password;
-        //System.out.println("auth string: " + authString);
         byte[] authEncBytes = Base64.getEncoder().encode(authString.getBytes());
-        String authStringEnc = new String(authEncBytes);
+        return new String(authEncBytes);
-        //System.out.println("Base64 encoded auth string: " + authStringEnc);
-        return authStringEnc;
     }
 
-    private String basicAuthGetUsername(String authString) throws UnsupportedEncodingException {
+    /**
+     * Aus dem Base64 BasicAuth String wird der Username extrahiert
+     * @param authString Base64 BasicAuth String aus dem der Username ausgelesen werden soll
+     * @return Der Username der in dem Base64 BasicAuth String ist
+     */
+    private String basicAuthGetUsername(String authString) {
         String[] values;
         if (authString != null) {
-            System.out.println("1");
             byte[] credDecoded = Base64.getDecoder().decode(authString);
-            System.out.println("2");
             String credentials = new String(credDecoded);
-            System.out.println("credentials:   ");
-            System.out.println(credentials);
-            // credentials = username:password
             values = credentials.split(":", 2);
         }else{
             values = null;
         }
-        return values[0];
+        return Objects.requireNonNull(values)[0];
     }
 
+    /**
+     * Alle Post Methoden, siehe API beschreibung für genauere details
+     *
+     * Kann auch von nicht angemeldeten usern erreicht werden.
+     * login() wird hier verwendet
+     * @throws JsonProcessingException Fehler beim de-/serialisieren
+     */
     private void postMethodes() throws JsonProcessingException {
         if (this.url.startsWith("/users")) {
-            //payload to map
+            Map<String, Object> map = JsonHelper.jsonPayloadToMap(this.payload);
-            ObjectMapper objectMapper = new ObjectMapper();
+            String username = (String) Objects.requireNonNull(map).get("Username");
-            Map<String, Object> map = objectMapper.readValue(this.payload, new TypeReference<Map<String,Object>>(){});
-            String username = (String) map.get("Username");
             String password = (String) map.get("Password");
-            User newUser = new User(new Credentials(username, password), username, username, "not implemented", new Coins(20));
+            User newUser = new User(new Credentials(username, password), username, username, "not implemented",  new Coins(20), "BIO", "IMAGE");
-            System.out.println("CON DB");
             DBConnection con = new DBConnection();
-            if(!con.addUser(username, password, username, "not implemented")){
+            if(!con.addUser(newUser.getCredentials().getUsername(), newUser.getCredentials().getPasswort(), newUser.getCredentials().getUsername(), newUser.getEmail(), newUser.getBio(), newUser.getImage())){
-                sendError("409");
+                sendResponse("", "409");
             }
-
+            String userJson = JsonHelper.userToJson(newUser);
-            //User to json
+            if(userJson != null) {
-            objectMapper = new ObjectMapper();
-            String userJson = "";
-            if(newUser != null) {
-                try {
-                    userJson += objectMapper.writeValueAsString(newUser);
-                } catch (JsonProcessingException e) {
-                    userJson = "Error: JsonProcessingException -> " + e.getMessage();
-                }
                 sendResponse(userJson, "201");
             }else{
-                sendError("500");
+                sendResponse("", "500");
             }
         }else if (this.url.startsWith("/sessions")) {
-            //payload to map
+            Map<String, Object> map = JsonHelper.jsonPayloadToMap(this.payload);
-            ObjectMapper objectMapper = new ObjectMapper();
+            String username = (String) Objects.requireNonNull(map).get("Username");
-            Map<String, Object> map = objectMapper.readValue(this.payload, new TypeReference<Map<String,Object>>(){});
-            String username = (String) map.get("Username");
             String password = (String) map.get("Password");
-            User user = null;
+            User user;
 
             DBConnection con = new DBConnection();
-            try {
+            user = con.getUser(username);
-                user = con.getUser(username);
-            } catch (SQLException throwables) {
-                throwables.printStackTrace();
-            }
 
             String authString = basicAuthBase64(user.getCredentials().getUsername(), user.getCredentials().getPasswort());
             if(basicAuth(username, password, authString)){
                 sendResponse(authString, "200");
             }else{
-                sendError("401");
+                sendResponse("Login Error", "401");
             }
         }else if (this.url.startsWith("/packages")) {
-            if(basicAuth("admin", "admin", this.authString)){
+            if (basicAuth("admin", "istrator", this.authString)) {
-                System.out.println("1");
                 ObjectMapper objectMapper = new ObjectMapper();
-                System.out.println("2");
+                ArrayList<Card> listCards = objectMapper.readValue(this.payload, new TypeReference<>() {
-                ArrayList<Card> listCards = objectMapper.readValue(this.payload, new TypeReference<ArrayList<Card>>(){});
+                });
-                System.out.println("List cards");
+                Package packageCards = new Package(new Cards(listCards), new DBConnection().nextPackageId() + "", 5);
-                System.out.println(listCards.toString());
+                if (!new DBConnection().addPackage(packageCards)) {
-                Package packageCards = new Package(new Cards(listCards), new DBConnection().nextPackageId()+"", 5);
+                    sendResponse("", "500");
-                System.out.println("3");
+                } else {
-                if(!new DBConnection().addPackage(packageCards)){
+                    String packageJson = JsonHelper.objToJson(packageCards);
-                    sendError("500");
+                    if (packageJson != null) {
-                }else{
-                    //Package to json
-                    objectMapper = new ObjectMapper();
-                    String packageJson = "";
-                    if(packageCards != null) {
-                        try {
-                            packageJson += objectMapper.writeValueAsString(packageCards);
-                        } catch (JsonProcessingException e) {
-                            packageJson = "Error: JsonProcessingException -> " + e.getMessage();
-                        }
                         sendResponse(packageJson, "201");
-                    }else{
+                    } else {
-                        sendError("500");
+                        sendResponse("", "500");
+                    }
+                }
+            } else {
+                sendResponse("Login Error", "401");
+            }
+        }else if (this.url.startsWith("/transactions/packages")) {
+            if (login()) {
+                DBConnection db = new DBConnection();
+                Package newPackage = db.userAcquirePackage(basicAuthGetUsername(this.authString));
+                if (newPackage == null) {
+                    sendResponse("", "500");
+                } else {
+                    String packageJson = JsonHelper.objToJson(newPackage);
+                    if (packageJson == null) {
+                        sendResponse("", "500");
+                    } else {
+                        sendResponse(packageJson, "200");
                     }
                 }
             }else{
-                sendError("401");
+                sendResponse("Login Error", "401");
             }
+        }else if (this.url.startsWith("/tradings")) {
+            if(login()) {
+                String dotradeid = this.url.substring(this.url.lastIndexOf('/') + 1);
+                if (!dotradeid.isEmpty() && !dotradeid.equals("tradings")) {
+                    //DO TRADE
+                    String username = basicAuthGetUsername(this.authString);
+                    if (username != null && !username.isEmpty()) {
+                        ArrayList<TradingDeal> tradingDealArrayList = new DBConnection().getAllTradingDeals();
+                        TradingDeal tradingDeal = null;
+                        if (tradingDealArrayList != null && !tradingDealArrayList.isEmpty()) {
+                            for (TradingDeal tr : tradingDealArrayList) {
+                                if (tr.getId().equals(dotradeid)) {
+                                    tradingDeal = tr;
+                                }
+                            }
+                            Card card = new DBConnection().getCardFromID(this.payload);
+                            if (card != null) {
+                                if (tradingDeal != null) {
+                                    if (tradingDeal.cardOk(card)) {
+                                        String json = JsonHelper.objToJson(card);
+                                        if (json != null && !json.isEmpty()) {
+                                            if (new DBConnection().addUserCard(username, tradingDeal.getCardToTrade().getName())) {
+                                                if (new DBConnection().delUserCard(tradingDeal.getUsername(), tradingDeal.getCardToTrade().getName())) {
+                                                    if (new DBConnection().deleteTradingDeal(tradingDeal.getId())) {
+                                                        if (new DBConnection().delUserCard(username, card.getName())) {
+                                                            if (new DBConnection().addUserCard(tradingDeal.getUsername(), card.getName())) {
+                                                                sendResponse(json, "200");
+                                                            } else {
+                                                                sendResponse("ERROR --> Add Card to: " + tradingDeal.getUsername(), "500");
+                                                            }
+                                                        } else {
+                                                            sendResponse("ERROR --> Del Card from: " + username, "500");
+                                                        }
+                                                    } else {
+                                                        sendResponse("Error --> Del Trading Deal", "500");
+                                                    }
+                                                } else {
+                                                    sendResponse("ERROR --> Del Card from: " + tradingDeal.getUsername(), "500");
+                                                }
+                                            } else {
+                                                sendResponse("ERROR --> Add Card to: " + username, "500");
+                                            }
+                                        } else {
+                                            sendResponse("ERROR --> JSON Empty", "500");
+                                        }
+                                    } else {
+                                        sendResponse("ERROR --> Trading Deal not ok", "500");
+                                    }
+                                } else {
+                                    sendResponse("ERROR --> Trading Deal not exist", "500");
+                                }
+                            } else {
+                                sendResponse("ERROR --> Card not exist", "500");
+                            }
+                        } else {
+                            sendResponse("ERROR --> Trading Deal not exist", "500");
+                        }
+                    } else {
+                        sendResponse("ERROR --> Username empty", "401");
+                    }
+                } else {
+                    //CREATE TRADING DEAL
+                    Map<String, Object> map = JsonHelper.jsonPayloadToMap(this.payload);
+                    String id = (String) Objects.requireNonNull(map).get("Id");
+                    String cardtotrade = (String) map.get("CardToTrade");
+                    String type = (String) map.get("Type");
+                    double mindamage = Double.parseDouble(map.get("MinimumDamage") + "");
+                    String username = basicAuthGetUsername(this.authString);
+                    if (username != null) {
+                        Card cardtoTradeC = new DBConnection().getCardFromID(cardtotrade);
+                        if (cardtoTradeC != null) {
+                            TradingDeal tradingDeal = new TradingDeal(id, cardtoTradeC, mindamage, type, username);
+                            String tradingJson = JsonHelper.objToJson(tradingDeal);
+                            ArrayList<String> deckCards = new DBConnection().getDeck(username);
+                            if (deckCards != null) {
+                                if (deckCards.contains(cardtotrade)) {
+                                    new DBConnection().delDeck(username);
+                                }
+                                if (new DBConnection().addTradingdeal(tradingDeal.getUsername(), tradingDeal.getId(), tradingDeal.getRequiredMinDamage(), tradingDeal.getRequiredCardType().name(), tradingDeal.getRequiredElementType().name(), tradingDeal.getCardToTrade().getName())) {
+                                    if (new DBConnection().updateCardLock(tradingDeal.getCardToTrade().getName(), true)) {
+                                        sendResponse(Objects.requireNonNull(JsonHelper.objToJson(tradingDeal)), "201");
+                                    } else {
+                                        sendResponse("", "500");
+                                    }
+                                } else {
+                                    sendResponse("", "500");
+                                }
+                            } else {
+                                sendResponse("", "500");
+                            }
+                            sendResponse(Objects.requireNonNull(tradingJson), "201");
+                        } else {
+                            sendResponse("", "500");
+                        }
+                    } else {
+                        sendResponse("", "500");
+                    }
+                }
+            }
+        }else if (this.url.startsWith("/battle")) {
+            if(login()){
+                String username = basicAuthGetUsername(this.authString);
+                if (username != null && !username.isEmpty()) {
+                    List<String> deckNamen = new DBConnection().getDeck(username);
+                    if (deckNamen != null && !deckNamen.isEmpty()) {
+                        Cards deck = new DBConnection().getCardsFromIDList(deckNamen);
+                        if(deck != null && deck.getCards().size() == 4) {
+                            Battle openBattle = new DBConnection().getOpenBattle();
+                            if (openBattle == null) {
+                                //Creator player Mode
+                                if(new DBConnection().addBattle(username)){
+                                    sendResponse("Du bist: #PLAYER 1\nBattle Einladung wurde erstellt von: " + username + "(#PLAYER1) \nSobald ein 2. Spieler dem Battle beitritt, kann das ergebnis mit /score abgefragt werden.","200");
+                                }else {
+                                    sendResponse("", "500");
+                                }
+
+                            } else {
+                                //Join game player
+                                User player2 = new DBConnection().getUser(username);
+                                if(player2 != null){
+                                    openBattle.setPlayer2(player2);
+                                    openBattle.setDeckPlayer2(deck);
+                                    if(new DBConnection().delBattleEinladung(openBattle.getId() + "")) {
+                                        if (openBattle.doFight()){
+                                            System.out.println(JsonHelper.objToJson(openBattle.getLog().size()));
+                                            if (new DBConnection().addBattleLog(openBattle.getId() + "", openBattle.getPlayer1().getName(), openBattle.getPlayer2().getName(), openBattle.getScorePlayer1() + "", openBattle.getScorePlayer2() + "", openBattle.getLog().toString())) {
+                                                if (new DBConnection().delDeck(openBattle.getPlayer1().getCredentials().getUsername()) && new DBConnection().delDeck(openBattle.getPlayer2().getCredentials().getUsername())) {
+                                                    //DEL OLD DECK CARDS
+                                                    ArrayList<String> oldDeck1 = new ArrayList<>();
+                                                    for (Card ca : openBattle.getDeckPlayer1Init().getCards()) {
+                                                        oldDeck1.add(ca.getName());
+                                                    }
+                                                    ArrayList<String> oldDeck2 = new ArrayList<>();
+                                                    for (Card ca : openBattle.getDeckPlayer2Init().getCards()) {
+                                                        oldDeck2.add(ca.getName());
+                                                    }
+                                                    //DEL NEW CARDS IF EXIST
+                                                    Cards player1cards = new DBConnection().getCards(openBattle.getPlayer1().getCredentials().getUsername());
+                                                    for (Card ca : openBattle.getDeckPlayer1().getCards()) {
+                                                        oldDeck1.add(ca.getName());
+                                                    }
+                                                    if (player1cards.getCards() != null && !player1cards.getCards().isEmpty()) {
+                                                        for (String ca : oldDeck1) {
+                                                            if (!new DBConnection().delUserCard(openBattle.getPlayer1().getCredentials().getUsername(), ca)) {
+                                                                sendResponse("Error Deleting user card1: " + ca, "500");
+                                                            }
+                                                        }
+                                                    }
+                                                    Cards player2cards = new DBConnection().getCards(openBattle.getPlayer2().getCredentials().getUsername());
+                                                    for (Card ca : openBattle.getDeckPlayer2().getCards()) {
+                                                        oldDeck2.add(ca.getName());
+                                                    }
+                                                    if (player2cards.getCards() != null && !player2cards.getCards().isEmpty()) {
+                                                        for (String ca : oldDeck2) {
+                                                            if (!new DBConnection().delUserCard(openBattle.getPlayer2().getCredentials().getUsername(), ca)) {
+                                                                sendResponse("Error Deleting user card2: " + ca, "500");
+                                                            }
+                                                        }
+                                                    }
+
+                                                    //ADD CARDS TO DECK
+                                                    for (Card ca : openBattle.getDeckPlayer1().getCards()) {
+                                                        if (!new DBConnection().addUserCard(openBattle.getPlayer1().getCredentials().getUsername(), ca.getName())) {
+                                                            sendResponse("Error adding card to user1: " + ca.getName(), "500");
+                                                        }
+                                                    }
+                                                    for (Card ca : openBattle.getDeckPlayer2().getCards()) {
+                                                        if (!new DBConnection().addUserCard(openBattle.getPlayer2().getCredentials().getUsername(), ca.getName())) {
+                                                            sendResponse("Error adding card to user2: " + ca.getName(), "500");
+                                                        }
+                                                    }
+                                                    sendResponse("Du bist: #PLAYER 2\nBattle --> " + openBattle.getPlayer1().getName() + "(#PLAYER1) |vs| " + openBattle.getPlayer2().getName() + "(#PLAYER2)\nErgebnisse unter /score abrufbar", "200");
+                                                }
+                                            } else {
+                                                sendResponse("Battle Log konnte ned geschrieben werden", "500"); //ERROR
+                                            }
+                                        }else {
+                                            sendResponse("Battle konnte ned durchgeführt werden", "500");
+                                        }
+                                    }else{
+                                        sendResponse("Battle einladung konnte ned akzeptiert werden", "500"); //ERROR
+                                    }
+                                }else{
+                                    sendResponse("GET User error", "500"); //ERROR
+                                }
+                            }
+                        }else {
+                            sendResponse("Nur "+ Objects.requireNonNull(deck).getCards().size()+" von 4 Karten im Deck. \nMach zuerst POST /deck [ID, ID, ID, ID] um dein Deck korrekt zu befüllen","424");
+                        }
+                    }else {
+                        sendResponse("Deck ist nicht gesetzt","424");
+                    }
+                }else {
+                    sendResponse("", "500");
+                }
+            }else {
+                sendResponse("Login Error", "401");
+            }
+        } else{
+            sendResponse("", "405");
+        }
+
+    }
+
+    /**
+     * Prüft den Login, anhand des BasicAuth Base64 String
+     * @return True wenn login daten korrekt, sonst false
+     */
+    private boolean login(){
+        if(this.authString != null && !this.authString.isEmpty()){
+            String username = basicAuthGetUsername(this.authString);
+            User user;
+            user = new DBConnection().getUser(username);
+            return basicAuth(user.getCredentials().getUsername(), user.getCredentials().getPasswort(), this.authString);
+
+        }else{
+            return false;
         }
     }
 
+    /**
+     * Alle Put Methoden
+     * Nur für angemeldete user erreichbar
+     */
     private void putMethodes(){
-        if (this.url.startsWith("/messages")) {
+        if (this.url.startsWith("/users")) {
-            String lastBit = this.url.substring(this.url.lastIndexOf('/') + 1);
+            String username = this.url.substring(this.url.lastIndexOf('/') + 1);
-            System.out.println("Last Bit: " + lastBit);
+            User user;
-            System.out.println("Payload" + this.payload);
+            user = new DBConnection().getUser(username);
-            String message = msgHandler.editMsg(Integer.parseInt(lastBit), this.payload);
+            if(user != null) {
-            if(message == null){
+                Map<String, Object> map = JsonHelper.jsonPayloadToMap(this.payload);
-                sendError("404");
+                String bio = (String) Objects.requireNonNull(map).get("Bio");
-            }else {
+                String image = (String) map.get("Image");
-                sendResponse("","200");
+                String name = (String) map.get("Name");
+                user.setBio(bio);
+                user.setImage(image);
+                user.setNachname(name);
+                if (new DBConnection().updateUser(username, user.getBio(), user.getImage(), user.getNachname())) {
+                    sendResponse(JsonHelper.userToJson(user), "200");
+                } else {
+                    sendResponse("", "500");
+                }
+            }else{
+                sendResponse("", "500");
+            }
+        }else if(this.url.startsWith("/deck")) {
+            List<String> deckIds = JsonHelper.jsonPayloadToList(this.payload);
+            if (deckIds != null && deckIds.size() == 4){
+                if (new DBConnection().setDeck(basicAuthGetUsername(this.authString), deckIds)){
+                    Cards deck = new DBConnection().getCardsFromIDList(deckIds);
+                    String deckJson = JsonHelper.objToJson(deck);
+                    if (deck != null && deckJson != null){
+                        sendResponse(deckJson, "200");
+                    }else {
+                        sendResponse("", "500");
+                    }
+                }else {
+                    sendResponse("", "500");
+                }
+            }else{
+                sendResponse(Objects.requireNonNull(deckIds).size() + " von 4 Karten sind im Deck.","500");
             }
         }
     }
 
-    private void deleteMethodes(){
-        if (this.url.startsWith("/messages")) {
-            String lastBit = this.url.substring(this.url.lastIndexOf('/') + 1);
-            String message = msgHandler.delMsg(Integer.parseInt(lastBit));
-            if(message == null){
-                sendError("404");
-            }else {
-                sendResponse("", "200");
-            }
-        }
-    }
 
 
     /**
-     * Sendet einen Error Response
+     * Alle Delete Methoden, siehe API beschreibung für genauere details
-     * @param errorCode Der Error Code
+     * Nur für angemeldete user erreichbar
      */
-    private void sendError(String errorCode) {
+    private void deleteMethodes(){
-        out.print("HTTP/1.0 "+errorCode+"\r\n");
+        if (this.url.startsWith("/tradings")) {
-        out.print("Server: Apache/0.8.4\r\n");
+            String tradeid = this.url.substring(this.url.lastIndexOf('/') + 1);
-        out.print("Content-Type: text/plain\r\n");
+            ArrayList<TradingDeal> allTradingDeals = new DBConnection().getAllTradingDeals();
-        out.print("Content-Length: 1\r\n");
+            TradingDeal tr = null;
-        out.print("\r\n");
+            if (allTradingDeals != null && !allTradingDeals.isEmpty()) {
-        //out.print(responseText);
+                for (TradingDeal i : allTradingDeals) {
+                    if (i.getId().equals(tradeid)) {
+                        tr = i;
+                    }
+                }
+                if (tr != null) {
+                    if (new DBConnection().deleteTradingDeal(tradeid)) {
+                        if (new DBConnection().updateCardLock(tr.getCardToTrade().getName(), false))
+                            sendResponse("", "204");
+                    } else {
+                        sendResponse("", "500");
+                    }
+                }else{
+                    sendResponse("", "500");
+                }
+            }
+
+        }
     }
 
-    private void startseite() {
-        sendResponse("lists all messages:   GET    /messages<br>" +
-                "add message:          POST   /messages     (Payload: the message; Response an id like1)<br>" +
-                "show first message:   GET    /messages/1<br>" +
-                "show third message:   GET    /messages/3<br>" +
-                "update first message: PUT    /messages/1   (Payload: the message)<br>" +
-                "remove first message: DELETE /messages/1<br>", "200");
-    }
-
-    private void listAllMsg() {
-        sendResponse(msgHandler.getAllMsg(), "200");
-        //sendResponse("Test");
-    }
 
     /**
      * Sendet eine Response
@@ -276,14 +599,4 @@ public class Response {
         out.print("\r\n");
         out.print(responseText);
     }
-
-    /**
-     * Get Msg Handler
-     *
-     * @return msgHandler Handler der Nachrichten
-     */
-    public MsgHandler getMsghandler() {
-        return this.msgHandler;
-    }
-
 }

src/test/java/CardTest.java

@@ -1,58 +1,50 @@
-import at.reisinger.Card;
+import at.reisinger.obj.Card;
-import at.reisinger.CardType;
+import at.reisinger.enums.CardType;
-import at.reisinger.EffectivnessType;
+import at.reisinger.enums.ElementTyp;
-import at.reisinger.ElementTyp;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.*;
 
 public class CardTest {
 
     @Test
     public void test_getName() {
         Card card = new Card("Name", 10, ElementTyp.WATER, CardType.SPELL);
-        assertTrue(card.getName().equals("Name"));
+        assertEquals(card.getName(), "Name");
     }
     @Test
     public void test_getDamage() {
         Card card = new Card("Name", 10, ElementTyp.WATER, CardType.SPELL);
-        assertTrue(card.getDamage() == 10);
+        assertEquals(card.getDamage(), 10);
     }
     @Test
     public void test_getElementType() {
         Card card = new Card("Name", 10, ElementTyp.WATER, CardType.SPELL);
         ElementTyp elementTyp = card.getElementTyp();
-        assertTrue(elementTyp == ElementTyp.WATER);
+        assertSame(elementTyp, ElementTyp.WATER);
     }
     @Test
     public void test_getCardType() {
         Card card = new Card("Name", 10, ElementTyp.WATER, CardType.SPELL);
         CardType cardType = card.getCardType();
-        assertTrue(cardType == CardType.SPELL);
+        assertSame(cardType, CardType.SPELL);
-    }
-    @Test
-    public void test_getEffectivenessAgainst() {
-        Card card = new Card("Name", 10, ElementTyp.WATER, CardType.MONSTER);
-        Card card2 = new Card("Name", 10, ElementTyp.WATER, CardType.MONSTER);
-        EffectivnessType effectivnessType = card.getEffectivenessAgainst(card2);
-        assertTrue(effectivnessType == EffectivnessType.NOEFFECT);
     }
     @Test
     public void test_setName() {
         Card card = new Card("Name", 10, ElementTyp.WATER, CardType.SPELL);
         card.setName("NeuerName");
-        assertTrue(card.getName().equals("NeuerName"));
+        assertEquals(card.getName(), "NeuerName");
     }
     @Test
     public void test_setDamage() {
         Card card = new Card("Name", 10, ElementTyp.WATER, CardType.SPELL);
         card.setDamage(100);
-        assertTrue(card.getDamage() == 100);
+        assertEquals(card.getDamage(), 100);
     }
     @Test
     public void test_setElementTyp() {
         Card card = new Card("Name", 10, ElementTyp.WATER, CardType.SPELL);
         card.setElementType(ElementTyp.FIRE);
-        assertTrue(card.getElementTyp() == ElementTyp.FIRE);
+        assertSame(card.getElementTyp(), ElementTyp.FIRE);
     }
 }

src/test/java/CardsTest.java

@@ -1,27 +1,27 @@
-import at.reisinger.Card;
+import at.reisinger.obj.Card;
-import at.reisinger.CardType;
+import at.reisinger.enums.CardType;
-import at.reisinger.Cards;
+import at.reisinger.obj.Cards;
-import at.reisinger.ElementTyp;
+import at.reisinger.enums.ElementTyp;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import java.util.ArrayList;
 
-import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.*;
-import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class CardsTest {
     private Cards cards, cards2, cards3;
-    private Card newCard, card, newerCard;
+    private Card newCard;
-    private ArrayList<Card> cardsArrayList, cardsArrayList2, cardsArrayList3;
+    private Card card;
+    private ArrayList<Card> cardsArrayList;
 
     @BeforeEach
     void setUp() {
         card = new Card("Name", 10, ElementTyp.WATER, CardType.MONSTER);
         newCard = new Card("NameNew", 10, ElementTyp.WATER, CardType.SPELL);
-        newerCard = new Card("NameNewerer", 100, ElementTyp.FIRE, CardType.MONSTER);
+        Card newerCard = new Card("NameNewerer", 100, ElementTyp.FIRE, CardType.MONSTER);
-        cardsArrayList = new ArrayList<Card>();
+        cardsArrayList = new ArrayList<>();
-        cardsArrayList2 = new ArrayList<Card>();
+        ArrayList<Card> cardsArrayList2 = new ArrayList<>();
-        cardsArrayList3 = new ArrayList<Card>();
+        ArrayList<Card> cardsArrayList3 = new ArrayList<>();
         cardsArrayList.add(card);
         cardsArrayList2.add(newCard);
         cardsArrayList2.add(card);
@@ -52,12 +52,12 @@ public class CardsTest {
 
     @Test
     void test_contains() {
-        assertTrue(cards2.containsCard(card));
+        assertTrue(cards2.containsCard(card.getName()));
     }
 
     @Test
     void test_contains2() {
-        assertFalse(cards.containsCard(newCard));
+        assertFalse(cards.containsCard(newCard.getName()));
     }
 
     @Test
@@ -66,11 +66,11 @@ public class CardsTest {
 
         cards.delCard(newCard);
 
-        assertTrue(cards.getCards().equals(cardsArrayList));
+        assertEquals(cardsArrayList, cards.getCards());
     }
     @Test
     void test_getCards() {
-        assertTrue(cards.getCards().equals(cardsArrayList));
+        assertEquals(cardsArrayList, cards.getCards());
     }
 
 }

src/test/java/CoinsTest.java

@@ -1,10 +1,8 @@
-import at.reisinger.Coins;
+import at.reisinger.obj.Coins;
-import at.reisinger.NegativAmountException;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;
-import static org.junit.jupiter.api.Assertions.assertFalse;
 
 public class CoinsTest {
 
@@ -14,55 +12,4 @@ public class CoinsTest {
         assertTrue(coin.getCoinAmount() >= 0);
     }
 
-    @Test
-    public void test_addCoinException(){
-        try {
-            Coins coin = new Coins(10);
-            coin.addCoin(-10);
-            fail("Erwartet at.reisinger.NegativAmountException - addCoin");
-        }catch (NegativAmountException negativAmountException) {
-            assertTrue(negativAmountException.getMessage().equals("Es kann kein negativer amount an at.reisinger.Coins hinzugefügt werden"));
-        }
-    }
-
-    @Test
-    public void test_removeCoinException(){
-        try {
-            Coins coin = new Coins(10);
-            coin.removeCoin(-10);
-            fail("Erwartet at.reisinger.NegativAmountException - removeCoin");
-        }catch (NegativAmountException negativAmountException) {
-            assertTrue(negativAmountException.getMessage().equals("Es kann kein negativer amount an at.reisinger.Coins hinzugefügt werden"));
-        }
-    }
-
-    @Test
-    public void test_removeCoin(){
-            Coins coin = new Coins(10);
-        try {
-            assertTrue(coin.removeCoin(10));
-        } catch (NegativAmountException e) {
-            e.printStackTrace();
-        }
-    }
-
-    @Test
-    public void test_changeCoinAmount_true(){
-        Coins coin = new Coins(10);
-        try {
-            assertTrue(coin.changeCoinAmmount(10));
-        } catch (NegativAmountException e) {
-            e.printStackTrace();
-        }
-    }
-
-    @Test
-    public void test_changeCoinAmount_false(){
-        Coins coin = new Coins(9);
-        try {
-            assertTrue(coin.changeCoinAmmount(7));
-        } catch (NegativAmountException e) {
-            e.printStackTrace();
-        }
-    }
 }

src/test/java/PackageTest.java

@@ -1,49 +1,49 @@
-import at.reisinger.*;
+import at.reisinger.obj.Card;
-import at.reisinger.Package;
+import at.reisinger.obj.Cards;
+import at.reisinger.obj.Package;
+import at.reisinger.enums.CardType;
+import at.reisinger.enums.ElementTyp;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
 
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 
 public class PackageTest {
-    private Cards newCards, cards, nochNewCards;
-    private Card newCard, card;
-    private ArrayList<Card> cardsArrayList, cardsArrayList2, cardsArrayList3;
     private Package myPackage;
     @BeforeEach
     void setUp() {
-        card = new Card("Name", 10, ElementTyp.WATER, CardType.MONSTER);
+        Card card = new Card("Name", 10, ElementTyp.WATER, CardType.MONSTER);
-        newCard = new Card("NameNew", 10, ElementTyp.WATER, CardType.SPELL);
+        Card newCard = new Card("NameNew", 10, ElementTyp.WATER, CardType.SPELL);
-        cardsArrayList = new ArrayList<Card>();
+        ArrayList<Card> cardsArrayList = new ArrayList<>();
-        cardsArrayList2 = new ArrayList<Card>();
+        ArrayList<Card> cardsArrayList2 = new ArrayList<>();
-        cardsArrayList3 = new ArrayList<Card>();
+        ArrayList<Card> cardsArrayList3 = new ArrayList<>();
         cardsArrayList.add(card);
         cardsArrayList2.add(newCard);
-        cards = new Cards(cardsArrayList);
+        Cards cards = new Cards(cardsArrayList);
-        newCards = new Cards(cardsArrayList2);
+        Cards newCards = new Cards(cardsArrayList2);
-        nochNewCards = new Cards(cardsArrayList3);
+        Cards nochNewCards = new Cards(cardsArrayList3);
         myPackage = new Package(cards,"Name", 100);
     }
 
     @Test
     void test_getName() {
         String result = myPackage.getName();
-        assertTrue(result.equals("Name"));
+        assertEquals(result, "Name");
     }
 
     @Test
     void test_getPrice() {
         int result = myPackage.getPrice();
-        assertTrue(result==100);
+        assertEquals(result, 100);
     }
 
     @Test
     void test_setName() {
         myPackage.setName("neuName");
         String result = myPackage.getName();
-        assertTrue(result.equals("neuName"));
+        assertEquals(result, "neuName");
     }
 }

src/test/java/StackTest.java

@@ -1,48 +0,0 @@
-import at.reisinger.*;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-import java.util.ArrayList;
-
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-
-public class StackTest {
-    private Cards newCards, cards, nochNewCards;
-    private Card newCard, card;
-    private ArrayList<Card> cardsArrayList, cardsArrayList2, cardsArrayList3;
-    private Stack stack;
-
-    @BeforeEach
-    void setUp() {
-        card = new Card("Name", 10, ElementTyp.WATER, CardType.MONSTER);
-        newCard = new Card("NameNew", 10, ElementTyp.WATER, CardType.SPELL);
-        cardsArrayList = new ArrayList<Card>();
-        cardsArrayList2 = new ArrayList<Card>();
-        cardsArrayList3 = new ArrayList<Card>();
-        cardsArrayList.add(card);
-        cardsArrayList2.add(newCard);
-        cardsArrayList2.add(card);
-        cards = new Cards(cardsArrayList);
-        newCards = new Cards(cardsArrayList2);
-        nochNewCards = new Cards(cardsArrayList3);
-        stack = new Stack(cards, nochNewCards);
-    }
-    @Test
-    void test_addDeck() {
-        stack.addDeck(newCards);
-        Cards result = stack.getDeck();
-        assertTrue(result.equals(newCards));
-    }
-    @Test
-    void test_delDeck() {
-        stack.addDeck(newCards);
-        stack.delDeck(newCard);
-        assertTrue(stack.getDeck().equals(cards));
-    }
-    @Test
-    void test_getDeck() {
-        Cards result = stack.getDeck();
-        assertTrue(result.equals(nochNewCards));
-    }
-}

src/test/java/StoreTest.java

@@ -1,145 +0,0 @@
-import at.reisinger.*;
-import at.reisinger.Package;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-import java.util.ArrayList;
-
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-public class StoreTest {
-
-    private TradingDeal tradingDeal;
-    private Cards newCards, cards, nochNewCards;
-    private Card newCard, card;
-    private ArrayList<Card> cardsArrayList, cardsArrayList2, cardsArrayList3;
-    private Stack stack;
-    private User user, userNew;
-    private Store store;
-
-    @BeforeEach
-    void setUp() {
-        //at.reisinger.Stack
-        card = new Card("Name", 100, ElementTyp.WATER, CardType.MONSTER);
-        newCard = new Card("NameNew", 10, ElementTyp.WATER, CardType.SPELL);
-        cardsArrayList = new ArrayList<Card>();
-        cardsArrayList2 = new ArrayList<Card>();
-        cardsArrayList3 = new ArrayList<Card>();
-        cardsArrayList.add(card);
-        cardsArrayList2.add(newCard);
-        cards = new Cards(cardsArrayList);
-        newCards = new Cards(cardsArrayList2);
-        nochNewCards = new Cards(cardsArrayList3);
-        stack = new Stack(cards, nochNewCards);
-
-        //at.reisinger.Coins
-        Coins coins = new Coins(10);
-        //at.reisinger.User
-        Credentials credentials = new Credentials("username", "passwort");
-        user = new User(credentials, "name", "nachname", "email", coins);
-        userNew = new User(credentials, "nameNew", "nachnameNew", "emailNew", coins);
-
-        //Trading Deal
-        Card cardToTrade = card;
-        ElementTyp requiredElementType = ElementTyp.FIRE;
-        double requiredMinDamage = 100;
-        CardType requiredCardType = CardType.MONSTER;
-        tradingDeal = new TradingDeal(user, cardToTrade, requiredElementType, requiredMinDamage, requiredCardType);
-
-    }
-
-    @Test
-    void test_addTradingDeal() {
-
-
-        Card c1 = new Card("Name", 10, ElementTyp.FIRE, CardType.MONSTER);
-        Card c2 = new Card("Name1", 12, ElementTyp.FIRE, CardType.SPELL);
-        Card c3 = new Card("Name2", 13, ElementTyp.WATER, CardType.MONSTER);
-        Card c4 = new Card("Name3", 14, ElementTyp.WATER, CardType.SPELL);
-        Card c5 = new Card("Name4", 15, ElementTyp.FIRE, CardType.MONSTER);
-        ArrayList<Card> deckArrList = new ArrayList<Card>();
-        ArrayList<Card> stackArrList = new ArrayList<Card>();
-        deckArrList.add(c1);
-        deckArrList.add(c2);
-        stackArrList.add(c3);
-        stackArrList.add(c4);
-        stackArrList.add(c5);
-        Cards deck = new Cards(deckArrList);
-        Cards stack = new Cards(stackArrList);
-        User user = new User(new Credentials("username", "passwort"), "Name", "Nachname", "Email", new Coins(1000));
-        ArrayList<TradingDeal> tradingDeals = new ArrayList<TradingDeal>();
-        ArrayList<Package> packages = new ArrayList<at.reisinger.Package>();
-        tradingDeals.add(new TradingDeal(user, c1, ElementTyp.FIRE, 10, CardType.MONSTER));
-        packages.add(new at.reisinger.Package(stack, "Test at.reisinger.Package", 100));
-
-
-        System.out.println(user.getTradingDeals().toString());
-
-        user.addTradingDeal(new TradingDeal(user, c1, ElementTyp.FIRE, 10, CardType.MONSTER));
-        System.out.println(user.getTradingDeals().toString());
-
-
-        System.out.println(tradingDeals.toString());
-        assertTrue(user.getTradingDeals().get(0).dealOk(tradingDeals.get(0)));
-    }
-    @Test
-    void test_doTrade() {
-        Card cardtest = new Card("Name", 100, ElementTyp.FIRE, CardType.MONSTER);
-        TradingDeal tradingDealtest = new TradingDeal(user, cardtest, ElementTyp.WATER, 100, CardType.MONSTER);
-        boolean result = user.doTrading(tradingDeal, tradingDealtest);
-        assertTrue(result);
-    }
-    @Test
-    void test_getTradingDeals() {
-        ArrayList<TradingDeal> result = user.getTradingDeals();
-        ArrayList<TradingDeal> expected = new ArrayList<TradingDeal>();
-
-        Card c1 = new Card("Name", 10, ElementTyp.FIRE, CardType.MONSTER);
-        Card c2 = new Card("Name1", 12, ElementTyp.FIRE, CardType.SPELL);
-        Card c3 = new Card("Name2", 13, ElementTyp.WATER, CardType.MONSTER);
-        Card c4 = new Card("Name3", 14, ElementTyp.WATER, CardType.SPELL);
-        Card c5 = new Card("Name4", 15, ElementTyp.FIRE, CardType.MONSTER);
-        ArrayList<Card> deckArrList = new ArrayList<Card>();
-        ArrayList<Card> stackArrList = new ArrayList<Card>();
-        deckArrList.add(c1);
-        deckArrList.add(c2);
-        stackArrList.add(c3);
-        stackArrList.add(c4);
-        stackArrList.add(c5);
-        Cards deck = new Cards(deckArrList);
-        Cards stack = new Cards(stackArrList);
-        User user = new User(new Credentials("username", "passwort"), "Name", "Nachname", "Email", new Coins(1000));
-        ArrayList<TradingDeal> tradingDeals = new ArrayList<TradingDeal>();
-        ArrayList<at.reisinger.Package> packages = new ArrayList<at.reisinger.Package>();
-        tradingDeals.add(new TradingDeal(user, c1, ElementTyp.FIRE, 10, CardType.MONSTER));
-        packages.add(new at.reisinger.Package(stack, "Test at.reisinger.Package", 100));
-
-        assertTrue(result.get(0).dealOk(new TradingDeal(user, c1, ElementTyp.FIRE, 10, CardType.MONSTER)));
-    }
-
-    @Test
-    void test_getPossibleTradingDeals() {
-        Card testCard = new Card("Test", 10, ElementTyp.FIRE, CardType.MONSTER);
-        ArrayList<TradingDeal> result = user.getPossibleTradingDeals(testCard);
-        ArrayList<TradingDeal> expected = new ArrayList<TradingDeal>();
-        Card c1 = new Card("Name", 10, ElementTyp.FIRE, CardType.MONSTER);
-        Card c2 = new Card("Name1", 12, ElementTyp.FIRE, CardType.SPELL);
-        Card c3 = new Card("Name2", 13, ElementTyp.WATER, CardType.MONSTER);
-        Card c4 = new Card("Name3", 14, ElementTyp.WATER, CardType.SPELL);
-        Card c5 = new Card("Name4", 15, ElementTyp.FIRE, CardType.MONSTER);
-        ArrayList<Card> deckArrList = new ArrayList<Card>();
-        ArrayList<Card> stackArrList = new ArrayList<Card>();
-        deckArrList.add(c1);
-        deckArrList.add(c2);
-        stackArrList.add(c3);
-        stackArrList.add(c4);
-        stackArrList.add(c5);
-        Cards deck = new Cards(deckArrList);
-        Cards stack = new Cards(stackArrList);
-        TradingDeal vonDB = new TradingDeal(new User(new Credentials("username", "passwort"), "DerName", "Nachname", "Email", new Coins(1000)), c1, ElementTyp.FIRE, 10, CardType.SPELL);
-        expected.add(vonDB);
-        System.out.println(result.get(0).getCardToTrade().getName());
-        System.out.println(expected.get(0).getCardToTrade().getName());
-        assertTrue(result.get(0).getCardToTrade().equals(expected.get(0).getCardToTrade()));
-    }
-}

src/test/java/TradingDealTest.java

@@ -1,60 +1,49 @@
-import at.reisinger.*;
+import at.reisinger.enums.CardType;
+import at.reisinger.enums.ElementTyp;
+import at.reisinger.obj.*;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
 
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.*;
 
 
 public class TradingDealTest {
 
     private TradingDeal tradingDeal;
-    private Cards newCards, cards, nochNewCards;
     private Card newCard, card;
-    private ArrayList<Card> cardsArrayList, cardsArrayList2, cardsArrayList3;
-    private Stack stack;
-    private User user, userNew;
 
     @BeforeEach
     void setUp() {
         //at.reisinger.Stack
         card = new Card("Name", 10, ElementTyp.WATER, CardType.MONSTER);
         newCard = new Card("NameNew", 10, ElementTyp.WATER, CardType.SPELL);
-        cardsArrayList = new ArrayList<Card>();
+        ArrayList<Card> cardsArrayList = new ArrayList<>();
-        cardsArrayList2 = new ArrayList<Card>();
+        ArrayList<Card> cardsArrayList2 = new ArrayList<>();
-        cardsArrayList3 = new ArrayList<Card>();
+        ArrayList<Card> cardsArrayList3 = new ArrayList<>();
         cardsArrayList.add(card);
         cardsArrayList2.add(newCard);
-        cards = new Cards(cardsArrayList);
+        Cards cards = new Cards(cardsArrayList);
-        newCards = new Cards(cardsArrayList2);
+        Cards newCards = new Cards(cardsArrayList2);
-        nochNewCards = new Cards(cardsArrayList3);
+        Cards nochNewCards = new Cards(cardsArrayList3);
-        stack = new Stack(cards, nochNewCards);
 
-        //at.reisinger.Coins
+        //at.reisinger.obj.Coins
         Coins coins = new Coins(10);
-        //at.reisinger.User
+        //at.reisinger.obj.User
         Credentials credentials = new Credentials("username", "passwort");
         Credentials newCredentials = new Credentials("usernamenew", "passwortnew");
-        user = new User(credentials, "name", "nachname", "email", coins);
+        User user = new User(credentials, "name", "nachname", "email", coins, "BIO", "IMAGE");
-        userNew = new User(newCredentials, "nameNew", "nachnameNew", "emailNew", coins);
+        User userNew = new User(newCredentials, "nameNew", "nachnameNew", "emailNew", coins, "BIO", "IMAGE");
 
         //Trading Deal
         Card cardToTrade = card;
         ElementTyp requiredElementType = ElementTyp.FIRE;
         double requiredMinDamage = 100;
         CardType requiredCardType = CardType.MONSTER;
-        tradingDeal = new TradingDeal(user, cardToTrade, requiredElementType, requiredMinDamage, requiredCardType);
+        tradingDeal = new TradingDeal("ID", cardToTrade, requiredElementType, requiredMinDamage, requiredCardType, "NAME");
     }
 
-    /*
-    @Test
-    void test_getTradingUser() {
-        User result = tradingDeal.getTradingUser();
-        assertTrue(result.equals(user));
-    }
-    */
-
     @Test
     void test_getCardToTrade() {
         Card result = tradingDeal.getCardToTrade();
@@ -63,50 +52,41 @@ public class TradingDealTest {
     @Test
     void test_getRequiredElementType() {
         ElementTyp result = tradingDeal.getRequiredElementType();
-        assertTrue(result==ElementTyp.FIRE);
+        assertSame(result, ElementTyp.FIRE);
     }
     @Test
     void test_getRequiredMinDamage() {
         double result = tradingDeal.getRequiredMinDamage();
-        assertTrue(result==100);
+        assertEquals(result, 100);
     }
     @Test
     void test_getRequiredCardType() {
         CardType result = tradingDeal.getRequiredCardType();
-        assertTrue(result==CardType.MONSTER);
+        assertSame(result, CardType.MONSTER);
     }
 
-    /*
-    @Test
-    void test_setTradingUser() {
-        tradingDeal.setTradingUser(userNew);
-        User result = tradingDeal.getTradingUser();
-        assertTrue(result.equals(userNew));
-    }
-    */
-
     @Test
     void test_setCardToTrade() {
         tradingDeal.setCardToTrade(newCard);
         Card result = tradingDeal.getCardToTrade();
-        assertTrue(result==newCard);
+        assertSame(result, newCard);
     }
     @Test
     void test_setRequiredElementType() {
         tradingDeal.setRequiredElementType(ElementTyp.WATER);
         ElementTyp result = tradingDeal.getRequiredElementType();
-        assertTrue(result==ElementTyp.WATER);
+        assertSame(result, ElementTyp.WATER);
     }
     @Test
     void test_setRequiredMinDamage() {
         tradingDeal.setRequiredMinDamage(10);
         double result = tradingDeal.getRequiredMinDamage();
-        assertTrue(result==10);
+        assertEquals(result, 10);
     }
     @Test
     void test_setRequiredCardType() {
         tradingDeal.setRequiredCardType(CardType.SPELL);
         CardType result = tradingDeal.getRequiredCardType();
-        assertTrue(result==CardType.SPELL);
+        assertSame(result, CardType.SPELL);
     }
 }

src/test/java/UserTest.java

@@ -1,59 +1,58 @@
-import at.reisinger.*;
+import at.reisinger.obj.*;
-import at.reisinger.Package;
+import at.reisinger.enums.CardType;
+import at.reisinger.enums.ElementTyp;
+import at.reisinger.obj.Package;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
+import java.util.Objects;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 
 public class UserTest {
     private TradingDeal tradingDeal;
-    private Cards newCards, cards, nochNewCards;
-    private Card newCard, card;
-    private ArrayList<Card> cardsArrayList, cardsArrayList2, cardsArrayList3;
-    private Stack stack;
     private User user;
-    private at.reisinger.Package myPackage;
+    private Package myPackage;
 
     @BeforeEach
     void setUp() {
         //at.reisinger.Stack
-        card = new Card("Name", 10, ElementTyp.WATER, CardType.MONSTER);
+        Card card = new Card("Name", 10, ElementTyp.WATER, CardType.MONSTER);
-        newCard = new Card("NameNew", 10, ElementTyp.WATER, CardType.SPELL);
+        Card newCard = new Card("NameNew", 10, ElementTyp.WATER, CardType.SPELL);
-        cardsArrayList = new ArrayList<Card>();
+        ArrayList<Card> cardsArrayList = new ArrayList<>();
-        cardsArrayList2 = new ArrayList<Card>();
+        ArrayList<Card> cardsArrayList2 = new ArrayList<>();
-        cardsArrayList3 = new ArrayList<Card>();
+        ArrayList<Card> cardsArrayList3 = new ArrayList<>();
         cardsArrayList.add(card);
         cardsArrayList2.add(newCard);
-        cards = new Cards(cardsArrayList);
+        Cards cards = new Cards(cardsArrayList);
-        newCards = new Cards(cardsArrayList2);
+        Cards newCards = new Cards(cardsArrayList2);
-        nochNewCards = new Cards(cardsArrayList3);
+        Cards nochNewCards = new Cards(cardsArrayList3);
-        stack = new Stack(cards, nochNewCards);
+        //at.reisinger.obj.Package
-        //at.reisinger.Package
         myPackage = new Package(cards, "Name", 100);
 
-        //at.reisinger.Coins
+        //at.reisinger.obj.Coins
         Coins coins = new Coins(10);
-        //at.reisinger.User
+        //at.reisinger.obj.User
         Credentials credentials = new Credentials("username", "pw");
-        user = new User(credentials, "name", "nachname", "email", coins);
+        user = new User(credentials, "name", "nachname", "email", coins, "BIO", "IMAGE");
     }
     @Test
     public void test_getName() {
         String result = user.getName();
-        assertTrue(result.equals("name"));
+        assertEquals(result, "name");
     }
     @Test
     public void test_getNachname() {
         String result = user.getNachname();
-        assertTrue(result.equals("nachname"));
+        assertEquals(result, "nachname");
     }
     @Test
     public void test_getEmail() {
         String result = user.getEmail();
-        assertTrue(result.equals("email"));
+        assertEquals(result, "email");
     }
 
     @Test
@@ -61,30 +60,26 @@ public class UserTest {
         String newstring = "new";
         user.setName(newstring);
         String result = user.getName();
-        assertTrue(result.equals(newstring));
+        assertEquals(newstring, result);
     }
     @Test
     public void test_setNachname() {
         String newstring = "new";
         user.setNachname(newstring);
         String result = user.getNachname();
-        assertTrue(result.equals(newstring));
+        assertEquals(newstring, result);
     }
     @Test
     public void test_setEmail() {
         String newstring = "new";
         user.setEmail(newstring);
         String result = user.getEmail();
-        assertTrue(result.equals(newstring));
+        assertEquals(newstring, result);
     }
     @Test
     public void test_buyPackage(){
-        Cards cards = null;
+        Cards cards;
-        try {
             cards = new Cards(user.buyPackage(myPackage));
-        } catch (NegativAmountException e) {
+        assertTrue(Objects.requireNonNull(cards).equals(new Cards(myPackage.getCards())));
-            e.printStackTrace();
-        }
-        assertTrue(cards.equals(new Cards(myPackage.getCards())));
     }
 }