card lock bei tradingDeal Create

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

@@ -46,6 +46,7 @@ public class DBConnection {
      * @return true bei erfolg, sonst false
      */
     public boolean updateCardLock(String name, boolean lock){
+        System.out.println("Update user_cards set gesperrt = " + lock + " where name = \'" + name + "\';");
         return PostgresHelper.executeUpdate("Update user_cards set gesperrt = " + lock + " where name = \'" + name + "\';");
     }
 

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");