From 39bba383d9de5153fd8666773644fa17449d3b20 Mon Sep 17 00:00:00 2001 From: dongHyo Date: Wed, 13 Jul 2022 14:13:16 +0900 Subject: [PATCH] =?UTF-8?q?fix:=20=EB=B8=8C=EB=9F=B0=EC=B9=98=20merge=20?= =?UTF-8?q?=EC=A4=91=20import=20=EA=B0=80=20=EC=9E=98=EB=AA=BB=EB=90=98?= =?UTF-8?q?=EC=84=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../server/user/application/UserController.java | 12 +++++++----- .../server/user/service/interfaces/UserService.java | 7 +++---- 2 files changed, 10 insertions(+), 9 deletions(-) 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 7c659ae..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 @@ -12,12 +12,12 @@ import com.ticketing.server.user.application.response.SignUpResponse; 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.UserGrade; +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 0b521ec..522346d 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 @@ -2,16 +2,16 @@ 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; +import com.ticketing.server.user.domain.UserGrade; 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.DeleteUserDTO; +import com.ticketing.server.user.service.dto.DeletedUserDTO; 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 { @@ -21,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);