From f4e93b8f201c5772508f9350d0dec3efe3baea51 Mon Sep 17 00:00:00 2001
From: hkarwa2s <holger.karwanni@smail.inf.h-brs.de>
Date: Mon, 19 Jun 2017 20:03:37 +0200
Subject: [PATCH] fix, damit die TransactionControl nicht schon bei einer
Setter Methode eine Exception wirft ;)
---
src/main/java/org/s4s/gui/views/CheckoutView.java | 6 +++++-
src/main/java/org/s4s/gui/views/WarenkorbView.java | 1 +
src/main/java/org/s4s/modell/dto/Transaction.java | 4 ++++
.../java/org/s4s/process/control/ProductSearch.java | 1 -
.../org/s4s/process/control/TransactionControl.java | 10 +++++++---
5 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/s4s/gui/views/CheckoutView.java b/src/main/java/org/s4s/gui/views/CheckoutView.java
index 46e4b14..07da476 100644
--- a/src/main/java/org/s4s/gui/views/CheckoutView.java
+++ b/src/main/java/org/s4s/gui/views/CheckoutView.java
@@ -10,7 +10,11 @@ public class CheckoutView extends TemplateView {
@Override
public void enter(ViewChangeListener.ViewChangeEvent event) {
- throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ this.setUp();
+ }
+
+ public void setUp() {
+
}
}
diff --git a/src/main/java/org/s4s/gui/views/WarenkorbView.java b/src/main/java/org/s4s/gui/views/WarenkorbView.java
index 3964888..bbe3279 100644
--- a/src/main/java/org/s4s/gui/views/WarenkorbView.java
+++ b/src/main/java/org/s4s/gui/views/WarenkorbView.java
@@ -99,6 +99,7 @@ public class WarenkorbView extends TemplateView {
TransactionControl t = new TransactionControl();
try {
t.createTransactions();
+ UI.getCurrent().getNavigator().navigateTo(Views.CHECKOUT);
} catch (DAOException ex) {
Logger.getLogger(WarenkorbView.class.getName()).log(Level.SEVERE, null, ex);
} catch (SQLException ex) {
diff --git a/src/main/java/org/s4s/modell/dto/Transaction.java b/src/main/java/org/s4s/modell/dto/Transaction.java
index ddfb783..5716ff0 100644
--- a/src/main/java/org/s4s/modell/dto/Transaction.java
+++ b/src/main/java/org/s4s/modell/dto/Transaction.java
@@ -21,6 +21,10 @@ public class Transaction {
this.produkt = produkt;
}
+ public Transaction() {
+
+ }
+
public Integer getVerkaeufer() {
return verkaeufer;
}
diff --git a/src/main/java/org/s4s/process/control/ProductSearch.java b/src/main/java/org/s4s/process/control/ProductSearch.java
index 87c7fd3..86192c6 100644
--- a/src/main/java/org/s4s/process/control/ProductSearch.java
+++ b/src/main/java/org/s4s/process/control/ProductSearch.java
@@ -102,7 +102,6 @@ public class ProductSearch extends AbstractDatabaseClass implements ProductDAO {
return p;
}
- // Noch fertig zu stellen!!!!!!!!!
@Override
public Shop getProductOwner(Product product) throws DAOException {
Shop s = new Shop();
diff --git a/src/main/java/org/s4s/process/control/TransactionControl.java b/src/main/java/org/s4s/process/control/TransactionControl.java
index 51c16ea..902368f 100644
--- a/src/main/java/org/s4s/process/control/TransactionControl.java
+++ b/src/main/java/org/s4s/process/control/TransactionControl.java
@@ -19,13 +19,17 @@ import org.s4s.services.util.Roles;
*/
public class TransactionControl extends AbstractDatabaseClass {
- Transaction transaktion;
+ private final Transaction transaktion = new Transaction();
private final Statement statement = JDBCConnection.getInstance().getStatement();
//String kaeuferString = (String) UI.getCurrent().getSession().getAttribute(Roles.CURRENTUSER);
public void createTransactions() throws DAOException, SQLException {
+ User u = (User) UI.getCurrent().getSession().getAttribute(Roles.CURRENTUSER);
+ String name = u.getBenutzername();
+ int id = u.getUserId();
+ User user = new User(name, id);
+ transaktion.setKaeufer(user);
for (Product p : Warenkorb.getInstance().inhalt()) {
- transaktion.setKaeufer((User) UI.getCurrent().getSession().getAttribute(Roles.CURRENTUSER));
transaktion.setVerkaeufer(kaeuferinDB(p.getId()));
transaktion.setProdukt(p);
createTransactionInDB(transaktion);
@@ -37,7 +41,7 @@ public class TransactionControl extends AbstractDatabaseClass {
Integer verkaeufer;
try (ResultSet rs = executeQuery("SELECT u.\"besitzer\"" + " FROM \"ERR\".\"shop\" u , \"ERR\".\"artikel\" s"
+ " WHERE u.shopid = s.shopid AND "
- + "s.artikelid'" + transaktion.getProdukt().getId() + "';");) {
+ + "s.artikelid = '" + transaktion.getProdukt().getId() + "';");) {
verkaeufer = rs.getInt("besitzer");
} catch (SQLException ex) {
--
GitLab