diff --git a/server/src/main/java/com/ticketing/server/user/application/UserController.java b/server/src/main/java/com/ticketing/server/user/application/UserController.java index f3ae181..e2387f4 100644 --- a/server/src/main/java/com/ticketing/server/user/application/UserController.java +++ b/server/src/main/java/com/ticketing/server/user/application/UserController.java @@ -13,11 +13,11 @@ import com.ticketing.server.user.application.response.UserChangePasswordResponse import com.ticketing.server.user.application.response.UserDeleteResponse; import com.ticketing.server.user.application.response.UserDetailResponse; import com.ticketing.server.user.domain.ChangeGradeDTO; +import com.ticketing.server.user.service.dto.ChangePasswordDTO; import com.ticketing.server.user.service.dto.ChangedPasswordUserDTO; +import com.ticketing.server.user.service.dto.CreatedUserDTO; import com.ticketing.server.user.service.dto.DeletedUserDTO; import com.ticketing.server.user.service.dto.PaymentsDTO; -import com.ticketing.server.user.service.dto.ChangePasswordDTO; -import com.ticketing.server.user.service.dto.CreatedUserDTO; import com.ticketing.server.user.service.dto.UserDetailDTO; import com.ticketing.server.user.service.interfaces.UserApisService; import com.ticketing.server.user.service.interfaces.UserService; @@ -44,8 +44,8 @@ import org.springframework.web.bind.annotation.RestController; @Slf4j public class UserController { - private final UserApisService userApisService; private final UserService userService; + private final UserApisService userApisService; private final PasswordEncoder passwordEncoder; @PostMapping @@ -90,7 +90,9 @@ public class UserController { @Secured(ADMIN) public ResponseEntity changeGrade(@RequestBody @Valid UserChangeGradeRequest request) { ChangeGradeDTO changeGradeDto = userService.changeGrade(request.getEmail(), request.getAfterGrade()); - return ResponseEntity.status(HttpStatus.OK).body(changeGradeDto.toResponse()); + + return ResponseEntity.status(HttpStatus.OK) + .body(changeGradeDto.toResponse()); } @GetMapping("/payments") diff --git a/server/src/main/java/com/ticketing/server/user/service/interfaces/UserService.java b/server/src/main/java/com/ticketing/server/user/service/interfaces/UserService.java index 5a8160e..f4e577f 100644 --- a/server/src/main/java/com/ticketing/server/user/service/interfaces/UserService.java +++ b/server/src/main/java/com/ticketing/server/user/service/interfaces/UserService.java @@ -12,7 +12,6 @@ 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 { @@ -22,7 +21,6 @@ public interface UserService { ChangedPasswordUserDTO changePassword(@Valid ChangePasswordDTO changePasswordDto); - @Transactional ChangeGradeDTO changeGrade(@NotNull String email, @NotNull UserGrade grade); UserDetailDTO findDetailByEmail(@NotNull String email);