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; private String email;
@NotNull(message = "Role is mandatory") @NotNull(message = "Role is mandatory")
private Role role; private Role role;
private boolean isNonLocked; private boolean isNotLocked;
private boolean isActive; private boolean isActive;
private MultipartFile profileImage; 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}) @Mapper(imports = {LocalDateTime.class})
public interface UserMapper { public interface UserMapper {
@Mapping(target = "isNotLocked", source = "nonLocked") @Mapping(target = "isNotLocked", source = "notLocked")
@Mapping(target = "isActive", source = "active") @Mapping(target = "isActive", source = "active")
@Mapping(target = "joinDate", expression = "java( LocalDateTime.now() )") @Mapping(target = "joinDate", expression = "java( LocalDateTime.now() )")
@Mapping(target = "role", source = "role", resultType = String.class) @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) .lastName(lastName)
.username(username) .username(username)
.isActive(true) .isActive(true)
.isNonLocked(true) .isNotLocked(true)
.role(defaultRole) .role(defaultRole)
.build(); .build();
return addNewUser(newUserDto); return addNewUser(newUserDto);
@ -208,7 +208,7 @@ public class UserServiceImpl implements UserService {
user.setEmail(userDto.getEmail()); user.setEmail(userDto.getEmail());
user.setRole(userDto.getRole().name()); user.setRole(userDto.getRole().name());
user.setAuthorities(userDto.getRole().getAuthorities()); user.setAuthorities(userDto.getRole().getAuthorities());
user.setNotLocked(userDto.isNonLocked()); user.setNotLocked(userDto.isNotLocked());
user.setActive(userDto.isActive()); user.setActive(userDto.isActive());
userRepository.save(user); userRepository.save(user);

2
support-portal-backend/src/test/java/net/shyshkin/study/fullstack/supportportal/backend/common/BaseUserTest.java
View File

@ -53,7 +53,7 @@ public abstract class BaseUserTest {
.lastName(FAKER.name().lastName()) .lastName(FAKER.name().lastName())
.username(FAKER.name().username()) .username(FAKER.name().username())
.isActive(true) .isActive(true)
.isNonLocked(true) .isNotLocked(true)
.role(ROLE_ADMIN) .role(ROLE_ADMIN)
.build(); .build();
} }

20
support-portal-backend/src/test/java/net/shyshkin/study/fullstack/supportportal/backend/controller/UserResourceTest.java
View File

@ -364,7 +364,7 @@ class UserResourceTest extends BaseUserTest {
"email", userDto.getEmail(), "email", userDto.getEmail(),
"role", userDto.getRole().name(), "role", userDto.getRole().name(),
"isActive", String.valueOf(userDto.isActive()), "isActive", String.valueOf(userDto.isActive()),
"isNonLocked", String.valueOf(userDto.isNonLocked()) "isNotLocked", String.valueOf(userDto.isNotLocked())
); );
//when //when
@ -376,7 +376,7 @@ class UserResourceTest extends BaseUserTest {
.postForEntity( .postForEntity(
"/user/add?username={username}&email={email}" + "/user/add?username={username}&email={email}" +
"&firstName={firstName}&lastName={lastName}" + "&firstName={firstName}&lastName={lastName}" +
"&role={role}&active={isActive}&nonLocked={isNonLocked}", "&role={role}&active={isActive}&notLocked={isNotLocked}",
requestEntity, requestEntity,
User.class, User.class,
paramMap paramMap
@ -410,7 +410,7 @@ class UserResourceTest extends BaseUserTest {
"email", userDto.getEmail(), "email", userDto.getEmail(),
"role", userDto.getRole().name(), "role", userDto.getRole().name(),
"isActive", userDto.isActive(), "isActive", userDto.isActive(),
"isNonLocked", userDto.isNonLocked() "isNotLocked", userDto.isNotLocked()
); );
//when //when
@ -418,7 +418,7 @@ class UserResourceTest extends BaseUserTest {
.postForEntity( .postForEntity(
"/user/add?username={username}&email={email}" + "/user/add?username={username}&email={email}" +
"&firstName={firstName}&lastName={lastName}" + "&firstName={firstName}&lastName={lastName}" +
"&role={role}&active={isActive}&nonLocked={isNonLocked}", "&role={role}&active={isActive}&notLocked={isNotLocked}",
null, null,
HttpResponse.class, HttpResponse.class,
paramMap paramMap
@ -452,7 +452,7 @@ class UserResourceTest extends BaseUserTest {
"email", userDto.getEmail(), "email", userDto.getEmail(),
"role", userDto.getRole().name(), "role", userDto.getRole().name(),
"isActive", userDto.isActive(), "isActive", userDto.isActive(),
"isNonLocked", userDto.isNonLocked() "isNotLocked", userDto.isNotLocked()
); );
//when //when
@ -464,7 +464,7 @@ class UserResourceTest extends BaseUserTest {
.postForEntity( .postForEntity(
"/user/add?username={username}&email={email}" + "/user/add?username={username}&email={email}" +
"&firstName={firstName}&lastName={lastName}" + "&firstName={firstName}&lastName={lastName}" +
"&role={role}&active={isActive}&nonLocked={isNonLocked}", "&role={role}&active={isActive}&notLocked={isNotLocked}",
requestEntity, requestEntity,
User.class, User.class,
paramMap paramMap
@ -501,7 +501,7 @@ class UserResourceTest extends BaseUserTest {
"email", userDto.getEmail(), "email", userDto.getEmail(),
"role", userDto.getRole().name(), "role", userDto.getRole().name(),
"isActive", userDto.isActive(), "isActive", userDto.isActive(),
"isNonLocked", userDto.isNonLocked() "isNotLocked", userDto.isNotLocked()
); );
//when //when
@ -513,7 +513,7 @@ class UserResourceTest extends BaseUserTest {
.postForEntity( .postForEntity(
"/user/add?username={username}&email={email}" + "/user/add?username={username}&email={email}" +
"&firstName={firstName}&lastName={lastName}" + "&firstName={firstName}&lastName={lastName}" +
"&role={role}&active={isActive}&nonLocked={isNonLocked}", "&role={role}&active={isActive}&notLocked={isNotLocked}",
requestEntity, requestEntity,
HttpResponse.class, HttpResponse.class,
paramMap paramMap
@ -547,7 +547,7 @@ class UserResourceTest extends BaseUserTest {
body.add("email", userDto.getEmail()); body.add("email", userDto.getEmail());
body.add("role", userDto.getRole().name()); body.add("role", userDto.getRole().name());
body.add("active", userDto.isActive()); body.add("active", userDto.isActive());
body.add("nonLocked", userDto.isNonLocked()); body.add("notLocked", userDto.isNotLocked());
body.add("profileImage", profileImage.getResource()); body.add("profileImage", profileImage.getResource());
//when //when
@ -605,7 +605,7 @@ class UserResourceTest extends BaseUserTest {
body.add("email", userDto.getEmail()); body.add("email", userDto.getEmail());
body.add("role", userDto.getRole().name()); body.add("role", userDto.getRole().name());
body.add("active", userDto.isActive()); body.add("active", userDto.isActive());
body.add("nonLocked", userDto.isNonLocked()); body.add("notLocked", userDto.isNotLocked());
body.add("profileImage", profileImage.getResource()); body.add("profileImage", profileImage.getResource());
//when //when

38
support-portal-backend/src/test/java/net/shyshkin/study/fullstack/supportportal/backend/controller/UserResourceUnSecureTest.java
View File

@ -63,7 +63,7 @@ class UserResourceUnSecureTest extends BaseUserTest {
"email", userDto.getEmail(), "email", userDto.getEmail(),
"role", userDto.getRole().name(), "role", userDto.getRole().name(),
"isActive", String.valueOf(userDto.isActive()), "isActive", String.valueOf(userDto.isActive()),
"isNonLocked", String.valueOf(userDto.isNonLocked()) "isNotLocked", String.valueOf(userDto.isNotLocked())
); );
//when //when
@ -71,7 +71,7 @@ class UserResourceUnSecureTest extends BaseUserTest {
.postForEntity( .postForEntity(
"/user/add?username={username}&email={email}" + "/user/add?username={username}&email={email}" +
"&firstName={firstName}&lastName={lastName}" + "&firstName={firstName}&lastName={lastName}" +
"&role={role}&active={isActive}&nonLocked={isNonLocked}", "&role={role}&active={isActive}&notLocked={isNotLocked}",
null, null,
User.class, User.class,
paramMap paramMap
@ -103,7 +103,7 @@ class UserResourceUnSecureTest extends BaseUserTest {
"email", userDto.getEmail(), "email", userDto.getEmail(),
"role", userDto.getRole().name(), "role", userDto.getRole().name(),
"isActive", String.valueOf(userDto.isActive()), "isActive", String.valueOf(userDto.isActive()),
"isNonLocked", String.valueOf(userDto.isNonLocked()) "isNotLocked", String.valueOf(userDto.isNotLocked())
); );
//when //when
@ -111,7 +111,7 @@ class UserResourceUnSecureTest extends BaseUserTest {
.postForEntity( .postForEntity(
"/user/add?username={username}&email={email}" + "/user/add?username={username}&email={email}" +
"&lastName={lastName}" + "&lastName={lastName}" +
"&role={role}&active={isActive}&nonLocked={isNonLocked}", "&role={role}&active={isActive}&notLocked={isNotLocked}",
null, null,
HttpResponse.class, HttpResponse.class,
paramMap paramMap
@ -139,7 +139,7 @@ class UserResourceUnSecureTest extends BaseUserTest {
"email", userDto.getEmail(), "email", userDto.getEmail(),
"role", "ROLE_FAKE", "role", "ROLE_FAKE",
"isActive", String.valueOf(userDto.isActive()), "isActive", String.valueOf(userDto.isActive()),
"isNonLocked", String.valueOf(userDto.isNonLocked()) "isNotLocked", String.valueOf(userDto.isNotLocked())
); );
//when //when
@ -147,7 +147,7 @@ class UserResourceUnSecureTest extends BaseUserTest {
.postForEntity( .postForEntity(
"/user/add?username={username}&email={email}" + "/user/add?username={username}&email={email}" +
"&firstName={firstName}&lastName={lastName}" + "&firstName={firstName}&lastName={lastName}" +
"&role={role}&active={isActive}&nonLocked={isNonLocked}", "&role={role}&active={isActive}&notLocked={isNotLocked}",
null, null,
HttpResponse.class, HttpResponse.class,
paramMap paramMap
@ -175,7 +175,7 @@ class UserResourceUnSecureTest extends BaseUserTest {
"email", "not_an_email", "email", "not_an_email",
"role", userDto.getRole().name(), "role", userDto.getRole().name(),
"isActive", String.valueOf(userDto.isActive()), "isActive", String.valueOf(userDto.isActive()),
"isNonLocked", String.valueOf(userDto.isNonLocked()) "isNotLocked", String.valueOf(userDto.isNotLocked())
); );
//when //when
@ -183,7 +183,7 @@ class UserResourceUnSecureTest extends BaseUserTest {
.postForEntity( .postForEntity(
"/user/add?username={username}&email={email}" + "/user/add?username={username}&email={email}" +
"&firstName={firstName}&lastName={lastName}" + "&firstName={firstName}&lastName={lastName}" +
"&role={role}&active={isActive}&nonLocked={isNonLocked}", "&role={role}&active={isActive}&notLocked={isNotLocked}",
null, null,
HttpResponse.class, HttpResponse.class,
paramMap paramMap
@ -211,7 +211,7 @@ class UserResourceUnSecureTest extends BaseUserTest {
"email", userDto.getEmail(), "email", userDto.getEmail(),
"role", userDto.getRole().name(), "role", userDto.getRole().name(),
"isActive", "yes", "isActive", "yes",
"isNonLocked", "not_a_boolean" "isNotLocked", "not_a_boolean"
); );
//when //when
@ -219,7 +219,7 @@ class UserResourceUnSecureTest extends BaseUserTest {
.postForEntity( .postForEntity(
"/user/add?username={username}&email={email}" + "/user/add?username={username}&email={email}" +
"&firstName={firstName}&lastName={lastName}" + "&firstName={firstName}&lastName={lastName}" +
"&role={role}&active={isActive}&nonLocked={isNonLocked}", "&role={role}&active={isActive}&notLocked={isNotLocked}",
null, null,
HttpResponse.class, HttpResponse.class,
paramMap paramMap
@ -232,7 +232,7 @@ class UserResourceUnSecureTest extends BaseUserTest {
.isNotNull() .isNotNull()
.hasNoNullFieldsOrProperties() .hasNoNullFieldsOrProperties()
.hasFieldOrPropertyWithValue("httpStatus", BAD_REQUEST) .hasFieldOrPropertyWithValue("httpStatus", BAD_REQUEST)
.hasFieldOrPropertyWithValue("message", "ERROR(S) IN PARAMETERS: [NONLOCKED:FAILED TO CONVERT PROPERTY VALUE OF TYPE 'JAVA.LANG.STRING' TO REQUIRED TYPE 'BOOLEAN' FOR PROPERTY 'NONLOCKED'; NESTED EXCEPTION IS JAVA.LANG.ILLEGALARGUMENTEXCEPTION: INVALID BOOLEAN VALUE [NOT_A_BOOLEAN]]"); .hasFieldOrPropertyWithValue("message", "ERROR(S) IN PARAMETERS: [NOTLOCKED:FAILED TO CONVERT PROPERTY VALUE OF TYPE 'JAVA.LANG.STRING' TO REQUIRED TYPE 'BOOLEAN' FOR PROPERTY 'NOTLOCKED'; NESTED EXCEPTION IS JAVA.LANG.ILLEGALARGUMENTEXCEPTION: INVALID BOOLEAN VALUE [NOT_A_BOOLEAN]]");
} }
} }
@ -265,7 +265,7 @@ class UserResourceUnSecureTest extends BaseUserTest {
"email", userDto.getEmail(), "email", userDto.getEmail(),
"role", userDto.getRole().name(), "role", userDto.getRole().name(),
"isActive", String.valueOf(userDto.isActive()), "isActive", String.valueOf(userDto.isActive()),
"isNonLocked", String.valueOf(userDto.isNonLocked()) "isNotLocked", String.valueOf(userDto.isNotLocked())
); );
//when //when
@ -273,7 +273,7 @@ class UserResourceUnSecureTest extends BaseUserTest {
.exchange( .exchange(
"/user/{currentUsername}?username={username}&email={email}" + "/user/{currentUsername}?username={username}&email={email}" +
"&firstName={firstName}&lastName={lastName}" + "&firstName={firstName}&lastName={lastName}" +
"&role={role}&active={isActive}&nonLocked={isNonLocked}", "&role={role}&active={isActive}&notLocked={isNotLocked}",
HttpMethod.PUT, HttpMethod.PUT,
null, null,
User.class, User.class,
@ -312,7 +312,7 @@ class UserResourceUnSecureTest extends BaseUserTest {
"email", userDto.getEmail(), "email", userDto.getEmail(),
"role", userDto.getRole().name(), "role", userDto.getRole().name(),
"isActive", userDto.isActive(), "isActive", userDto.isActive(),
"isNonLocked", userDto.isNonLocked() "isNotLocked", userDto.isNotLocked()
); );
//when //when
@ -320,7 +320,7 @@ class UserResourceUnSecureTest extends BaseUserTest {
.exchange( .exchange(
"/user/{currentUsername}?username={username}&email={email}" + "/user/{currentUsername}?username={username}&email={email}" +
"&firstName={firstName}&lastName={lastName}" + "&firstName={firstName}&lastName={lastName}" +
"&role={role}&active={isActive}&nonLocked={isNonLocked}", "&role={role}&active={isActive}&notLocked={isNotLocked}",
HttpMethod.PUT, HttpMethod.PUT,
null, null,
User.class, User.class,
@ -359,7 +359,7 @@ class UserResourceUnSecureTest extends BaseUserTest {
"email", userDto.getEmail(), "email", userDto.getEmail(),
"role", userDto.getRole().name(), "role", userDto.getRole().name(),
"isActive", userDto.isActive(), "isActive", userDto.isActive(),
"isNonLocked", userDto.isNonLocked() "isNotLocked", userDto.isNotLocked()
); );
//when //when
@ -367,7 +367,7 @@ class UserResourceUnSecureTest extends BaseUserTest {
.exchange( .exchange(
"/user/{currentUsername}?username={username}&email={email}" + "/user/{currentUsername}?username={username}&email={email}" +
"&firstName={firstName}" + "&firstName={firstName}" +
"&role={role}&active={isActive}&nonLocked={isNonLocked}", "&role={role}&active={isActive}&notLocked={isNotLocked}",
HttpMethod.PUT, HttpMethod.PUT,
null, null,
HttpResponse.class, HttpResponse.class,
@ -401,7 +401,7 @@ class UserResourceUnSecureTest extends BaseUserTest {
"email", userDto.getEmail(), "email", userDto.getEmail(),
"role", userDto.getRole().name(), "role", userDto.getRole().name(),
"isActive", String.valueOf(userDto.isActive()), "isActive", String.valueOf(userDto.isActive()),
"isNonLocked", String.valueOf(userDto.isNonLocked()) "isNotLocked", String.valueOf(userDto.isNotLocked())
); );
//when //when
@ -409,7 +409,7 @@ class UserResourceUnSecureTest extends BaseUserTest {
.exchange( .exchange(
"/user/{currentUsername}?username={username}&email={email}" + "/user/{currentUsername}?username={username}&email={email}" +
"&firstName={firstName}&lastName={lastName}" + "&firstName={firstName}&lastName={lastName}" +
"&role={role}&active={isActive}&nonLocked={isNonLocked}", "&role={role}&active={isActive}&notLocked={isNotLocked}",
HttpMethod.PUT, HttpMethod.PUT,
null, null,
HttpResponse.class, HttpResponse.class,

2
support-portal-backend/src/test/java/net/shyshkin/study/fullstack/supportportal/backend/service/UserServiceTest.java
View File

@ -89,7 +89,7 @@ class UserServiceTest extends BaseUserTest {
.hasFieldOrPropertyWithValue("firstName", randomUserDto.getFirstName()) .hasFieldOrPropertyWithValue("firstName", randomUserDto.getFirstName())
.hasFieldOrPropertyWithValue("lastName", randomUserDto.getLastName()) .hasFieldOrPropertyWithValue("lastName", randomUserDto.getLastName())
.hasFieldOrPropertyWithValue("isActive", randomUserDto.isActive()) .hasFieldOrPropertyWithValue("isActive", randomUserDto.isActive())
.hasFieldOrPropertyWithValue("isNotLocked", randomUserDto.isNonLocked()) .hasFieldOrPropertyWithValue("isNotLocked", randomUserDto.isNotLocked())
.hasFieldOrPropertyWithValue("role", "ROLE_ADMIN") .hasFieldOrPropertyWithValue("role", "ROLE_ADMIN")
; ;
} }