Added user methods

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/customUI/Button.java

@@ -1,4 +1,3 @@
-//Marc Beyer//
 package customUI;
 
 public class Button extends javafx.scene.control.Button {

client/app/src/main/java/customUI/Converter.java

@@ -1,4 +1,3 @@
-//Marc Beyer//
 package customUI;
 
 public class Converter {

client/app/src/main/java/customUI/Label.java

@@ -1,4 +1,3 @@
-//Marc Beyer//
 package customUI;
 
 public class Label extends javafx.scene.control.Label {

client/app/src/main/java/customUI/Tooltip.java

@@ -1,4 +1,3 @@
-//Marco Kühn//
 package customUI;
 
 public class Tooltip extends javafx.scene.control.Tooltip {

client/app/src/main/java/helper/SvgBtnCreator.java

@@ -1,4 +1,3 @@
-//Marco Kühn//
 package helper;
 
 import javafx.geometry.Bounds;

client/app/src/main/java/main/CreateEventController.java

@@ -42,7 +42,6 @@ public class CreateEventController {
     public CreateEventController() {
     }
 
-    //Marco Kühn//
     @FXML
     public void initialize() {
 
@@ -54,7 +53,7 @@ public class CreateEventController {
         timeEnd.setConverter(defaultConverter);
     }
 
-    //Marc Beyer//
+
     @FXML
     protected void createBtnClick(ActionEvent actionEvent) {
         try {
@@ -86,13 +85,11 @@ public class CreateEventController {
         }
     }
 
-    //Marc Beyer//
     protected void sendHttpRequest(Event event) throws HttpRequestException {
         DataController dataController = new DataController();
         dataController.createEvent(event);
     }
 
-    //Marc Beyer//
     @FXML
     protected void abortBtnClick(ActionEvent event) {
         Stage stage = (Stage) ((Node) event.getSource()).getScene().getWindow();

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

@@ -1,4 +1,3 @@
-//Marc Beyer//
 package main;
 
 import customUI.Converter;
@@ -31,13 +30,9 @@ public class EditEventController extends CreateEventController{
         //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.createEvent(event);
+        dataController.editEvent(currentEvent, event);
     }
 }

client/app/src/main/java/main/MainApplication.java

@@ -1,4 +1,3 @@
-//Marc Beyer//
 package main;
 
 import config.Config;
@@ -13,7 +12,6 @@ import res.HttpRequest;
 import java.io.IOException;
 import java.util.Objects;
 
-
 public class MainApplication extends Application {
     @Override
     public void start(Stage stage) throws IOException {

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

@@ -58,7 +58,6 @@ public class MainController {
     }
 
     @FXML
-    //Marco Kühn,Marc Beyer//
     public void initialize() {
         createWeek();
         setDates();
@@ -67,7 +66,6 @@ public class MainController {
         leftNav.setSpacing(40);
     }
 
-    //Marc Beyer//
     private void updateEvents() {
         for (VBox vBox : dayVBoxes) {
             vBox.getChildren().clear();
@@ -85,7 +83,6 @@ public class MainController {
         }
     }
 
-    //Marc Beyer//
     @FXML
     protected void onBackClick() {
         weekOffset--;
@@ -93,7 +90,6 @@ public class MainController {
         updateEvents();
     }
 
-    //Marc Beyer//
     @FXML
     protected void onTodayClick() {
         weekOffset = 0;
@@ -101,7 +97,6 @@ public class MainController {
         updateEvents();
     }
 
-    //Marc Beyer//
     @FXML
     protected void onNextClick() {
         weekOffset++;
@@ -109,8 +104,6 @@ public class MainController {
         updateEvents();
     }
 
-
-    //Marco Kühn,Marc Beyer//
     @FXML
     protected void onAddBtnClick() {
         try {
@@ -132,12 +125,10 @@ public class MainController {
         updateEvents();
     }
 
-    //Marco Kühn//
     protected void onSettingBtnClick(){
 
     }
 
-    //Marc Beyer//
     protected void onLogoutBtnClick(ActionEvent event){
         ConfigLoader.save(new Config());
         DataController.USER_ID = -1;
@@ -146,7 +137,6 @@ public class MainController {
         stage.close();
     }
 
-    //Marc Beyer//
     private void createWeek() {
         for (int i = 0; i < 7; i++) {
             Label label = new Label();
@@ -174,7 +164,6 @@ public class MainController {
         }
     }
 
-    //Marco Kühn ,Marc Beyer//
     private void addEvent(Event event) {
         VBox vBox = new VBox();
         vBox.getStyleClass().add("event");
@@ -264,7 +253,6 @@ public class MainController {
         }
     }
 
-    //Marc Beyer//
     private String formatTime(String time) {
         String[] timeArr = time.split(":");
         if (timeArr.length > 2) {
@@ -273,7 +261,6 @@ public class MainController {
         return time;
     }
 
-    //Marc Beyer//
     private void setDates() {
         DateTimeFormatter dateFormatter = DateTimeFormatter.ofPattern("LLLL yyyy");
         DateTimeFormatter dayFormatter = DateTimeFormatter.ofPattern("E dd.MM");
@@ -292,7 +279,6 @@ public class MainController {
 
     }
 
-    //Marco Kühn//
     private void createBtns(){
         Group svgAdd = new Group(
                 SvgBtnCreator.createPath("M0 0h24v24H0z", "transparent", "transparent"),

client/app/src/main/java/users/CreateUserController.java

@@ -1,4 +1,3 @@
-//Alex Rechtin//
 package users;
 
 import javafx.event.ActionEvent;

client/app/src/main/java/users/LoginController.java

@@ -1,4 +1,3 @@
-//Alex Rechtin//
 package users;
 
 import com.jfoenix.controls.*;

client/app/src/main/resources/main/create-event.css

@@ -1,4 +1,3 @@
-/*Marco Kühn*/
 GridPane{
     -fx-background-color: #3E415F;
     -fx-padding: 20px;

client/app/src/main/resources/main/create-event.fxml

@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- Marco Kühn -->
-
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
 

client/app/src/main/resources/main/edit-event.fxml

@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- Marco Kühn -->
-
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
 

client/app/src/main/resources/main/main-view.css

@@ -1,4 +1,3 @@
-/*Alex Rechtin, Marco Kühn*/
 * {
    -fx-base-background-color: #2B2D42;
    -fx-base1-background-color: #525E74;

client/app/src/main/resources/main/main-view.fxml

@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- Alex Rechtin, Marco Kühn -->
-
 <?import javafx.geometry.*?>
 <?import javafx.scene.control.*?>
 <?import javafx.scene.image.*?>

client/app/src/main/resources/users/create-user.css

@@ -1,4 +1,3 @@
-/*Alex Rechtin*/
 * {
    -fx-base-background-color: #2B2D42;
    -fx-base1-background-color: #525E74;

client/app/src/main/resources/users/create-user.fxml

@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- Alex Rechtin -->
-
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
 <?import javafx.geometry.Insets?>

client/app/src/main/resources/users/login.css

@@ -1,4 +1,3 @@
-/* Marco Kühn*/
 * {
    -fx-base-background-color: #2B2D42;
    -fx-base1-background-color: #525E74;

client/app/src/main/resources/users/login.fxml

@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- Marco Kühn -->
-
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
 <?import com.jfoenix.controls.*?>

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

@@ -1,4 +1,3 @@
-//Marc Beyer//
 package config;
 
 public class Config {

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

@@ -1,4 +1,3 @@
-//Marc Beyer//
 package config;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -18,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/helper/HttpRequestException.java

@@ -1,4 +1,3 @@
-//Marc Beyer//
 package helper;
 
 public class HttpRequestException extends Exception{

client/data/src/main/java/helper/Tuple.java

@@ -1,4 +1,3 @@
-//Marc Beyer//
 package helper;
 
 public class Tuple<X, Y> {

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

@@ -1,4 +1,3 @@
-//Marc Beyer//
 package res;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
@@ -24,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;
@@ -48,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;
@@ -74,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;
@@ -84,35 +81,40 @@ public class DataController {
         return USER_ID >= 0;
     }
 
+    /*********
+     * Event *
+     *********/
     public void createEvent(Event event) throws HttpRequestException {
-        try {
-            Tuple<Integer, String> response = httpRequest.sendPostRequest(ADD_EVENT_ENDPOINT, event.getAsUrlParam(), true);
-            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);
-        }
+        sendBasicHttpRequest(
+                ADD_EVENT_ENDPOINT,
+                event.getAsUrlParam(),
+                true
+        );
     }
 
     public void deleteEvent(int userId, int eventId, LocalDateTime date) throws HttpRequestException {
-        try {
-            System.out.println("DELETE: userId=" + userId + "&eventId=" + eventId + "&date=" + date.toLocalDate());
-            Tuple<Integer, String> response = httpRequest.sendPostRequest(
-                    DELETE_EVENT_ENDPOINT,
-                    "userId=" + userId + "&eventId=" + eventId + "&date=" + date.toLocalDate(),
-                    true
-            );
-            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);
-        }
+        sendBasicHttpRequest(
+                DELETE_EVENT_ENDPOINT,
+                "userId=" + userId + "&eventId=" + eventId + "&date=" + date.toLocalDate(),
+                true
+        );
+    }
+
+    public void editEvent(Event oldEvent, Event event) throws HttpRequestException {
+        sendBasicHttpRequest(
+                EDIT_EVENT_ENDPOINT,
+                "eventId=" + oldEvent.getId() +
+                        "&userId=" + oldEvent.getOwnerId() +
+                        "&date=" + oldEvent.getDate().toLocalDate() +
+                        "&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 {
@@ -123,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();
@@ -131,17 +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;
     }
 
+    /********
+     * User *
+     ********/
 
+    /*
+    public void createUser(User user) throws HttpRequestException {
+        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

@@ -1,4 +1,3 @@
-//Marc Beyer//
 package res;
 
 import com.sun.jdi.event.StepEvent;
@@ -31,68 +30,7 @@ public class Event {
     private int ownerId;
     private String ownerName;
 
-    /*
-    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() {}
 
     public Event(String name,
                  int priority,

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

@@ -1,10 +1,10 @@
-//Marc Beyer//
 package res;
 
 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;
@@ -18,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);
-        con.setInstanceFollowRedirects(false);
-        con.setRequestMethod("POST");
-        con.setRequestProperty("Content-Type", "application/x-www-form-urlencoded");
-        con.setRequestProperty("charset", "utf-8");
-        con.setRequestProperty("Content-Length", Integer.toString(postDataLength));
-        con.setUseCaches(false);
+        connection.setDoOutput(true);
+        connection.setInstanceFollowRedirects(false);
+        connection.setRequestMethod("POST");
+        connection.setRequestProperty("Content-Type", "application/x-www-form-urlencoded");
+        connection.setRequestProperty("charset", "utf-8");
+        connection.setRequestProperty("Content-Length", Integer.toString(postDataLength));
+        connection.setUseCaches(false);
 
         if(sendAuth){
-            con.setRequestProperty("Accept", "application/json");
-            con.setRequestProperty("Authorization", "Bearer " + TOKEN);
+            connection.setRequestProperty("Accept", "application/json");
+            connection.setRequestProperty("Authorization", "Bearer " + TOKEN);
         }
 
-        try (DataOutputStream wr = new DataOutputStream(con.getOutputStream())) {
-            wr.write(postData);
+        try (DataOutputStream writer = new DataOutputStream(connection.getOutputStream())) {
+            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) {
@@ -67,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);
-        }
-    }
 }