diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..562b66d --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +.idea/ +out/ \ No newline at end of file diff --git a/Tourplaner.iml b/Tourplaner.iml index 699c51d..1f2f651 100644 --- a/Tourplaner.iml +++ b/Tourplaner.iml @@ -20,5 +20,6 @@ + \ No newline at end of file diff --git a/conf.ini b/conf.ini index cb26538..317e542 100644 --- a/conf.ini +++ b/conf.ini @@ -1,2 +1,9 @@ [start] -message = Tour Planer App gestartet \ No newline at end of file +message = Tour Planer App gestartet + +[db] +dbname = tourplaner +url = 192.168.1.116 +port = 5432 +user = user +pw = user \ No newline at end of file diff --git a/log/log4j/log.out b/log/log4j/log.out index 370e527..674aa4f 100644 --- a/log/log4j/log.out +++ b/log/log4j/log.out @@ -4,3 +4,38 @@ App started 2021-02-26 15:59:44 INFO TourPlaner:15 - App started 2021-02-26 16:06:01 FATAL TourPlanerConfig:27 - C:\Users\georg\OneDrive\FH\Swe\Tourplaner\conf.ini (Das System kann die angegebene Datei nicht finden) 2021-02-26 16:08:31 INFO TourPlaner:15 - Tour Planer App gestartet +2021-02-26 21:27:46 INFO TourPlaner:15 - Tour Planer App gestartet +2021-02-26 21:27:46 ERROR PresenterMain:33 - +/C:/Users/georg/OneDrive/FH/Swe/Tourplaner/out/production/Tourplaner/tourplaner/ui/tourplaner.fxml:56 + +2021-02-26 21:27:46 INFO PostgresHelper:15 - User Table created +2021-02-26 21:27:46 ERROR ClassNotFoundException:33 - org.postgresql.Driver +2021-02-26 21:27:46 ERROR NullPointerException:33 - +2021-02-26 21:30:59 INFO TourPlaner:15 - Tour Planer App gestartet +2021-02-26 21:30:59 ERROR PresenterMain:33 - +/C:/Users/georg/OneDrive/FH/Swe/Tourplaner/out/production/Tourplaner/tourplaner/ui/tourplaner.fxml:56 + +2021-02-26 21:30:59 INFO PostgresHelper:15 - User Table created +2021-02-26 21:31:01 ERROR PSQLException:33 - Connection to postgres.dergeorg.at:5432 refused. Check that the hostname and port are correct and that the postmaster is accepting TCP/IP connections. +2021-02-26 21:31:01 ERROR NullPointerException:33 - +2021-02-26 21:32:19 INFO TourPlaner:15 - Tour Planer App gestartet +2021-02-26 21:32:19 ERROR PresenterMain:33 - +/C:/Users/georg/OneDrive/FH/Swe/Tourplaner/out/production/Tourplaner/tourplaner/ui/tourplaner.fxml:56 + +2021-02-26 21:32:19 INFO PostgresHelper:15 - User Table created +2021-02-26 21:32:21 ERROR PSQLException:33 - Connection to postgres.dergeorg.at:5432 refused. Check that the hostname and port are correct and that the postmaster is accepting TCP/IP connections. +2021-02-26 21:32:21 ERROR NullPointerException:33 - +2021-02-26 21:33:05 INFO TourPlaner:15 - Tour Planer App gestartet +2021-02-26 21:33:05 ERROR PresenterMain:33 - +/C:/Users/georg/OneDrive/FH/Swe/Tourplaner/out/production/Tourplaner/tourplaner/ui/tourplaner.fxml:56 + +2021-02-26 21:33:05 INFO PostgresHelper:15 - User Table created +2021-02-26 21:33:07 ERROR PSQLException:33 - Connection to postgres.dergeorg.at:5432 refused. Check that the hostname and port are correct and that the postmaster is accepting TCP/IP connections. +2021-02-26 21:33:07 ERROR NullPointerException:33 - +2021-02-26 21:35:08 INFO TourPlaner:15 - Tour Planer App gestartet +2021-02-26 21:35:08 ERROR PresenterMain:33 - +/C:/Users/georg/OneDrive/FH/Swe/Tourplaner/out/production/Tourplaner/tourplaner/ui/tourplaner.fxml:56 + +2021-02-26 21:35:08 INFO PostgresHelper:15 - User Table created +2021-02-26 21:35:10 ERROR PSQLException:33 - Connection to postgres.dergeorg.at:5432 refused. Check that the hostname and port are correct and that the postmaster is accepting TCP/IP connections. +2021-02-26 21:35:10 ERROR NullPointerException:33 - diff --git a/logs/tourplaner.log b/logs/tourplaner.log deleted file mode 100644 index e69de29..0000000 diff --git a/out/production/Tourplaner/tourplaner/business/ConfigHelper.class b/out/production/Tourplaner/tourplaner/business/ConfigHelper.class deleted file mode 100644 index f394a10..0000000 Binary files a/out/production/Tourplaner/tourplaner/business/ConfigHelper.class and /dev/null differ diff --git a/out/production/Tourplaner/tourplaner/business/LogHelper.class b/out/production/Tourplaner/tourplaner/business/LogHelper.class deleted file mode 100644 index a88201a..0000000 Binary files a/out/production/Tourplaner/tourplaner/business/LogHelper.class and /dev/null differ diff --git a/out/production/Tourplaner/tourplaner/business/TourPlaner.class b/out/production/Tourplaner/tourplaner/business/TourPlaner.class deleted file mode 100644 index 388030c..0000000 Binary files a/out/production/Tourplaner/tourplaner/business/TourPlaner.class and /dev/null differ diff --git a/out/production/Tourplaner/tourplaner/data/DbConnect.class b/out/production/Tourplaner/tourplaner/data/DbConnect.class deleted file mode 100644 index 5dd5aa4..0000000 Binary files a/out/production/Tourplaner/tourplaner/data/DbConnect.class and /dev/null differ diff --git a/out/production/Tourplaner/tourplaner/ui/PresenterMain.class b/out/production/Tourplaner/tourplaner/ui/PresenterMain.class deleted file mode 100644 index 1c6850b..0000000 Binary files a/out/production/Tourplaner/tourplaner/ui/PresenterMain.class and /dev/null differ diff --git a/out/production/Tourplaner/tourplaner/ui/tourplaner.fxml b/out/production/Tourplaner/tourplaner/ui/tourplaner.fxml deleted file mode 100644 index 41d5fe6..0000000 --- a/out/production/Tourplaner/tourplaner/ui/tourplaner.fxml +++ /dev/null @@ -1,237 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/tourplaner/business/ConfigHelper.java b/src/tourplaner/business/ConfigHelper.java index adec8e3..c2ad72d 100644 --- a/src/tourplaner/business/ConfigHelper.java +++ b/src/tourplaner/business/ConfigHelper.java @@ -5,33 +5,90 @@ import org.ini4j.Wini; import java.io.File; import java.io.IOException; +/** + * Dient dem ein und auslesen von .ini Dateien + */ public class ConfigHelper { - public static String standartConfig = "conf.ini"; + public static String standartConfig = "conf.ini"; // Config.ini befindet sich im Root Verzeichnis - - public static int getIniInt(String filename, String sectionName, String optionName) throws IOException { - Wini ini = new Wini(new File(filename)); + /** + * Liest einen Int aus der Config aus + * @param filename Speicherort + * @param sectionName Sections Name + * @param optionName Options Name + * @return Den angeforderten String + */ + public static int getIniInt(String filename, String sectionName, String optionName){ + Wini ini = null; + try { + ini = new Wini(new File(filename)); + } catch (IOException e) { + LogHelper.error(e.getMessage(), e.getClass().getName()); + } + assert ini != null; return ini.get(sectionName, optionName, int.class); } - public static String getIniString(String filename, String sectionName, String optionName) throws IOException { - Wini ini = new Wini(new File(filename)); + /** + * Liest einen String aus der Config aus + * @param filename Speicherort + * @param sectionName Sections Name + * @param optionName Options Name + * @return Den angeforderten String + */ + public static String getIniString(String filename, String sectionName, String optionName){ + Wini ini = null; + try { + ini = new Wini(new File(filename)); + } catch (IOException e) { + LogHelper.error(e.getMessage(), e.getClass().getName()); + } + assert ini != null; return ini.get(sectionName, optionName, String.class); } - public static void setIniString(String filename, String sectionName, String optionName, String value) throws IOException { - Wini ini = new Wini(new File(filename)); - ini.put(sectionName, optionName, value); - ini.store(); + /** + * Setzt ein String in der Config + * @param filename Speicherort + * @param sectionName Sections Name + * @param optionName Options Name + * @param value Wert der eingetragen werden soll + */ + public static void setIniString(String filename, String sectionName, String optionName, String value) { + Wini ini = null; + try { + ini = new Wini(new File(filename)); + ini.put(sectionName, optionName, value); + ini.store(); + } catch (IOException e) { + LogHelper.error(e.getMessage(), e.getClass().getName()); + } + } - public static void setIniInt(String filename, String sectionName, String optionName, int value) throws IOException { - Wini ini = new Wini(new File(filename)); - ini.put(sectionName, optionName, value); - ini.store(); + /** + * Setzt ein int in der Config + * @param filename Speicherort + * @param sectionName Sections Name + * @param optionName Options Name + * @param value Wert der eingetragen werden soll + */ + public static void setIniInt(String filename, String sectionName, String optionName, int value){ + Wini ini = null; + try { + ini = new Wini(new File(filename)); + ini.put(sectionName, optionName, value); + ini.store(); + } catch (IOException e) { + LogHelper.error(e.getMessage(), e.getClass().getName()); + } } + /** + * Gibt den namen des standard Config file zurück + * @return Name des standard config files + */ public static String getStandartConfig() { return standartConfig; } diff --git a/src/tourplaner/business/LogHelper.java b/src/tourplaner/business/LogHelper.java index ded2a02..e0d9ee3 100644 --- a/src/tourplaner/business/LogHelper.java +++ b/src/tourplaner/business/LogHelper.java @@ -7,7 +7,7 @@ import org.apache.log4j.*; */ public class LogHelper{ /** - * Logging in file und Console + * Log info in file und Console * @param msg Nachricht in dem Log * @param name Name des Log Eintrags */ @@ -15,20 +15,40 @@ public class LogHelper{ getLog(name).info(msg); } + /** + * Log info in file und Console + * @param msg Nachricht in dem Log + * @param name Name des Log Eintrags + */ public static void warn(String msg, String name){ getLog(name).warn(msg); } + /** + * Log info in file und Console + * @param msg Nachricht in dem Log + * @param name Name des Log Eintrags + */ public static void error(String msg, String name){ getLog(name).error(msg); } + /** + * Log info in file und Console + * @param msg Nachricht in dem Log + * @param name Name des Log Eintrags + */ public static void fatal(String msg, String name){ getLog(name).fatal(msg); } + /** + * Instanziert den Logger + * @param name Name des Loggers + * @return Den Logger + */ private static Logger getLog(String name){ - return Logger.getLogger(name); // Initialiesiert das Logging + return Logger.getLogger(name); // Instanziert den Logger } } diff --git a/src/tourplaner/business/PostgresHelper.java b/src/tourplaner/business/PostgresHelper.java new file mode 100644 index 0000000..2209191 --- /dev/null +++ b/src/tourplaner/business/PostgresHelper.java @@ -0,0 +1,60 @@ +package tourplaner.business; + + +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://" + ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "db", "url") + ":" + ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "db", "port") + "/" + ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "db", "dbname"), + ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "db", "user"), ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "db", "pw")); + } catch (Exception e) { + LogHelper.error(e.getMessage(), e.getClass().getName()); + } + return c; + } + + /** + * Führt ein Sql statement ohne rückgabe aus, mit message nachricht + * @param sql Sql command + * @param message Mesasage die vor dem Durchführen angezeigt wird + * @return True bei erfolg, sonst false + */ + public static boolean executeUpdateMessage(String sql, String message){ + LogHelper.info(message, "PostgresHelper"); + 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) { + LogHelper.error(e.getMessage(), e.getClass().getName()); + return false; + } + return true; + } +} diff --git a/src/tourplaner/business/TourPlaner.java b/src/tourplaner/business/TourPlaner.java index b29ecc6..05337ea 100644 --- a/src/tourplaner/business/TourPlaner.java +++ b/src/tourplaner/business/TourPlaner.java @@ -2,6 +2,7 @@ package tourplaner.business; import javafx.stage.Stage; import org.apache.log4j.Logger; +import tourplaner.data.DbConnect; import tourplaner.ui.PresenterMain; import java.io.IOException; @@ -17,13 +18,10 @@ public class TourPlaner{ * @param primaryStage Stage für den Presenter */ public TourPlaner(Stage primaryStage){ - try { - String startText = ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "start", "message"); - LogHelper.info(startText, "TourPlaner"); - PresenterMain presenterMain = new PresenterMain(primaryStage); // Start Presenter/GUI - } catch (IOException e) { - LogHelper.fatal(e.getMessage(), "TourPlanerConfig"); - } + String startText = ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "start", "message"); + LogHelper.info(startText, "TourPlaner"); + PresenterMain presenterMain = new PresenterMain(primaryStage); // Start Presenter/GUI + new DbConnect().init(); } } diff --git a/src/tourplaner/data/DbConnect.java b/src/tourplaner/data/DbConnect.java index cd8db12..f57f59b 100644 --- a/src/tourplaner/data/DbConnect.java +++ b/src/tourplaner/data/DbConnect.java @@ -1,7 +1,37 @@ package tourplaner.data; +import tourplaner.business.PostgresHelper; + +import java.sql.Connection; +import java.sql.Statement; +import java.util.ArrayList; + /** * Verwaltet die Datenbankverbindung zu dem Postgres Server */ public class DbConnect { + private Connection c; + private Statement stmt; + + + /** + * Erstellt alle Beispieldaten und simuliert somit den + * Verbindungsaufbau zu einer DB + */ + public DbConnect() { + this.c = null; + } + + + /** + * Erstellt alle Tabellen die für den Betrieb der Software bennötigt werden + * @return True bei erfolg, sonst error + */ + public boolean init() { + // TODO: 26.02.2021 Alle sql im init sind noch falsch + ArrayList errors = new ArrayList<>(); + errors.add(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")); + return !errors.contains(false); + } + } diff --git a/src/tourplaner/ui/PresenterMain.java b/src/tourplaner/ui/PresenterMain.java index 86332f8..4bdfc92 100644 --- a/src/tourplaner/ui/PresenterMain.java +++ b/src/tourplaner/ui/PresenterMain.java @@ -22,11 +22,12 @@ public class PresenterMain { public PresenterMain(Stage primaryStage){ Parent root = null; try { - root = FXMLLoader.load(getClass().getResource("../ui/tourplaner.fxml")); + root = FXMLLoader.load(getClass().getResource("tourplaner.fxml")); primaryStage.setTitle("DerGeorg Touren Planer"); primaryStage.setScene(new Scene(root, 600, 600)); primaryStage.show(); } catch (IOException e) { + e.printStackTrace(); LogHelper.error(e.getMessage(), "PresenterMain"); }