From 78c3c05be249e74feb68bf8d5d70df22f23fdc86 Mon Sep 17 00:00:00 2001 From: Art Date: Tue, 21 Sep 2021 15:19:23 +0300 Subject: [PATCH] Refactored UserDto to use isNotLocked field instead of isNonLocked (#22) --- .../backend/domain/dto/UserDto.java | 2 +- .../backend/mapper/UserMapper.java | 2 +- .../backend/service/UserServiceImpl.java | 4 +- .../backend/common/BaseUserTest.java | 2 +- .../backend/controller/UserResourceTest.java | 20 +++++----- .../controller/UserResourceUnSecureTest.java | 38 +++++++++---------- .../backend/service/UserServiceTest.java | 2 +- 7 files changed, 35 insertions(+), 35 deletions(-) diff --git a/support-portal-backend/src/main/java/net/shyshkin/study/fullstack/supportportal/backend/domain/dto/UserDto.java b/support-portal-backend/src/main/java/net/shyshkin/study/fullstack/supportportal/backend/domain/dto/UserDto.java index 6a1900e..1bf7e94 100644 --- a/support-portal-backend/src/main/java/net/shyshkin/study/fullstack/supportportal/backend/domain/dto/UserDto.java +++ b/support-portal-backend/src/main/java/net/shyshkin/study/fullstack/supportportal/backend/domain/dto/UserDto.java @@ -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; } diff --git a/support-portal-backend/src/main/java/net/shyshkin/study/fullstack/supportportal/backend/mapper/UserMapper.java b/support-portal-backend/src/main/java/net/shyshkin/study/fullstack/supportportal/backend/mapper/UserMapper.java index 6f790b1..1787172 100644 --- a/support-portal-backend/src/main/java/net/shyshkin/study/fullstack/supportportal/backend/mapper/UserMapper.java +++ b/support-portal-backend/src/main/java/net/shyshkin/study/fullstack/supportportal/backend/mapper/UserMapper.java @@ -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) diff --git a/support-portal-backend/src/main/java/net/shyshkin/study/fullstack/supportportal/backend/service/UserServiceImpl.java b/support-portal-backend/src/main/java/net/shyshkin/study/fullstack/supportportal/backend/service/UserServiceImpl.java index a7e5d84..be029df 100644 --- a/support-portal-backend/src/main/java/net/shyshkin/study/fullstack/supportportal/backend/service/UserServiceImpl.java +++ b/support-portal-backend/src/main/java/net/shyshkin/study/fullstack/supportportal/backend/service/UserServiceImpl.java @@ -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); diff --git a/support-portal-backend/src/test/java/net/shyshkin/study/fullstack/supportportal/backend/common/BaseUserTest.java b/support-portal-backend/src/test/java/net/shyshkin/study/fullstack/supportportal/backend/common/BaseUserTest.java index 63a8c8f..79f829d 100644 --- a/support-portal-backend/src/test/java/net/shyshkin/study/fullstack/supportportal/backend/common/BaseUserTest.java +++ b/support-portal-backend/src/test/java/net/shyshkin/study/fullstack/supportportal/backend/common/BaseUserTest.java @@ -53,7 +53,7 @@ public abstract class BaseUserTest { .lastName(FAKER.name().lastName()) .username(FAKER.name().username()) .isActive(true) - .isNonLocked(true) + .isNotLocked(true) .role(ROLE_ADMIN) .build(); } diff --git a/support-portal-backend/src/test/java/net/shyshkin/study/fullstack/supportportal/backend/controller/UserResourceTest.java b/support-portal-backend/src/test/java/net/shyshkin/study/fullstack/supportportal/backend/controller/UserResourceTest.java index c391cc5..82973aa 100644 --- a/support-portal-backend/src/test/java/net/shyshkin/study/fullstack/supportportal/backend/controller/UserResourceTest.java +++ b/support-portal-backend/src/test/java/net/shyshkin/study/fullstack/supportportal/backend/controller/UserResourceTest.java @@ -364,7 +364,7 @@ class UserResourceTest extends BaseUserTest { "email", userDto.getEmail(), "role", userDto.getRole().name(), "isActive", String.valueOf(userDto.isActive()), - "isNonLocked", String.valueOf(userDto.isNonLocked()) + "isNotLocked", String.valueOf(userDto.isNotLocked()) ); //when @@ -376,7 +376,7 @@ class UserResourceTest extends BaseUserTest { .postForEntity( "/user/add?username={username}&email={email}" + "&firstName={firstName}&lastName={lastName}" + - "&role={role}&active={isActive}&nonLocked={isNonLocked}", + "&role={role}&active={isActive}¬Locked={isNotLocked}", requestEntity, User.class, paramMap @@ -410,7 +410,7 @@ class UserResourceTest extends BaseUserTest { "email", userDto.getEmail(), "role", userDto.getRole().name(), "isActive", userDto.isActive(), - "isNonLocked", userDto.isNonLocked() + "isNotLocked", userDto.isNotLocked() ); //when @@ -418,7 +418,7 @@ class UserResourceTest extends BaseUserTest { .postForEntity( "/user/add?username={username}&email={email}" + "&firstName={firstName}&lastName={lastName}" + - "&role={role}&active={isActive}&nonLocked={isNonLocked}", + "&role={role}&active={isActive}¬Locked={isNotLocked}", null, HttpResponse.class, paramMap @@ -452,7 +452,7 @@ class UserResourceTest extends BaseUserTest { "email", userDto.getEmail(), "role", userDto.getRole().name(), "isActive", userDto.isActive(), - "isNonLocked", userDto.isNonLocked() + "isNotLocked", userDto.isNotLocked() ); //when @@ -464,7 +464,7 @@ class UserResourceTest extends BaseUserTest { .postForEntity( "/user/add?username={username}&email={email}" + "&firstName={firstName}&lastName={lastName}" + - "&role={role}&active={isActive}&nonLocked={isNonLocked}", + "&role={role}&active={isActive}¬Locked={isNotLocked}", requestEntity, User.class, paramMap @@ -501,7 +501,7 @@ class UserResourceTest extends BaseUserTest { "email", userDto.getEmail(), "role", userDto.getRole().name(), "isActive", userDto.isActive(), - "isNonLocked", userDto.isNonLocked() + "isNotLocked", userDto.isNotLocked() ); //when @@ -513,7 +513,7 @@ class UserResourceTest extends BaseUserTest { .postForEntity( "/user/add?username={username}&email={email}" + "&firstName={firstName}&lastName={lastName}" + - "&role={role}&active={isActive}&nonLocked={isNonLocked}", + "&role={role}&active={isActive}¬Locked={isNotLocked}", requestEntity, HttpResponse.class, paramMap @@ -547,7 +547,7 @@ class UserResourceTest extends BaseUserTest { body.add("email", userDto.getEmail()); body.add("role", userDto.getRole().name()); body.add("active", userDto.isActive()); - body.add("nonLocked", userDto.isNonLocked()); + body.add("notLocked", userDto.isNotLocked()); body.add("profileImage", profileImage.getResource()); //when @@ -605,7 +605,7 @@ class UserResourceTest extends BaseUserTest { body.add("email", userDto.getEmail()); body.add("role", userDto.getRole().name()); body.add("active", userDto.isActive()); - body.add("nonLocked", userDto.isNonLocked()); + body.add("notLocked", userDto.isNotLocked()); body.add("profileImage", profileImage.getResource()); //when diff --git a/support-portal-backend/src/test/java/net/shyshkin/study/fullstack/supportportal/backend/controller/UserResourceUnSecureTest.java b/support-portal-backend/src/test/java/net/shyshkin/study/fullstack/supportportal/backend/controller/UserResourceUnSecureTest.java index 1197774..b13caed 100644 --- a/support-portal-backend/src/test/java/net/shyshkin/study/fullstack/supportportal/backend/controller/UserResourceUnSecureTest.java +++ b/support-portal-backend/src/test/java/net/shyshkin/study/fullstack/supportportal/backend/controller/UserResourceUnSecureTest.java @@ -63,7 +63,7 @@ class UserResourceUnSecureTest extends BaseUserTest { "email", userDto.getEmail(), "role", userDto.getRole().name(), "isActive", String.valueOf(userDto.isActive()), - "isNonLocked", String.valueOf(userDto.isNonLocked()) + "isNotLocked", String.valueOf(userDto.isNotLocked()) ); //when @@ -71,7 +71,7 @@ class UserResourceUnSecureTest extends BaseUserTest { .postForEntity( "/user/add?username={username}&email={email}" + "&firstName={firstName}&lastName={lastName}" + - "&role={role}&active={isActive}&nonLocked={isNonLocked}", + "&role={role}&active={isActive}¬Locked={isNotLocked}", null, User.class, paramMap @@ -103,7 +103,7 @@ class UserResourceUnSecureTest extends BaseUserTest { "email", userDto.getEmail(), "role", userDto.getRole().name(), "isActive", String.valueOf(userDto.isActive()), - "isNonLocked", String.valueOf(userDto.isNonLocked()) + "isNotLocked", String.valueOf(userDto.isNotLocked()) ); //when @@ -111,7 +111,7 @@ class UserResourceUnSecureTest extends BaseUserTest { .postForEntity( "/user/add?username={username}&email={email}" + "&lastName={lastName}" + - "&role={role}&active={isActive}&nonLocked={isNonLocked}", + "&role={role}&active={isActive}¬Locked={isNotLocked}", null, HttpResponse.class, paramMap @@ -139,7 +139,7 @@ class UserResourceUnSecureTest extends BaseUserTest { "email", userDto.getEmail(), "role", "ROLE_FAKE", "isActive", String.valueOf(userDto.isActive()), - "isNonLocked", String.valueOf(userDto.isNonLocked()) + "isNotLocked", String.valueOf(userDto.isNotLocked()) ); //when @@ -147,7 +147,7 @@ class UserResourceUnSecureTest extends BaseUserTest { .postForEntity( "/user/add?username={username}&email={email}" + "&firstName={firstName}&lastName={lastName}" + - "&role={role}&active={isActive}&nonLocked={isNonLocked}", + "&role={role}&active={isActive}¬Locked={isNotLocked}", null, HttpResponse.class, paramMap @@ -175,7 +175,7 @@ class UserResourceUnSecureTest extends BaseUserTest { "email", "not_an_email", "role", userDto.getRole().name(), "isActive", String.valueOf(userDto.isActive()), - "isNonLocked", String.valueOf(userDto.isNonLocked()) + "isNotLocked", String.valueOf(userDto.isNotLocked()) ); //when @@ -183,7 +183,7 @@ class UserResourceUnSecureTest extends BaseUserTest { .postForEntity( "/user/add?username={username}&email={email}" + "&firstName={firstName}&lastName={lastName}" + - "&role={role}&active={isActive}&nonLocked={isNonLocked}", + "&role={role}&active={isActive}¬Locked={isNotLocked}", null, HttpResponse.class, paramMap @@ -211,7 +211,7 @@ class UserResourceUnSecureTest extends BaseUserTest { "email", userDto.getEmail(), "role", userDto.getRole().name(), "isActive", "yes", - "isNonLocked", "not_a_boolean" + "isNotLocked", "not_a_boolean" ); //when @@ -219,7 +219,7 @@ class UserResourceUnSecureTest extends BaseUserTest { .postForEntity( "/user/add?username={username}&email={email}" + "&firstName={firstName}&lastName={lastName}" + - "&role={role}&active={isActive}&nonLocked={isNonLocked}", + "&role={role}&active={isActive}¬Locked={isNotLocked}", null, HttpResponse.class, paramMap @@ -232,7 +232,7 @@ class UserResourceUnSecureTest extends BaseUserTest { .isNotNull() .hasNoNullFieldsOrProperties() .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(), "role", userDto.getRole().name(), "isActive", String.valueOf(userDto.isActive()), - "isNonLocked", String.valueOf(userDto.isNonLocked()) + "isNotLocked", String.valueOf(userDto.isNotLocked()) ); //when @@ -273,7 +273,7 @@ class UserResourceUnSecureTest extends BaseUserTest { .exchange( "/user/{currentUsername}?username={username}&email={email}" + "&firstName={firstName}&lastName={lastName}" + - "&role={role}&active={isActive}&nonLocked={isNonLocked}", + "&role={role}&active={isActive}¬Locked={isNotLocked}", HttpMethod.PUT, null, User.class, @@ -312,7 +312,7 @@ class UserResourceUnSecureTest extends BaseUserTest { "email", userDto.getEmail(), "role", userDto.getRole().name(), "isActive", userDto.isActive(), - "isNonLocked", userDto.isNonLocked() + "isNotLocked", userDto.isNotLocked() ); //when @@ -320,7 +320,7 @@ class UserResourceUnSecureTest extends BaseUserTest { .exchange( "/user/{currentUsername}?username={username}&email={email}" + "&firstName={firstName}&lastName={lastName}" + - "&role={role}&active={isActive}&nonLocked={isNonLocked}", + "&role={role}&active={isActive}¬Locked={isNotLocked}", HttpMethod.PUT, null, User.class, @@ -359,7 +359,7 @@ class UserResourceUnSecureTest extends BaseUserTest { "email", userDto.getEmail(), "role", userDto.getRole().name(), "isActive", userDto.isActive(), - "isNonLocked", userDto.isNonLocked() + "isNotLocked", userDto.isNotLocked() ); //when @@ -367,7 +367,7 @@ class UserResourceUnSecureTest extends BaseUserTest { .exchange( "/user/{currentUsername}?username={username}&email={email}" + "&firstName={firstName}" + - "&role={role}&active={isActive}&nonLocked={isNonLocked}", + "&role={role}&active={isActive}¬Locked={isNotLocked}", HttpMethod.PUT, null, HttpResponse.class, @@ -401,7 +401,7 @@ class UserResourceUnSecureTest extends BaseUserTest { "email", userDto.getEmail(), "role", userDto.getRole().name(), "isActive", String.valueOf(userDto.isActive()), - "isNonLocked", String.valueOf(userDto.isNonLocked()) + "isNotLocked", String.valueOf(userDto.isNotLocked()) ); //when @@ -409,7 +409,7 @@ class UserResourceUnSecureTest extends BaseUserTest { .exchange( "/user/{currentUsername}?username={username}&email={email}" + "&firstName={firstName}&lastName={lastName}" + - "&role={role}&active={isActive}&nonLocked={isNonLocked}", + "&role={role}&active={isActive}¬Locked={isNotLocked}", HttpMethod.PUT, null, HttpResponse.class, diff --git a/support-portal-backend/src/test/java/net/shyshkin/study/fullstack/supportportal/backend/service/UserServiceTest.java b/support-portal-backend/src/test/java/net/shyshkin/study/fullstack/supportportal/backend/service/UserServiceTest.java index 47372db..486b68a 100644 --- a/support-portal-backend/src/test/java/net/shyshkin/study/fullstack/supportportal/backend/service/UserServiceTest.java +++ b/support-portal-backend/src/test/java/net/shyshkin/study/fullstack/supportportal/backend/service/UserServiceTest.java @@ -89,7 +89,7 @@ class UserServiceTest extends BaseUserTest { .hasFieldOrPropertyWithValue("firstName", randomUserDto.getFirstName()) .hasFieldOrPropertyWithValue("lastName", randomUserDto.getLastName()) .hasFieldOrPropertyWithValue("isActive", randomUserDto.isActive()) - .hasFieldOrPropertyWithValue("isNotLocked", randomUserDto.isNonLocked()) + .hasFieldOrPropertyWithValue("isNotLocked", randomUserDto.isNotLocked()) .hasFieldOrPropertyWithValue("role", "ROLE_ADMIN") ; }