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

fix: 브런치 merge 중 import 가 잘못되서 수정

Browse Source
This commit is contained in:
dongHyo
2022-07-13 14:13:16 +09:00
parent db5e8272b6
commit 39bba383d9
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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.UserChangePasswordResponse;
import com.ticketing.server.user.application.response.UserDeleteResponse; import com.ticketing.server.user.application.response.UserDeleteResponse;
import com.ticketing.server.user.application.response.UserDetailResponse; 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.ChangedPasswordUserDTO;
import com.ticketing.server.user.service.dto.CreatedUserDTO;
import com.ticketing.server.user.service.dto.DeletedUserDTO; import com.ticketing.server.user.service.dto.DeletedUserDTO;
import com.ticketing.server.user.service.dto.PaymentsDTO; 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.dto.UserDetailDTO;
import com.ticketing.server.user.service.interfaces.UserApisService; import com.ticketing.server.user.service.interfaces.UserApisService;
import com.ticketing.server.user.service.interfaces.UserService; import com.ticketing.server.user.service.interfaces.UserService;
@@ -44,8 +44,8 @@ import org.springframework.web.bind.annotation.RestController;
@Slf4j @Slf4j
public class UserController { public class UserController {
private final UserApisService userApisService;
private final UserService userService; private final UserService userService;
private final UserApisService userApisService;
private final PasswordEncoder passwordEncoder; private final PasswordEncoder passwordEncoder;
@PostMapping @PostMapping
@@ -90,7 +90,9 @@ public class UserController {
@Secured(ADMIN) @Secured(ADMIN)
public ResponseEntity<UserChangeGradeResponse> changeGrade(@RequestBody @Valid UserChangeGradeRequest request) { public ResponseEntity<UserChangeGradeResponse> changeGrade(@RequestBody @Valid UserChangeGradeRequest request) {
ChangeGradeDTO changeGradeDto = userService.changeGrade(request.getEmail(), request.getAfterGrade()); 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") @GetMapping("/payments")

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

@@ -2,16 +2,16 @@ package com.ticketing.server.user.service.interfaces;
import com.ticketing.server.user.domain.ChangeGradeDTO; import com.ticketing.server.user.domain.ChangeGradeDTO;
import com.ticketing.server.user.domain.User; import com.ticketing.server.user.domain.User;
import com.ticketing.server.user.service.dto.ChangedPasswordUserDTO; import com.ticketing.server.user.domain.UserGrade;
import com.ticketing.server.user.service.dto.DeletedUserDTO;
import com.ticketing.server.user.service.dto.ChangePasswordDTO; 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.CreatedUserDTO;
import com.ticketing.server.user.service.dto.DeleteUserDTO; 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.SignUpDTO;
import com.ticketing.server.user.service.dto.UserDetailDTO; import com.ticketing.server.user.service.dto.UserDetailDTO;
import javax.validation.Valid; import javax.validation.Valid;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
import org.springframework.transaction.annotation.Transactional;
public interface UserService { public interface UserService {
@@ -21,7 +21,6 @@ public interface UserService {
ChangedPasswordUserDTO changePassword(@Valid ChangePasswordDTO changePasswordDto); ChangedPasswordUserDTO changePassword(@Valid ChangePasswordDTO changePasswordDto);
@Transactional
ChangeGradeDTO changeGrade(@NotNull String email, @NotNull UserGrade grade); ChangeGradeDTO changeGrade(@NotNull String email, @NotNull UserGrade grade);
UserDetailDTO findDetailByEmail(@NotNull String email); UserDetailDTO findDetailByEmail(@NotNull String email);