Merge branch 'sign_in_up_out'
commit
1a8f2bfa74
5
pom.xml
5
pom.xml
|
@ -28,6 +28,11 @@
|
|||
<artifactId>json</artifactId>
|
||||
<version>20210307</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>commons-codec</groupId>
|
||||
<artifactId>commons-codec</artifactId>
|
||||
<version>1.17.0</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
<build>
|
||||
<resources>
|
||||
|
|
|
@ -1,27 +1,27 @@
|
|||
package de.hs_mannheim.domain;
|
||||
|
||||
import java.io.BufferedReader;
|
||||
import java.io.InputStream;
|
||||
import java.io.InputStreamReader;
|
||||
import java.io.*;
|
||||
import java.net.URI;
|
||||
import java.net.http.HttpClient;
|
||||
import java.net.http.HttpRequest;
|
||||
import java.net.http.HttpResponse;
|
||||
import java.net.http.HttpResponse.BodyHandlers;
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashSet;
|
||||
import java.util.TreeSet;
|
||||
|
||||
import org.apache.commons.codec.binary.Base64;
|
||||
import org.json.JSONObject;
|
||||
|
||||
public class System {
|
||||
|
||||
private User current_user = new User();
|
||||
private ArrayList<User> all_user = new ArrayList<>();
|
||||
private String api_key;
|
||||
private ArrayList<String> distances = new ArrayList<>();
|
||||
|
||||
public System(String api_key) {
|
||||
this.api_key = api_key;
|
||||
get_all_user();
|
||||
}
|
||||
|
||||
public void set_current_user_zip(String zip) {
|
||||
|
@ -40,26 +40,204 @@ public class System {
|
|||
this.current_user.setBike_avg_kmh(bike_avg_kmh);
|
||||
}
|
||||
|
||||
public HashSet<User> get_all_user(){
|
||||
return new HashSet<User>();
|
||||
public static String decoding(String string) {
|
||||
byte[] binary_data = new byte[string.length()];
|
||||
for(int i = 0; i < string.length(); i++) {
|
||||
binary_data[i] = (byte)string.charAt(i);
|
||||
}
|
||||
return new String(Base64.decodeBase64(binary_data));
|
||||
}
|
||||
|
||||
public static String encoding(String string) {
|
||||
byte[] binary_data = new byte[string.length()];
|
||||
for (int i = 0; i < string.length(); i++) {
|
||||
binary_data[i] = (byte) string.charAt(i);
|
||||
}
|
||||
return Base64.encodeBase64String(binary_data);
|
||||
}
|
||||
|
||||
public static int parseInt(String s) throws NumberFormatException{
|
||||
if(s.equals(""))
|
||||
return 0;
|
||||
else
|
||||
return Integer.parseInt(s);
|
||||
}
|
||||
|
||||
public static double parseDouble(String s) throws NumberFormatException {
|
||||
if(s.equals(""))
|
||||
return 0;
|
||||
else
|
||||
return Double.parseDouble(s);
|
||||
}
|
||||
|
||||
public void get_all_user() {
|
||||
String[] fileString = new String[8];
|
||||
|
||||
InputStream inputStream = System.class.getResourceAsStream("/user_data.csv");
|
||||
String path;
|
||||
|
||||
try (BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream))) {
|
||||
while ((path = reader.readLine()) != null) {
|
||||
fileString = path.split(";");
|
||||
fileString[1] = decoding(fileString[1]);
|
||||
this.all_user.add(new User(fileString[0], fileString[1], fileString[2],
|
||||
Integer.parseInt(fileString[3]), fileString[4],
|
||||
Double.parseDouble(fileString[5]),
|
||||
Double.parseDouble(fileString[6]),
|
||||
Double.parseDouble(fileString[7])));
|
||||
}
|
||||
} catch (Exception e) {
|
||||
}
|
||||
}
|
||||
|
||||
public ArrayList<String> all_user_toString(){
|
||||
|
||||
ArrayList<String> result = new ArrayList<>();
|
||||
|
||||
for(User user : this.all_user){
|
||||
result.add(user.toString());
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
public boolean sign_in_user(String username, String password) {
|
||||
|
||||
for (User user : this.all_user) {
|
||||
if (user.getUsername().equals(username) && user.getPassword().equals(password)) {
|
||||
current_user = new User(user.getUsername(), user.getPassword(),
|
||||
user.getHometown(), user.getZip(), user.getCar_name(),
|
||||
user.getCar_l_100km(), user.getCar_avg_kmh(), user.getBike_avg_kmh());
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
public boolean sign_up_user(String username, String password, String hometown, String zipS,
|
||||
String car_name, String car_l_100kmS, String car_avg_kmhS, String bike_avg_kmhS){
|
||||
|
||||
int zip;
|
||||
double car_l_100km;
|
||||
double car_avg_kmh;
|
||||
double bike_avg_kmh;
|
||||
|
||||
try{
|
||||
zip = parseInt(zipS);
|
||||
car_l_100km = parseDouble(car_l_100kmS);
|
||||
car_avg_kmh = parseDouble(car_avg_kmhS);
|
||||
bike_avg_kmh = parseDouble(bike_avg_kmhS);
|
||||
} catch (NumberFormatException n){
|
||||
return false;
|
||||
}
|
||||
|
||||
if(username.equals("")||password.equals("")||hometown.equals("")||zipS.equals(""))
|
||||
return false;
|
||||
|
||||
for(User user: this.all_user)
|
||||
if(user.getUsername().equals(username))
|
||||
return false;
|
||||
|
||||
ArrayList<String> mem = search(zipS);
|
||||
boolean bool = false;
|
||||
|
||||
for (String line: mem)
|
||||
if(line.split(";")[1].equals(hometown)) {
|
||||
bool = true;
|
||||
break;
|
||||
}
|
||||
|
||||
if(!bool)
|
||||
return false;
|
||||
|
||||
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");
|
||||
write_to_file(all_user_toString(), "src/test/resources/user_data.csv");
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
public boolean sign_up_user(String username, String password, String hometown, int zip,
|
||||
String car_name, double car_co2_km, double car_avg_kmh, double bike_avg_kmh){
|
||||
public boolean change_user_details(String username, String password, String hometown, String zipS,
|
||||
String car_name, String car_l_100kmS, String car_avg_kmhS, String bike_avg_kmhS){
|
||||
|
||||
int zip;
|
||||
double car_l_100km;
|
||||
double car_avg_kmh;
|
||||
double bike_avg_kmh;
|
||||
|
||||
try{
|
||||
zip = parseInt(zipS);
|
||||
car_l_100km = parseDouble(car_l_100kmS);
|
||||
car_avg_kmh = parseDouble(car_avg_kmhS);
|
||||
bike_avg_kmh = parseDouble(bike_avg_kmhS);
|
||||
} catch (NumberFormatException n){
|
||||
return false;
|
||||
}
|
||||
|
||||
if(username.equals("")||password.equals("")||hometown.equals("")||zipS.equals(""))
|
||||
return false;
|
||||
|
||||
for(User user: this.all_user)
|
||||
if(user.getUsername().equals(username))
|
||||
return false;
|
||||
|
||||
ArrayList<String> mem = search(zipS);
|
||||
boolean bool = false;
|
||||
|
||||
for (String line: mem)
|
||||
if(line.split(";")[1].equals(hometown)) {
|
||||
bool = true;
|
||||
break;
|
||||
}
|
||||
|
||||
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);
|
||||
|
||||
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.all_user.add(current_user);
|
||||
|
||||
write_to_file(all_user_toString(), "src/main/resources/user_data.csv");
|
||||
write_to_file(all_user_toString(), "src/test/resources/user_data.csv");
|
||||
|
||||
return true;
|
||||
|
||||
}
|
||||
|
||||
public void write_to_file(ArrayList<String> lines, String file) {
|
||||
try (BufferedWriter writer = new BufferedWriter(new FileWriter(file))) {
|
||||
for (int i = 0; i < lines.size() - 1; i++) {
|
||||
writer.write(lines.get(i));
|
||||
writer.newLine();
|
||||
}
|
||||
writer.write(lines.getLast());
|
||||
} catch (IOException e) {}
|
||||
}
|
||||
|
||||
public void sign_out_user() {
|
||||
this.distances = new ArrayList<>();
|
||||
|
||||
current_user = new User();
|
||||
}
|
||||
|
||||
public boolean change_user_details(String username, String password, String hometown, int zip,
|
||||
String car_name, double car_co2_km, double car_avg_kmh, double bike_avg_kmh){
|
||||
return true;
|
||||
public String[] getDetails(){
|
||||
return new String[]{current_user.getUsername(), current_user.getPassword(),
|
||||
current_user.getHometown(),
|
||||
current_user.getZip()==0?"":String.valueOf(current_user.getZip()),
|
||||
current_user.getCar_name(),
|
||||
current_user.getCar_l_100km()==0?"":String.valueOf(current_user.getCar_l_100km()),
|
||||
current_user.getCar_avg_kmh()==0?"":String.valueOf(current_user.getCar_avg_kmh()),
|
||||
current_user.getBike_avg_kmh()==0?"":String.valueOf(current_user.getBike_avg_kmh())};
|
||||
}
|
||||
|
||||
public ArrayList<String> search(String hometown_or_zip) {
|
||||
|
@ -76,7 +254,8 @@ public class System {
|
|||
zip_set.add(line);
|
||||
}
|
||||
}
|
||||
} catch (Exception e) {}
|
||||
} catch (Exception e) {
|
||||
}
|
||||
|
||||
return new ArrayList<>(zip_set);
|
||||
}
|
||||
|
@ -147,7 +326,8 @@ public class System {
|
|||
JSONObject json = new JSONObject(((String) get_response.body()).substring(0, ((String) get_response.body()).length()));
|
||||
weather = json.getJSONArray("weather").getJSONObject(0).getString("description");
|
||||
temperature = json.getJSONObject("main").getDouble("temp");
|
||||
} catch (Exception e){}
|
||||
} catch (Exception e) {
|
||||
}
|
||||
|
||||
if (weather.equals(""))
|
||||
return "Es ist ein Fehler aufgetreten!";
|
||||
|
@ -220,7 +400,8 @@ public class System {
|
|||
temperature_day_3_3 = json.getJSONArray("list").getJSONObject(28).getJSONObject("main").getDouble("temp");
|
||||
temperature_day_3_4 = json.getJSONArray("list").getJSONObject(30).getJSONObject("main").getDouble("temp");
|
||||
|
||||
} catch (Exception e){}
|
||||
} catch (Exception e) {
|
||||
}
|
||||
|
||||
temperature_day_1.add(temperature_day_1_1);
|
||||
temperature_day_1.add(temperature_day_1_2);
|
||||
|
@ -278,7 +459,8 @@ public class System {
|
|||
lat1 = Double.parseDouble(line.split(";")[3]);
|
||||
}
|
||||
}
|
||||
} catch (Exception e) {}
|
||||
} catch (Exception e) {
|
||||
}
|
||||
|
||||
if (lon1 == -1 || lon2 == -1 || lat1 == -1 || lat2 == -1)
|
||||
return "Es ist ein Fehler aufgetreten!";
|
||||
|
@ -310,7 +492,8 @@ public class System {
|
|||
this.distances.add(line.split(";")[0] + ";" + line.split(";")[1] + ";" + Double.parseDouble(distance(line.split(";")[0]).replace(" km", "")));
|
||||
|
||||
}
|
||||
} catch (Exception e) {}
|
||||
} catch (Exception e) {
|
||||
}
|
||||
}
|
||||
|
||||
public String[] travel_time(String destination_zip) {
|
||||
|
|
|
@ -5,11 +5,25 @@ public class User {
|
|||
private String username = "";
|
||||
private String password = "";
|
||||
private String hometown = "";
|
||||
private int zip;
|
||||
private int zip = 0;
|
||||
private String car_name = "";
|
||||
private double car_l_100km;
|
||||
private double car_avg_kmh;
|
||||
private double bike_avg_kmh;
|
||||
private double car_l_100km = 0;
|
||||
private double car_avg_kmh = 0;
|
||||
private double bike_avg_kmh = 0;
|
||||
|
||||
public User(){}
|
||||
|
||||
public User(String username, String password, String hometown, int zip
|
||||
, String car_name, double car_l_100km, double car_avg_kmh, double bike_avg_kmh){
|
||||
this.username = username;
|
||||
this.password = password;
|
||||
this.hometown = hometown;
|
||||
this.zip = zip;
|
||||
this.car_name = car_name;
|
||||
this.car_l_100km = car_l_100km;
|
||||
this.car_avg_kmh = car_avg_kmh;
|
||||
this.bike_avg_kmh = bike_avg_kmh;
|
||||
}
|
||||
|
||||
public String getUsername() {
|
||||
return username;
|
||||
|
@ -74,4 +88,9 @@ public class User {
|
|||
public void setBike_avg_kmh(double bike_avg_kmh) {
|
||||
this.bike_avg_kmh = bike_avg_kmh;
|
||||
}
|
||||
|
||||
public String toString(){
|
||||
return this.username + ";" + System.encoding(this.password) + ";" + this.hometown + ";" + this.zip + ";" + this.car_name + ";"
|
||||
+ this.car_l_100km + ";" + this.car_avg_kmh + ";" + this.bike_avg_kmh;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -0,0 +1,2 @@
|
|||
Daniel;MTQwMURhbmllbA==;Mannheim;68305;BMW;1.5;50.4;40.2
|
||||
David;MTIzRXNlbA==;Mannheim;68161;AMG;10.0;300.0;20.0
|
|
|
@ -86,4 +86,68 @@ public class SystemTest {
|
|||
assertEquals(true, Double.parseDouble(current_system.distance(current_system.random_destinations_bike().get(0).split(";")[0]).replace(" km", "")) < 100);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void encoding(){
|
||||
|
||||
String test_password = "123Esel";
|
||||
|
||||
assertEquals("MTIzRXNlbA==",System.encoding(test_password));
|
||||
|
||||
}
|
||||
|
||||
@Test
|
||||
public void decoding(){
|
||||
|
||||
String test_password = "MTIzRXNlbA==";
|
||||
|
||||
assertEquals("123Esel",System.decoding(test_password));
|
||||
|
||||
}
|
||||
|
||||
@Test
|
||||
public void sign_in_user() {
|
||||
|
||||
assertEquals(true, current_system.sign_in_user("Daniel", "1401Daniel"));
|
||||
assertEquals("Daniel",current_system.getDetails()[0]);
|
||||
|
||||
}
|
||||
|
||||
@Test
|
||||
public void sign_out_user() {
|
||||
|
||||
assertEquals(true, current_system.sign_in_user("David", "123Esel"));
|
||||
assertEquals("David",current_system.getDetails()[0]);
|
||||
current_system.sign_out_user();
|
||||
assertEquals("",current_system.getDetails()[0]);
|
||||
|
||||
}
|
||||
|
||||
@Test
|
||||
public void sign_up_user(){
|
||||
// Username darf nicht doppelt vorkommen!
|
||||
assertEquals(false, current_system.sign_up_user("David","123Esel","Mannheim","68161","AMG","10","300","20"));
|
||||
assertEquals(true, current_system.sign_up_user("Selim","Penis69","Mannheim","68161","AMG","10","300","20"));
|
||||
// PLZ muss mit Stadt übereinstimmen
|
||||
assertEquals(false, current_system.sign_up_user("Lukas","123Esel","Mannheim","11105","AMG","10","300","20"));
|
||||
assertEquals(true, current_system.sign_up_user("Lukas","123Esel","Mannheim","68305","AMG","10","300","20"));
|
||||
|
||||
assertEquals("Lukas",current_system.getDetails()[0]);
|
||||
current_system.sign_out_user();
|
||||
assertEquals("",current_system.getDetails()[0]);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void change_user_details(){
|
||||
|
||||
current_system.sign_in_user("David", "123Esel");
|
||||
current_system.change_user_details("Enes", "Penis123", "Mannheim", "68161", "", "", "", "");
|
||||
assertEquals("Enes", current_system.getDetails()[0]);
|
||||
|
||||
}
|
||||
/*
|
||||
Tests auf Basis von user_data.csv: Daniel;MTQwMURhbmllbA==;Mannheim;68305;BMW;1.5;50.4;40.2
|
||||
David;MTIzRXNlbA==;Mannheim;68161;AMG;10.0;300.0;20.0
|
||||
*/
|
||||
|
||||
|
||||
}
|
|
@ -0,0 +1,2 @@
|
|||
Daniel;MTQwMURhbmllbA==;Mannheim;68305;BMW;1.5;50.4;40.2
|
||||
David;MTIzRXNlbA==;Mannheim;68161;AMG;10.0;300.0;20.0
|
|
Loading…
Reference in New Issue