Skip to content

Commit bff4226

Browse files
committed
refactors paths
1 parent 58c74db commit bff4226

File tree

3 files changed

+17
-12
lines changed

3 files changed

+17
-12
lines changed

README.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
# WSMS
22

3-
### Reference Documentation
3+
## Reference Documentation
44

55
* Student Record Manager
66
* User Record Manager
7-
* Authentication and Authorisation
7+
* Authentication and Authorisation
8+
9+
### Student Record Manager
10+
Creates and maintains student records

src/main/java/com/lifu/wsms/reload/controller/user/UserController.java

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,15 @@ public class UserController {
1414

1515
public static final String USER_PATH = "/api/v1/users";
1616
public static final String USER_PATH_USERNAME = USER_PATH + "/{username}";
17-
public static final String USER_PATH_SET_PASSWORD = USER_PATH_USERNAME + "/set-password";
18-
public static final String USER_PATH_CHANGE_PASSWORD = USER_PATH_USERNAME + "/change-password";
19-
public static final String USER_PATH_CHANGE_STATUS = USER_PATH_USERNAME + "/change-status";
17+
public static final String SET_PASSWORD_PATH = "/set-password";
18+
public static final String USER_PATH_SET_PASSWORD = USER_PATH_USERNAME + SET_PASSWORD_PATH;
19+
public static final String CHANGE_PASSWORD_PATH = "/change-password";
20+
public static final String USER_PATH_CHANGE_PASSWORD = USER_PATH_USERNAME + CHANGE_PASSWORD_PATH;
21+
public static final String CHANGE_STATUS_PATH = "/change-status";
22+
public static final String USER_PATH_CHANGE_STATUS = USER_PATH_USERNAME + CHANGE_STATUS_PATH;
2023
public static final String ADD_ROLES_PATH = "/add-roles";
2124
public static final String USER_PATH_ADD_ROLES = USER_PATH_USERNAME + ADD_ROLES_PATH;
22-
private static final String LOCATION = "location";
25+
public static final String LOCATION = "location";
2326

2427
@PostMapping(USER_PATH)
2528
public ResponseEntity<?> createUser(@RequestBody final CreateUserRequest createUserRequest) {

src/test/java/com/lifu/wsms/reload/controller/user/UserControllerTest.java

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@
1919
import java.util.HashSet;
2020
import java.util.Set;
2121

22-
import static com.lifu.wsms.reload.controller.user.UserController.ADD_ROLES_PATH;
23-
import static com.lifu.wsms.reload.controller.user.UserController.USER_PATH;
22+
import static com.lifu.wsms.reload.controller.user.UserController.*;
2423
import static com.lifu.wsms.reload.util.UserTestUtil.getCreateUserDTO;
2524
import static com.lifu.wsms.reload.util.UserTestUtil.getUpdateUserDTO;
2625
import static org.junit.jupiter.api.Assertions.*;
@@ -46,7 +45,7 @@ void shouldCreateAndReadUser() {
4645
assertEquals(HttpStatus.CREATED, createUserResponseEntity.getStatusCode());
4746

4847
//When
49-
String location = createUserResponseEntity.getHeaders().getFirst("location");
48+
String location = createUserResponseEntity.getHeaders().getFirst(LOCATION);
5049
ResponseEntity<String> getUserResponseEntity = restTemplate.getForEntity(location, String.class);
5150

5251
//Then
@@ -96,7 +95,7 @@ void shouldCreateAndReadUser() {
9695
assertFalse(isPasswordSet);
9796

9897
//When
99-
restTemplate.put(location + "/set-password", passwordSetRequest);
98+
restTemplate.put(location + SET_PASSWORD_PATH, passwordSetRequest);
10099
ResponseEntity<String> getUserResponseEntityAfterPasswordSet = restTemplate.getForEntity(location, String.class);
101100

102101
//Then
@@ -114,7 +113,7 @@ void shouldCreateAndReadUser() {
114113
changePasswordRequest.setNewPassword(newPassword);
115114

116115
//Then
117-
restTemplate.put(location + "/change-password", changePasswordRequest);
116+
restTemplate.put(location + CHANGE_PASSWORD_PATH, changePasswordRequest);
118117
ResponseEntity<String> getUserResponseEntityAfterPasswordChange = restTemplate.getForEntity(location, String.class);
119118

120119
DocumentContext documentContextAfterPasswordChange = JsonPath.parse(getUserResponseEntityAfterPasswordChange.getBody());
@@ -130,7 +129,7 @@ void shouldCreateAndReadUser() {
130129
//When
131130
UserStatusUpdateRequest statusUpdateRequest = new UserStatusUpdateRequest();
132131
statusUpdateRequest.setStatus(UserStatus.ACTIVE);
133-
restTemplate.put(location + "/change-status", statusUpdateRequest);
132+
restTemplate.put(location + CHANGE_STATUS_PATH, statusUpdateRequest);
134133
ResponseEntity<String> getUserResponseEntityAfterStatusUpdate = restTemplate.getForEntity(location, String.class);
135134

136135
//Then

0 commit comments

Comments
 (0)