admin/cmc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactored UserDto to use isNotLocked field instead of isNonLocked (#22)

Browse Source
This commit is contained in:
Art
2021-09-21 15:19:23 +03:00
parent 6573cef24d
commit 78c3c05be2
7 changed files with 35 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
support-portal-backend/src/main/java/net/shyshkin/study/fullstack/supportportal/backend/domain/dto/UserDto.java
View File

@ -28,7 +28,7 @@ public class UserDto {
private String email;
@NotNull(message = "Role is mandatory")
private Role role;
private boolean isNonLocked;
private boolean isNotLocked;
private boolean isActive;
private MultipartFile profileImage;
}

2
support-portal-backend/src/main/java/net/shyshkin/study/fullstack/supportportal/backend/mapper/UserMapper.java
View File

@ -10,7 +10,7 @@ import java.time.LocalDateTime;
@Mapper(imports = {LocalDateTime.class})
public interface UserMapper {
@Mapping(target = "isNotLocked", source = "nonLocked")
@Mapping(target = "isNotLocked", source = "notLocked")
@Mapping(target = "isActive", source = "active")
@Mapping(target = "joinDate", expression = "java( LocalDateTime.now() )")
@Mapping(target = "role", source = "role", resultType = String.class)

4
support-portal-backend/src/main/java/net/shyshkin/study/fullstack/supportportal/backend/service/UserServiceImpl.java
View File

@ -97,7 +97,7 @@ public class UserServiceImpl implements UserService {
.lastName(lastName)
.username(username)
.isActive(true)
.isNonLocked(true)
.isNotLocked(true)
.role(defaultRole)
.build();
return addNewUser(newUserDto);
@ -208,7 +208,7 @@ public class UserServiceImpl implements UserService {
user.setEmail(userDto.getEmail());
user.setRole(userDto.getRole().name());
user.setAuthorities(userDto.getRole().getAuthorities());
user.setNotLocked(userDto.isNonLocked());
user.setNotLocked(userDto.isNotLocked());
user.setActive(userDto.isActive());
userRepository.save(user);