Merge branch 'master' of https://git.bib.de/Subway-Surfers/VPR_App into Max_EssensverwaltungMitarbeiter
This commit is contained in:
commit
0326d80a21
@ -8,9 +8,11 @@ public class Account {
|
|||||||
// region Felder
|
// region Felder
|
||||||
private String passwort;
|
private String passwort;
|
||||||
|
|
||||||
private int id;
|
private transient int id;
|
||||||
|
|
||||||
private String benutzername;
|
private String name;
|
||||||
|
|
||||||
|
private int rid;
|
||||||
// endregion
|
// endregion
|
||||||
|
|
||||||
// region Getter & Setter
|
// region Getter & Setter
|
||||||
@ -32,18 +34,23 @@ public class Account {
|
|||||||
|
|
||||||
|
|
||||||
public String getBenutzername() {
|
public String getBenutzername() {
|
||||||
return benutzername;
|
return name;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setBenutzername(String benutzername) {
|
public void setBenutzername(String benutzername) {
|
||||||
this.benutzername = benutzername;
|
this.name = benutzername;
|
||||||
}
|
}
|
||||||
// endregion
|
// endregion
|
||||||
|
|
||||||
// region Konstruktoren
|
// region Konstruktoren
|
||||||
public Account(String passwort, String benutzername) {
|
public Account(String passwort, String name) {
|
||||||
this.passwort = passwort;
|
this.passwort = passwort;
|
||||||
this.benutzername = benutzername;
|
this.name = name;
|
||||||
|
|
||||||
|
if(this instanceof MitarbeiterAccount)
|
||||||
|
rid = 0;
|
||||||
|
else if (this instanceof ElternAccount)
|
||||||
|
rid = 1;
|
||||||
}
|
}
|
||||||
// endregion
|
// endregion
|
||||||
|
|
||||||
|
@ -7,15 +7,14 @@
|
|||||||
|
|
||||||
package Logik;
|
package Logik;
|
||||||
|
|
||||||
import java.nio.file.WatchEvent;
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
|
|
||||||
public class Benutzer extends Account {
|
public class ElternAccount extends Account {
|
||||||
|
|
||||||
// region Felder
|
// region Felder
|
||||||
private String email;
|
private String email;
|
||||||
|
|
||||||
private ArrayList<Kind> kinder;
|
private transient ArrayList<Kind> kinder;
|
||||||
// endregion
|
// endregion
|
||||||
|
|
||||||
// region Getter & Setter
|
// region Getter & Setter
|
||||||
@ -37,7 +36,7 @@ public class Benutzer extends Account {
|
|||||||
// endregion
|
// endregion
|
||||||
|
|
||||||
// region Konstruktoren
|
// region Konstruktoren
|
||||||
public Benutzer(String passwort, String benutzername, String email) {
|
public ElternAccount(String passwort, String benutzername, String email) {
|
||||||
super(passwort, benutzername);
|
super(passwort, benutzername);
|
||||||
this.email = email;
|
this.email = email;
|
||||||
kinder = new ArrayList<>();
|
kinder = new ArrayList<>();
|
@ -11,7 +11,6 @@ public class Kind {
|
|||||||
private String vorname;
|
private String vorname;
|
||||||
private int bid;
|
private int bid;
|
||||||
|
|
||||||
// TODO Zutat implementieren!
|
|
||||||
private ArrayList<Zutat> filter;
|
private ArrayList<Zutat> filter;
|
||||||
// endregion
|
// endregion
|
||||||
|
|
||||||
@ -48,8 +47,6 @@ public class Kind {
|
|||||||
this.bid = bid;
|
this.bid = bid;
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO Zutat implementieren!
|
|
||||||
|
|
||||||
public ArrayList<Zutat> getFilter() {
|
public ArrayList<Zutat> getFilter() {
|
||||||
return filter;
|
return filter;
|
||||||
}
|
}
|
||||||
|
@ -51,7 +51,7 @@ public class MitarbeiterAccount extends Account {
|
|||||||
* @param kinder Eine Liste mit allen zugehörigen Kindern des Accounts
|
* @param kinder Eine Liste mit allen zugehörigen Kindern des Accounts
|
||||||
*/
|
*/
|
||||||
public void accountErstellen(String passwort, String benutzername, String email, ArrayList<Kind> kinder) {
|
public void accountErstellen(String passwort, String benutzername, String email, ArrayList<Kind> kinder) {
|
||||||
Benutzer newAccount = new Benutzer(passwort, benutzername, email);
|
ElternAccount newAccount = new ElternAccount(passwort, benutzername, email);
|
||||||
newAccount.setKinder(kinder);
|
newAccount.setKinder(kinder);
|
||||||
// Id muss aus der Datenbank geholt werden und dann gesetzt werden
|
// Id muss aus der Datenbank geholt werden und dann gesetzt werden
|
||||||
}
|
}
|
||||||
|
@ -5,8 +5,8 @@ import java.net.http.HttpClient;
|
|||||||
import java.net.http.HttpRequest;
|
import java.net.http.HttpRequest;
|
||||||
import java.net.http.HttpResponse;
|
import java.net.http.HttpResponse;
|
||||||
import java.nio.charset.StandardCharsets;
|
import java.nio.charset.StandardCharsets;
|
||||||
import java.nio.file.WatchEvent;
|
|
||||||
|
|
||||||
|
import Logik.ElternAccount;
|
||||||
import Logik.Kind;
|
import Logik.Kind;
|
||||||
import com.google.gson.Gson;
|
import com.google.gson.Gson;
|
||||||
|
|
||||||
@ -28,20 +28,18 @@ public class RestApiClient implements IRestAPI{
|
|||||||
gson = new Gson();
|
gson = new Gson();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
public static void main(String[] args){
|
public static void main(String[] args){
|
||||||
|
|
||||||
Kind kind = new Kind("Klein", "Kevin", 2);
|
RestApiClient client1 = new RestApiClient();
|
||||||
|
|
||||||
String json = new Gson().toJson(kind);
|
client1.post("Gericht", "{\"name\" : \"Svens Beine\", \"69.69\", \"beschreibung\" : \"Muss net schmegge, muss wirge\"}");
|
||||||
|
|
||||||
new RestApiClient().post("Kind", json);
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param controllerName
|
* Methode für einen Get-Aufruf. Ruft alle Elemente einer Tabelle auf.
|
||||||
|
*
|
||||||
|
* @param controllerName Name des aufzurufenden Controllers
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public void get(String controllerName) {
|
public void get(String controllerName) {
|
||||||
@ -67,8 +65,10 @@ public class RestApiClient implements IRestAPI{
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param controllerName
|
* Methode für einen Get-Aufruf. Ruft ein spezifisches Element auf.
|
||||||
* @param id
|
*
|
||||||
|
* @param controllerName Name des aufzurufenden Controllers
|
||||||
|
* @param id Id der Aufzurufenden Zeile
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public void get(String controllerName, int id) {
|
public void get(String controllerName, int id) {
|
||||||
@ -83,13 +83,9 @@ public class RestApiClient implements IRestAPI{
|
|||||||
// Send the request and get the response
|
// Send the request and get the response
|
||||||
HttpResponse<String> httpResponse = client.send(httpRequest, HttpResponse.BodyHandlers.ofString());
|
HttpResponse<String> httpResponse = client.send(httpRequest, HttpResponse.BodyHandlers.ofString());
|
||||||
|
|
||||||
Kind[] test = gson.fromJson(httpResponse.body(), Kind[].class);
|
|
||||||
|
|
||||||
// Print the response status code and body
|
// Print the response status code and body
|
||||||
System.out.println("Status Code: " + httpResponse.statusCode());
|
System.out.println("Status Code: " + httpResponse.statusCode() + httpResponse.body());
|
||||||
for(Kind i : test){
|
|
||||||
System.out.println(i.getVorname());
|
|
||||||
}
|
|
||||||
//System.out.println("Response Body: " + test);
|
//System.out.println("Response Body: " + test);
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
@ -97,9 +93,11 @@ public class RestApiClient implements IRestAPI{
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param controllerName
|
* Methode für einen Get-Aufruf. Ruft ein spezielles Element auf.
|
||||||
* @param id
|
*
|
||||||
* @param bezahlt
|
* @param controllerName Name des aufzurufenden Controllers
|
||||||
|
* @param id Id der Aufzurufenden Zeile
|
||||||
|
* @param bezahlt TODO Warum ist das hier?
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public void get(String controllerName, int id, boolean bezahlt) {
|
public void get(String controllerName, int id, boolean bezahlt) {
|
||||||
@ -123,8 +121,11 @@ public class RestApiClient implements IRestAPI{
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param controllerName
|
* Methode für einen Put-Aufruf. Aktualisiert einen Eintrag.
|
||||||
* @param id
|
*
|
||||||
|
* @param controllerName Name des aufzurufenden Controllers.
|
||||||
|
* @param id Id des zu änderenden Eintrags.
|
||||||
|
* @param jsonData JsonString mit den neuen Daten.
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public void put(String controllerName, int id, String jsonData) {
|
public void put(String controllerName, int id, String jsonData) {
|
||||||
@ -150,7 +151,10 @@ public class RestApiClient implements IRestAPI{
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param controllerName
|
* Methode für einen Post-Aufruf. Fügt einen Eintrag in eine Datenbank hinzu.
|
||||||
|
*
|
||||||
|
* @param controllerName Name des aufzurufenden Controllers.
|
||||||
|
* @param jsonData JsonString mit den Daten des Eintrags.
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public void post(String controllerName, String jsonData) {
|
public void post(String controllerName, String jsonData) {
|
||||||
@ -177,12 +181,33 @@ public class RestApiClient implements IRestAPI{
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param controllerName
|
* Methode für einen Delete-Aufruf. Löscht einen Eintrag mit einer Id.
|
||||||
* @param id
|
*
|
||||||
|
* @param controllerName Name des aufzurufenden Controllers
|
||||||
|
* @param id Id des zu löschenden Eintrags.
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public void delete(String controllerName, int id) {
|
public void delete(String controllerName, int id) {
|
||||||
|
URI apiUri = URI.create(String.format("%s/%s/%d", urlBase,controllerName, id));
|
||||||
|
|
||||||
|
System.out.println(apiUri);
|
||||||
|
|
||||||
|
HttpRequest httpRequest = HttpRequest.newBuilder()
|
||||||
|
.uri(apiUri)
|
||||||
|
.header("Content-Type", "application/json")
|
||||||
|
.DELETE()
|
||||||
|
.build();
|
||||||
|
|
||||||
|
try {
|
||||||
|
// Send the request and get the response
|
||||||
|
HttpResponse<String> httpResponse = client.send(httpRequest, HttpResponse.BodyHandlers.ofString());
|
||||||
|
|
||||||
|
// Print the response status code and body
|
||||||
|
System.out.println("Status Code: " + httpResponse.statusCode());
|
||||||
|
System.out.println("Response Body: " + httpResponse.body());
|
||||||
|
} catch (Exception e) {
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user