Compare commits

..

1 Commits

Author SHA1 Message Date
dongHyo
acbaf0232b feat: 권한변경 API 구현 2022-07-12 14:51:24 +09:00
63 changed files with 338 additions and 648 deletions

View File

@@ -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/>

View File

@@ -33,8 +33,7 @@ public enum ErrorCode {
DUPLICATE_EMAIL(CONFLICT, "이메일이 이미 존재합니다."),
DUPLICATE_PAYMENT(CONFLICT, "해당 좌석은 현재 판매된 좌석입니다."),
DUPLICATE_MOVIE(CONFLICT, "해당 영화 정보가 이미 존재합니다."),
DELETED_EMAIL(CONFLICT, "이미 삭제된 이메일 입니다."),
DELETED_MOVIE(CONFLICT, "이미 삭제된 영화 입니다.");
DELETED_EMAIL(CONFLICT, "이미 삭제된 이메일 입니다.");
private final HttpStatus httpStatus;
private final String detail;
@@ -99,8 +98,4 @@ public enum ErrorCode {
throw new TicketingException(DELETED_EMAIL);
}
public static TicketingException throwDeletedMovie() {
throw new TicketingException(DELETED_MOVIE);
}
}

View File

@@ -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) {

View File

@@ -1,15 +1,8 @@
package com.ticketing.server.movie.application;
import static com.ticketing.server.user.domain.UserGrade.ROLES.STAFF;
import com.ticketing.server.movie.application.request.MovieDeleteRequest;
import com.ticketing.server.movie.application.request.MovieRegisterRequest;
import com.ticketing.server.movie.application.response.MovieDeleteResponse;
import com.ticketing.server.movie.application.response.MovieListResponse;
import com.ticketing.server.movie.application.response.MovieInfoResponse;
import com.ticketing.server.movie.service.dto.DeletedMovieDTO;
import com.ticketing.server.movie.service.dto.MovieListDTO;
import com.ticketing.server.movie.service.dto.RegisteredMovieDTO;
import com.ticketing.server.movie.application.response.MovieTitleResponse;
import com.ticketing.server.movie.service.interfaces.MovieService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -19,7 +12,6 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.security.access.annotation.Secured;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -37,37 +29,25 @@ public class MovieController {
@PostMapping()
@ApiOperation(value = "영화 정보 등록")
@Secured(STAFF)
public ResponseEntity<MovieInfoResponse> registerMovie(@RequestBody @Valid MovieRegisterRequest request) {
RegisteredMovieDTO registeredMovieDto =
movieService.registerMovie(request.getTitle(), request.getRunningTime());
@Secured("ROLE_STAFF")
public ResponseEntity<MovieTitleResponse> registerMovie(@RequestBody @Valid MovieRegisterRequest request) {
return ResponseEntity.status(HttpStatus.OK)
.body(
registeredMovieDto.toResponse()
MovieTitleResponse.from(
movieService.registerMovie(request.toMovieRegisterDTO())
)
);
}
@GetMapping()
@ApiOperation(value = "영화 목록 조회")
public ResponseEntity<MovieListResponse> getMovies() {
MovieListDTO movieListDto = movieService.getMovies();
return ResponseEntity.status(HttpStatus.OK)
.body(
movieListDto.toResponse()
MovieListResponse.from(
movieService.getMovies()
)
);
}
@DeleteMapping()
@ApiOperation(value = "영화 정보 삭제")
@Secured(STAFF)
public ResponseEntity<MovieDeleteResponse> deleteMovie(@RequestBody @Valid MovieDeleteRequest request) {
DeletedMovieDTO deletedMovieDto = movieService.deleteMovie(request.getId());
return ResponseEntity.status(HttpStatus.OK)
.body(
deletedMovieDto.toResponse()
);
}
}

View File

@@ -1,16 +0,0 @@
package com.ticketing.server.movie.application.request;
import javax.validation.constraints.NotNull;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
@Getter
@NoArgsConstructor
@AllArgsConstructor
public class MovieDeleteRequest {
@NotNull(message = "{validation.not.null.id}")
private Long id;
}

View File

@@ -1,17 +0,0 @@
package com.ticketing.server.movie.application.response;
import java.time.LocalDateTime;
import lombok.AllArgsConstructor;
import lombok.Getter;
@Getter
@AllArgsConstructor
public class MovieDeleteResponse {
private final Long id;
private final String title;
private final LocalDateTime deletedAt;
}

View File

@@ -1,17 +0,0 @@
package com.ticketing.server.movie.application.response;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Getter;
@Getter
@AllArgsConstructor
public class MovieInfoResponse {
@ApiModelProperty(value = "영화 ID")
private Long movieId;
@ApiModelProperty(value = "영화 제목")
private String title;
}

View File

@@ -3,14 +3,19 @@ package com.ticketing.server.movie.application.response;
import com.ticketing.server.movie.service.dto.MovieDTO;
import io.swagger.annotations.ApiModelProperty;
import java.util.List;
import lombok.AccessLevel;
import lombok.AllArgsConstructor;
import lombok.Getter;
@Getter
@AllArgsConstructor
@AllArgsConstructor(access = AccessLevel.PRIVATE)
public class MovieListResponse {
@ApiModelProperty(value = "영화 제목")
private List<MovieDTO> movieDtos;
public static MovieListResponse from(List<MovieDTO> movieDtos) {
return new MovieListResponse(movieDtos);
}
}

View File

@@ -0,0 +1,20 @@
package com.ticketing.server.movie.application.response;
import com.ticketing.server.movie.service.dto.MovieDTO;
import io.swagger.annotations.ApiModelProperty;
import lombok.AccessLevel;
import lombok.AllArgsConstructor;
import lombok.Getter;
@Getter
@AllArgsConstructor(access = AccessLevel.PRIVATE)
public class MovieTitleResponse {
@ApiModelProperty(value = "영화 제목")
private String title;
public static MovieTitleResponse from(MovieDTO movieDto) {
return new MovieTitleResponse(movieDto.getTitle());
}
}

View File

@@ -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;

View File

@@ -1,9 +1,7 @@
package com.ticketing.server.movie.domain;
import com.ticketing.server.global.dto.repository.AbstractEntity;
import com.ticketing.server.global.exception.ErrorCode;
import com.ticketing.server.movie.service.dto.MovieDTO;
import java.time.LocalDateTime;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.validation.constraints.NotNull;
import lombok.AccessLevel;
@@ -18,6 +16,7 @@ import lombok.NoArgsConstructor;
public class Movie extends AbstractEntity {
@NotNull
@Column(unique = true)
private String title;
@NotNull
@@ -29,18 +28,4 @@ public class Movie extends AbstractEntity {
this.runningTime = runningTime;
}
public Movie delete() {
if (deletedAt != null) {
throw ErrorCode.throwDeletedMovie();
}
deletedAt = LocalDateTime.now();
return this;
}
public MovieDTO toMovieDTO() {
return new MovieDTO(this.id, this.title);
}
}

View File

@@ -13,14 +13,6 @@ public interface MovieRepository extends JpaRepository<Movie, Long> {
Optional<Movie> findByTitle(String title);
Optional<Movie> findByIdAndDeletedAtNull(Long id);
@Query(value = "SELECT m "
+ "FROM Movie m "
+ "WHERE title = :title "
+ "AND deleted_at IS NULL")
Optional<Movie> findValidMovieWithTitle(String title);
@Query(value = "SELECT * "
+ "FROM movie "
+ "WHERE deleted_at IS NULL", nativeQuery = true)

View File

@@ -3,15 +3,12 @@ package com.ticketing.server.movie.service;
import com.ticketing.server.global.exception.ErrorCode;
import com.ticketing.server.movie.domain.Movie;
import com.ticketing.server.movie.domain.repository.MovieRepository;
import com.ticketing.server.movie.service.dto.DeletedMovieDTO;
import com.ticketing.server.movie.service.dto.MovieDTO;
import com.ticketing.server.movie.service.dto.MovieListDTO;
import com.ticketing.server.movie.service.dto.RegisteredMovieDTO;
import com.ticketing.server.movie.service.dto.MovieRegisterDTO;
import com.ticketing.server.movie.service.interfaces.MovieService;
import java.util.List;
import java.util.Optional;
import java.util.stream.Collectors;
import javax.transaction.Transactional;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@@ -24,39 +21,24 @@ public class MovieServiceImpl implements MovieService {
private final MovieRepository movieRepository;
@Override
public RegisteredMovieDTO registerMovie(String title, Long runningTime) {
Optional<Movie> movie = movieRepository.findValidMovieWithTitle(title);
public MovieDTO registerMovie(MovieRegisterDTO movieRegisterDto) {
Optional<Movie> movie = movieRepository.findByTitle(movieRegisterDto.getTitle());
if(movie.isEmpty()) {
Movie newMovie = movieRepository.save(
new Movie(title, runningTime)
);
return new RegisteredMovieDTO(newMovie);
return MovieDTO.from(movieRepository.save(movieRegisterDto.toMovie()));
}
throw ErrorCode.throwDuplicateMovie();
}
@Override
public MovieListDTO getMovies() {
public List<MovieDTO> getMovies() {
List<Movie> movies = movieRepository.findValidMovies();
List<MovieDTO> movieDtos = movies.stream()
.map(movie -> movie.toMovieDTO())
return movies.stream()
.map(MovieDTO::from)
.collect(Collectors.toList());
return new MovieListDTO(movieDtos);
}
@Override
@Transactional
public DeletedMovieDTO deleteMovie(Long id) {
Movie movie = movieRepository.findByIdAndDeletedAtNull(id)
.orElseThrow(ErrorCode::throwMovieNotFound);
Movie deletedMovie = movie.delete();
return new DeletedMovieDTO(deletedMovie);
}
}

View File

@@ -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;

View File

@@ -1,32 +0,0 @@
package com.ticketing.server.movie.service.dto;
import com.ticketing.server.movie.application.response.MovieDeleteResponse;
import com.ticketing.server.movie.domain.Movie;
import java.time.LocalDateTime;
import lombok.AccessLevel;
import lombok.AllArgsConstructor;
import lombok.Getter;
@Getter
@AllArgsConstructor(access = AccessLevel.PRIVATE)
public class DeletedMovieDTO {
private final Long id;
private final String title;
private final LocalDateTime deletedAt;
public DeletedMovieDTO(Movie movie) {
this(
movie.getId(),
movie.getTitle(),
movie.getDeletedAt()
);
}
public MovieDeleteResponse toResponse() {
return new MovieDeleteResponse(id, title, deletedAt);
}
}

View File

@@ -1,14 +1,18 @@
package com.ticketing.server.movie.service.dto;
import com.ticketing.server.movie.domain.Movie;
import lombok.AccessLevel;
import lombok.AllArgsConstructor;
import lombok.Getter;
@Getter
@AllArgsConstructor
@AllArgsConstructor(access = AccessLevel.PRIVATE)
public class MovieDTO {
private Long movieId;
private String title;
public static MovieDTO from(Movie movie) {
return new MovieDTO(movie.getTitle());
}
}

View File

@@ -1,18 +0,0 @@
package com.ticketing.server.movie.service.dto;
import com.ticketing.server.movie.application.response.MovieListResponse;
import java.util.List;
import lombok.AllArgsConstructor;
import lombok.Getter;
@Getter
@AllArgsConstructor()
public class MovieListDTO {
private final List<MovieDTO> movieDtos;
public MovieListResponse toResponse() {
return new MovieListResponse(movieDtos);
}
}

View File

@@ -1,28 +0,0 @@
package com.ticketing.server.movie.service.dto;
import com.ticketing.server.movie.application.response.MovieInfoResponse;
import com.ticketing.server.movie.domain.Movie;
import lombok.AccessLevel;
import lombok.AllArgsConstructor;
import lombok.Getter;
@Getter
@AllArgsConstructor(access = AccessLevel.PRIVATE)
public class RegisteredMovieDTO {
private final Long id;
private final String title;
public RegisteredMovieDTO(Movie movie) {
this(
movie.getId(),
movie.getTitle()
);
}
public MovieInfoResponse toResponse() {
return new MovieInfoResponse(id, title);
}
}

View File

@@ -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;

View File

@@ -1,14 +1,13 @@
package com.ticketing.server.movie.service.interfaces;
import com.ticketing.server.movie.service.dto.DeletedMovieDTO;
import com.ticketing.server.movie.service.dto.MovieListDTO;
import com.ticketing.server.movie.service.dto.RegisteredMovieDTO;
import com.ticketing.server.movie.service.dto.MovieDTO;
import com.ticketing.server.movie.service.dto.MovieRegisterDTO;
import java.util.List;
public interface MovieService {
RegisteredMovieDTO registerMovie(String title, Long runningTime);
MovieDTO registerMovie(MovieRegisterDTO movieRegisterDto);
MovieListDTO getMovies();
List<MovieDTO> getMovies();
DeletedMovieDTO deleteMovie(Long id);
}

View File

@@ -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);
}
}

View File

@@ -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()
);
}
}

View File

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

View File

@@ -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()
);
}
}

View File

@@ -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);
}
}

View File

@@ -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

View File

@@ -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);
}
}

View File

@@ -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(

View File

@@ -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()
);
}
}

View File

@@ -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);
}

View File

@@ -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() {

View File

@@ -13,11 +13,7 @@ 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.service.dto.UserDetailDTO;
import com.ticketing.server.user.service.interfaces.UserApisService;
import com.ticketing.server.user.service.interfaces.UserService;
@@ -44,34 +40,28 @@ 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)
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) {
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")
@@ -79,29 +69,22 @@ public class UserController {
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());
User user = userService.changePassword(request.toChangePasswordDto(userRequest.getUsername(), passwordEncoder));
return ResponseEntity.status(HttpStatus.OK).body(UserChangePasswordResponse.from(user));
}
@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());
return ResponseEntity.status(HttpStatus.OK).body(changeGradeDto.toResponse());
}
@GetMapping("/payments")
@Secured(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);
}
}

View File

@@ -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());
}
}

View File

@@ -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());
}
}

View File

@@ -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());
}
}

View File

@@ -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);
}
}

View File

@@ -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;
}

View File

@@ -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());
}
}

View File

@@ -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());
}
}

View File

@@ -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()
);
}
}

View File

@@ -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) {

View File

@@ -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);
}
}

View File

@@ -7,10 +7,7 @@ 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 +32,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,20 +43,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);
public User changePassword(@Valid ChangePasswordDTO changePasswordDto) {
User user = findNotDeletedUserByEmail(changePasswordDto.getEmail());
return user.changePassword(changePasswordDto);
}
@Override

View File

@@ -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;

View File

@@ -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);
}
}

View File

@@ -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);
}
}

View File

@@ -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);
}
}

View File

@@ -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) {

View File

@@ -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);
}
}

View File

@@ -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);
}
}

View File

@@ -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);

View File

@@ -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);
}
}

View File

@@ -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);
}
}

View File

@@ -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);
}

View File

@@ -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);
}

View File

@@ -3,24 +3,23 @@ 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;
import javax.validation.Valid;
import javax.validation.constraints.NotNull;
import org.springframework.transaction.annotation.Transactional;
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);
User changePassword(@Valid ChangePasswordDTO changePasswordDto);
@Transactional
ChangeGradeDTO changeGrade(@NotNull String email, @NotNull UserGrade grade);
UserDetailDTO findDetailByEmail(@NotNull String email);

View File

@@ -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

View File

@@ -6,7 +6,6 @@ import static org.mockito.Mockito.when;
import com.ticketing.server.movie.domain.Movie;
import com.ticketing.server.movie.domain.repository.MovieRepository;
import com.ticketing.server.movie.service.dto.MovieDTO;
import com.ticketing.server.movie.service.dto.MovieListDTO;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -39,10 +38,10 @@ public class MovieServiceImplTest {
.thenReturn(Collections.emptyList());
// when
MovieListDTO movieListDto = movieService.getMovies();
List<MovieDTO> movieDTOList = movieService.getMovies();
// then
assertTrue(movieListDto.getMovieDtos().isEmpty());
assertTrue(movieDTOList.isEmpty());
}
@Test
@@ -50,16 +49,18 @@ public class MovieServiceImplTest {
void shouldAbleToGetMovies() {
// given
movie = new Movie("범죄도시2", 106L);
movieDto = movieDto.from(movie);
movies.add(movie);
movieDTOS.add(movieDto);
when(movieRepository.findValidMovies())
.thenReturn(movies);
// when
MovieListDTO movieListDto = movieService.getMovies();
List<MovieDTO> movieDTOList = movieService.getMovies();
// then
assertTrue(!movieListDto.getMovieDtos().isEmpty());
assertTrue(!movieDTOList.isEmpty());
}
}

View File

@@ -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;

View File

@@ -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(

View File

@@ -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(

View File

@@ -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)
);
}

View File

@@ -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