merge: addMovie 와 병합

closed #65

README.md

@@ -37,7 +37,6 @@
 - [패키지 구조](https://github.com/f-lab-edu/Ticketing/wiki#-%ED%8C%A8%ED%82%A4%EC%A7%80-%EA%B5%AC%EC%A1%B0)
 - [Use Case](https://github.com/f-lab-edu/Ticketing/wiki/Use-Case)
 - [Prototype](https://github.com/f-lab-edu/Ticketing/wiki/Prototype)
-- [Issue Posting](https://github.com/f-lab-edu/Ticketing/wiki/Issue-Posting)
 
 <br/>
 
@@ -50,7 +49,6 @@ erDiagram
         bigint id PK "영화 ID"
         varchar title "영화제목"
         int running_time "러닝타임"
-        datetime deleted_at "삭제일시"
         datetime created_at "등록일시"
         datetime updated_at "수정일시"
     }
@@ -60,7 +58,6 @@ erDiagram
         bigint id PK "상영관 ID"
         int theater_number "상영관 번호"
         int seat_count "좌석수"
-        datetime deleted_at "삭제일시"
         datetime created_at "등록일시"
         datetime updated_at "수정일시"
     }
@@ -70,7 +67,6 @@ erDiagram
         bigint theater_id FK "상영관 ID"
         int column "열"
         int row "행"
-        datetime deleted_at "삭제일시"
         datetime created_at "등록일시"
         datetime updated_at "수정일시"
     }
@@ -82,7 +78,6 @@ erDiagram
         int round "회차"
         time start_at "시작 시간"
         time end_at "종료 시간"
-        datetime deleted_at "삭제일시"
         datetime created_at "등록일시"
         datetime updated_at "수정일시"
     }
@@ -93,33 +88,31 @@ erDiagram
         bigint payment_id "결제 ID"
         varchar status "상태 - 구매가능/예약진행중/판매완료"
         int ticket_price "가격"
-        datetime deleted_at "삭제일시"
         datetime created_at "등록일시"
         datetime updated_at "수정일시"
     }
     TICKET }|--|| PAYMENT : ""
     PAYMENT {
         bigint id PK "결제 ID"
-        bigint user_alternate_id "유저 대체ID"
+        bigint user_id "유저ID"
         varchar movie_title "영화제목"
         varchar type "결제 타입 - 예) 네이버페이, 카카오페이"
         varchar status "상태 - 완료/환불/실패"
         varchar failed_message "실패사유 - 컬럼명을 알아보기 쉬운가?"
         varchar payment_number "예매번호"
         int total_price "결제 금액"
-        datetime deleted_at "삭제일시"
         datetime created_at "결제일시"
         datetime updated_at "수정일시"
     }
     USER ||--o{ PAYMENT : ""
     USER {
         bigint id "회원"
-        bigint alternate_id "대체ID"
         varchar name "이름"
         varchar email "이메일"
         varchar password "비밀번호"
         varchar grade "등급 - 고객/임직원"
         varchar phone "휴대폰 번호"
+        boolean is_deleted "탈퇴여부"
         datetime deleted_at "탈퇴일시"
         datetime created_at "가입일시"
         datetime updated_at "수정일시"

server/src/main/java/com/ticketing/server/global/exception/ErrorCode.java

@@ -17,7 +17,6 @@ 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, "해당 정보에 접근 권한이 존재하지 않습니다."),
@@ -51,10 +50,6 @@ 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);

server/src/main/java/com/ticketing/server/global/security/jwt/JwtProvider.java

@@ -1,6 +1,6 @@
 package com.ticketing.server.global.security.jwt;
 
-import com.ticketing.server.user.service.dto.TokenDTO;
+import com.ticketing.server.user.application.response.TokenDto;
 import io.jsonwebtoken.Claims;
 import io.jsonwebtoken.Jwts;
 import io.jsonwebtoken.SignatureAlgorithm;
@@ -42,12 +42,12 @@ public class JwtProvider {
 		this.refreshTokenValidityInMilliseconds = jwtProperties.getRefreshTokenValidityInSeconds() * 1000L;
 	}
 
-	public TokenDTO generateTokenDto(Authentication authentication) {
+	public TokenDto generateTokenDto(Authentication authentication) {
 		String accessToken = createAccessToken(authentication);
 		String refreshToken = createRefreshToken(authentication);
 		long expiresIn = accessTokenValidityInMilliseconds / 1000L;
 
-		return new TokenDTO(accessToken, refreshToken, prefix, expiresIn);
+		return TokenDto.of(accessToken, refreshToken, prefix, expiresIn);
 	}
 
 	private String createAccessToken(Authentication authentication) {

server/src/main/java/com/ticketing/server/movie/application/response/TicketDetailsResponse.java

@@ -1,6 +1,6 @@
 package com.ticketing.server.movie.application.response;
 
-import com.ticketing.server.payment.service.dto.TicketDetailDTO;
+import com.ticketing.server.payment.application.response.TicketDetailDTO;
 import java.util.List;
 import lombok.Getter;
 

server/src/main/java/com/ticketing/server/movie/service/TicketServiceImpl.java

@@ -4,7 +4,7 @@ import com.ticketing.server.global.exception.ErrorCode;
 import com.ticketing.server.movie.domain.repository.TicketRepository;
 import com.ticketing.server.movie.service.dto.TicketDetailsDTO;
 import com.ticketing.server.movie.service.interfaces.TicketService;
-import com.ticketing.server.payment.service.dto.TicketDetailDTO;
+import com.ticketing.server.payment.application.response.TicketDetailDTO;
 import java.util.List;
 import java.util.stream.Collectors;
 import javax.validation.constraints.NotNull;

server/src/main/java/com/ticketing/server/movie/service/dto/TicketDetailsDTO.java

@@ -1,7 +1,7 @@
 package com.ticketing.server.movie.service.dto;
 
 import com.ticketing.server.movie.application.response.TicketDetailsResponse;
-import com.ticketing.server.payment.service.dto.TicketDetailDTO;
+import com.ticketing.server.payment.application.response.TicketDetailDTO;
 import java.util.List;
 import lombok.AllArgsConstructor;
 import lombok.Getter;

server/src/main/java/com/ticketing/server/payment/application/PaymentController.java

@@ -1,11 +1,10 @@
 package com.ticketing.server.payment.application;
 
 import com.ticketing.server.payment.application.response.PaymentDetailResponse;
-import com.ticketing.server.payment.application.response.SimplePaymentsResponse;
-import com.ticketing.server.payment.service.dto.PaymentDetailDTO;
 import com.ticketing.server.payment.service.dto.SimplePaymentsDTO;
 import com.ticketing.server.payment.service.interfaces.PaymentApisService;
 import com.ticketing.server.payment.service.interfaces.PaymentService;
+import com.ticketing.server.payment.application.response.SimplePaymentsResponse;
 import com.ticketing.server.user.domain.UserGrade;
 import javax.validation.constraints.NotNull;
 import lombok.RequiredArgsConstructor;
@@ -30,18 +29,14 @@ public class PaymentController {
 	@Secured(UserGrade.ROLES.USER)
 	public ResponseEntity<SimplePaymentsResponse> simplePayments(@NotNull Long userAlternateId) {
 		SimplePaymentsDTO simplePayments = paymentService.findSimplePayments(userAlternateId);
-
-		return ResponseEntity.status(HttpStatus.OK)
-			.body(simplePayments.toResponse());
+		return ResponseEntity.status(HttpStatus.OK).body(simplePayments.toResponse());
 	}
 
 	@GetMapping("/detail")
 	@Secured(UserGrade.ROLES.USER)
 	public ResponseEntity<PaymentDetailResponse> detail(@NotNull Long paymentId) {
-		PaymentDetailDTO paymentDetail = paymentApisService.findPaymentDetail(paymentId);
-
-		return ResponseEntity.status(HttpStatus.OK)
-			.body(paymentDetail.toResponse());
+		PaymentDetailResponse paymentDetail = paymentApisService.findPaymentDetail(paymentId);
+		return ResponseEntity.status(HttpStatus.OK).body(paymentDetail);
 	}
 
 }

server/src/main/java/com/ticketing/server/payment/application/response/PaymentDetailResponse.java

@@ -1,20 +1,38 @@
 package com.ticketing.server.payment.application.response;
 
-import com.ticketing.server.payment.service.dto.TicketDetailDTO;
+import com.ticketing.server.movie.application.response.TicketDetailsResponse;
+import com.ticketing.server.payment.domain.Payment;
 import java.time.LocalDateTime;
 import java.util.List;
+import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
 @Getter
-@AllArgsConstructor
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
 public class PaymentDetailResponse {
 
 	private Long paymentId;
+
 	private String movieTitle;
+
 	private String paymentNumber;
+
 	private Integer totalPrice;
+
 	private LocalDateTime createdAt;
-	private List<TicketDetailDTO> tickets;
+
+	List<TicketDetailDTO> tickets;
+
+	public PaymentDetailResponse(Payment payment, TicketDetailsResponse ticketDetails) {
+		this(
+			payment.getId(),
+			payment.getMovieTitle(),
+			payment.getPaymentNumber(),
+			payment.getTotalPrice(),
+			payment.getCreatedAt(),
+			ticketDetails.getTicketDetails()
+		);
+	}
 
 }

server/src/main/java/com/ticketing/server/payment/application/response/SimplePaymentsResponse.java

@@ -10,6 +10,7 @@ import lombok.Getter;
 public class SimplePaymentsResponse {
 
 	private final Long userAlternateId;
+
 	private final List<SimplePaymentDTO> payments;
 
 }

server/src/main/java/com/ticketing/server/payment/application/response/TicketDetailDTO.java

@@ -0,0 +1,36 @@
+package com.ticketing.server.payment.application.response;
+
+import com.ticketing.server.movie.domain.Ticket;
+import java.time.LocalDateTime;
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
+public class TicketDetailDTO {
+
+	private Integer price;
+
+	private Integer theaterNumber;
+
+	private Integer column;
+
+	private Integer row;
+
+	private LocalDateTime startAt;
+
+	private LocalDateTime endAt;
+
+	public TicketDetailDTO(Ticket ticket) {
+		this(
+				ticket.getTicketPrice(),
+				ticket.getTheaterNumber(),
+				ticket.getColumn(),
+				ticket.getRow(),
+				ticket.getStartAt(),
+				ticket.getEndAt()
+			);
+	}
+
+}

server/src/main/java/com/ticketing/server/payment/service/PaymentApisServiceImpl.java

@@ -5,9 +5,9 @@ import com.ticketing.server.movie.application.response.TicketDetailsResponse;
 import com.ticketing.server.payment.api.MovieClient;
 import com.ticketing.server.payment.api.UserClient;
 import com.ticketing.server.payment.api.dto.response.UserDetailResponse;
+import com.ticketing.server.payment.application.response.PaymentDetailResponse;
 import com.ticketing.server.payment.domain.Payment;
 import com.ticketing.server.payment.domain.repository.PaymentRepository;
-import com.ticketing.server.payment.service.dto.PaymentDetailDTO;
 import com.ticketing.server.payment.service.interfaces.PaymentApisService;
 import javax.validation.constraints.NotNull;
 import lombok.RequiredArgsConstructor;
@@ -28,7 +28,7 @@ public class PaymentApisServiceImpl implements PaymentApisService {
 	private final UserClient userClient;
 
 	@Override
-	public PaymentDetailDTO findPaymentDetail(@NotNull Long paymentId) {
+	public PaymentDetailResponse findPaymentDetail(@NotNull Long paymentId) {
 		Payment payment = paymentRepository.findById(paymentId)
 			.orElseThrow(ErrorCode::throwPaymentIdNotFound);
 
@@ -38,7 +38,7 @@ public class PaymentApisServiceImpl implements PaymentApisService {
 		}
 
 		TicketDetailsResponse tickets = movieClient.getTicketsByPaymentId(payment.getId());
-		return new PaymentDetailDTO(payment, tickets);
+		return new PaymentDetailResponse(payment, tickets);
 	}
 
 }

server/src/main/java/com/ticketing/server/payment/service/dto/CreatePaymentDTO.java

@@ -10,12 +10,12 @@ import lombok.Getter;
 @AllArgsConstructor
 public class CreatePaymentDTO {
 
-	private final Long userAlternateId;
-	private final String movieTitle;
-	private final PaymentType type;
-	private final PaymentStatus status;
-	private final String paymentNumber;
-	private final Integer totalPrice;
+	private Long userAlternateId;
+	private String movieTitle;
+	private PaymentType type;
+	private PaymentStatus status;
+	private String paymentNumber;
+	private Integer totalPrice;
 
 	public Payment toEntity() {
 		return new Payment

server/src/main/java/com/ticketing/server/payment/service/dto/PaymentDetailDTO.java

@@ -1,39 +0,0 @@
-package com.ticketing.server.payment.service.dto;
-
-import com.ticketing.server.movie.application.response.TicketDetailsResponse;
-import com.ticketing.server.payment.application.response.PaymentDetailResponse;
-import com.ticketing.server.payment.domain.Payment;
-import com.ticketing.server.payment.service.dto.TicketDetailDTO;
-import java.time.LocalDateTime;
-import java.util.List;
-import lombok.AccessLevel;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-@Getter
-@AllArgsConstructor(access = AccessLevel.PRIVATE)
-public class PaymentDetailDTO {
-
-	private final Long paymentId;
-	private final String movieTitle;
-	private final String paymentNumber;
-	private final Integer totalPrice;
-	private final LocalDateTime createdAt;
-	private final List<TicketDetailDTO> tickets;
-
-	public PaymentDetailDTO(Payment payment, TicketDetailsResponse ticketDetails) {
-		this(
-			payment.getId(),
-			payment.getMovieTitle(),
-			payment.getPaymentNumber(),
-			payment.getTotalPrice(),
-			payment.getCreatedAt(),
-			ticketDetails.getTicketDetails()
-		);
-	}
-
-	public PaymentDetailResponse toResponse() {
-		return new PaymentDetailResponse(paymentId, movieTitle, paymentNumber, totalPrice, createdAt, tickets);
-	}
-
-}

server/src/main/java/com/ticketing/server/payment/service/dto/SimplePaymentDTO.java

@@ -9,10 +9,10 @@ import lombok.Getter;
 @AllArgsConstructor(access = AccessLevel.PRIVATE)
 public class SimplePaymentDTO {
 
-	private final Long paymentId;
-	private final String movieTitle;
-	private final String paymentNumber;
-	private final Integer totalPrice;
+	private Long paymentId;
+	private String movieTitle;
+	private String paymentNumber;
+	private Integer totalPrice;
 
 	public SimplePaymentDTO(Payment payment) {
 		this(

server/src/main/java/com/ticketing/server/payment/service/dto/TicketDetailDTO.java

@@ -1,31 +0,0 @@
-package com.ticketing.server.payment.service.dto;
-
-import com.ticketing.server.movie.domain.Ticket;
-import java.time.LocalDateTime;
-import lombok.AccessLevel;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-@Getter
-@AllArgsConstructor(access = AccessLevel.PRIVATE)
-public class TicketDetailDTO {
-
-	private final Integer price;
-	private final Integer theaterNumber;
-	private final Integer column;
-	private final Integer row;
-	private final LocalDateTime startAt;
-	private final LocalDateTime endAt;
-
-	public TicketDetailDTO(Ticket ticket) {
-		this(
-			ticket.getTicketPrice(),
-			ticket.getTheaterNumber(),
-			ticket.getColumn(),
-			ticket.getRow(),
-			ticket.getStartAt(),
-			ticket.getEndAt()
-		);
-	}
-
-}

server/src/main/java/com/ticketing/server/payment/service/interfaces/PaymentApisService.java

@@ -1,9 +1,9 @@
 package com.ticketing.server.payment.service.interfaces;
 
-import com.ticketing.server.payment.service.dto.PaymentDetailDTO;
+import com.ticketing.server.payment.application.response.PaymentDetailResponse;
 import javax.validation.constraints.NotNull;
 
 public interface PaymentApisService {
 
-	PaymentDetailDTO findPaymentDetail(@NotNull Long paymentId);
+	PaymentDetailResponse findPaymentDetail(@NotNull Long paymentId);
 }

server/src/main/java/com/ticketing/server/user/application/AuthController.java

@@ -2,9 +2,7 @@ package com.ticketing.server.user.application;
 
 import com.ticketing.server.user.application.request.LoginRequest;
 import com.ticketing.server.user.application.response.LogoutResponse;
-import com.ticketing.server.user.service.dto.TokenDTO;
-import com.ticketing.server.user.application.response.TokenResponse;
-import com.ticketing.server.user.service.dto.DeleteRefreshTokenDTO;
+import com.ticketing.server.user.application.response.TokenDto;
 import com.ticketing.server.user.service.interfaces.AuthenticationService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -28,29 +26,29 @@ public class AuthController {
 	private final AuthenticationService authenticationService;
 
 	@PostMapping("/token")
-	public ResponseEntity<TokenResponse> login(@RequestBody LoginRequest loginRequest) {
-		TokenDTO tokenDto = authenticationService.generateTokenDto(loginRequest.toAuthentication());
+	public ResponseEntity<TokenDto> login(@RequestBody LoginRequest loginRequest) {
+		TokenDto tokenDto = authenticationService.generateTokenDto(loginRequest.toAuthentication());
 
 		return ResponseEntity.status(HttpStatus.OK)
 			.headers(getHttpHeaders())
-			.body(tokenDto.toResponse());
+			.body(tokenDto);
 	}
 
 	@PostMapping("/refresh")
-	public ResponseEntity<TokenResponse> refreshToken(@RequestParam("refreshToken") String refreshToken) {
-		TokenDTO tokenDto = authenticationService.reissueTokenDto(refreshToken);
+	public ResponseEntity<TokenDto> refreshToken(@RequestParam("refreshToken") String refreshToken) {
+		TokenDto tokenDto = authenticationService.reissueTokenDto(refreshToken);
 
 		return ResponseEntity.status(HttpStatus.OK)
 			.headers(getHttpHeaders())
-			.body(tokenDto.toResponse());
+			.body(tokenDto);
 	}
 
 	@PostMapping("/logout")
 	public ResponseEntity<LogoutResponse> logout(@AuthenticationPrincipal UserDetails userRequest) {
-		DeleteRefreshTokenDTO refreshToken = authenticationService.deleteRefreshToken(userRequest.getUsername());
+		LogoutResponse logoutResponse = authenticationService.deleteRefreshToken(userRequest.getUsername());
 
 		return ResponseEntity.status(HttpStatus.OK)
-			.body(refreshToken.toResponse());
+			.body(logoutResponse);
 	}
 
 	private HttpHeaders getHttpHeaders() {

server/src/main/java/com/ticketing/server/user/application/UserChangeGradeResponse.java

@@ -1,17 +0,0 @@
-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;
-
-}

server/src/main/java/com/ticketing/server/user/application/UserController.java

@@ -1,10 +1,6 @@
 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;
@@ -12,12 +8,8 @@ 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.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.domain.User;
+import com.ticketing.server.user.domain.UserGrade;
 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,64 +36,44 @@ import org.springframework.web.bind.annotation.RestController;
 @Slf4j
 public class UserController {
 
-	private final UserService userService;
 	private final UserApisService userApisService;
+	private final UserService userService;
 	private final PasswordEncoder passwordEncoder;
 
 	@PostMapping
 	public ResponseEntity<SignUpResponse> register(@RequestBody @Valid SignUpRequest request) {
-		CreatedUserDTO createdUserDto = userService.register(request.toSignUpDto(passwordEncoder));
-
-		return ResponseEntity.status(HttpStatus.CREATED)
-			.body(createdUserDto.toResponse());
+		User user = userService.register(request.toSignUpDto(passwordEncoder));
+		return ResponseEntity.status(HttpStatus.CREATED).body(SignUpResponse.from(user));
 	}
 
 	@GetMapping("/details")
-	@Secured(USER)
+	@Secured(UserGrade.ROLES.USER)
 	public ResponseEntity<UserDetailResponse> details(@AuthenticationPrincipal UserDetails userRequest) {
 		UserDetailDTO userDetail = userService.findDetailByEmail(userRequest.getUsername());
-
-		return ResponseEntity.status(HttpStatus.OK)
-			.body(userDetail.toResponse());
+		return ResponseEntity.status(HttpStatus.OK).body(userDetail.toResponse());
 	}
 
 	@DeleteMapping
-	@Secured(USER)
+	@Secured(UserGrade.ROLES.USER)
 	public ResponseEntity<UserDeleteResponse> deleteUser(@RequestBody @Valid UserDeleteRequest request) {
-		DeletedUserDTO deletedUserDto = userService.delete(request.toDeleteUserDto(passwordEncoder));
-
-		return ResponseEntity.status(HttpStatus.OK)
-			.body(deletedUserDto.toResponse());
+		User user = userService.delete(request.toDeleteUserDto(passwordEncoder));
+		return ResponseEntity.status(HttpStatus.OK).body(UserDeleteResponse.from(user));
 	}
 
 	@PutMapping("/password")
-	@Secured(USER)
+	@Secured(UserGrade.ROLES.USER)
 	public ResponseEntity<UserChangePasswordResponse> changePassword(
 		@AuthenticationPrincipal UserDetails userRequest,
 		@RequestBody @Valid UserChangePasswordRequest request) {
-		ChangePasswordDTO changePasswordDto = request.toChangePasswordDto(userRequest.getUsername(), passwordEncoder);
-		ChangedPasswordUserDTO changedUserDto = userService.changePassword(changePasswordDto);
-
-		return ResponseEntity.status(HttpStatus.OK)
-			.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());
+		User user = userService.changePassword(request.toChangePasswordDto(userRequest.getUsername(), passwordEncoder));
+		return ResponseEntity.status(HttpStatus.OK).body(UserChangePasswordResponse.from(user));
 	}
 
 	@GetMapping("/payments")
-	@Secured(USER)
+	@Secured(UserGrade.ROLES.USER)
 	public ResponseEntity<PaymentsResponse> getPayments(@AuthenticationPrincipal UserDetails userRequest) {
-		PaymentsDTO paymentsDto = userApisService.findPaymentsByEmail(userRequest.getUsername());
-
-		return ResponseEntity.status(HttpStatus.OK)
-			.body(paymentsDto.toResponse());
+		PaymentsResponse paymentDetails = userApisService.findPaymentsByEmail(userRequest.getUsername());
+		return ResponseEntity.status(HttpStatus.OK).body(paymentDetails);
 	}
 
 }

server/src/main/java/com/ticketing/server/user/application/request/UserChangeGradeRequest.java

@@ -1,19 +0,0 @@
-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;
-
-}

server/src/main/java/com/ticketing/server/user/application/response/LogoutResponse.java

@@ -1,14 +1,28 @@
 package com.ticketing.server.user.application.response;
 
+import com.ticketing.server.global.redis.RefreshToken;
+import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
 @Getter
-@AllArgsConstructor
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
 public class LogoutResponse {
 
-	private final Long refreshTokenId;
-	private final String email;
-	private final String refreshToken;
+	private Long refreshTokenId;
+	private String email;
+	private String refreshToken;
+
+	private LogoutResponse(String email) {
+		this.email = email;
+	}
+
+	public static LogoutResponse from(String email) {
+		return new LogoutResponse(email);
+	}
+
+	public static LogoutResponse from(RefreshToken refreshToken) {
+		return new LogoutResponse(refreshToken.getId(), refreshToken.getEmail(), refreshToken.getToken());
+	}
 
 }

server/src/main/java/com/ticketing/server/user/application/response/PaymentsResponse.java

@@ -1,5 +1,6 @@
 package com.ticketing.server.user.application.response;
 
+import com.ticketing.server.payment.application.response.SimplePaymentsResponse;
 import com.ticketing.server.payment.service.dto.SimplePaymentDTO;
 import java.util.List;
 import lombok.AllArgsConstructor;
@@ -9,7 +10,11 @@ import lombok.Getter;
 @AllArgsConstructor
 public class PaymentsResponse {
 
-	private final String email;
-	private final List<SimplePaymentDTO> payments;
+	private String email;
+	private List<SimplePaymentDTO> payments;
 
+	public PaymentsResponse(String email, SimplePaymentsResponse simplePayments) {
+		this(email, simplePayments.getPayments());
+	}
+	
 }

server/src/main/java/com/ticketing/server/user/application/response/SignUpResponse.java

@@ -1,13 +1,20 @@
 package com.ticketing.server.user.application.response;
 
+import com.ticketing.server.user.domain.User;
+import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
 @Getter
-@AllArgsConstructor
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
 public class SignUpResponse {
 
-	private final String name;
-	private final String email;
+	private String name;
+
+	private String email;
+
+	public static SignUpResponse from(User user) {
+		return new SignUpResponse(user.getName(), user.getEmail());
+	}
 
 }

server/src/main/java/com/ticketing/server/user/application/response/TokenDto.java

@@ -0,0 +1,20 @@
+package com.ticketing.server.user.application.response;
+
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
+public class TokenDto {
+
+	private final String accessToken;
+	private final String refreshToken;
+	private final String tokenType;
+	private final long expiresIn;
+
+	public static TokenDto of(String accessToken, String refreshToken, String tokenType, long expiresIn) {
+		return new TokenDto(accessToken, refreshToken, tokenType, expiresIn);
+	}
+
+}

server/src/main/java/com/ticketing/server/user/application/response/TokenResponse.java

@@ -1,15 +0,0 @@
-package com.ticketing.server.user.application.response;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-@Getter
-@AllArgsConstructor
-public class TokenResponse {
-
-	private final String accessToken;
-	private final String refreshToken;
-	private final String tokenType;
-	private final long expiresIn;
-
-}

server/src/main/java/com/ticketing/server/user/application/response/UserChangePasswordResponse.java

@@ -1,15 +1,20 @@
 package com.ticketing.server.user.application.response;
 
-import java.time.LocalDateTime;
+import com.ticketing.server.user.domain.User;
+import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
 @Getter
-@AllArgsConstructor
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
 public class UserChangePasswordResponse {
 
-	private final String name;
-	private final String email;
-	private final LocalDateTime updatedAt;
+	private String name;
+
+	private String email;
+
+	public static UserChangePasswordResponse from(User user) {
+		return new UserChangePasswordResponse(user.getName(), user.getEmail());
+	}
 
 }

server/src/main/java/com/ticketing/server/user/application/response/UserDeleteResponse.java

@@ -1,15 +1,20 @@
 package com.ticketing.server.user.application.response;
 
-import java.time.LocalDateTime;
+import com.ticketing.server.user.domain.User;
+import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
 @Getter
-@AllArgsConstructor
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
 public class UserDeleteResponse {
 
-	private final String name;
-	private final String email;
-	private final LocalDateTime deletedAt;
+	private String name;
+
+	private String email;
+
+	public static UserDeleteResponse from(User user) {
+		return new UserDeleteResponse(user.getName(), user.getEmail());
+	}
 
 }

server/src/main/java/com/ticketing/server/user/application/response/UserDetailResponse.java

@@ -7,7 +7,7 @@ import lombok.AllArgsConstructor;
 import lombok.Getter;
 
 @Getter
-@AllArgsConstructor
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
 public class UserDetailResponse {
 
 	private final String name;
@@ -15,4 +15,13 @@ public class UserDetailResponse {
 	private final UserGrade grade;
 	private final String phone;
 
+	public UserDetailResponse(UserDetailDTO userDetailDto) {
+		this(
+			userDetailDto.getName(),
+			userDetailDto.getEmail(),
+			userDetailDto.getGrade(),
+			userDetailDto.getPhone()
+		);
+	}
+
 }

server/src/main/java/com/ticketing/server/user/domain/ChangeGradeDTO.java

@@ -1,19 +0,0 @@
-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);
-	}
-
-}

server/src/main/java/com/ticketing/server/user/domain/User.java

@@ -93,14 +93,4 @@ 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);
-	}
-
 }

server/src/main/java/com/ticketing/server/user/service/AuthenticationServiceImpl.java

@@ -5,8 +5,8 @@ import com.ticketing.server.global.redis.RefreshRedisRepository;
 import com.ticketing.server.global.redis.RefreshToken;
 import com.ticketing.server.global.security.jwt.JwtProperties;
 import com.ticketing.server.global.security.jwt.JwtProvider;
-import com.ticketing.server.user.service.dto.TokenDTO;
-import com.ticketing.server.user.service.dto.DeleteRefreshTokenDTO;
+import com.ticketing.server.user.application.response.LogoutResponse;
+import com.ticketing.server.user.application.response.TokenDto;
 import com.ticketing.server.user.service.interfaces.AuthenticationService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
@@ -28,14 +28,14 @@ public class AuthenticationServiceImpl implements AuthenticationService {
 
 	@Override
 	@Transactional
-	public TokenDTO generateTokenDto(UsernamePasswordAuthenticationToken authenticationToken) {
+	public TokenDto generateTokenDto(UsernamePasswordAuthenticationToken authenticationToken) {
 		// 회원인증
 		Authentication authentication = authenticationManagerBuilder.getObject().authenticate(authenticationToken);
 
 		String email = authenticationToken.getName();
 
 		// 토큰 발급
-		TokenDTO tokenDto = jwtProvider.generateTokenDto(authentication);
+		TokenDto tokenDto = jwtProvider.generateTokenDto(authentication);
 
 		// refresh 토큰이 있으면 수정, 없으면 생성
 		refreshRedisRepository.findByEmail(email)
@@ -49,7 +49,7 @@ public class AuthenticationServiceImpl implements AuthenticationService {
 
 	@Override
 	@Transactional
-	public TokenDTO reissueTokenDto(String bearerRefreshToken) {
+	public TokenDto reissueTokenDto(String bearerRefreshToken) {
 		String refreshToken = resolveToken(bearerRefreshToken);
 
 		// 토큰 검증
@@ -67,7 +67,7 @@ public class AuthenticationServiceImpl implements AuthenticationService {
 		}
 
 		// 토큰 발급
-		TokenDTO tokenDto = jwtProvider.generateTokenDto(authentication);
+		TokenDto tokenDto = jwtProvider.generateTokenDto(authentication);
 
 		// 토큰 최신화
 		findTokenEntity.changeToken(tokenDto.getRefreshToken());
@@ -78,14 +78,12 @@ public class AuthenticationServiceImpl implements AuthenticationService {
 
 	@Override
 	@Transactional
-	public DeleteRefreshTokenDTO deleteRefreshToken(String email) {
+	public LogoutResponse deleteRefreshToken(String email) {
 		return refreshRedisRepository.findByEmail(email)
 			.map(tokenDto -> {
 				refreshRedisRepository.delete(tokenDto);
-				return new DeleteRefreshTokenDTO(tokenDto);
-			}).orElseGet(
-				() -> new DeleteRefreshTokenDTO(email)
-			);
+				return LogoutResponse.from(tokenDto);
+			}).orElseGet(() -> LogoutResponse.from(email));
 	}
 
 	private String resolveToken(String bearerToken) {

server/src/main/java/com/ticketing/server/user/service/UserApisServiceImpl.java

@@ -2,8 +2,8 @@ package com.ticketing.server.user.service;
 
 import com.ticketing.server.payment.application.response.SimplePaymentsResponse;
 import com.ticketing.server.user.api.PaymentClient;
+import com.ticketing.server.user.application.response.PaymentsResponse;
 import com.ticketing.server.user.domain.User;
-import com.ticketing.server.user.service.dto.PaymentsDTO;
 import com.ticketing.server.user.service.interfaces.UserApisService;
 import com.ticketing.server.user.service.interfaces.UserService;
 import javax.validation.constraints.NotNull;
@@ -24,11 +24,11 @@ public class UserApisServiceImpl implements UserApisService {
 	private final UserService userService;
 
 	@Override
-	public PaymentsDTO findPaymentsByEmail(@NotNull String email) {
+	public PaymentsResponse findPaymentsByEmail(@NotNull String email) {
 		User user = userService.findNotDeletedUserByEmail(email);
 		SimplePaymentsResponse simplePayments = paymentClient.getPayments(user.getAlternateId());
 
-		return new PaymentsDTO(user, simplePayments);
+		return new PaymentsResponse(user.getEmail(), simplePayments);
 	}
 
 }

server/src/main/java/com/ticketing/server/user/service/UserServiceImpl.java

@@ -1,16 +1,11 @@
 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;
-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 com.ticketing.server.user.service.interfaces.UserService;
@@ -35,11 +30,10 @@ public class UserServiceImpl implements UserService {
 
 	@Override
 	@Transactional
-	public CreatedUserDTO register(@Valid SignUpDTO signUpDto) {
-		Optional<User> optionalUser = userRepository.findByEmail(signUpDto.getEmail());
-		if (optionalUser.isEmpty()) {
-			User user = userRepository.save(signUpDto.toUser(sequenceGenerator.generateId()));
-			return new CreatedUserDTO(user);
+	public User register(@Valid SignUpDTO signUpDto) {
+		Optional<User> user = userRepository.findByEmail(signUpDto.getEmail());
+		if (user.isEmpty()) {
+			return userRepository.save(signUpDto.toUser(sequenceGenerator.generateId()));
 		}
 
 		throw ErrorCode.throwDuplicateEmail();
@@ -47,27 +41,16 @@ public class UserServiceImpl implements UserService {
 
 	@Override
 	@Transactional
-	public DeletedUserDTO delete(@Valid DeleteUserDTO deleteUserDto) {
-		User user = findNotDeletedUserByEmail(deleteUserDto.getEmail())
-			.delete(deleteUserDto);
-
-		return new DeletedUserDTO(user);
+	public User delete(@Valid DeleteUserDTO deleteUserDto) {
+		User user = findNotDeletedUserByEmail(deleteUserDto.getEmail());
+		return user.delete(deleteUserDto);
 	}
 
 	@Override
 	@Transactional
-	public ChangedPasswordUserDTO changePassword(@Valid ChangePasswordDTO changePasswordDto) {
-		User user = findNotDeletedUserByEmail(changePasswordDto.getEmail())
-			.changePassword(changePasswordDto);
-
-		return new ChangedPasswordUserDTO(user);
-	}
-
-	@Override
-	@Transactional
-	public ChangeGradeDTO changeGrade(@NotNull String email, @NotNull UserGrade grade) {
-		User user = findNotDeletedUserByEmail(email);
-		return user.changeGrade(grade);
+	public User changePassword(@Valid ChangePasswordDTO changePasswordDto) {
+		User user = findNotDeletedUserByEmail(changePasswordDto.getEmail());
+		return user.changePassword(changePasswordDto);
 	}
 
 	@Override

server/src/main/java/com/ticketing/server/user/service/dto/ChangePasswordDTO.java

@@ -2,23 +2,28 @@ package com.ticketing.server.user.service.dto;
 
 import javax.validation.constraints.Email;
 import javax.validation.constraints.NotEmpty;
-import lombok.AllArgsConstructor;
 import org.springframework.security.crypto.password.PasswordEncoder;
 
-@AllArgsConstructor
 public class ChangePasswordDTO implements PasswordMatches {
 
 	@NotEmpty(message = "{validation.not.empty.email}")
 	@Email(message = "{validation.email}")
-	private final String email;
+	private String email;
 
 	@NotEmpty(message = "{validation.not.empty.oldpassword}")
-	private final String oldPassword;
+	private String oldPassword;
 
 	@NotEmpty(message = "{validation.not.empty.newpassword}")
-	private final String newPassword;
+	private String newPassword;
 
-	private final PasswordEncoder passwordEncoder;
+	private PasswordEncoder passwordEncoder;
+
+	public ChangePasswordDTO(String email, String oldPassword, String newPassword, PasswordEncoder passwordEncoder) {
+		this.email = email;
+		this.oldPassword = oldPassword;
+		this.newPassword = newPassword;
+		this.passwordEncoder = passwordEncoder;
+	}
 
 	public String getEmail() {
 		return email;

server/src/main/java/com/ticketing/server/user/service/dto/ChangedPasswordUserDTO.java

@@ -1,24 +0,0 @@
-package com.ticketing.server.user.service.dto;
-
-import com.ticketing.server.user.application.response.UserChangePasswordResponse;
-import com.ticketing.server.user.domain.User;
-import java.time.LocalDateTime;
-import lombok.AccessLevel;
-import lombok.AllArgsConstructor;
-
-@AllArgsConstructor(access = AccessLevel.PRIVATE)
-public class ChangedPasswordUserDTO {
-
-	private final String name;
-	private final String email;
-	private final LocalDateTime updatedAt;
-
-	public ChangedPasswordUserDTO(User user) {
-		this(user.getName(), user.getEmail(), user.getUpdatedAt());
-	}
-
-	public UserChangePasswordResponse toResponse() {
-		return new UserChangePasswordResponse(name, email, updatedAt);
-	}
-
-}

server/src/main/java/com/ticketing/server/user/service/dto/CreatedUserDTO.java

@@ -1,25 +0,0 @@
-package com.ticketing.server.user.service.dto;
-
-import com.ticketing.server.user.application.response.SignUpResponse;
-import com.ticketing.server.user.domain.User;
-import lombok.AccessLevel;
-import lombok.AllArgsConstructor;
-
-@AllArgsConstructor(access = AccessLevel.PRIVATE)
-public class CreatedUserDTO {
-
-	private final String name;
-	private final String email;
-
-	public CreatedUserDTO(User user) {
-		this(
-			user.getName(),
-			user.getEmail()
-		);
-	}
-
-	public SignUpResponse toResponse() {
-		return new SignUpResponse(name, email);
-	}
-
-}

server/src/main/java/com/ticketing/server/user/service/dto/DeleteRefreshTokenDTO.java

@@ -1,26 +0,0 @@
-package com.ticketing.server.user.service.dto;
-
-import com.ticketing.server.global.redis.RefreshToken;
-import com.ticketing.server.user.application.response.LogoutResponse;
-import lombok.AccessLevel;
-import lombok.AllArgsConstructor;
-
-@AllArgsConstructor(access = AccessLevel.PRIVATE)
-public class DeleteRefreshTokenDTO {
-
-	private final Long refreshTokenId;
-	private final String email;
-	private final String refreshToken;
-
-	public DeleteRefreshTokenDTO(String email) {
-		this(null, email, null);
-	}
-
-	public DeleteRefreshTokenDTO(RefreshToken refreshToken) {
-		this(refreshToken.getId(), refreshToken.getEmail(), refreshToken.getToken());
-	}
-
-	public LogoutResponse toResponse() {
-		return new LogoutResponse(refreshTokenId, email, refreshToken);
-	}
-}

server/src/main/java/com/ticketing/server/user/service/dto/DeleteUserDTO.java

@@ -2,20 +2,24 @@ package com.ticketing.server.user.service.dto;
 
 import javax.validation.constraints.Email;
 import javax.validation.constraints.NotEmpty;
-import lombok.AllArgsConstructor;
 import org.springframework.security.crypto.password.PasswordEncoder;
 
-@AllArgsConstructor
 public class DeleteUserDTO implements PasswordMatches {
 
 	@NotEmpty(message = "{validation.not.empty.email}")
 	@Email(message = "{validation.email}")
-	private final String email;
+	private String email;
 
 	@NotEmpty(message = "{validation.not.empty.password}")
-	private final String inputPassword;
+	private String inputPassword;
 
-	private final PasswordEncoder passwordEncoder;
+	private PasswordEncoder passwordEncoder;
+
+	public DeleteUserDTO(String email, String inputPassword, PasswordEncoder passwordEncoder) {
+		this.email = email;
+		this.inputPassword = inputPassword;
+		this.passwordEncoder = passwordEncoder;
+	}
 
 	@Override
 	public boolean passwordMatches(String password) {

server/src/main/java/com/ticketing/server/user/service/dto/DeletedUserDTO.java

@@ -1,26 +0,0 @@
-package com.ticketing.server.user.service.dto;
-
-import com.ticketing.server.user.application.response.UserDeleteResponse;
-import com.ticketing.server.user.domain.User;
-import java.time.LocalDateTime;
-import lombok.AccessLevel;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-@Getter
-@AllArgsConstructor(access = AccessLevel.PRIVATE)
-public class DeletedUserDTO {
-
-	private final String name;
-	private final String email;
-	private final LocalDateTime deletedAt;
-
-	public DeletedUserDTO(User user) {
-		this(user.getName(), user.getEmail(), user.getDeletedAt());
-	}
-
-	public UserDeleteResponse toResponse() {
-		return new UserDeleteResponse(name, email, deletedAt);
-	}
-
-}

server/src/main/java/com/ticketing/server/user/service/dto/PaymentsDTO.java

@@ -1,27 +0,0 @@
-package com.ticketing.server.user.service.dto;
-
-import com.ticketing.server.payment.application.response.SimplePaymentsResponse;
-import com.ticketing.server.payment.service.dto.SimplePaymentDTO;
-import com.ticketing.server.user.application.response.PaymentsResponse;
-import com.ticketing.server.user.domain.User;
-import java.util.List;
-import lombok.AccessLevel;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-@Getter
-@AllArgsConstructor(access = AccessLevel.PRIVATE)
-public class PaymentsDTO {
-
-	private final String email;
-	private final List<SimplePaymentDTO> payments;
-
-	public PaymentsDTO(User user, SimplePaymentsResponse simplePayments) {
-		this(user.getEmail(), simplePayments.getPayments());
-	}
-
-	public PaymentsResponse toResponse() {
-		return new PaymentsResponse(email, payments);
-	}
-
-}

server/src/main/java/com/ticketing/server/user/service/dto/SignUpDTO.java

@@ -13,18 +13,18 @@ import lombok.Getter;
 public class SignUpDTO {
 
 	@NotEmpty(message = "{validation.not.empty.name}")
-	private final String name;
+	private String name;
 
 	@NotEmpty(message = "{validation.not.empty.email}")
 	@Email(message = "{validation.email}")
-	private final String email;
+	private String email;
 
 	@NotEmpty(message = "{validation.not.empty.password}")
-	private final String password;
+	private String password;
 
 	@NotEmpty(message = "{validation.not.empty.phone}")
 	@Phone
-	private final String phone;
+	private String phone;
 
 	public User toUser(long alternateId) {
 		return new User(alternateId, this.name, this.email, password, UserGrade.USER, this.phone);

server/src/main/java/com/ticketing/server/user/service/dto/TokenDTO.java

@@ -1,20 +0,0 @@
-package com.ticketing.server.user.service.dto;
-
-import com.ticketing.server.user.application.response.TokenResponse;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-@Getter
-@AllArgsConstructor
-public class TokenDTO {
-
-	private final String accessToken;
-	private final String refreshToken;
-	private final String tokenType;
-	private final long expiresIn;
-
-	public TokenResponse toResponse() {
-		return new TokenResponse(accessToken, refreshToken, tokenType, expiresIn);
-	}
-
-}

server/src/main/java/com/ticketing/server/user/service/dto/UserDetailDTO.java

@@ -11,11 +11,11 @@ import lombok.Getter;
 @AllArgsConstructor(access = AccessLevel.PRIVATE)
 public class UserDetailDTO {
 
-	private final Long alternateId;
-	private final String name;
-	private final String email;
-	private final UserGrade grade;
-	private final String phone;
+	private Long alternateId;
+	private String name;
+	private String email;
+	private UserGrade grade;
+	private String phone;
 
 	public UserDetailDTO(User user) {
 		this(
@@ -28,7 +28,6 @@ public class UserDetailDTO {
 	}
 
 	public UserDetailResponse toResponse() {
-		return new UserDetailResponse(name, email, grade, phone);
+		return new UserDetailResponse(this);
 	}
-
 }

server/src/main/java/com/ticketing/server/user/service/interfaces/AuthenticationService.java

@@ -1,15 +1,15 @@
 package com.ticketing.server.user.service.interfaces;
 
-import com.ticketing.server.user.service.dto.TokenDTO;
-import com.ticketing.server.user.service.dto.DeleteRefreshTokenDTO;
+import com.ticketing.server.user.application.response.LogoutResponse;
+import com.ticketing.server.user.application.response.TokenDto;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 
 public interface AuthenticationService {
 
-	TokenDTO generateTokenDto(UsernamePasswordAuthenticationToken usernamePasswordAuthenticationToken);
+	TokenDto generateTokenDto(UsernamePasswordAuthenticationToken usernamePasswordAuthenticationToken);
 
-	TokenDTO reissueTokenDto(String bearerRefreshToken);
+	TokenDto reissueTokenDto(String bearerRefreshToken);
 
-	DeleteRefreshTokenDTO deleteRefreshToken(String email);
+	LogoutResponse deleteRefreshToken(String email);
 
 }

server/src/main/java/com/ticketing/server/user/service/interfaces/UserApisService.java

@@ -1,10 +1,10 @@
 package com.ticketing.server.user.service.interfaces;
 
-import com.ticketing.server.user.service.dto.PaymentsDTO;
+import com.ticketing.server.user.application.response.PaymentsResponse;
 import javax.validation.constraints.NotNull;
 
 public interface UserApisService {
 
-	PaymentsDTO findPaymentsByEmail(@NotNull String email);
+	PaymentsResponse findPaymentsByEmail(@NotNull String email);
 
 }

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

@@ -1,13 +1,8 @@
 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.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;
@@ -15,13 +10,11 @@ import javax.validation.constraints.NotNull;
 
 public interface UserService {
 
-	CreatedUserDTO register(@Valid SignUpDTO signUpDto);
+	User register(@Valid SignUpDTO signUpDto);
 
-	DeletedUserDTO delete(@Valid DeleteUserDTO deleteUserDto);
+	User delete(@Valid DeleteUserDTO deleteUserDto);
 
-	ChangedPasswordUserDTO changePassword(@Valid ChangePasswordDTO changePasswordDto);
-
-	ChangeGradeDTO changeGrade(@NotNull String email, @NotNull UserGrade grade);
+	User changePassword(@Valid ChangePasswordDTO changePasswordDto);
 
 	UserDetailDTO findDetailByEmail(@NotNull String email);
 

server/src/test/java/com/ticketing/server/global/security/jwt/TokenProviderTest.java

@@ -3,7 +3,7 @@ package com.ticketing.server.global.security.jwt;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import com.ticketing.server.global.factory.YamlPropertySourceFactory;
-import com.ticketing.server.user.service.dto.TokenDTO;
+import com.ticketing.server.user.application.response.TokenDto;
 import com.ticketing.server.user.domain.UserGrade;
 import java.util.Collections;
 import org.junit.jupiter.api.BeforeEach;
@@ -43,10 +43,10 @@ class TokenProviderTest {
 			new UsernamePasswordAuthenticationToken("ticketing@gmail.com", "123456", Collections.singleton(grantedAuthority));
 
 		// when
-		TokenDTO tokenDto = jwtProvider.generateTokenDto(authenticationToken);
+		TokenDto tokenDto = jwtProvider.generateTokenDto(authenticationToken);
 
 		// then
-		assertThat(tokenDto).isInstanceOf(TokenDTO.class);
+		assertThat(tokenDto).isInstanceOf(TokenDto.class);
 	}
 
 	@Test
@@ -58,7 +58,7 @@ class TokenProviderTest {
 			new UsernamePasswordAuthenticationToken("ticketing@gmail.com", "123456", Collections.singleton(grantedAuthority));
 
 		// when
-		TokenDTO tokenDto = jwtProvider.generateTokenDto(authenticationToken);
+		TokenDto tokenDto = jwtProvider.generateTokenDto(authenticationToken);
 		Authentication authentication = jwtProvider.getAuthentication(tokenDto.getAccessToken());
 
 		// then

server/src/test/java/com/ticketing/server/movie/service/TicketServiceImplTest.java

@@ -11,7 +11,7 @@ import com.ticketing.server.global.exception.TicketingException;
 import com.ticketing.server.movie.domain.Ticket;
 import com.ticketing.server.movie.domain.repository.TicketRepository;
 import com.ticketing.server.movie.service.dto.TicketDetailsDTO;
-import com.ticketing.server.payment.service.dto.TicketDetailDTO;
+import com.ticketing.server.payment.application.response.TicketDetailDTO;
 import java.util.Collections;
 import java.util.List;
 import org.junit.jupiter.api.DisplayName;

server/src/test/java/com/ticketing/server/payment/service/PaymentApisServiceImplTest.java

@@ -16,8 +16,7 @@ import com.ticketing.server.payment.api.MovieClient;
 import com.ticketing.server.payment.api.UserClient;
 import com.ticketing.server.payment.api.dto.response.UserDetailResponse;
 import com.ticketing.server.payment.application.response.PaymentDetailResponse;
-import com.ticketing.server.payment.service.dto.PaymentDetailDTO;
-import com.ticketing.server.payment.service.dto.TicketDetailDTO;
+import com.ticketing.server.payment.application.response.TicketDetailDTO;
 import com.ticketing.server.payment.domain.repository.PaymentRepository;
 import com.ticketing.server.user.domain.User;
 import com.ticketing.server.user.service.dto.UserDetailDTO;
@@ -105,7 +104,7 @@ class PaymentApisServiceImplTest {
 		when(movieClient.getTicketsByPaymentId(1L)).thenReturn(response);
 
 		// when
-		PaymentDetailDTO paymentDetail = paymentApisService.findPaymentDetail(1L);
+		PaymentDetailResponse paymentDetail = paymentApisService.findPaymentDetail(1L);
 
 		// then
 		assertAll(

server/src/test/java/com/ticketing/server/user/domain/UserTest.java

@@ -2,9 +2,7 @@ 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;
@@ -35,37 +33,6 @@ 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("입력된 패스워드가 다를 경우")

server/src/test/java/com/ticketing/server/user/service/AuthenticationServiceImplTest.java

@@ -10,7 +10,7 @@ import com.ticketing.server.global.redis.RefreshRedisRepository;
 import com.ticketing.server.global.redis.RefreshToken;
 import com.ticketing.server.global.security.jwt.JwtProperties;
 import com.ticketing.server.global.security.jwt.JwtProvider;
-import com.ticketing.server.user.service.dto.TokenDTO;
+import com.ticketing.server.user.application.response.TokenDto;
 import com.ticketing.server.user.domain.UserGrade;
 import java.util.Collections;
 import java.util.Optional;
@@ -70,7 +70,7 @@ class AuthenticationServiceImplTest {
 		when(jwtProperties.hasTokenStartsWith(refreshToken)).thenReturn(true);
 
 		// when
-		TokenDTO tokenDto = authenticationService.reissueTokenDto(refreshToken);
+		TokenDto tokenDto = authenticationService.reissueTokenDto(refreshToken);
 
 		// then
 		assertAll(

server/src/test/java/com/ticketing/server/user/service/UserApisServiceImplTest.java

@@ -11,9 +11,9 @@ import com.ticketing.server.payment.application.response.SimplePaymentsResponse;
 import com.ticketing.server.payment.service.dto.CreatePaymentDTO;
 import com.ticketing.server.payment.service.dto.SimplePaymentDTO;
 import com.ticketing.server.user.api.PaymentClient;
+import com.ticketing.server.user.application.response.PaymentsResponse;
 import com.ticketing.server.user.domain.User;
 import com.ticketing.server.user.domain.UserGrade;
-import com.ticketing.server.user.service.dto.PaymentsDTO;
 import com.ticketing.server.user.service.interfaces.UserService;
 import java.util.Arrays;
 import java.util.Collections;
@@ -53,12 +53,12 @@ class UserApisServiceImplTest {
 		when(paymentClient.getPayments(any())).thenReturn(new SimplePaymentsResponse(1L, Collections.emptyList()));
 
 		// when
-		PaymentsDTO paymentsDto = userApisService.findPaymentsByEmail("ticketing@gmail.com");
+		PaymentsResponse paymentDetails = userApisService.findPaymentsByEmail("ticketing@gmail.com");
 
 		// then
 		assertAll(
-			() -> assertThat(paymentsDto.getEmail()).isEqualTo("ticketing@gmail.com")
-			, () -> assertThat(paymentsDto.getPayments()).isEmpty()
+			() -> assertThat(paymentDetails.getEmail()).isEqualTo("ticketing@gmail.com")
+			, () -> assertThat(paymentDetails.getPayments()).hasSize(0)
 		);
 	}
 
@@ -77,12 +77,12 @@ class UserApisServiceImplTest {
 		when(paymentClient.getPayments(any())).thenReturn(new SimplePaymentsResponse(1L, payments));
 
 		// when
-		PaymentsDTO patmentsDto = userApisService.findPaymentsByEmail("ticketing@gmail.com");
+		PaymentsResponse paymentDetails = userApisService.findPaymentsByEmail("ticketing@gmail.com");
 
 		// then
 		assertAll(
-			() -> assertThat(patmentsDto.getEmail()).isEqualTo("ticketing@gmail.com")
-			, () -> assertThat(patmentsDto.getPayments()).hasSize(2)
+			() -> assertThat(paymentDetails.getEmail()).isEqualTo("ticketing@gmail.com")
+			, () -> assertThat(paymentDetails.getPayments()).hasSize(2)
 		);
 	}
 

server/src/test/java/com/ticketing/server/user/service/UserServiceImplTest.java

@@ -13,11 +13,8 @@ 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;
-import com.ticketing.server.user.service.dto.CreatedUserDTO;
 import com.ticketing.server.user.service.dto.DeleteUserDTO;
 import com.ticketing.server.user.service.dto.DeleteUserDTOTest;
-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 java.util.Optional;
@@ -75,10 +72,10 @@ class UserServiceImplTest {
 		when(sequenceGenerator.generateId()).thenReturn(123L);
 
 		// when
-		CreatedUserDTO createdUserDto = userService.register(signUpDto);
+		User user = userService.register(signUpDto);
 
 		// then
-		assertThat(createdUserDto).isNotNull();
+		assertThat(user).isNotNull();
 	}
 
 	@Test
@@ -100,10 +97,10 @@ class UserServiceImplTest {
 		when(userRepository.findByEmailAndDeletedAtNull("ticketing@gmail.com")).thenReturn(Optional.of(user));
 
 		// when
-		DeletedUserDTO deletedUserDto = userService.delete(deleteUserDto);
+		User user = userService.delete(deleteUserDto);
 
 		// then
-		assertThat(deletedUserDto.getDeletedAt()).isNotNull();
+		assertThat(user.getDeletedAt()).isNotNull();
 	}
 
 	@Test
@@ -125,10 +122,10 @@ class UserServiceImplTest {
 		when(userRepository.findByEmailAndDeletedAtNull("ticketing@gmail.com")).thenReturn(Optional.of(user));
 
 		// when
-		ChangedPasswordUserDTO changedUserDto = userService.changePassword(changePasswordDto);
+		User user = userService.changePassword(changePasswordDto);
 
 		// then
-		assertThat(changedUserDto).isNotNull();
+		assertThat(user).isNotNull();
 	}
 
 	@Test