mindol1004/Ticketing
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/changeConstructor

Browse Source
This commit is contained in:
손창현
2022-07-12 18:51:38 +09:00
committed by GitHub
parent 7ea560b648 7283eeb5d3
commit 8cc80f376a
9 changed files with 132 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
server/src/main/java/com/ticketing/server/global/exception/ErrorCode.java
View File

@@ -17,6 +17,7 @@ public enum ErrorCode {
MISMATCH_PASSWORD(BAD_REQUEST, "비밀번호가 일치하지 않습니다."),
TOKEN_TYPE(BAD_REQUEST, "토큰 타입이 올바르지 않습니다."),
UNAVAILABLE_REFRESH_TOKEN(BAD_REQUEST, "사용할 수 없는 토큰 입니다."),
UNABLE_CHANGE_GRADE(BAD_REQUEST, "동일한 등급으로 변경할 수 없습니다."),
/* 403 FORBIDDEN : 접근 권한 제한 */
VALID_USER_ID(FORBIDDEN, "해당 정보에 접근 권한이 존재하지 않습니다."),
@@ -50,6 +51,10 @@ public enum ErrorCode {
throw new TicketingException(UNAVAILABLE_REFRESH_TOKEN);
}
public static TicketingException throwUnableChangeGrade() {
throw new TicketingException(UNABLE_CHANGE_GRADE);
}
/* 403 FORBIDDEN : 접근 권한 제한 */
public static TicketingException throwValidUserId() {
throw new TicketingException(VALID_USER_ID);

17
server/src/main/java/com/ticketing/server/user/application/UserChangeGradeResponse.java Normal file
View File

@@ -0,0 +1,17 @@
package com.ticketing.server.user.application;
import com.ticketing.server.user.domain.UserGrade;
import lombok.AllArgsConstructor;
import lombok.Getter;
@Getter
@AllArgsConstructor
public class UserChangeGradeResponse {
private String email;
private UserGrade beforeGrade;
private UserGrade afterGrade;
}

19
server/src/main/java/com/ticketing/server/user/application/UserController.java
View File

@@ -1,6 +1,10 @@
package com.ticketing.server.user.application;
import static com.ticketing.server.user.domain.UserGrade.ROLES.ADMIN;
import static com.ticketing.server.user.domain.UserGrade.ROLES.USER;
import com.ticketing.server.user.application.request.SignUpRequest;
import com.ticketing.server.user.application.request.UserChangeGradeRequest;
import com.ticketing.server.user.application.request.UserChangePasswordRequest;
import com.ticketing.server.user.application.request.UserDeleteRequest;
import com.ticketing.server.user.application.response.PaymentsResponse;
@@ -53,7 +57,7 @@ public class UserController {
}
@GetMapping("/details")
@Secured(UserGrade.ROLES.USER)
@Secured(USER)
public ResponseEntity<UserDetailResponse> details(@AuthenticationPrincipal UserDetails userRequest) {
UserDetailDTO userDetail = userService.findDetailByEmail(userRequest.getUsername());
@@ -62,7 +66,7 @@ public class UserController {
}
@DeleteMapping
@Secured(UserGrade.ROLES.USER)
@Secured(USER)
public ResponseEntity<UserDeleteResponse> deleteUser(@RequestBody @Valid UserDeleteRequest request) {
DeletedUserDTO deletedUserDto = userService.delete(request.toDeleteUserDto(passwordEncoder));
@@ -71,7 +75,7 @@ public class UserController {
}
@PutMapping("/password")
@Secured(UserGrade.ROLES.USER)
@Secured(USER)
public ResponseEntity<UserChangePasswordResponse> changePassword(
@AuthenticationPrincipal UserDetails userRequest,
@RequestBody @Valid UserChangePasswordRequest request) {
@@ -82,8 +86,15 @@ public class UserController {
.body(changedUserDto.toResponse());
}
@PostMapping("/grade")
@Secured(ADMIN)
public ResponseEntity<UserChangeGradeResponse> changeGrade(@RequestBody @Valid UserChangeGradeRequest request) {
ChangeGradeDTO changeGradeDto = userService.changeGrade(request.getEmail(), request.getAfterGrade());
return ResponseEntity.status(HttpStatus.OK).body(changeGradeDto.toResponse());
}
@GetMapping("/payments")
@Secured(UserGrade.ROLES.USER)
@Secured(USER)
public ResponseEntity<PaymentsResponse> getPayments(@AuthenticationPrincipal UserDetails userRequest) {
PaymentsDTO paymentsDto = userApisService.findPaymentsByEmail(userRequest.getUsername());

19
server/src/main/java/com/ticketing/server/user/application/request/UserChangeGradeRequest.java Normal file
View File

@@ -0,0 +1,19 @@
package com.ticketing.server.user.application.request;
import com.ticketing.server.user.domain.UserGrade;
import javax.validation.constraints.Email;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import lombok.Getter;
@Getter
public class UserChangeGradeRequest {
@NotEmpty(message = "{validation.not.empty.email}")
@Email(message = "{validation.email}")
private String email;
@NotNull(message = "{validation.not.null.grade}")
private UserGrade afterGrade;
}

19
server/src/main/java/com/ticketing/server/user/domain/ChangeGradeDTO.java Normal file
View File

@@ -0,0 +1,19 @@
package com.ticketing.server.user.domain;
import com.ticketing.server.user.application.UserChangeGradeResponse;
import lombok.AllArgsConstructor;
import lombok.Getter;
@Getter
@AllArgsConstructor
public class ChangeGradeDTO {
private final String email;
private final UserGrade beforeGrade;
private final UserGrade afterGrade;
public UserChangeGradeResponse toResponse() {
return new UserChangeGradeResponse(email, beforeGrade, afterGrade);
}
}

10
server/src/main/java/com/ticketing/server/user/domain/User.java
View File

@@ -93,4 +93,14 @@ public class User extends AbstractEntity {
}
}
public ChangeGradeDTO changeGrade(UserGrade afterGrade) {
if (grade.equals(afterGrade)) {
throw ErrorCode.throwUnableChangeGrade();
}
final UserGrade beforeGrade = this.grade;
this.grade = afterGrade;
return new ChangeGradeDTO(email, beforeGrade, afterGrade);
}
}

9
server/src/main/java/com/ticketing/server/user/service/UserServiceImpl.java
View File

@@ -1,8 +1,10 @@
package com.ticketing.server.user.service;
import com.ticketing.server.global.exception.ErrorCode;
import com.ticketing.server.user.domain.ChangeGradeDTO;
import com.ticketing.server.user.domain.SequenceGenerator;
import com.ticketing.server.user.domain.User;
import com.ticketing.server.user.domain.UserGrade;
import com.ticketing.server.user.domain.repository.UserRepository;
import com.ticketing.server.user.service.dto.ChangePasswordDTO;
import com.ticketing.server.user.service.dto.ChangedPasswordUserDTO;
@@ -61,6 +63,13 @@ public class UserServiceImpl implements UserService {
return new ChangedPasswordUserDTO(user);
}
@Override
@Transactional
public ChangeGradeDTO changeGrade(@NotNull String email, @NotNull UserGrade grade) {
User user = findNotDeletedUserByEmail(email);
return user.changeGrade(grade);
}
@Override
public UserDetailDTO findDetailByEmail(@NotNull String email) {
User user = userRepository.findByEmail(email)

5
server/src/main/java/com/ticketing/server/user/service/interfaces/UserService.java
View File

@@ -1,5 +1,6 @@
package com.ticketing.server.user.service.interfaces;
import com.ticketing.server.user.domain.ChangeGradeDTO;
import com.ticketing.server.user.domain.User;
import com.ticketing.server.user.service.dto.ChangedPasswordUserDTO;
import com.ticketing.server.user.service.dto.DeletedUserDTO;
@@ -10,6 +11,7 @@ import com.ticketing.server.user.service.dto.SignUpDTO;
import com.ticketing.server.user.service.dto.UserDetailDTO;
import javax.validation.Valid;
import javax.validation.constraints.NotNull;
import org.springframework.transaction.annotation.Transactional;
public interface UserService {
@@ -19,6 +21,9 @@ public interface UserService {
ChangedPasswordUserDTO changePassword(@Valid ChangePasswordDTO changePasswordDto);
@Transactional
ChangeGradeDTO changeGrade(@NotNull String email, @NotNull UserGrade grade);
UserDetailDTO findDetailByEmail(@NotNull String email);
User findNotDeletedUserByEmail(@NotNull String email);

33
server/src/test/java/com/ticketing/server/user/domain/UserTest.java
View File

@@ -2,7 +2,9 @@ package com.ticketing.server.user.domain;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.junit.jupiter.api.Assertions.assertAll;
import com.ticketing.server.global.exception.ErrorCode;
import com.ticketing.server.global.exception.TicketingException;
import com.ticketing.server.user.service.dto.ChangePasswordDTO;
import com.ticketing.server.user.service.dto.DeleteUserDTO;
@@ -33,6 +35,37 @@ public class UserTest {
users = provideCorrectUsers().collect(Collectors.toMap(User::getEmail, user -> user));
}
@Test
@DisplayName("동일한 권한으로 변경 시 예외처리")
void changeGradeFail() {
// given
User user = users.get("ticketing1@gmail.com");
// when
// then
assertThatThrownBy(() -> user.changeGrade(UserGrade.USER))
.isInstanceOf(TicketingException.class)
.extracting("errorCode")
.isEqualTo(ErrorCode.UNABLE_CHANGE_GRADE);
}
@Test
@DisplayName("권한 변경 성공")
void changeGradeSuccess() {
// given
User user = users.get("ticketing1@gmail.com");
// when
ChangeGradeDTO changeGradeDto = user.changeGrade(UserGrade.ADMIN);
// then
assertAll(
() -> assertThat(changeGradeDto.getEmail()).isEqualTo("ticketing1@gmail.com"),
() -> assertThat(changeGradeDto.getBeforeGrade()).isEqualTo(UserGrade.USER),
() -> assertThat(changeGradeDto.getAfterGrade()).isEqualTo(UserGrade.ADMIN)
);
}
@ParameterizedTest
@MethodSource("provideDifferentPasswordDeleteUsers")
@DisplayName("입력된 패스워드가 다를 경우")