@@ -59,7 +59,7 @@ public class UserController {
|
||||
.map(u -> new UserDTO(u.getFullName(), u.getCompanyName(), u.getEmail(), u.isActive(),
|
||||
u.getPhone(), u.getGenderType(),
|
||||
u.getBirthday(), u.getCreatedAt(), u.getSubscriptionType(), tariffService.getAllTariffs(),
|
||||
null))
|
||||
null, null))
|
||||
.toList();
|
||||
|
||||
return ResponseEntity.ok(allUsers);
|
||||
@@ -121,6 +121,7 @@ public class UserController {
|
||||
userDTO.setCreatedAt(user.getCreatedAt());
|
||||
userDTO.setSubscriptionType(user.getSubscriptionType());
|
||||
userDTO.setActive(user.isActive());
|
||||
userDTO.setPermission(user.getUserPermissions());
|
||||
|
||||
return ResponseEntity.ok(userDTO);
|
||||
}
|
||||
|
||||
@@ -29,4 +29,5 @@ public class UserDTO {
|
||||
private SubscriptionType subscriptionType;
|
||||
private List<TariffDTO> tariffs;
|
||||
private TariffInfoDTO tariffInfo;
|
||||
private Long permission;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user