Skip to content

fix-username-validation #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
AleksOBM wants to merge 1 commit into from
Closed

fix-username-validation #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/java/ru/yandex/practicum/filmorate/dto/request/create/UserCreateRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
@Data
public class UserCreateRequest {

@Size(min = 2, max = 50, message = "Длина имени пользователя может быть от 2 до 50 символов.")
@Size(max = 50, message = "Длина имени пользователя не может быть больше 50 символов.")
private String name;

@NotNull(message = "Логин должен быть указан.")
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/ru/yandex/practicum/filmorate/dto/request/update/UserUpdateRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ public class UserUpdateRequest {
@Positive(message = "Id должен быть положительным числом.")
private Long id;

@Size(min = 2, max = 50, message = "Длина имени пользователя может быть от 2 до 50 символов.")
@Size(max = 50, message = "Длина имени пользователя не может быть больше 50 символов.")
private String name;

@Pattern(regexp = "^[A-Za-z0-9_]+$", message = "Логин может состоять только из этих символов [A-Za-z0-9_].")
Expand Down
8 changes: 8 additions & 0 deletions src/main/java/ru/yandex/practicum/filmorate/servise/UserService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,10 @@ public void changeFriends(FriendsAction action, long userId, long friendId) {

public UserDto create(UserCreateRequest request) {
log.info("Добавление нового пользователя login={}.", request.getLogin());
if (request.getName().isBlank()) {
request.setName(request.getLogin());
}

User user = UserMapper.mapToUser(request);

try {
Expand All @@ -103,6 +107,10 @@ public UserDto create(UserCreateRequest request) {

public UserDto update(UserUpdateRequest request) {
log.info("Обновление данных о пользователе с id={}.", request.getId());
if (request.getName().isBlank()) {
request.setName(request.getLogin());
}

User oldUser = findUser(request.getId());
logUserUpdate(request, oldUser);
User newUser = UserMapper.updateUserFields(oldUser, request);
Expand Down
Loading