byte/expensetracker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add email and username to return statement

Browse Source
This commit is contained in:
Cravcenco Dmitrii
2023-12-21 23:07:17 +02:00
parent f9ccaca90d
commit f2b6178f11
1 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/main/java/com/faf223/expensetrackerfaf/controller/UserController.java
View File

@@ -84,7 +84,8 @@ public class UserController {
userData.put("firstname", user.getFirstName()); userData.put("firstname", user.getFirstName());
userData.put("lastname", user.getLastName()); userData.put("lastname", user.getLastName());
userData.put("username", user.getUsername()); userData.put("username", user.getUsername());
userData.put("userrole", credential.get().getRole().toString()); // Assuming UserRole is an enum userData.put("email", credential.get().getEmail());
userData.put("userrole", credential.get().getRole().toString());
return ResponseEntity.ok(userData); return ResponseEntity.ok(userData);
} }
@@ -94,10 +95,25 @@ public class UserController {
@GetMapping() @GetMapping()
@PreAuthorize("hasRole('ADMIN')") @PreAuthorize("hasRole('ADMIN')")
public ResponseEntity<ArrayList<UserDTO>> getAllUsers() { public ResponseEntity<ArrayList<Map<String, String>>> getAllUsers() {
ArrayList<User> users = new ArrayList<>(userService.getUsers()); ArrayList<User> users = new ArrayList<>(userService.getUsers());
return ResponseEntity.ok(userMapper.toDto(users)); ArrayList<Map<String, String>> mappedUsers = new ArrayList<>();
for (User u: users) {
Map<String, String> userData = new HashMap<>();
userData.put("firstname", u.getFirstName());
userData.put("lastname", u.getLastName());
userData.put("username", u.getUsername());
Optional<Credential> credential = credentialRepository.findByUser(u);
if (credential.isEmpty()) continue;
userData.put("email", credential.get().getEmail());
userData.put("userrole", credential.get().getRole().toString());
mappedUsers.add(userData);
}
return ResponseEntity.ok(mappedUsers);
} }
@GetMapping("/delete/{username}") @GetMapping("/delete/{username}")