@@ -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, null, u.getVerificationStatus()))
|
||||
.toList();
|
||||
|
||||
return ResponseEntity.ok(allUsers);
|
||||
@@ -79,6 +79,7 @@ public class UserController {
|
||||
UserDTO userDTO = userMapper.toDTO(user);
|
||||
userDTO.setEmail(email);
|
||||
userDTO.setFullName(user.getFullName());
|
||||
userDTO.setVerifiedStatus(user.getVerificationStatus());
|
||||
|
||||
if (user.getCompany() != null) {
|
||||
userDTO.setCompany(user.getCompany().getCompanyName());
|
||||
|
||||
@@ -7,6 +7,7 @@ import lombok.NoArgsConstructor;
|
||||
import ru.soune.nocopy.dto.tarriff.TariffDTO;
|
||||
import ru.soune.nocopy.dto.tarriff.TariffInfoDTO;
|
||||
import ru.soune.nocopy.entity.user.GenderType;
|
||||
import ru.soune.nocopy.entity.user.ModerationStatus;
|
||||
import ru.soune.nocopy.entity.user.SubscriptionType;
|
||||
|
||||
import java.time.LocalDate;
|
||||
@@ -30,4 +31,5 @@ public class UserDTO {
|
||||
private List<TariffDTO> tariffs;
|
||||
private TariffInfoDTO tariffInfo;
|
||||
private Long permission;
|
||||
private ModerationStatus verifiedStatus;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user