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

78.1 Update user (#9)

Browse Source
This commit is contained in:
Art
2021-09-09 22:34:38 +03:00
parent beaab1d298
commit c1f3d53793
2 changed files with 201 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
support-portal-backend/src/main/java/net/shyshkin/study/fullstack/supportportal/backend/controller/UserResource.java
View File

@ -63,6 +63,12 @@ public class UserResource {
return userService.addNewUser(userDto);
}
@PutMapping("{currentUsername}")
public User updateUser(@PathVariable String currentUsername, @Valid UserDto userDto) {
log.debug("User DTO: {}", userDto);
return userService.updateUser(currentUsername, userDto);
}
private void authenticate(String username, String password) {
Authentication auth = new UsernamePasswordAuthenticationToken(username, password);
authenticationManager.authenticate(auth);

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

@ -3,13 +3,16 @@ package net.shyshkin.study.fullstack.supportportal.backend.controller;
import lombok.extern.slf4j.Slf4j;
import net.shyshkin.study.fullstack.supportportal.backend.common.BaseUserTest;
import net.shyshkin.study.fullstack.supportportal.backend.domain.HttpResponse;
import net.shyshkin.study.fullstack.supportportal.backend.domain.Role;
import net.shyshkin.study.fullstack.supportportal.backend.domain.User;
import net.shyshkin.study.fullstack.supportportal.backend.domain.dto.UserDto;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.web.client.TestRestTemplate;
import org.springframework.http.HttpMethod;
import org.springframework.http.ResponseEntity;
import org.springframework.test.context.TestPropertySource;
@ -216,4 +219,196 @@ class UserResourceUnSecureTest extends BaseUserTest {
.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]]");
}
}
@Nested
class UpdateUserTests {
@BeforeEach
void setUp() {
user = userRepository
.findAll()
.stream()
.findAny()
.orElseGet(() -> userRepository.save(createRandomUser()));
}
@Test
void updateUser_correct_LeaveUsername() {
//given
UserDto userDto = createRandomUserDto();
String currentUsername = user.getUsername();
userDto.setUsername(currentUsername);
userDto.setRole(Role.ROLE_MANAGER);
Map<String, ?> paramMap = Map.of(
"currentUsername", currentUsername,
"firstName", userDto.getFirstName(),
"lastName", userDto.getLastName(),
"username", userDto.getUsername(),
"email", userDto.getEmail(),
"role", userDto.getRole().name(),
"isActive", String.valueOf(userDto.isActive()),
"isNonLocked", String.valueOf(userDto.isNonLocked())
);
//when
ResponseEntity<User> responseEntity = restTemplate
.exchange(
"/user/{currentUsername}?username={username}&email={email}" +
"&firstName={firstName}&lastName={lastName}" +
"&role={role}&active={isActive}&nonLocked={isNonLocked}",
HttpMethod.PUT,
null,
User.class,
paramMap
);
//then
log.debug("Response Entity: {}", responseEntity);
assertThat(responseEntity.getStatusCode()).isEqualTo(OK);
assertThat(responseEntity.getBody())
.isNotNull()
.hasNoNullFieldsOrPropertiesExcept("lastLoginDate", "lastLoginDateDisplay")
.hasFieldOrPropertyWithValue("username", userDto.getUsername())
.hasFieldOrPropertyWithValue("email", userDto.getEmail())
.hasFieldOrPropertyWithValue("firstName", userDto.getFirstName())
.hasFieldOrPropertyWithValue("lastName", userDto.getLastName())
.hasFieldOrPropertyWithValue("isActive", true)
.hasFieldOrPropertyWithValue("isNotLocked", true)
.hasFieldOrPropertyWithValue("role", "ROLE_MANAGER");
}
@Test
void updateUser_correct_ChangeUsername() {
//given
UserDto userDto = createRandomUserDto();
String currentUsername = user.getUsername();
userDto.setRole(Role.ROLE_HR);
Map<String, ?> paramMap = Map.of(
"currentUsername", currentUsername,
"firstName", userDto.getFirstName(),
"lastName", userDto.getLastName(),
"username", userDto.getUsername(),
"email", userDto.getEmail(),
"role", userDto.getRole().name(),
"isActive", userDto.isActive(),
"isNonLocked", userDto.isNonLocked()
);
//when
ResponseEntity<User> responseEntity = restTemplate
.exchange(
"/user/{currentUsername}?username={username}&email={email}" +
"&firstName={firstName}&lastName={lastName}" +
"&role={role}&active={isActive}&nonLocked={isNonLocked}",
HttpMethod.PUT,
null,
User.class,
paramMap
);
//then
log.debug("Response Entity: {}", responseEntity);
assertThat(responseEntity.getStatusCode()).isEqualTo(OK);
assertThat(responseEntity.getBody())
.isNotNull()
.hasNoNullFieldsOrPropertiesExcept("lastLoginDate", "lastLoginDateDisplay")
.hasFieldOrPropertyWithValue("username", userDto.getUsername())
.hasFieldOrPropertyWithValue("email", userDto.getEmail())
.hasFieldOrPropertyWithValue("firstName", userDto.getFirstName())
.hasFieldOrPropertyWithValue("lastName", userDto.getLastName())
.hasFieldOrPropertyWithValue("isActive", true)
.hasFieldOrPropertyWithValue("isNotLocked", true)
.hasFieldOrPropertyWithValue("role", "ROLE_HR")
.satisfies(u -> assertThat(u.getAuthorities()).hasSize(2));
}
@Test
void updateUser_missedLastName() {
//given
UserDto userDto = createRandomUserDto();
String currentUsername = user.getUsername();
userDto.setRole(Role.ROLE_USER);
Map<String, ?> paramMap = Map.of(
"currentUsername", currentUsername,
"firstName", userDto.getFirstName(),
"username", userDto.getUsername(),
"email", userDto.getEmail(),
"role", userDto.getRole().name(),
"isActive", userDto.isActive(),
"isNonLocked", userDto.isNonLocked()
);
//when
var responseEntity = restTemplate
.exchange(
"/user/{currentUsername}?username={username}&email={email}" +
"&firstName={firstName}" +
"&role={role}&active={isActive}&nonLocked={isNonLocked}",
HttpMethod.PUT,
null,
HttpResponse.class,
paramMap
);
//then
log.debug("Response Entity: {}", responseEntity);
assertThat(responseEntity.getStatusCode()).isEqualTo(BAD_REQUEST);
assertThat(responseEntity.getBody())
.isNotNull()
.hasNoNullFieldsOrProperties()
.hasFieldOrPropertyWithValue("httpStatus", BAD_REQUEST)
.hasFieldOrPropertyWithValue("message", "ERROR(S) IN PARAMETERS: [LASTNAME:SHOULD NOT BE EMPTY]");
}
@Test
void updateUser_absentUser() {
//given
UserDto userDto = createRandomUserDto();
String currentUsername = FAKER.name().username();
userDto.setUsername(currentUsername);
userDto.setRole(Role.ROLE_MANAGER);
Map<String, ?> paramMap = Map.of(
"currentUsername", currentUsername,
"firstName", userDto.getFirstName(),
"lastName", userDto.getLastName(),
"username", userDto.getUsername(),
"email", userDto.getEmail(),
"role", userDto.getRole().name(),
"isActive", String.valueOf(userDto.isActive()),
"isNonLocked", String.valueOf(userDto.isNonLocked())
);
//when
var responseEntity = restTemplate
.exchange(
"/user/{currentUsername}?username={username}&email={email}" +
"&firstName={firstName}&lastName={lastName}" +
"&role={role}&active={isActive}&nonLocked={isNonLocked}",
HttpMethod.PUT,
null,
HttpResponse.class,
paramMap
);
//then
log.debug("Response Entity: {}", responseEntity);
assertThat(responseEntity.getStatusCode()).isEqualTo(BAD_REQUEST);
assertThat(responseEntity.getBody())
.isNotNull()
.hasNoNullFieldsOrProperties()
.hasFieldOrPropertyWithValue("httpStatus", BAD_REQUEST)
.hasFieldOrPropertyWithValue("message", String.format("User with username `%s` not found", currentUsername).toUpperCase());
}
}
}