client/app/build.gradle.kts

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

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

@@ -30,9 +30,13 @@ public class EditEventController extends CreateEventController{
         //timeEnd.setValue(currentEvent.getEnd());
     }
 
+
+
+
     @Override
     protected void sendHttpRequest(Event event) throws HttpRequestException {
         DataController dataController = new DataController();
-        dataController.editEvent(currentEvent, event);
+        dataController.deleteEvent(currentEvent.getOwnerId(), currentEvent.getId(), currentEvent.getDate());
+        dataController.createEvent(event);
     }
 }

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) {
-            System.out.println("config.json missing");
+            e.printStackTrace();
         }
         return null;
     }

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

@@ -23,15 +23,10 @@ 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;
@@ -52,6 +47,13 @@ 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;
@@ -71,7 +73,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;
@@ -81,40 +83,35 @@ public class DataController {
         return USER_ID >= 0;
     }
 
-    /*********
-     * Event *
-     *********/
     public void createEvent(Event event) throws HttpRequestException {
-        sendBasicHttpRequest(
-                ADD_EVENT_ENDPOINT,
-                event.getAsUrlParam(),
-                true
-        );
+        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);
+        }
     }
 
     public void deleteEvent(int userId, int eventId, LocalDateTime date) throws HttpRequestException {
-        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
-        );
+        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);
+        }
     }
 
     public ArrayList<Event> getAllVisibleEvents(LocalDateTime startDate, LocalDateTime endDate) throws HttpRequestException {
@@ -125,7 +122,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();
@@ -133,63 +130,17 @@ 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

@@ -30,7 +30,68 @@ 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,

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

@@ -4,7 +4,6 @@ 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,52 +17,48 @@ public class HttpRequest {
         byte[] postData = urlParameters.getBytes(StandardCharsets.UTF_8);
         int postDataLength = postData.length;
 
-        URL url = new URL(urlString);
-        HttpURLConnection connection = (HttpURLConnection) url.openConnection();
+        /*
+        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");
 
-        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);
+        System.out.println(http.getResponseCode() + " " + http.getResponseMessage());
+        http.disconnect();
+         */
+        URL url = new URL(urlString);
+        HttpURLConnection con = (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);
 
         if(sendAuth){
-            connection.setRequestProperty("Accept", "application/json");
-            connection.setRequestProperty("Authorization", "Bearer " + TOKEN);
+            con.setRequestProperty("Accept", "application/json");
+            con.setRequestProperty("Authorization", "Bearer " + TOKEN);
         }
 
-        try (DataOutputStream writer = new DataOutputStream(connection.getOutputStream())) {
-            writer.write(postData);
+        try (DataOutputStream wr = new DataOutputStream(con.getOutputStream())) {
+            wr.write(postData);
         }
 
-        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();
+        int status = con.getResponseCode();
         String inputLine;
         StringBuilder content = new StringBuilder();
         BufferedReader in;
 
         if (status == 200) {
-            in = new BufferedReader(new InputStreamReader(connection.getInputStream()));
+             in = new BufferedReader(new InputStreamReader(con.getInputStream()));
         } else {
-            in = new BufferedReader(new InputStreamReader(connection.getErrorStream()));
+             in = new BufferedReader(new InputStreamReader(con.getErrorStream()));
         }
 
         while ((inputLine = in.readLine()) != null) {
@@ -71,8 +66,36 @@ public class HttpRequest {
         }
         in.close();
 
-        connection.disconnect();
+        con.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);
+        }
+    }
 }