ns.potapov/IP_PIbd-21_Potapov_Backend
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Пофиксил мелкие баги

Browse Source
This commit is contained in:
Никита Потапов 2024-06-20 15:58:50 +04:00
parent 2365d240cb
commit 1eb0514cc9
2 changed files with 22 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
nekontakte/src/main/java/com/example/nekontakte/users/api/AdminUserController.java
View File

@ -91,10 +91,6 @@ public class AdminUserController {
BindingResult bindingResult,
Model model,
RedirectAttributes redirectAttributes) {
if (bindingResult.hasErrors()) {
model.addAttribute(PAGE_ATTRIBUTE, page);
return USER_EDIT_VIEW;
}
UserEntity userEntity;
@ -118,24 +114,18 @@ public class AdminUserController {
if (userService.checkUserWithSameUsernameExist(userEntity)) {
bindingResult.rejectValue("username", "userEdit:username", "Пользователь с таким логином уже есть");
model.addAttribute(PAGE_ATTRIBUTE, page);
userEditDTO.setPasswordConfirm(null);
model.addAttribute(USER_ATTRIBUTE, userEditDTO);
return USER_EDIT_VIEW;
}
if (userEditDTO.getId() == null && (userEditDTO.getPassword() == null || userEditDTO.getPassword() == "")) {
bindingResult.rejectValue("password", "userEdit:passwords", "Укажите пароль");
model.addAttribute(PAGE_ATTRIBUTE, page);
userEditDTO.setPasswordConfirm(null);
model.addAttribute(USER_ATTRIBUTE, userEditDTO);
return USER_EDIT_VIEW;
}
if (!Objects.equals(userEditDTO.getPassword(), userEditDTO.getPasswordConfirm())) {
bindingResult.rejectValue("password", "userEdit:passwords", "Пароли не совпадают");
bindingResult.rejectValue("passwordConfirm", "userEdit:passwords", "Пароли не совпадают");
}
if (bindingResult.hasErrors()) {
model.addAttribute(PAGE_ATTRIBUTE, page);
userEditDTO.setPasswordConfirm(null);
model.addAttribute(USER_ATTRIBUTE, userEditDTO);
return USER_EDIT_VIEW;
}

29
nekontakte/src/main/java/com/example/nekontakte/users/api/UserSignupController.java
View File

@ -31,13 +31,6 @@ public class UserSignupController {
this.userService = userService;
}
private UserEntity toEntity(UserSignupDto dto) {
UserEntity userEntity = new UserEntity();
userEntity.setUsername(dto.getUsername());
userEntity.setPassword(dto.getPassword());
return userEntity;
}
@GetMapping
public String getSignup(Model model) {
model.addAttribute(USER_ATTRIBUTE, new UserSignupDto());
@ -49,15 +42,29 @@ public class UserSignupController {
@ModelAttribute(name = USER_ATTRIBUTE) @Valid UserSignupDto user,
BindingResult bindingResult,
Model model) {
if (bindingResult.hasErrors()) {
return SIGNUP_VIEW;
UserEntity userEntity = new UserEntity();
userEntity.setUsername(user.getUsername());
userEntity.setPassword(user.getPassword());
if (userService.checkUserWithSameUsernameExist(userEntity)) {
bindingResult.rejectValue("username", "signup:username", "Пользователь с таким логином уже есть");
}
if (user.getPassword() == null || user.getPassword() == "") {
bindingResult.rejectValue("password", "signup:passwords", "Укажите пароль");
}
if (!Objects.equals(user.getPassword(), user.getPasswordConfirm())) {
bindingResult.rejectValue("password", "signup:passwords", "Пароли не совпадают.");
bindingResult.rejectValue("passwordConfirm", "signup:passwords", "Пароли не совпадают");
}
if (bindingResult.hasErrors()) {
model.addAttribute(USER_ATTRIBUTE, user);
return SIGNUP_VIEW;
}
userService.create(toEntity(user));
userService.create(userEntity);
return Constants.REDIRECT_VIEW + Constants.LOGIN_URL + "?signup";
}
}