Merge branch 'option-ui' into merge

# Conflicts:
#	client/data/src/main/java/res/DataController.java

client/app/build.gradle.kts

@@ -13,7 +13,7 @@ javafx {
 }
 
 application {
-    mainClassName = "client.MainApplication"
+    mainClassName = "main.MainApplication"
 }
 
 repositories {
@@ -27,7 +27,7 @@ dependencies {
 
 val jar by tasks.getting(Jar::class) {
     manifest {
-        attributes["Main-Class"] = "client.Launcher"
+        attributes["Main-Class"] = "main.Launcher"
     }
     from({
         configurations.runtimeClasspath.get().map { if (it.isDirectory) it else zipTree(it) }

client/app/src/main/java/main/EditEventController.java

@@ -1,9 +1,17 @@
 package main;
 
+import customUI.Converter;
 import helper.HttpRequestException;
+import javafx.fxml.FXML;
+import javafx.util.StringConverter;
+import javafx.util.converter.LocalTimeStringConverter;
 import res.DataController;
 import res.Event;
 
+import java.time.LocalTime;
+import java.time.format.FormatStyle;
+import java.util.Locale;
+
 public class EditEventController extends CreateEventController{
 
     private Event currentEvent;
@@ -14,12 +22,17 @@ public class EditEventController extends CreateEventController{
 
     public void setCurrentEvent(Event currentEvent) {
         this.currentEvent = currentEvent;
+
+        textName.setText(Converter.convertString(currentEvent.getName()));
+        datePickerDate.setValue(currentEvent.getDate().toLocalDate());
+        ComboBoxPriotity.getSelectionModel().select(currentEvent.getPriority());
+
+        //timeEnd.setValue(currentEvent.getEnd());
     }
 
     @Override
     protected void sendHttpRequest(Event event) throws HttpRequestException {
         DataController dataController = new DataController();
-        dataController.deleteEvent(currentEvent.getOwnerId(), currentEvent.getId(), currentEvent.getDate());
+        dataController.editEvent(currentEvent, event);
-        dataController.createEvent(event);
     }
 }

client/app/src/main/java/main/MainController.java

@@ -1,5 +1,7 @@
 package main;
 
+import config.Config;
+import config.ConfigLoader;
 import customUI.Button;
 import customUI.Label;
 import helper.SvgBtnCreator;
@@ -8,6 +10,7 @@ import javafx.fxml.FXML;
 import javafx.fxml.FXMLLoader;
 import javafx.geometry.Pos;
 import javafx.scene.Group;
+import javafx.scene.Node;
 import javafx.scene.Scene;
 import javafx.scene.control.ScrollPane;
 import javafx.scene.layout.GridPane;
@@ -18,6 +21,9 @@ import javafx.stage.Stage;
 import res.DataController;
 import res.Event;
 
+import javafx.event.ActionEvent;
+import res.HttpRequest;
+
 import java.io.IOException;
 import java.time.Duration;
 import java.time.LocalDateTime;
@@ -137,8 +143,12 @@ public class MainController {
         }
     }
 
-    protected void onLogoutBtnClick(){
+    protected void onLogoutBtnClick(ActionEvent event){
-
+        ConfigLoader.save(new Config());
+        DataController.USER_ID = -1;
+        HttpRequest.TOKEN = "";
+        Stage stage = (Stage) ((Node) event.getSource()).getScene().getWindow();
+        stage.close();
     }
 
     private void createWeek() {
@@ -310,7 +320,7 @@ public class MainController {
                         "white", "gray")
         );
         Button logoutBtn = SvgBtnCreator.createBtn(svgLogout, 40, "main-btn", "Abmelden");
-        logoutBtn.setOnAction(e -> onLogoutBtnClick());
+        logoutBtn.setOnAction(this::onLogoutBtnClick);
         logoutBtn.getStyleClass().add("main-btn");
         leftNav.getChildren().add(logoutBtn);
 

client/data/src/main/java/config/ConfigLoader.java

@@ -17,7 +17,7 @@ public class ConfigLoader {
             objectMapper.findAndRegisterModules();
             return objectMapper.readValue(jsonString, Config.class);
         } catch (IOException e) {
-            e.printStackTrace();
+            System.out.println("config.json missing");
         }
         return null;
     }

client/data/src/main/java/res/DataController.java

@@ -23,10 +23,15 @@ public class DataController {
     private static final String ALL_EVENTS_ENDPOINT = "http://localhost:8080/event/all";
     private static final String ADD_EVENT_ENDPOINT = "http://localhost:8080/event/add";
     private static final String DELETE_EVENT_ENDPOINT = "http://localhost:8080/event/del";
+    private static final String EDIT_EVENT_ENDPOINT = "http://localhost:8080/event/edit";
+
+    private static final String ALL_USER_ENDPOINT = "http://localhost:8080/user/all";
+    private static final String ADD_USER_ENDPOINT = "http://localhost:8080/user/add";
+    private static final String DELETE_USER_ENDPOINT = "http://localhost:8080/user/del";
+    private static final String EDIT_USER_ENDPOINT = "http://localhost:8080/user/edit";
 
     private static final String LOGIN_ENDPOINT = "http://localhost:8080/user/login";
     private static final String LOGIN_WITH_TOKEN_ENDPOINT = "http://localhost:8080/user/login-with-token";
-    private static final String ALL_USERS_ENDPOINT = "http://localhost:8080/user/all";
     private static final String HEADER_TEST_ENDPOINT = "http://localhost:8080/vpr/header-test";
 
     private final HttpRequest httpRequest;
@@ -47,13 +52,6 @@ public class DataController {
 
             USER_ID = Long.parseLong(data[1]);
             HttpRequest.TOKEN = data[0];
-
-            Tuple<Integer, String> auth = httpRequest.sendPostRequest(
-                    HEADER_TEST_ENDPOINT,
-                    "",
-                    true
-            );
-            System.out.println("auth " + auth);
         } catch (Exception e) {
             e.printStackTrace();
             return false;
@@ -73,7 +71,7 @@ public class DataController {
 
             System.out.println(response.getKey() + " " + response.getValue());
 
-            if(response.getKey() != 200) return false;
+            if (response.getKey() != 200) return false;
         } catch (Exception e) {
             e.printStackTrace();
             return false;
@@ -83,35 +81,40 @@ public class DataController {
         return USER_ID >= 0;
     }
 
+    /*********
+     * Event *
+     *********/
     public void createEvent(Event event) throws HttpRequestException {
-        try {
+        sendBasicHttpRequest(
-            Tuple<Integer, String> response = httpRequest.sendPostRequest(ADD_EVENT_ENDPOINT, event.getAsUrlParam(), true);
+                ADD_EVENT_ENDPOINT,
-            if(response.getKey() != 200){
+                event.getAsUrlParam(),
-                throw new HttpRequestException(response);
+                true
-            }
+        );
-        }catch (HttpRequestException e){
-            throw e;
-        }catch (Exception e) {
-            throw new HttpRequestException("Es konnte keine Verbindung mit dem Server hergestellt werden.", 600);
-        }
     }
 
     public void deleteEvent(int userId, int eventId, LocalDateTime date) throws HttpRequestException {
-        try {
+        sendBasicHttpRequest(
-            System.out.println("DELETE: userId=" + userId + "&eventId=" + eventId + "&date=" + date.toLocalDate());
+                DELETE_EVENT_ENDPOINT,
-            Tuple<Integer, String> response = httpRequest.sendPostRequest(
+                "userId=" + userId + "&eventId=" + eventId + "&date=" + date.toLocalDate(),
-                    DELETE_EVENT_ENDPOINT,
+                true
-                    "userId=" + userId + "&eventId=" + eventId + "&date=" + date.toLocalDate(),
+        );
-                    true
+    }
-            );
+
-            if(response.getKey() != 200){
+    public void editEvent(Event oldEvent, Event event) throws HttpRequestException {
-                throw new HttpRequestException(response);
+        sendBasicHttpRequest(
-            }
+                EDIT_EVENT_ENDPOINT,
-        }catch (HttpRequestException e){
+                "eventId=" + oldEvent.getId() +
-            throw e;
+                        "&userId=" + oldEvent.getOwnerId() +
-        }catch (Exception e) {
+                        "&date=" + oldEvent.getDate().toLocalDate() +
-            throw new HttpRequestException("Es konnte keine Verbindung mit dem Server hergestellt werden.", 600);
+                        "&newDate=" + event.getDate().toLocalDate() +
-        }
+                        "&newName=" + event.getName() +
+                        "&newStart=" + event.getStart() +
+                        "&newEnd=" + event.getEnd() +
+                        "&newPriority=" + event.getPriority() +
+                        "&newIsFullDay=" + event.isFullDay() +
+                        "&newIsPrivate=" + event.isPrivate(),
+                true
+        );
     }
 
     public ArrayList<Event> getAllVisibleEvents(LocalDateTime startDate, LocalDateTime endDate) throws HttpRequestException {
@@ -122,7 +125,7 @@ public class DataController {
                     "userId=" + USER_ID + "&startDate=" + startDate.toLocalDate() + "&endDate=" + endDate.toLocalDate(),
                     true
             );
-            if(response.getKey() != 200){
+            if (response.getKey() != 200) {
                 throw new HttpRequestException(response);
             }
             String jsonResponse = response.getValue();
@@ -130,25 +133,63 @@ public class DataController {
 
             ObjectMapper objectMapper = new ObjectMapper();
             objectMapper.findAndRegisterModules();
-            eventList = (ArrayList<Event>) objectMapper.readValue(jsonResponse, new TypeReference<List<Event>>(){});
+            eventList = (ArrayList<Event>) objectMapper.readValue(jsonResponse, new TypeReference<List<Event>>() {
+            });
 
 
-        }catch (HttpRequestException e){
+        } catch (HttpRequestException e) {
             throw e;
-        }catch (Exception e) {
+        } catch (Exception e) {
             throw new HttpRequestException("Es konnte keine Verbindung mit dem Server hergestellt werden.", 600);
         }
 
         return eventList;
     }
 
-    public List<User> getAllUseres(){
+    /********
-        List<User> users = new ArrayList<>();
+     * User *
+     ********/
 
-        
+    /*
-
+    public void createUser(User user) throws HttpRequestException {
-        return users;
+        sendBasicHttpRequest(
+                ADD_USER_ENDPOINT,
+                user.getAsUrlParam(),
+                true
+        );
     }
 
+    public void deleteUser(User user) throws HttpRequestException {
+        sendBasicHttpRequest(
+                DELETE_USER_ENDPOINT,
+                user.getAsUrlParam(),
+                true
+        );
+    }
 
+    public void editUser(User oldUser, User user) throws HttpRequestException {
+        sendBasicHttpRequest(
+                EDIT_USER_ENDPOINT,
+                user.getAsUrlParam(),
+                true
+        );
+    }
+     */
+
+    private void sendBasicHttpRequest(String urlString, String urlParameters, boolean sendAuth) throws HttpRequestException {
+        try {
+            Tuple<Integer, String> response = httpRequest.sendPostRequest(
+                    urlString,
+                    urlParameters,
+                    sendAuth
+            );
+            if (response.getKey() != 200) {
+                throw new HttpRequestException(response);
+            }
+        } catch (HttpRequestException e) {
+            throw e;
+        } catch (Exception e) {
+            throw new HttpRequestException("Es konnte keine Verbindung mit dem Server hergestellt werden.", 600);
+        }
+    }
 }

client/data/src/main/java/res/Event.java

@@ -30,68 +30,7 @@ public class Event {
     private int ownerId;
     private String ownerName;
 
-    /*
+    public Event() {}
-    Constructor for SELECT:
-    e.id AS eid,
-    e.name AS ename,
-    e.start,
-    e.end,
-    e.priority,
-    e.is_full_day,
-
-    ue.date,
-
-    u.id AS uid,
-    u.forename,
-    u.name AS uname
-     */
-
-    public Event() {
-
-    }
-
-    public Event(ArrayList<Object> arr) {
-        id = (int) arr.get(0);
-        name = (String) arr.get(1);
-        start = (String) arr.get(2);
-        end = (String) arr.get(3);
-        priority = (int) arr.get(4);
-        isFullDay = (Boolean) arr.get(5); //((String)arr.get(5)).equals("true");
-
-
-        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm");
-        date = LocalDateTime.parse(arr.get(6) + " 00:00", formatter);
-
-        ownerId = (int) arr.get(7);
-        ownerName = arr.get(8) + " " + arr.get(9);
-    }
-
-    public Event(
-            int id,
-            String name,
-            int priority,
-            boolean isFullDay,
-            boolean isPrivate,
-            String start,
-            String end,
-            String date,
-            int ownerId,
-            String ownerName
-    ) {
-        this.ownerId = ownerId;
-        this.ownerName = ownerName;
-        this.id = id;
-        this.name = name;
-        this.start = start;
-        this.end = end;
-        this.priority = priority;
-        this.isFullDay = isFullDay;
-
-
-        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm");
-        this.date = LocalDateTime.parse(date + " 00:00", formatter);
-
-    }
 
     public Event(String name,
                  int priority,
@@ -110,26 +49,6 @@ public class Event {
         Pattern pattern = Pattern.compile("[A-Za-z\u00e4\u00f6\u00fc\u00c4\u00d6\u00dc\u00df0-9 =!?+*/$.:,;_<>()-]*");
         Matcher matcher = pattern.matcher(name);
         if (!matcher.matches()) {
-            System.out.println(name);
-
-            byte[] bytes = name.getBytes(StandardCharsets.UTF_16);
-
-            String utf8EncodedString = new String(bytes, StandardCharsets.UTF_16);
-            System.out.println(utf8EncodedString);
-
-            for (char c : (name).toCharArray()) {
-                System.out.print(c + " " + (int) c + ", ");
-            }
-            System.out.println();
-            for (char c : (name).toCharArray()) {
-                System.out.print(c + " " + (int) c + ", ");
-            }
-            System.out.println();
-            for (char c : ("TäöüÄÖÜ").toCharArray()) {
-                System.out.print(c + " " + (int) c + ", ");
-            }
-            System.out.println();
-
             throw new IllegalArgumentException("Der Name darf nur aus Zahlen, Buchstaben und folgenden Sonderzeichen bestehen: \u00e4\u00f6\u00fc \u00c4\u00d6\u00dc \u00df =!?+*/$.:,;_ <>()-");
         }
         if (priority < 0) {
@@ -163,7 +82,9 @@ public class Event {
     }
 
     public void setName(String name) {
-        this.name = convertToASCII(name);
+        System.out.println(name);
+        this.name = name;
+        System.out.println(this.name);
     }
 
     public int getPriority() {
@@ -250,9 +171,4 @@ public class Event {
                 "&isFullDay=" + isFullDay() +
                 "&isPrivate=" + isPrivate();
     }
-
-    private String convertToASCII(String s) {
-        byte[] germanBytes = s.getBytes();
-        return new String(germanBytes, StandardCharsets.US_ASCII);
-    }
 }

client/data/src/main/java/res/HttpRequest.java

@@ -4,6 +4,7 @@ import helper.Tuple;
 
 import java.io.BufferedReader;
 import java.io.DataOutputStream;
+import java.io.IOException;
 import java.io.InputStreamReader;
 import java.net.HttpURLConnection;
 import java.net.URL;
@@ -17,48 +18,52 @@ public class HttpRequest {
         byte[] postData = urlParameters.getBytes(StandardCharsets.UTF_8);
         int postDataLength = postData.length;
 
-        /*
-        URL url = new URL("http://test.de:8080/event/add");
-        HttpURLConnection http = (HttpURLConnection)url.openConnection();
-        http.setRequestMethod("POST");
-        http.setDoOutput(true);
-        http.setRequestProperty("Accept", "application/json");
-        http.setRequestProperty("Authorization", "Bearer {token}");
-        http.setRequestProperty("Content-Type", "");
-        http.setRequestProperty("Content-Length", "0");
-
-        System.out.println(http.getResponseCode() + " " + http.getResponseMessage());
-        http.disconnect();
-         */
         URL url = new URL(urlString);
-        HttpURLConnection con = (HttpURLConnection) url.openConnection();
+        HttpURLConnection connection = (HttpURLConnection) url.openConnection();
 
-        con.setDoOutput(true);
+        connection.setDoOutput(true);
-        con.setInstanceFollowRedirects(false);
+        connection.setInstanceFollowRedirects(false);
-        con.setRequestMethod("POST");
+        connection.setRequestMethod("POST");
-        con.setRequestProperty("Content-Type", "application/x-www-form-urlencoded");
+        connection.setRequestProperty("Content-Type", "application/x-www-form-urlencoded");
-        con.setRequestProperty("charset", "utf-8");
+        connection.setRequestProperty("charset", "utf-8");
-        con.setRequestProperty("Content-Length", Integer.toString(postDataLength));
+        connection.setRequestProperty("Content-Length", Integer.toString(postDataLength));
-        con.setUseCaches(false);
+        connection.setUseCaches(false);
 
         if(sendAuth){
-            con.setRequestProperty("Accept", "application/json");
+            connection.setRequestProperty("Accept", "application/json");
-            con.setRequestProperty("Authorization", "Bearer " + TOKEN);
+            connection.setRequestProperty("Authorization", "Bearer " + TOKEN);
         }
 
-        try (DataOutputStream wr = new DataOutputStream(con.getOutputStream())) {
+        try (DataOutputStream writer = new DataOutputStream(connection.getOutputStream())) {
-            wr.write(postData);
+            writer.write(postData);
         }
 
-        int status = con.getResponseCode();
+        return getHttpTuple(connection);
+    }
+
+    public Tuple<Integer, String> sendGetRequest(String urlString) throws Exception {
+        URL url = new URL(urlString);
+        HttpURLConnection connection = (HttpURLConnection) url.openConnection();
+        connection.setRequestMethod("GET");
+
+        connection.setConnectTimeout(5000);
+        connection.setReadTimeout(5000);
+
+        int status = connection.getResponseCode();
+
+        return getHttpTuple(connection);
+    }
+
+    private Tuple<Integer, String> getHttpTuple(HttpURLConnection connection) throws IOException {
+        int status = connection.getResponseCode();
         String inputLine;
         StringBuilder content = new StringBuilder();
         BufferedReader in;
 
         if (status == 200) {
-             in = new BufferedReader(new InputStreamReader(con.getInputStream()));
+            in = new BufferedReader(new InputStreamReader(connection.getInputStream()));
         } else {
-             in = new BufferedReader(new InputStreamReader(con.getErrorStream()));
+            in = new BufferedReader(new InputStreamReader(connection.getErrorStream()));
         }
 
         while ((inputLine = in.readLine()) != null) {
@@ -66,36 +71,8 @@ public class HttpRequest {
         }
         in.close();
 
-        con.disconnect();
+        connection.disconnect();
 
         return new Tuple<>(status, content.toString());
     }
-
-    public String sendGetRequest(String urlString) throws Exception {
-        URL url = new URL(urlString);
-        HttpURLConnection con = (HttpURLConnection) url.openConnection();
-        con.setRequestMethod("GET");
-
-        con.setConnectTimeout(5000);
-        con.setReadTimeout(5000);
-
-        int status = con.getResponseCode();
-        if (status == 200) {
-            BufferedReader in = new BufferedReader(
-                    new InputStreamReader(con.getInputStream()));
-            String inputLine;
-            StringBuilder content = new StringBuilder();
-            while ((inputLine = in.readLine()) != null) {
-                content.append(inputLine);
-            }
-            in.close();
-
-            con.disconnect();
-            return content.toString();
-
-        } else {
-            con.disconnect();
-            throw new Exception("Status: " + status);
-        }
-    }
 }