Merge branch 'bugfix_branch'

README.txt

@@ -0,0 +1,3 @@
+Selim Eser 2211482: Selim Eser, Selim
+David Groys 3012642: David Groys
+Daniel Zdravkovic 3012893: Daniel Zdravkovic

src/main/java/de/hs_mannheim/domain/System.java

@@ -111,7 +111,8 @@ public class System {
         return false;
     }
 
-    public boolean sign_up_user(String username, String password, String password_authentication, String hometown, String zip,
+    public boolean sign_up_user(String username, String password, String password_authentication, String hometown,
+            String zip,
             String car_name, String car_l_100kmS, String car_avg_kmhS, String bike_avg_kmhS) {
 
         double car_l_100km;
@@ -180,9 +181,11 @@ public class System {
         if (username.equals("") || hometown.equals("") || zip.equals(""))
             return false;
 
+        if (!current_user.getUsername().equals(username)) {
             for (User user : this.all_user)
                 if (user.getUsername().equals(username))
                     return false;
+        }
 
         ArrayList<String> mem = search(zip);
         boolean bool = false;
@@ -196,7 +199,6 @@ public class System {
         if (!bool)
             return false;
 
-        
         for (int i = 0; i < this.all_user.size(); i++)
             if (this.all_user.get(i).getUsername().equals(current_user.getUsername()))
                 this.all_user.remove(i);
@@ -204,7 +206,8 @@ public class System {
         write_to_file(all_user_toString(), "src/main/resources/user_data.csv");
         write_to_file(all_user_toString(), "src/test/resources/user_data.csv");
 
-        this.current_user = new User(username, password, hometown, zip, car_name, car_l_100km, car_avg_kmh, bike_avg_kmh);
+        this.current_user = new User(username, password, hometown, zip, car_name, car_l_100km, car_avg_kmh,
+                bike_avg_kmh);
         this.all_user.add(current_user);
 
         write_to_file(all_user_toString(), "src/main/resources/user_data.csv");
@@ -222,6 +225,9 @@ public class System {
         if (!new_password.equals(new_password_authentication))
             return false;
 
+        if(old_password.equals(new_password))
+            return false;
+
         for (int i = 0; i < this.all_user.size(); i++)
             if (this.all_user.get(i).getUsername().equals(current_user.getUsername()))
                 this.all_user.remove(i);
@@ -273,7 +279,8 @@ public class System {
             String line;
             while ((line = reader.readLine()) != null && zip_set.size() < 200) {
                 line = line.replace("\"", "");
-                if (line.split(";")[0].contains(hometown_or_zip)||line.split(";")[1].contains(hometown_or_zip)) 
+                if (line.split(";")[0].toUpperCase().startsWith(hometown_or_zip.toUpperCase()) 
+                    || line.split(";")[1].toUpperCase().startsWith(hometown_or_zip.toUpperCase()))
                     zip_set.add(line);
             }
         } catch (Exception e) {
@@ -320,13 +327,15 @@ public class System {
     }
 
     public String[] destination_details(String destination_zip) {
-        String[] result = new String[5];
+        String[] result = new String[7];
 
-        result[0] = distance(destination_zip); // Entfernung
+        result[0] = weather_forecast(destination_zip)[0]; // Wettervorhersage für die nächsten 3 Tage
-        result[1] = travel_time(destination_zip)[0]; // Reisedauer Auto
+        result[1] = weather_forecast(destination_zip)[1];
-        result[2] = travel_time(destination_zip)[1]; // Reisedauer Fahrrad
+        result[2] = weather_forecast(destination_zip)[2];
-        result[3] = calc_l_consumption(destination_zip); // Kraftstoffverbrauch Auto
+        result[3] = distance(destination_zip); // Entfernung
-        result[4] = weather_forecast(destination_zip); // Wettervorhersage für die nächsten 3 Tage
+        result[4] = travel_time(destination_zip)[0]; // Reisedauer Auto
+        result[5] = calc_l_consumption(destination_zip); // Kraftstoffverbrauch Auto
+        result[6] = travel_time(destination_zip)[1]; // Reisedauer Fahrrad
 
         return result;
     }
@@ -338,11 +347,23 @@ public class System {
 
         try {
             HttpClient http_client = HttpClient.newHttpClient();
+            HttpRequest get_request;
             
-            HttpRequest get_request = HttpRequest.newBuilder()
+            if(current_user.getZip().length()<5){
-                    .uri(new URI("https://api.openweathermap.org/data/2.5/weather?zip=" + current_user.getZip() + ",de&appid=" + api_key + "&units=metric&lang=de"))
+                get_request = HttpRequest.newBuilder()
+                    .uri(new URI("https://api.openweathermap.org/data/2.5/weather?q=" + current_user.getHometown()
+                            + ",de&appid=" + api_key + "&units=metric&lang=de"))
                     .GET()
                     .build();
+            }
+            
+            else{
+                get_request = HttpRequest.newBuilder()
+                    .uri(new URI("https://api.openweathermap.org/data/2.5/weather?zip=" + current_user.getZip()
+                            + ",de&appid=" + api_key + "&units=metric&lang=de"))
+                    .GET()
+                    .build();
+            }
             
             HttpResponse<String> get_response = http_client.send(get_request, BodyHandlers.ofString());
 
@@ -356,15 +377,16 @@ public class System {
         if (weather.equals(""))
             return "Es ist ein Fehler aufgetreten!";
         else
-            return weather + "\n" + temperature + "°C";
+            return weather + " " + temperature + "°C";
 
     }
 
-    public String weather_forecast(String destination_zip) {
+    public String[] weather_forecast(String destination_zip) {
 
         String weather_day_1 = "";
         String weather_day_2 = "";
         String weather_day_3 = "";
+        String[] result = new String[3];
 
         double temperature_day_1_1 = 1;
         double temperature_day_1_2 = 1;
@@ -402,11 +424,22 @@ public class System {
 
         try {
             HttpClient http_client = HttpClient.newHttpClient();
+            HttpRequest get_request;
             
-            HttpRequest get_request = HttpRequest.newBuilder()
+            if(destination_zip.length()<5){
-                    .uri(new URI("https://api.openweathermap.org/data/2.5/forecast?zip=" + destination_zip + ",de&appid=" + api_key + "&units=metric&lang=de"))
+                get_request = HttpRequest.newBuilder()
+                    .uri(new URI("https://api.openweathermap.org/data/2.5/forecast?q=" + search(destination_zip).get(0).split(";")[1]
+                            + ",de&appid=" + api_key + "&units=metric&lang=de"))
                     .GET()
                     .build();
+            } 
+            else{
+                get_request = HttpRequest.newBuilder()
+                    .uri(new URI("https://api.openweathermap.org/data/2.5/forecast?zip=" + destination_zip
+                            + ",de&appid=" + api_key + "&units=metric&lang=de"))
+                    .GET()
+                    .build();
+            }
             
             HttpResponse<String> get_response = http_client.send(get_request, BodyHandlers.ofString());
 
@@ -471,27 +504,45 @@ public class System {
             day3date = json.getJSONArray("list").getJSONObject(day3_1).getString("dt_txt").split(" ")[0];
             day3date = day3date.split("-")[2] + "." + day3date.split("-")[1] + "." + day3date.split("-")[0];
 
-            weather_day_1 = json.getJSONArray("list").getJSONObject(day1_3).getJSONArray("weather").getJSONObject(0).getString("description");
+            weather_day_1 = json.getJSONArray("list").getJSONObject(day1_3).getJSONArray("weather").getJSONObject(0)
-            weather_day_2 = json.getJSONArray("list").getJSONObject(day2_3).getJSONArray("weather").getJSONObject(0).getString("description");
+                    .getString("description");
-            weather_day_3 = json.getJSONArray("list").getJSONObject(day3_3).getJSONArray("weather").getJSONObject(0).getString("description");
+            weather_day_2 = json.getJSONArray("list").getJSONObject(day2_3).getJSONArray("weather").getJSONObject(0)
+                    .getString("description");
+            weather_day_3 = json.getJSONArray("list").getJSONObject(day3_3).getJSONArray("weather").getJSONObject(0)
+                    .getString("description");
 
-            temperature_day_1_1 = json.getJSONArray("list").getJSONObject(day1_1).getJSONObject("main").getDouble("temp");
+            temperature_day_1_1 = json.getJSONArray("list").getJSONObject(day1_1).getJSONObject("main")
-            temperature_day_1_2 = json.getJSONArray("list").getJSONObject(day1_2).getJSONObject("main").getDouble("temp");
+                    .getDouble("temp");
-            temperature_day_1_3 = json.getJSONArray("list").getJSONObject(day1_3).getJSONObject("main").getDouble("temp");
+            temperature_day_1_2 = json.getJSONArray("list").getJSONObject(day1_2).getJSONObject("main")
-            temperature_day_1_4 = json.getJSONArray("list").getJSONObject(day1_4).getJSONObject("main").getDouble("temp");
+                    .getDouble("temp");
-            temperature_day_1_5 = json.getJSONArray("list").getJSONObject(day1_5).getJSONObject("main").getDouble("temp");
+            temperature_day_1_3 = json.getJSONArray("list").getJSONObject(day1_3).getJSONObject("main")
+                    .getDouble("temp");
+            temperature_day_1_4 = json.getJSONArray("list").getJSONObject(day1_4).getJSONObject("main")
+                    .getDouble("temp");
+            temperature_day_1_5 = json.getJSONArray("list").getJSONObject(day1_5).getJSONObject("main")
+                    .getDouble("temp");
 
-            temperature_day_2_1 = json.getJSONArray("list").getJSONObject(day2_1).getJSONObject("main").getDouble("temp");
+            temperature_day_2_1 = json.getJSONArray("list").getJSONObject(day2_1).getJSONObject("main")
-            temperature_day_2_2 = json.getJSONArray("list").getJSONObject(day2_2).getJSONObject("main").getDouble("temp");
+                    .getDouble("temp");
-            temperature_day_2_3 = json.getJSONArray("list").getJSONObject(day2_3).getJSONObject("main").getDouble("temp");
+            temperature_day_2_2 = json.getJSONArray("list").getJSONObject(day2_2).getJSONObject("main")
-            temperature_day_2_4 = json.getJSONArray("list").getJSONObject(day2_4).getJSONObject("main").getDouble("temp");
+                    .getDouble("temp");
-            temperature_day_2_5 = json.getJSONArray("list").getJSONObject(day2_5).getJSONObject("main").getDouble("temp");
+            temperature_day_2_3 = json.getJSONArray("list").getJSONObject(day2_3).getJSONObject("main")
+                    .getDouble("temp");
+            temperature_day_2_4 = json.getJSONArray("list").getJSONObject(day2_4).getJSONObject("main")
+                    .getDouble("temp");
+            temperature_day_2_5 = json.getJSONArray("list").getJSONObject(day2_5).getJSONObject("main")
+                    .getDouble("temp");
 
-            temperature_day_3_1 = json.getJSONArray("list").getJSONObject(day3_1).getJSONObject("main").getDouble("temp");
+            temperature_day_3_1 = json.getJSONArray("list").getJSONObject(day3_1).getJSONObject("main")
-            temperature_day_3_2 = json.getJSONArray("list").getJSONObject(day3_2).getJSONObject("main").getDouble("temp");
+                    .getDouble("temp");
-            temperature_day_3_3 = json.getJSONArray("list").getJSONObject(day3_3).getJSONObject("main").getDouble("temp");
+            temperature_day_3_2 = json.getJSONArray("list").getJSONObject(day3_2).getJSONObject("main")
-            temperature_day_3_4 = json.getJSONArray("list").getJSONObject(day3_4).getJSONObject("main").getDouble("temp");
+                    .getDouble("temp");
-            temperature_day_3_5 = json.getJSONArray("list").getJSONObject(day3_5).getJSONObject("main").getDouble("temp");
+            temperature_day_3_3 = json.getJSONArray("list").getJSONObject(day3_3).getJSONObject("main")
+                    .getDouble("temp");
+            temperature_day_3_4 = json.getJSONArray("list").getJSONObject(day3_4).getJSONObject("main")
+                    .getDouble("temp");
+            temperature_day_3_5 = json.getJSONArray("list").getJSONObject(day3_5).getJSONObject("main")
+                    .getDouble("temp");
 
         } catch (Exception e) {
             //
@@ -524,12 +575,20 @@ public class System {
         temperature_day_3_high = (double) temperature_day_3.toArray()[temperature_day_2.size() - 1];
         temperature_day_3_low = (double) temperature_day_3.toArray()[0];
 
-        if (weather_day_1.equals("") || weather_day_2.equals("") || weather_day_3.equals(""))
+        if (weather_day_1.equals("") || weather_day_2.equals("") || weather_day_3.equals("")) {
-            return "Es ist ein Fehler aufgetreten!";
+            result[0] = "Es ist ein Fehler aufgetreten!";
-        else
+            result[1] = "Es ist ein Fehler aufgetreten!";
-            return day1date + "\n" + weather_day_1 + "\nH: " + temperature_day_1_high + "°C" + " T: " + temperature_day_1_low + "°C\n\n"
+            result[2] = "Es ist ein Fehler aufgetreten!";
-                    + day2date + "\n" + weather_day_2 + "\nH: " + temperature_day_2_high + "°C" + " T: " + temperature_day_2_low + "°C\n\n"
+        } else {
-                    + day3date + "\n" + weather_day_3 + "\nH: " + temperature_day_3_high + "°C" + " T: " + temperature_day_3_low + "°C";
+            result[0] = day1date + ": " + weather_day_1 + " H: " + temperature_day_1_high + "°C" + " T: "
+                    + temperature_day_1_low + "°C";
+            result[1] = day2date + ": " + weather_day_2 + " H: " + temperature_day_2_high + "°C" + " T: "
+                    + temperature_day_2_low + "°C";
+            result[2] = day3date + ": " + weather_day_3 + " H: " + temperature_day_3_high + "°C" + " T: "
+                    + temperature_day_3_low + "°C";
+        }
+
+        return result;
     }
 
     public boolean all_distances() {
@@ -576,13 +635,16 @@ public class System {
                 dLat = lat2 - lat1;
                 dLon = lon2 - lon1;
 
-                a = Math.pow(Math.sin(Math.toRadians(dLat / 2.0)), 2) + Math.pow(Math.sin(Math.toRadians(dLon / 2.0)), 2) * Math.cos(Math.toRadians(lat1)) * Math.cos(Math.toRadians(lat2));
+                a = Math.pow(Math.sin(Math.toRadians(dLat / 2.0)), 2)
+                        + Math.pow(Math.sin(Math.toRadians(dLon / 2.0)), 2) * Math.cos(Math.toRadians(lat1))
+                                * Math.cos(Math.toRadians(lat2));
 
                 distance = 6378.388 * 2.0 * Math.atan2(Math.sqrt(a), Math.sqrt(1.0 - a));
 
-                result = Math.round(distance * 1.25 * 1000) / 1000.0;
+                result = Math.round(distance * 1.25 * 100) / 100.0;
 
-                this.all_destinations.put(line.split(";")[0],new Destination(line.split(";")[1],line.split(";")[0], result));
+                this.all_destinations.put(line.split(";")[0],
+                        new Destination(line.split(";")[1], line.split(";")[0], result));
 
             }
         } catch (Exception e) {
@@ -602,16 +664,27 @@ public class System {
 
         String[] result = new String[2];
 
-        result[0] = "" + (Math.round(Double.parseDouble(distance(destination_zip).replace(" km", "")) / current_user.getCar_avg_kmh() * 1000) / 1000.0) + " h";
+        if (current_user.getCar_avg_kmh() == 0)
-        result[1] = "" + (Math.round(Double.parseDouble(distance(destination_zip).replace(" km", "")) / current_user.getBike_avg_kmh() * 1000) / 1000.0) + " h";
+            result[0] = "";
+        else
+            result[0] = "" + (Math.round(Double.parseDouble(distance(destination_zip).replace(" km", ""))
+                    / current_user.getCar_avg_kmh() * 100) / 100.0) + " h";
+
+        if (current_user.getBike_avg_kmh() == 0)
+            result[1] = "";
+        else
+            result[1] = "" + (Math.round(Double.parseDouble(distance(destination_zip).replace(" km", ""))
+                    / current_user.getBike_avg_kmh() * 100) / 100.0) + " h";
 
         return result;
     }
 
     public String calc_l_consumption(String destination_zip) {
 
-        return "" + (Math.round(Double.parseDouble(distance(destination_zip).replace(" km", "")) * current_user.getCar_l_100km() / 100.0 * 1000) / 1000.0) + " l";
+        if (current_user.getCar_l_100km() == 0)
+            return "";
+        return "" + (Math.round(Double.parseDouble(distance(destination_zip).replace(" km", ""))
+                * current_user.getCar_l_100km() / 100.0 * 100) / 100.0) + " l";
 
     }
 }
-

src/test/java/de/hs_mannheim/domain/SystemTest.java

@@ -16,7 +16,7 @@ public class SystemTest {
 
         current_system.sign_in_user("David", "123Esel");
 
-        assertNotEquals("Es ist ein Fehler aufgetreten!",current_system.weather_forecast("68161"));
+        assertNotEquals("Es ist ein Fehler aufgetreten!", current_system.weather_forecast("68161")[0]);
     }
 
     @Test
@@ -43,8 +43,8 @@ public class SystemTest {
         current_system.sign_in_user("David", "123Esel");
 
         assertEquals("88.46 km", current_system.distance("60306")); // Frankfurt
-        assertEquals("581.109 km", current_system.distance("20095")); // Hamburg
+        assertEquals("581.11 km", current_system.distance("20095")); // Hamburg
-        assertEquals("603.608 km", current_system.distance("10115")); // Berlin
+        assertEquals("603.61 km", current_system.distance("10115")); // Berlin
 
     }
 
@@ -53,10 +53,10 @@ public class SystemTest {
 
         current_system.sign_in_user("David", "123Esel");
 
-        assertEquals("0.885 h", current_system.travel_time("60306")[0]); // Frankfurt mit Auto
+        assertEquals("0.88 h", current_system.travel_time("60306")[0]); // Frankfurt mit Auto
-        assertEquals("4.423 h", current_system.travel_time("60306")[1]); // Frankfurt mit Fahrrad
+        assertEquals("4.42 h", current_system.travel_time("60306")[1]); // Frankfurt mit Fahrrad
 
-        assertEquals("6.036 h", current_system.travel_time("10115")[0]); // Berlin mit Auto
+        assertEquals("6.04 h", current_system.travel_time("10115")[0]); // Berlin mit Auto
         assertEquals("30.18 h", current_system.travel_time("10115")[1]); // Berlin mit Fahrrad
     }
 
@@ -65,9 +65,9 @@ public class SystemTest {
 
         current_system.sign_in_user("David", "123Esel");
 
-        assertEquals("8.846 l", current_system.calc_l_consumption("60306")); // Kraftstoffverbrauch nach Frankfurt
+        assertEquals("8.85 l", current_system.calc_l_consumption("60306")); // Kraftstoffverbrauch nach Frankfurt
-        assertEquals("58.111 l", current_system.calc_l_consumption("20095")); // Kraftstoffverbrauch nach Hamburg
+        assertEquals("58.11 l", current_system.calc_l_consumption("20095")); // Kraftstoffverbrauch nach Hamburg
-        assertEquals("60.361 l", current_system.calc_l_consumption("10115")); // Kraftstoffverbrauch nach Berlin
+        assertEquals("60.36 l", current_system.calc_l_consumption("10115")); // Kraftstoffverbrauch nach Berlin
     }
 
     @Test
@@ -80,10 +80,14 @@ public class SystemTest {
         assertEquals(3, random_destination_car.size()); // random_destinations_car gibt genau 3 destinations zurück
         assertEquals(3, random_destination_bike.size()); // random destinations_bike gibt genau 3 destinations zurück
 
-        // random_destinations_car gibt nur destinations mit mindestens 150 km Entfernung zurück
+        // random_destinations_car gibt nur destinations mit mindestens 150 km
-        assertEquals(true, Double.parseDouble(current_system.distance(random_destination_car.get(0).split(";")[0]).replace(" km", "")) > 150);
+        // Entfernung zurück
-        // random_destinations_bike gibt nur destinations mit maximal 100 km Entfernung zurück
+        assertEquals(true, Double.parseDouble(
-        assertEquals(true, Double.parseDouble(current_system.distance(random_destination_bike.get(0).split(";")[0]).replace(" km", "")) < 100);
+                current_system.distance(random_destination_car.get(0).split(";")[0]).replace(" km", "")) > 150);
+        // random_destinations_bike gibt nur destinations mit maximal 100 km Entfernung
+        // zurück
+        assertEquals(true, Double.parseDouble(
+                current_system.distance(random_destination_bike.get(0).split(";")[0]).replace(" km", "")) < 100);
     }
 
     @Test
@@ -125,11 +129,15 @@ public class SystemTest {
     @Test
     public void sign_up_user() {
         // Username darf nicht doppelt vorkommen!
-        assertEquals(false, current_system.sign_up_user("David","123Esel","123Esel","Mannheim","68161","AMG","10","300","20"));
+        assertEquals(false, current_system.sign_up_user("David", "123Esel", "123Esel", "Mannheim", "68161", "AMG", "10",
-        assertEquals(true, current_system.sign_up_user("Selim","Penis69","Penis69","Mannheim","68161","AMG","10","300","20"));
+                "300", "20"));
+        assertEquals(true, current_system.sign_up_user("Selim", "Penis69", "Penis69", "Mannheim", "68161", "AMG", "10",
+                "300", "20"));
         // PLZ muss mit Stadt übereinstimmen
-        assertEquals(false, current_system.sign_up_user("Lukas","123Esel","123Esel","Mannheim","11105","AMG","10","300","20"));
+        assertEquals(false, current_system.sign_up_user("Lukas", "123Esel", "123Esel", "Mannheim", "11105", "AMG", "10",
-        assertEquals(true, current_system.sign_up_user("Lukas","123Esel","123Esel","Mannheim","68305","AMG","10","300","20"));
+                "300", "20"));
+        assertEquals(true, current_system.sign_up_user("Lukas", "123Esel", "123Esel", "Mannheim", "68305", "AMG", "10",
+                "300", "20"));
 
         assertEquals("Lukas", current_system.getDetails()[0]);
         current_system.sign_out_user();
@@ -160,10 +168,9 @@ public class SystemTest {
 
     }
     /*
-Tests auf Basis von user_data.csv:  
+     * Tests auf Basis von user_data.csv:
-Daniel;MTQwMURhbmllbA==;Mannheim;68305;BMW;1.5;50.4;40.2
+     * Daniel;MTQwMURhbmllbA==;Mannheim;68305;BMW;1.5;50.4;40.2
-David;MTIzRXNlbA==;Mannheim;68161;AMG;10.0;100.0;20.0
+     * David;MTIzRXNlbA==;Mannheim;68161;AMG;10.0;100.0;20.0
      */
 
-
 }