Monnethic/java-api
0
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

up

Browse source
This commit is contained in:
GME 2019-04-16 18:47:49 +02:00
parent 3812808697
commit 58f866fef0
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/main/java/restService/UserResource.java
View file

@ -130,7 +130,8 @@ public class UserResource {
try { try {
UserImplementation userImplementation = new UserImplementation(); UserImplementation userImplementation = new UserImplementation();
User r = userImplementation.getUserWithEmail(email); User r = userImplementation.getUserWithEmail(email);
return ResponseEntity.status(HttpStatus.OK).body(r); String response = "{\"name\":\""+r.getName()+"\",\"firstname\":\""+r.getFirstname()+"\",\"user_hash\":\""+r.getUser_hash()+"\"}";
return ResponseEntity.status(HttpStatus.OK).body(response);
}catch (Exception e){ }catch (Exception e){
String r = "{\"response\":\""+e.getMessage()+"\"}"; String r = "{\"response\":\""+e.getMessage()+"\"}";
return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(r); return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(r);
@ -143,7 +144,8 @@ public class UserResource {
try { try {
UserImplementation userImplementation = new UserImplementation(); UserImplementation userImplementation = new UserImplementation();
User r = userImplementation.getUserWithPhone(phone); User r = userImplementation.getUserWithPhone(phone);
return ResponseEntity.status(HttpStatus.OK).body(r); String response = "{\"name\":\""+r.getName()+"\",\"firstname\":\""+r.getFirstname()+"\",\"user_hash\":\""+r.getUser_hash()+"\"}";
return ResponseEntity.status(HttpStatus.OK).body(response);
}catch (Exception e){ }catch (Exception e){
String r = "{\"response\":\""+e.getMessage()+"\"}"; String r = "{\"response\":\""+e.getMessage()+"\"}";
return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(r); return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(r);
@ -156,7 +158,8 @@ public class UserResource {
try { try {
UserImplementation userImplementation = new UserImplementation(); UserImplementation userImplementation = new UserImplementation();
User r = userImplementation.getUserWithMailAndPhone(email,phone); User r = userImplementation.getUserWithMailAndPhone(email,phone);
return ResponseEntity.status(HttpStatus.OK).body(r); String response = "{\"name\":\""+r.getName()+"\",\"firstname\":\""+r.getFirstname()+"\",\"user_hash\":\""+r.getUser_hash()+"\"}";
return ResponseEntity.status(HttpStatus.OK).body(response);
}catch (Exception e){ }catch (Exception e){
String r = "{\"response\":\""+e.getMessage()+"\"}"; String r = "{\"response\":\""+e.getMessage()+"\"}";
return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(r); return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(r);