Compare commits
2 Commits
refactor/L
...
feature/ch
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8cc80f376a | ||
|
|
7ea560b648 |
@@ -1,6 +1,6 @@
|
||||
package com.ticketing.server.global.security.jwt;
|
||||
|
||||
import com.ticketing.server.user.application.response.TokenDto;
|
||||
import com.ticketing.server.user.service.dto.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 TokenDto.of(accessToken, refreshToken, prefix, expiresIn);
|
||||
return new TokenDTO(accessToken, refreshToken, prefix, expiresIn);
|
||||
}
|
||||
|
||||
private String createAccessToken(Authentication authentication) {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package com.ticketing.server.movie.application.response;
|
||||
|
||||
import com.ticketing.server.payment.application.response.TicketDetailDTO;
|
||||
import com.ticketing.server.payment.service.dto.TicketDetailDTO;
|
||||
import java.util.List;
|
||||
import lombok.Getter;
|
||||
|
||||
|
||||
@@ -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.application.response.TicketDetailDTO;
|
||||
import com.ticketing.server.payment.service.dto.TicketDetailDTO;
|
||||
import java.util.List;
|
||||
import java.util.stream.Collectors;
|
||||
import javax.validation.constraints.NotNull;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package com.ticketing.server.movie.service.dto;
|
||||
|
||||
import com.ticketing.server.movie.application.response.TicketDetailsResponse;
|
||||
import com.ticketing.server.payment.application.response.TicketDetailDTO;
|
||||
import com.ticketing.server.payment.service.dto.TicketDetailDTO;
|
||||
import java.util.List;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Getter;
|
||||
|
||||
@@ -1,10 +1,11 @@
|
||||
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;
|
||||
@@ -29,14 +30,18 @@ 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) {
|
||||
PaymentDetailResponse paymentDetail = paymentApisService.findPaymentDetail(paymentId);
|
||||
return ResponseEntity.status(HttpStatus.OK).body(paymentDetail);
|
||||
PaymentDetailDTO paymentDetail = paymentApisService.findPaymentDetail(paymentId);
|
||||
|
||||
return ResponseEntity.status(HttpStatus.OK)
|
||||
.body(paymentDetail.toResponse());
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -1,38 +1,20 @@
|
||||
package com.ticketing.server.payment.application.response;
|
||||
|
||||
import com.ticketing.server.movie.application.response.TicketDetailsResponse;
|
||||
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)
|
||||
@AllArgsConstructor
|
||||
public class PaymentDetailResponse {
|
||||
|
||||
private Long paymentId;
|
||||
|
||||
private String movieTitle;
|
||||
|
||||
private String paymentNumber;
|
||||
|
||||
private Integer totalPrice;
|
||||
|
||||
private LocalDateTime createdAt;
|
||||
|
||||
List<TicketDetailDTO> tickets;
|
||||
|
||||
public PaymentDetailResponse(Payment payment, TicketDetailsResponse ticketDetails) {
|
||||
this(
|
||||
payment.getId(),
|
||||
payment.getMovieTitle(),
|
||||
payment.getPaymentNumber(),
|
||||
payment.getTotalPrice(),
|
||||
payment.getCreatedAt(),
|
||||
ticketDetails.getTicketDetails()
|
||||
);
|
||||
}
|
||||
private List<TicketDetailDTO> tickets;
|
||||
|
||||
}
|
||||
|
||||
@@ -10,7 +10,6 @@ import lombok.Getter;
|
||||
public class SimplePaymentsResponse {
|
||||
|
||||
private final Long userAlternateId;
|
||||
|
||||
private final List<SimplePaymentDTO> payments;
|
||||
|
||||
}
|
||||
|
||||
@@ -1,36 +0,0 @@
|
||||
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()
|
||||
);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -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 PaymentDetailResponse findPaymentDetail(@NotNull Long paymentId) {
|
||||
public PaymentDetailDTO 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 PaymentDetailResponse(payment, tickets);
|
||||
return new PaymentDetailDTO(payment, tickets);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -10,12 +10,12 @@ import lombok.Getter;
|
||||
@AllArgsConstructor
|
||||
public class CreatePaymentDTO {
|
||||
|
||||
private Long userAlternateId;
|
||||
private String movieTitle;
|
||||
private PaymentType type;
|
||||
private PaymentStatus status;
|
||||
private String paymentNumber;
|
||||
private Integer totalPrice;
|
||||
private final Long userAlternateId;
|
||||
private final String movieTitle;
|
||||
private final PaymentType type;
|
||||
private final PaymentStatus status;
|
||||
private final String paymentNumber;
|
||||
private final Integer totalPrice;
|
||||
|
||||
public Payment toEntity() {
|
||||
return new Payment
|
||||
|
||||
@@ -0,0 +1,39 @@
|
||||
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);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -9,10 +9,10 @@ import lombok.Getter;
|
||||
@AllArgsConstructor(access = AccessLevel.PRIVATE)
|
||||
public class SimplePaymentDTO {
|
||||
|
||||
private Long paymentId;
|
||||
private String movieTitle;
|
||||
private String paymentNumber;
|
||||
private Integer totalPrice;
|
||||
private final Long paymentId;
|
||||
private final String movieTitle;
|
||||
private final String paymentNumber;
|
||||
private final Integer totalPrice;
|
||||
|
||||
public SimplePaymentDTO(Payment payment) {
|
||||
this(
|
||||
|
||||
@@ -0,0 +1,31 @@
|
||||
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()
|
||||
);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,9 +1,9 @@
|
||||
package com.ticketing.server.payment.service.interfaces;
|
||||
|
||||
import com.ticketing.server.payment.application.response.PaymentDetailResponse;
|
||||
import com.ticketing.server.payment.service.dto.PaymentDetailDTO;
|
||||
import javax.validation.constraints.NotNull;
|
||||
|
||||
public interface PaymentApisService {
|
||||
|
||||
PaymentDetailResponse findPaymentDetail(@NotNull Long paymentId);
|
||||
PaymentDetailDTO findPaymentDetail(@NotNull Long paymentId);
|
||||
}
|
||||
|
||||
@@ -2,7 +2,9 @@ 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.application.response.TokenDto;
|
||||
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.service.interfaces.AuthenticationService;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
@@ -26,29 +28,29 @@ public class AuthController {
|
||||
private final AuthenticationService authenticationService;
|
||||
|
||||
@PostMapping("/token")
|
||||
public ResponseEntity<TokenDto> login(@RequestBody LoginRequest loginRequest) {
|
||||
TokenDto tokenDto = authenticationService.generateTokenDto(loginRequest.toAuthentication());
|
||||
public ResponseEntity<TokenResponse> login(@RequestBody LoginRequest loginRequest) {
|
||||
TokenDTO tokenDto = authenticationService.generateTokenDto(loginRequest.toAuthentication());
|
||||
|
||||
return ResponseEntity.status(HttpStatus.OK)
|
||||
.headers(getHttpHeaders())
|
||||
.body(tokenDto);
|
||||
.body(tokenDto.toResponse());
|
||||
}
|
||||
|
||||
@PostMapping("/refresh")
|
||||
public ResponseEntity<TokenDto> refreshToken(@RequestParam("refreshToken") String refreshToken) {
|
||||
TokenDto tokenDto = authenticationService.reissueTokenDto(refreshToken);
|
||||
public ResponseEntity<TokenResponse> refreshToken(@RequestParam("refreshToken") String refreshToken) {
|
||||
TokenDTO tokenDto = authenticationService.reissueTokenDto(refreshToken);
|
||||
|
||||
return ResponseEntity.status(HttpStatus.OK)
|
||||
.headers(getHttpHeaders())
|
||||
.body(tokenDto);
|
||||
.body(tokenDto.toResponse());
|
||||
}
|
||||
|
||||
@PostMapping("/logout")
|
||||
public ResponseEntity<LogoutResponse> logout(@AuthenticationPrincipal UserDetails userRequest) {
|
||||
LogoutResponse logoutResponse = authenticationService.deleteRefreshToken(userRequest.getUsername());
|
||||
DeleteRefreshTokenDTO refreshToken = authenticationService.deleteRefreshToken(userRequest.getUsername());
|
||||
|
||||
return ResponseEntity.status(HttpStatus.OK)
|
||||
.body(logoutResponse);
|
||||
.body(refreshToken.toResponse());
|
||||
}
|
||||
|
||||
private HttpHeaders getHttpHeaders() {
|
||||
|
||||
@@ -12,8 +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.ChangeGradeDTO;
|
||||
import com.ticketing.server.user.domain.User;
|
||||
import com.ticketing.server.user.domain.UserGrade;
|
||||
import com.ticketing.server.user.service.dto.ChangedPasswordUserDTO;
|
||||
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;
|
||||
@@ -46,22 +50,28 @@ public class UserController {
|
||||
|
||||
@PostMapping
|
||||
public ResponseEntity<SignUpResponse> register(@RequestBody @Valid SignUpRequest request) {
|
||||
User user = userService.register(request.toSignUpDto(passwordEncoder));
|
||||
return ResponseEntity.status(HttpStatus.CREATED).body(SignUpResponse.from(user));
|
||||
CreatedUserDTO createdUserDto = userService.register(request.toSignUpDto(passwordEncoder));
|
||||
|
||||
return ResponseEntity.status(HttpStatus.CREATED)
|
||||
.body(createdUserDto.toResponse());
|
||||
}
|
||||
|
||||
@GetMapping("/details")
|
||||
@Secured(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)
|
||||
public ResponseEntity<UserDeleteResponse> deleteUser(@RequestBody @Valid UserDeleteRequest request) {
|
||||
User user = userService.delete(request.toDeleteUserDto(passwordEncoder));
|
||||
return ResponseEntity.status(HttpStatus.OK).body(UserDeleteResponse.from(user));
|
||||
DeletedUserDTO deletedUserDto = userService.delete(request.toDeleteUserDto(passwordEncoder));
|
||||
|
||||
return ResponseEntity.status(HttpStatus.OK)
|
||||
.body(deletedUserDto.toResponse());
|
||||
}
|
||||
|
||||
@PutMapping("/password")
|
||||
@@ -69,8 +79,11 @@ public class UserController {
|
||||
public ResponseEntity<UserChangePasswordResponse> changePassword(
|
||||
@AuthenticationPrincipal UserDetails userRequest,
|
||||
@RequestBody @Valid UserChangePasswordRequest request) {
|
||||
User user = userService.changePassword(request.toChangePasswordDto(userRequest.getUsername(), passwordEncoder));
|
||||
return ResponseEntity.status(HttpStatus.OK).body(UserChangePasswordResponse.from(user));
|
||||
ChangePasswordDTO changePasswordDto = request.toChangePasswordDto(userRequest.getUsername(), passwordEncoder);
|
||||
ChangedPasswordUserDTO changedUserDto = userService.changePassword(changePasswordDto);
|
||||
|
||||
return ResponseEntity.status(HttpStatus.OK)
|
||||
.body(changedUserDto.toResponse());
|
||||
}
|
||||
|
||||
@PostMapping("/grade")
|
||||
@@ -83,8 +96,10 @@ public class UserController {
|
||||
@GetMapping("/payments")
|
||||
@Secured(USER)
|
||||
public ResponseEntity<PaymentsResponse> getPayments(@AuthenticationPrincipal UserDetails userRequest) {
|
||||
PaymentsResponse paymentDetails = userApisService.findPaymentsByEmail(userRequest.getUsername());
|
||||
return ResponseEntity.status(HttpStatus.OK).body(paymentDetails);
|
||||
PaymentsDTO paymentsDto = userApisService.findPaymentsByEmail(userRequest.getUsername());
|
||||
|
||||
return ResponseEntity.status(HttpStatus.OK)
|
||||
.body(paymentsDto.toResponse());
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -1,28 +1,14 @@
|
||||
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(access = AccessLevel.PRIVATE)
|
||||
@AllArgsConstructor
|
||||
public class LogoutResponse {
|
||||
|
||||
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());
|
||||
}
|
||||
private final Long refreshTokenId;
|
||||
private final String email;
|
||||
private final String refreshToken;
|
||||
|
||||
}
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
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;
|
||||
@@ -10,11 +9,7 @@ import lombok.Getter;
|
||||
@AllArgsConstructor
|
||||
public class PaymentsResponse {
|
||||
|
||||
private String email;
|
||||
private List<SimplePaymentDTO> payments;
|
||||
private final String email;
|
||||
private final List<SimplePaymentDTO> payments;
|
||||
|
||||
public PaymentsResponse(String email, SimplePaymentsResponse simplePayments) {
|
||||
this(email, simplePayments.getPayments());
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -1,20 +1,13 @@
|
||||
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(access = AccessLevel.PRIVATE)
|
||||
@AllArgsConstructor
|
||||
public class SignUpResponse {
|
||||
|
||||
private String name;
|
||||
|
||||
private String email;
|
||||
|
||||
public static SignUpResponse from(User user) {
|
||||
return new SignUpResponse(user.getName(), user.getEmail());
|
||||
}
|
||||
private final String name;
|
||||
private final String email;
|
||||
|
||||
}
|
||||
|
||||
@@ -1,20 +0,0 @@
|
||||
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);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,15 @@
|
||||
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;
|
||||
|
||||
}
|
||||
@@ -1,20 +1,15 @@
|
||||
package com.ticketing.server.user.application.response;
|
||||
|
||||
import com.ticketing.server.user.domain.User;
|
||||
import lombok.AccessLevel;
|
||||
import java.time.LocalDateTime;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Getter;
|
||||
|
||||
@Getter
|
||||
@AllArgsConstructor(access = AccessLevel.PRIVATE)
|
||||
@AllArgsConstructor
|
||||
public class UserChangePasswordResponse {
|
||||
|
||||
private String name;
|
||||
|
||||
private String email;
|
||||
|
||||
public static UserChangePasswordResponse from(User user) {
|
||||
return new UserChangePasswordResponse(user.getName(), user.getEmail());
|
||||
}
|
||||
private final String name;
|
||||
private final String email;
|
||||
private final LocalDateTime updatedAt;
|
||||
|
||||
}
|
||||
|
||||
@@ -1,20 +1,15 @@
|
||||
package com.ticketing.server.user.application.response;
|
||||
|
||||
import com.ticketing.server.user.domain.User;
|
||||
import lombok.AccessLevel;
|
||||
import java.time.LocalDateTime;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Getter;
|
||||
|
||||
@Getter
|
||||
@AllArgsConstructor(access = AccessLevel.PRIVATE)
|
||||
@AllArgsConstructor
|
||||
public class UserDeleteResponse {
|
||||
|
||||
private String name;
|
||||
|
||||
private String email;
|
||||
|
||||
public static UserDeleteResponse from(User user) {
|
||||
return new UserDeleteResponse(user.getName(), user.getEmail());
|
||||
}
|
||||
private final String name;
|
||||
private final String email;
|
||||
private final LocalDateTime deletedAt;
|
||||
|
||||
}
|
||||
|
||||
@@ -7,7 +7,7 @@ import lombok.AllArgsConstructor;
|
||||
import lombok.Getter;
|
||||
|
||||
@Getter
|
||||
@AllArgsConstructor(access = AccessLevel.PRIVATE)
|
||||
@AllArgsConstructor
|
||||
public class UserDetailResponse {
|
||||
|
||||
private final String name;
|
||||
@@ -15,13 +15,4 @@ public class UserDetailResponse {
|
||||
private final UserGrade grade;
|
||||
private final String phone;
|
||||
|
||||
public UserDetailResponse(UserDetailDTO userDetailDto) {
|
||||
this(
|
||||
userDetailDto.getName(),
|
||||
userDetailDto.getEmail(),
|
||||
userDetailDto.getGrade(),
|
||||
userDetailDto.getPhone()
|
||||
);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -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.application.response.LogoutResponse;
|
||||
import com.ticketing.server.user.application.response.TokenDto;
|
||||
import com.ticketing.server.user.service.dto.TokenDTO;
|
||||
import com.ticketing.server.user.service.dto.DeleteRefreshTokenDTO;
|
||||
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,12 +78,14 @@ public class AuthenticationServiceImpl implements AuthenticationService {
|
||||
|
||||
@Override
|
||||
@Transactional
|
||||
public LogoutResponse deleteRefreshToken(String email) {
|
||||
public DeleteRefreshTokenDTO deleteRefreshToken(String email) {
|
||||
return refreshRedisRepository.findByEmail(email)
|
||||
.map(tokenDto -> {
|
||||
refreshRedisRepository.delete(tokenDto);
|
||||
return LogoutResponse.from(tokenDto);
|
||||
}).orElseGet(() -> LogoutResponse.from(email));
|
||||
return new DeleteRefreshTokenDTO(tokenDto);
|
||||
}).orElseGet(
|
||||
() -> new DeleteRefreshTokenDTO(email)
|
||||
);
|
||||
}
|
||||
|
||||
private String resolveToken(String bearerToken) {
|
||||
|
||||
@@ -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 PaymentsResponse findPaymentsByEmail(@NotNull String email) {
|
||||
public PaymentsDTO findPaymentsByEmail(@NotNull String email) {
|
||||
User user = userService.findNotDeletedUserByEmail(email);
|
||||
SimplePaymentsResponse simplePayments = paymentClient.getPayments(user.getAlternateId());
|
||||
|
||||
return new PaymentsResponse(user.getEmail(), simplePayments);
|
||||
return new PaymentsDTO(user, simplePayments);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -7,7 +7,10 @@ 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;
|
||||
@@ -32,10 +35,11 @@ public class UserServiceImpl implements UserService {
|
||||
|
||||
@Override
|
||||
@Transactional
|
||||
public User register(@Valid SignUpDTO signUpDto) {
|
||||
Optional<User> user = userRepository.findByEmail(signUpDto.getEmail());
|
||||
if (user.isEmpty()) {
|
||||
return userRepository.save(signUpDto.toUser(sequenceGenerator.generateId()));
|
||||
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);
|
||||
}
|
||||
|
||||
throw ErrorCode.throwDuplicateEmail();
|
||||
@@ -43,16 +47,20 @@ public class UserServiceImpl implements UserService {
|
||||
|
||||
@Override
|
||||
@Transactional
|
||||
public User delete(@Valid DeleteUserDTO deleteUserDto) {
|
||||
User user = findNotDeletedUserByEmail(deleteUserDto.getEmail());
|
||||
return user.delete(deleteUserDto);
|
||||
public DeletedUserDTO delete(@Valid DeleteUserDTO deleteUserDto) {
|
||||
User user = findNotDeletedUserByEmail(deleteUserDto.getEmail())
|
||||
.delete(deleteUserDto);
|
||||
|
||||
return new DeletedUserDTO(user);
|
||||
}
|
||||
|
||||
@Override
|
||||
@Transactional
|
||||
public User changePassword(@Valid ChangePasswordDTO changePasswordDto) {
|
||||
User user = findNotDeletedUserByEmail(changePasswordDto.getEmail());
|
||||
return user.changePassword(changePasswordDto);
|
||||
public ChangedPasswordUserDTO changePassword(@Valid ChangePasswordDTO changePasswordDto) {
|
||||
User user = findNotDeletedUserByEmail(changePasswordDto.getEmail())
|
||||
.changePassword(changePasswordDto);
|
||||
|
||||
return new ChangedPasswordUserDTO(user);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -2,28 +2,23 @@ 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 String email;
|
||||
private final String email;
|
||||
|
||||
@NotEmpty(message = "{validation.not.empty.oldpassword}")
|
||||
private String oldPassword;
|
||||
private final String oldPassword;
|
||||
|
||||
@NotEmpty(message = "{validation.not.empty.newpassword}")
|
||||
private String newPassword;
|
||||
private final String newPassword;
|
||||
|
||||
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;
|
||||
}
|
||||
private final PasswordEncoder passwordEncoder;
|
||||
|
||||
public String getEmail() {
|
||||
return email;
|
||||
|
||||
@@ -0,0 +1,24 @@
|
||||
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);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,25 @@
|
||||
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);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,26 @@
|
||||
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);
|
||||
}
|
||||
}
|
||||
@@ -2,24 +2,20 @@ 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 String email;
|
||||
private final String email;
|
||||
|
||||
@NotEmpty(message = "{validation.not.empty.password}")
|
||||
private String inputPassword;
|
||||
private final String inputPassword;
|
||||
|
||||
private PasswordEncoder passwordEncoder;
|
||||
|
||||
public DeleteUserDTO(String email, String inputPassword, PasswordEncoder passwordEncoder) {
|
||||
this.email = email;
|
||||
this.inputPassword = inputPassword;
|
||||
this.passwordEncoder = passwordEncoder;
|
||||
}
|
||||
private final PasswordEncoder passwordEncoder;
|
||||
|
||||
@Override
|
||||
public boolean passwordMatches(String password) {
|
||||
|
||||
@@ -0,0 +1,26 @@
|
||||
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);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,27 @@
|
||||
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);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -13,18 +13,18 @@ import lombok.Getter;
|
||||
public class SignUpDTO {
|
||||
|
||||
@NotEmpty(message = "{validation.not.empty.name}")
|
||||
private String name;
|
||||
private final String name;
|
||||
|
||||
@NotEmpty(message = "{validation.not.empty.email}")
|
||||
@Email(message = "{validation.email}")
|
||||
private String email;
|
||||
private final String email;
|
||||
|
||||
@NotEmpty(message = "{validation.not.empty.password}")
|
||||
private String password;
|
||||
private final String password;
|
||||
|
||||
@NotEmpty(message = "{validation.not.empty.phone}")
|
||||
@Phone
|
||||
private String phone;
|
||||
private final String phone;
|
||||
|
||||
public User toUser(long alternateId) {
|
||||
return new User(alternateId, this.name, this.email, password, UserGrade.USER, this.phone);
|
||||
|
||||
@@ -0,0 +1,20 @@
|
||||
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);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -11,11 +11,11 @@ import lombok.Getter;
|
||||
@AllArgsConstructor(access = AccessLevel.PRIVATE)
|
||||
public class UserDetailDTO {
|
||||
|
||||
private Long alternateId;
|
||||
private String name;
|
||||
private String email;
|
||||
private UserGrade grade;
|
||||
private String phone;
|
||||
private final Long alternateId;
|
||||
private final String name;
|
||||
private final String email;
|
||||
private final UserGrade grade;
|
||||
private final String phone;
|
||||
|
||||
public UserDetailDTO(User user) {
|
||||
this(
|
||||
@@ -28,6 +28,7 @@ public class UserDetailDTO {
|
||||
}
|
||||
|
||||
public UserDetailResponse toResponse() {
|
||||
return new UserDetailResponse(this);
|
||||
return new UserDetailResponse(name, email, grade, phone);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -1,15 +1,15 @@
|
||||
package com.ticketing.server.user.service.interfaces;
|
||||
|
||||
import com.ticketing.server.user.application.response.LogoutResponse;
|
||||
import com.ticketing.server.user.application.response.TokenDto;
|
||||
import com.ticketing.server.user.service.dto.TokenDTO;
|
||||
import com.ticketing.server.user.service.dto.DeleteRefreshTokenDTO;
|
||||
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);
|
||||
|
||||
LogoutResponse deleteRefreshToken(String email);
|
||||
DeleteRefreshTokenDTO deleteRefreshToken(String email);
|
||||
|
||||
}
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
package com.ticketing.server.user.service.interfaces;
|
||||
|
||||
import com.ticketing.server.user.application.response.PaymentsResponse;
|
||||
import com.ticketing.server.user.service.dto.PaymentsDTO;
|
||||
import javax.validation.constraints.NotNull;
|
||||
|
||||
public interface UserApisService {
|
||||
|
||||
PaymentsResponse findPaymentsByEmail(@NotNull String email);
|
||||
PaymentsDTO findPaymentsByEmail(@NotNull String email);
|
||||
|
||||
}
|
||||
|
||||
@@ -2,8 +2,10 @@ 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.ChangedPasswordUserDTO;
|
||||
import com.ticketing.server.user.service.dto.DeletedUserDTO;
|
||||
import com.ticketing.server.user.service.dto.ChangePasswordDTO;
|
||||
import com.ticketing.server.user.service.dto.CreatedUserDTO;
|
||||
import com.ticketing.server.user.service.dto.DeleteUserDTO;
|
||||
import com.ticketing.server.user.service.dto.SignUpDTO;
|
||||
import com.ticketing.server.user.service.dto.UserDetailDTO;
|
||||
@@ -13,11 +15,11 @@ import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
public interface UserService {
|
||||
|
||||
User register(@Valid SignUpDTO signUpDto);
|
||||
CreatedUserDTO register(@Valid SignUpDTO signUpDto);
|
||||
|
||||
User delete(@Valid DeleteUserDTO deleteUserDto);
|
||||
DeletedUserDTO delete(@Valid DeleteUserDTO deleteUserDto);
|
||||
|
||||
User changePassword(@Valid ChangePasswordDTO changePasswordDto);
|
||||
ChangedPasswordUserDTO changePassword(@Valid ChangePasswordDTO changePasswordDto);
|
||||
|
||||
@Transactional
|
||||
ChangeGradeDTO changeGrade(@NotNull String email, @NotNull UserGrade grade);
|
||||
|
||||
@@ -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.application.response.TokenDto;
|
||||
import com.ticketing.server.user.service.dto.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
|
||||
|
||||
@@ -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.application.response.TicketDetailDTO;
|
||||
import com.ticketing.server.payment.service.dto.TicketDetailDTO;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
import org.junit.jupiter.api.DisplayName;
|
||||
|
||||
@@ -16,7 +16,8 @@ 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.application.response.TicketDetailDTO;
|
||||
import com.ticketing.server.payment.service.dto.PaymentDetailDTO;
|
||||
import com.ticketing.server.payment.service.dto.TicketDetailDTO;
|
||||
import com.ticketing.server.payment.domain.repository.PaymentRepository;
|
||||
import com.ticketing.server.user.domain.User;
|
||||
import com.ticketing.server.user.service.dto.UserDetailDTO;
|
||||
@@ -104,7 +105,7 @@ class PaymentApisServiceImplTest {
|
||||
when(movieClient.getTicketsByPaymentId(1L)).thenReturn(response);
|
||||
|
||||
// when
|
||||
PaymentDetailResponse paymentDetail = paymentApisService.findPaymentDetail(1L);
|
||||
PaymentDetailDTO paymentDetail = paymentApisService.findPaymentDetail(1L);
|
||||
|
||||
// then
|
||||
assertAll(
|
||||
|
||||
@@ -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.application.response.TokenDto;
|
||||
import com.ticketing.server.user.service.dto.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(
|
||||
|
||||
@@ -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
|
||||
PaymentsResponse paymentDetails = userApisService.findPaymentsByEmail("ticketing@gmail.com");
|
||||
PaymentsDTO paymentsDto = userApisService.findPaymentsByEmail("ticketing@gmail.com");
|
||||
|
||||
// then
|
||||
assertAll(
|
||||
() -> assertThat(paymentDetails.getEmail()).isEqualTo("ticketing@gmail.com")
|
||||
, () -> assertThat(paymentDetails.getPayments()).hasSize(0)
|
||||
() -> assertThat(paymentsDto.getEmail()).isEqualTo("ticketing@gmail.com")
|
||||
, () -> assertThat(paymentsDto.getPayments()).isEmpty()
|
||||
);
|
||||
}
|
||||
|
||||
@@ -77,12 +77,12 @@ class UserApisServiceImplTest {
|
||||
when(paymentClient.getPayments(any())).thenReturn(new SimplePaymentsResponse(1L, payments));
|
||||
|
||||
// when
|
||||
PaymentsResponse paymentDetails = userApisService.findPaymentsByEmail("ticketing@gmail.com");
|
||||
PaymentsDTO patmentsDto = userApisService.findPaymentsByEmail("ticketing@gmail.com");
|
||||
|
||||
// then
|
||||
assertAll(
|
||||
() -> assertThat(paymentDetails.getEmail()).isEqualTo("ticketing@gmail.com")
|
||||
, () -> assertThat(paymentDetails.getPayments()).hasSize(2)
|
||||
() -> assertThat(patmentsDto.getEmail()).isEqualTo("ticketing@gmail.com")
|
||||
, () -> assertThat(patmentsDto.getPayments()).hasSize(2)
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
@@ -13,8 +13,11 @@ 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;
|
||||
@@ -72,10 +75,10 @@ class UserServiceImplTest {
|
||||
when(sequenceGenerator.generateId()).thenReturn(123L);
|
||||
|
||||
// when
|
||||
User user = userService.register(signUpDto);
|
||||
CreatedUserDTO createdUserDto = userService.register(signUpDto);
|
||||
|
||||
// then
|
||||
assertThat(user).isNotNull();
|
||||
assertThat(createdUserDto).isNotNull();
|
||||
}
|
||||
|
||||
@Test
|
||||
@@ -97,10 +100,10 @@ class UserServiceImplTest {
|
||||
when(userRepository.findByEmailAndDeletedAtNull("ticketing@gmail.com")).thenReturn(Optional.of(user));
|
||||
|
||||
// when
|
||||
User user = userService.delete(deleteUserDto);
|
||||
DeletedUserDTO deletedUserDto = userService.delete(deleteUserDto);
|
||||
|
||||
// then
|
||||
assertThat(user.getDeletedAt()).isNotNull();
|
||||
assertThat(deletedUserDto.getDeletedAt()).isNotNull();
|
||||
}
|
||||
|
||||
@Test
|
||||
@@ -122,10 +125,10 @@ class UserServiceImplTest {
|
||||
when(userRepository.findByEmailAndDeletedAtNull("ticketing@gmail.com")).thenReturn(Optional.of(user));
|
||||
|
||||
// when
|
||||
User user = userService.changePassword(changePasswordDto);
|
||||
ChangedPasswordUserDTO changedUserDto = userService.changePassword(changePasswordDto);
|
||||
|
||||
// then
|
||||
assertThat(user).isNotNull();
|
||||
assertThat(changedUserDto).isNotNull();
|
||||
}
|
||||
|
||||
@Test
|
||||
|
||||
Reference in New Issue
Block a user