Merge branch 'master' of https://git.fslab.de/tpinza2s/s4s

# Conflicts:
#	src/main/java/org/s4s/dao/ShopDAO.java
#	src/main/java/org/s4s/process/control/ShopControl.java

super toller Merge

src/main/java/org/s4s/dao/ShopDAO.java

 package org.s4s.dao;
 
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 import org.s4s.modell.dto.User;
-import org.s4s.services.db.JDBCConnection;
 
 /**
  *
  * @author Benjamin
  */
-public class ShopDAO {
+public interface ShopDAO {
 
-    public static ShopDAO dao = null;
-    private final Statement statement = JDBCConnection.getInstance().getStatement();
+    boolean viewShop(User user);
 
-    private ShopDAO() {
-
-    }
-
-    public static ShopDAO getInstance() {
-        if (dao == null) {
-            dao = new ShopDAO();
-        }
-        return dao;
-    }
-
-    //Shop anhand von User/Besitzer auslesen
-    public boolean viewShop(User user) {
-        boolean result = true;
-        try {
-            ResultSet set = statement.executeQuery("SELECT *"
-                    + "FROM ERR.shop"
-                    + "WHERE besitzer = \'" + user.getBenutzername() + "\'");
-
-            if (set != null) {
-                result = false;
-            }
-        } catch (SQLException ex) {
-            Logger.getLogger(ShopDAO.class.getName()).log(Level.SEVERE, null, ex);
-        }
-        return result;
-    }
-
-    public boolean addShop(User user, String shopName, String shopDescription) {
-        //Shop via Benutzername anlegen da dieser idR eindeutig ist
-        try {
-            // vorausgesetzt ID wird automatisch gesetzt von der DB
-            statement.execute("INSERT INTO ERR.shop (name, besitzer, beschreibung) VALUES ("
-                    + shopName + ","
-                    + user.getBenutzername() + ","
-                    + shopDescription + ");");
-            return true;
-        } catch (SQLException ex) {
-            Logger.getLogger(ShopDAO.class.getName()).log(Level.SEVERE, null, ex);
-            return false;
-        }
-
-    }
+    boolean addShop(User user, String shopName);
 }

src/main/java/org/s4s/gui/views/ShopErstellung.java

@@ -9,7 +9,6 @@ import com.vaadin.ui.FormLayout;
 import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.Panel;
-import com.vaadin.ui.TextArea;
 import com.vaadin.ui.TextField;
 import com.vaadin.ui.UI;
 import java.sql.SQLException;
@@ -47,9 +46,8 @@ public class ShopErstellung extends TemplateView implements View {
 //                select.addItems("Student", "Hivi", "Prof");
 //                select.setNullSelectionAllowed(false);
 //                content.addComponent(select);
-        TextArea area = new TextArea("Shopbeschreibung");
-        content.addComponent(area);
-
+//        TextArea area = new TextArea("Shopbeschreibung");
+//        content.addComponent(area);
 //                TextField emailTxt = new TextField("E-Mail:");
 //                emailTxt.setIcon(FontAwesome.MAIL_FORWARD);
 //                content.addComponent(emailTxt);
@@ -73,9 +71,9 @@ public class ShopErstellung extends TemplateView implements View {
 //             String shopOwner = shopowner.getValue();
 //             String email = emailTxt.getValue();
             String shopName = shopname.getValue();
-            String beschreibung = area.getValue();
+            //           String beschreibung = area.getValue();
             try {
-                ShopControl.checkUserShop(shopName, beschreibung);
+                ShopControl.checkUserShop(shopName);
             } catch (OwnsAlreadyShop ex) {
                 Logger.getLogger(ShopErstellung.class.getName()).log(Level.SEVERE, null, ex);
             } catch (SQLException ex) {
@@ -87,7 +85,7 @@ public class ShopErstellung extends TemplateView implements View {
 //             System.out.println(shopOwner);
             System.out.println(shopname);
 //             System.out.println(email);
-            System.out.println(beschreibung);
+//            System.out.println(beschreibung);
             System.out.println(s);
 
             // Weiterleitung auf Bestätigunsseite

src/main/java/org/s4s/process/control/ShopControl.java

 package org.s4s.process.control;
 
 import com.vaadin.server.VaadinSession;
-import com.vaadin.ui.UI;
+import java.sql.ResultSet;
 import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 import org.s4s.dao.ShopDAO;
+import org.s4s.dao.impl.AbstractDatabaseClass;
 import org.s4s.exceptions.OwnsAlreadyShop;
 import org.s4s.modell.dto.User;
+import org.s4s.services.db.JDBCConnection;
 import org.s4s.services.util.Roles;
-import org.s4s.services.util.Views;
 
 /**
  *
  * @author Benjamin
  */
-public class ShopControl {
+public class ShopControl extends AbstractDatabaseClass implements ShopDAO {
 
     private static final User user = (User) VaadinSession.getCurrent().getAttribute(Roles.CURRENTUSER);
+    private final Statement statement = JDBCConnection.getInstance().getStatement();
 
-    //bekommt User aus der View übergeben und prüft ob dieser schon in der Shopdb vorhanden ist (= hat schon einen Shop).
-    public static void checkUserShop(String shopName, String shopBeschreibung) throws OwnsAlreadyShop, SQLException {
-        boolean test = ShopDAO.getInstance().viewShop(user);
+    //bekommt User aus der View übergeben und prüft ob dieser schon in der Shopdb vorhanden ist (= hat schon einen Shop).
+    public static void checkUserShop(String shopName) throws OwnsAlreadyShop, SQLException {
+        ShopControl sc = new ShopControl();
+        boolean test = sc.viewShop(user);
         //Shop mit dem Nutzer schon vorhanden
-        if (test == false) {
+        if (test == true) {
             throw new OwnsAlreadyShop("Sie besitzen bereits einen Shop!");
         } //noch kein Shop vorhanden
         else {
-            addUserShop(shopName, shopBeschreibung);
+            addUserShop(shopName);
         }
     }
 
-    private static void addUserShop(String shopName, String shopBeschreibung) throws SQLException {
-        boolean erstellung = ShopDAO.getInstance().addShop(user, shopName, shopBeschreibung);
+    private static void addUserShop(String shopName) throws SQLException {
+        ShopControl sc = new ShopControl();
+        boolean erstellung = sc.addShop(user, shopName);
 
-        if (erstellung == true) {
-            //Weiterleitung zur Shopseite, wenn Shop erfolgreich erstellt
-            UI.getCurrent().getNavigator().navigateTo(Views.SHOP);
-        } else {
+        if (erstellung == false) {
             //Fehlerhandling
             throw new SQLException("Fehler beim Anlegen des Shops bitte noch einmal versuchen oder Programmierer kontaktieren!");
         }
     }
+
+    //Shop anhand von User/Besitzer auslesen
+    /**
+     *
+     * @param user
+     * @return
+     */
+    @Override
+    public boolean viewShop(User user) {
+        boolean result = false;
+        try {
+            ResultSet set = executeQuery("SELECT \"besitzer\""
+                    + "FROM \"ERR\".\"shop\" "
+                    + "WHERE besitzer = " + user.getUserId() + ";");
+
+            if (set.next()) {
+                result = true;
+            }
+        } catch (SQLException ex) {
+            Logger.getLogger(ShopDAO.class.getName()).log(Level.SEVERE, null, ex);
+        }
+        return result;
+    }
+
+    /**
+     *
+     * @param user
+     * @param shopName
+     * @return
+     */
+    @Override
+    public boolean addShop(User user, String shopName) {
+        //Shop via Benutzername anlegen da dieser idR eindeutig ist
+        try {
+            // vorausgesetzt ID wird automatisch gesetzt von der DB
+            statement.execute("INSERT INTO \"ERR\".\"shop\" (name, besitzer) VALUES ("
+                    + "'" + shopName + "'" + ","
+                    + user.getUserId() + ");"); // + ","
+            //+ shopDescription + ");");
+            return true;
+        } catch (SQLException ex) {
+            Logger.getLogger(ShopDAO.class.getName()).log(Level.SEVERE, null, ex);
+            return false;
+        }
+
+    }
 }