delTradingDeal + unlock card

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

@@ -49,6 +49,15 @@ public class DBConnection {
         return PostgresHelper.executeUpdate("Update user_cards set gesperrt = " + lock + " where name = \'" + name + "\';");
     }
 
+    /**
+     * 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

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

@@ -129,6 +129,20 @@ public class Response {
             } else {
                 sendError("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 != ""){
+                    sendResponse(json, "200");
+                }else{
+                    sendError("500");
+                }
+            }else{
+                sendError("500");
+            }
+        }else{
+            sendError("204");
         }
     }
 
@@ -272,17 +286,13 @@ public class Response {
                         if (tradingDeal != null) {
                             String tradingJson = JsonHelper.objToJson(tradingDeal);
                             if (tradingDeal != null) {
-                                //DB Trading deal add
-                                // Lock Card for deck
-                                //Wenn card im deck, dann del aus deck
-                                //new DBConnection().;
                                 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.getUsername(), true)){
+                                        if(new DBConnection().updateCardLock(tradingDeal.getCardToTrade().getName(), true)){
                                             sendResponse(JsonHelper.objToJson(tradingDeal), "201");
                                         }else{
                                             sendError("500");
@@ -395,7 +405,28 @@ public class Response {
      * @throws JsonProcessingException Fehler beim de-/serialisieren
      */
     private void deleteMethodes(){
-        if (this.url.startsWith("/messages")) {
+        if (this.url.startsWith("/tradings")) {
+            String tradeid = this.url.substring(this.url.lastIndexOf('/') + 1);
+            System.out.println("Format in /tradings/{tradingid}: " + tradeid);
+            ArrayList<TradingDeal> allTradingDeals = new DBConnection().getAllTradingDeals();
+            TradingDeal tr = null;
+            if (allTradingDeals != null && !allTradingDeals.isEmpty()) {
+                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 {
+                        sendError("500");
+                    }
+                }else{
+                    sendError("500");
+                }
+            }
 
         }
     }