refactor: 피드백 반영

README.md

@@ -91,7 +91,7 @@ erDiagram
         bigint seat_id FK "좌석 ID"
         bigint movie_time_id FK "상영시간표 ID"
         bigint payment_id "결제 ID"
-        varchar status "상태 - 판매가능/예약/"
+        varchar status "상태 - 구매가능/예약진행중/판매완료"
         int ticket_price "가격"
         datetime deleted_at "삭제일시"
         datetime created_at "등록일시"
@@ -101,11 +101,10 @@ erDiagram
     PAYMENT {
         bigint id PK "결제 ID"
         bigint user_alternate_id "유저 대체ID"
-        varchar tid "카카오페이 결제고유번호"
         varchar movie_title "영화제목"
         varchar type "결제 타입 - 예) 네이버페이, 카카오페이"
-        varchar status "상태 - 완료/환불"
-        varchar failed_message "실패사유"
+        varchar status "상태 - 완료/환불/실패"
+        varchar failed_message "실패사유 - 컬럼명을 알아보기 쉬운가?"
         varchar payment_number "예매번호"
         int total_price "결제 금액"
         datetime deleted_at "삭제일시"

server/src/main/java/com/ticketing/server/movie/application/MovieController.java

@@ -8,12 +8,11 @@ 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.MovieDTO;
+import com.ticketing.server.movie.service.dto.MovieListDTO;
 import com.ticketing.server.movie.service.dto.RegisteredMovieDTO;
 import com.ticketing.server.movie.service.interfaces.MovieService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import java.util.List;
 import javax.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -52,11 +51,11 @@ public class MovieController {
 	@GetMapping()
 	@ApiOperation(value = "영화 목록 조회")
 	public ResponseEntity<MovieListResponse> getMovies() {
-		List<MovieDTO> movieDtos = movieService.getMovies();
+		MovieListDTO movieListDto = movieService.getMovies();
 
 		return ResponseEntity.status(HttpStatus.OK)
 			.body(
-				new MovieListResponse(movieDtos)
+				movieListDto.toResponse()
 			);
 	}
 

server/src/main/java/com/ticketing/server/movie/application/MovieTimeController.java

@@ -5,14 +5,13 @@ import static com.ticketing.server.user.domain.UserGrade.ROLES.STAFF;
 import com.ticketing.server.movie.application.request.MovieTimeRegisterRequest;
 import com.ticketing.server.movie.application.response.MovieTimeInfoResponse;
 import com.ticketing.server.movie.application.response.MovieTimeListResponse;
-import com.ticketing.server.movie.service.dto.MovieTimeDTO;
+import com.ticketing.server.movie.service.dto.MovieTimeListDTO;
 import com.ticketing.server.movie.service.dto.RegisteredMovieTimeDTO;
 import com.ticketing.server.movie.service.interfaces.MovieTimeService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import java.time.LocalDate;
-import java.util.List;
 import javax.validation.Valid;
 import javax.validation.constraints.NotNull;
 import lombok.RequiredArgsConstructor;
@@ -59,11 +58,11 @@ public class MovieTimeController {
 	public ResponseEntity<MovieTimeListResponse> getMovieTimes(
 		@ApiParam(value = "영화 ID", required = true) @RequestParam @NotNull Long movieId,
 		@ApiParam(value = "상영 날짜", required = true) @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") LocalDate runningDate) {
-		List<MovieTimeDTO> movieTimeDtos = movieTimeService.getMovieTimes(movieId, runningDate);
+		MovieTimeListDTO movieTimeListDto = movieTimeService.getMovieTimes(movieId, runningDate);
 
 		return ResponseEntity.status(HttpStatus.OK)
 			.body(
-				new MovieTimeListResponse(movieTimeDtos)
+				movieTimeListDto.toResponse()
 			);
 	}
 

server/src/main/java/com/ticketing/server/movie/application/TicketController.java

@@ -4,11 +4,10 @@ import static com.ticketing.server.user.domain.UserGrade.ROLES.USER;
 
 import com.ticketing.server.movie.application.response.TicketDetailsResponse;
 import com.ticketing.server.movie.application.response.TicketListResponse;
-import com.ticketing.server.movie.service.dto.TicketDTO;
+import com.ticketing.server.movie.service.dto.TicketDetailsDTO;
+import com.ticketing.server.movie.service.dto.TicketListDTO;
 import com.ticketing.server.movie.service.interfaces.TicketService;
-import com.ticketing.server.payment.service.dto.TicketDetailDTO;
 import io.swagger.annotations.ApiParam;
-import java.util.List;
 import javax.validation.constraints.NotNull;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpStatus;
@@ -33,11 +32,11 @@ public class TicketController {
 	@Secured(USER)
 	public ResponseEntity<TicketListResponse> getTickets(
 		@ApiParam(value = "영화 시간표 ID", required = true) @RequestParam @NotNull Long movieTimeId) {
-		List<TicketDTO> tickets = ticketService.getTickets(movieTimeId);
+		TicketListDTO ticketListDto = ticketService.getTickets(movieTimeId);
 
 		return ResponseEntity.status(HttpStatus.OK)
 			.body(
-				new TicketListResponse(tickets)
+				ticketListDto.toResponse()
 			);
 	}
 
@@ -45,11 +44,11 @@ public class TicketController {
 	@Secured(USER)
 	public ResponseEntity<TicketDetailsResponse> findTicketsByPaymentId(
 		@PathVariable("paymentId") @NotNull Long paymentId) {
-		List<TicketDetailDTO> tickets = ticketService.findTicketsByPaymentId(paymentId);
+		TicketDetailsDTO tickets = ticketService.findTicketsByPaymentId(paymentId);
 
 		return ResponseEntity.status(HttpStatus.OK)
 			.body(
-				new TicketDetailsResponse(tickets)
+				tickets.toResponse()
 			);
 	}
 

server/src/main/java/com/ticketing/server/movie/domain/repository/MovieRepository.java

@@ -1,6 +1,7 @@
 package com.ticketing.server.movie.domain.repository;
 
 import com.ticketing.server.movie.domain.Movie;
+import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Optional;
 import org.springframework.data.jpa.repository.JpaRepository;
@@ -16,8 +17,8 @@ public interface MovieRepository extends JpaRepository<Movie, Long> {
 
 	@Query(value = "SELECT m "
 		+ "FROM Movie m "
-		+ "WHERE m.title = :title "
-		+ "AND m.deletedAt IS NULL")
+		+ "WHERE title = :title "
+		+ "AND deleted_at IS NULL")
 	Optional<Movie> findValidMovieWithTitle(String title);
 
     @Query(value = "SELECT * "

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

@@ -5,6 +5,7 @@ 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.interfaces.MovieService;
 import java.util.List;
@@ -38,12 +39,14 @@ public class MovieServiceImpl implements MovieService {
 	}
 
 	@Override
-	public List<MovieDTO> getMovies() {
+	public MovieListDTO getMovies() {
 		List<Movie> movies = movieRepository.findValidMovies();
 
-		return movies.stream()
+		List<MovieDTO> movieDtos = movies.stream()
 			.map(movie -> movie.toMovieDTO())
 			.collect(Collectors.toList());
+
+		return new MovieListDTO(movieDtos);
 	}
 
 	@Override

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

@@ -8,7 +8,9 @@ import com.ticketing.server.movie.domain.repository.MovieRepository;
 import com.ticketing.server.movie.domain.repository.MovieTimeRepository;
 import com.ticketing.server.movie.domain.repository.TheaterRepository;
 import com.ticketing.server.movie.service.dto.MovieTimeDTO;
+import com.ticketing.server.movie.service.dto.MovieTimeListDTO;
 import com.ticketing.server.movie.service.dto.MovieTimeRegisterDTO;
+import com.ticketing.server.movie.service.dto.RegisteredMovieDTO;
 import com.ticketing.server.movie.service.dto.RegisteredMovieTimeDTO;
 import com.ticketing.server.movie.service.interfaces.MovieTimeService;
 import java.time.LocalDate;
@@ -54,7 +56,7 @@ public class MovieTimeServiceImpl implements MovieTimeService {
 	}
 
 	@Override
-	public List<MovieTimeDTO> getMovieTimes(Long movieId, LocalDate runningDate) {
+	public MovieTimeListDTO getMovieTimes(Long movieId, LocalDate runningDate) {
 		Movie movie = findMovieById(movieId);
 
 		LocalDateTime startOfDay = runningDate.atStartOfDay().plusHours(6);
@@ -62,9 +64,11 @@ public class MovieTimeServiceImpl implements MovieTimeService {
 
 		List<MovieTime> movieTimes = movieTimeRepository.findValidMovieTimes(movie, startOfDay, endOfDay);
 
-		return movieTimes.stream()
+		List<MovieTimeDTO> movieTimeDtos = movieTimes.stream()
 			.map(movieTime -> movieTime.toMovieTimeDTO())
 			.collect(Collectors.toList());
+
+		return new MovieTimeListDTO(movieTimeDtos);
 	}
 
 	@Override

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

@@ -1,21 +1,26 @@
 package com.ticketing.server.movie.service;
 
 import com.ticketing.server.global.exception.ErrorCode;
-import com.ticketing.server.global.validator.constraints.NotEmptyCollection;
 import com.ticketing.server.movie.domain.MovieTime;
-import com.ticketing.server.movie.domain.Ticket;
 import com.ticketing.server.movie.domain.repository.MovieTimeRepository;
+import com.ticketing.server.global.validator.constraints.NotEmptyCollection;
+import com.ticketing.server.movie.domain.Ticket;
 import com.ticketing.server.movie.domain.repository.TicketRepository;
 import com.ticketing.server.movie.service.dto.TicketDTO;
+import com.ticketing.server.movie.service.dto.TicketDetailsDTO;
+import com.ticketing.server.movie.service.dto.TicketListDTO;
 import com.ticketing.server.movie.service.dto.TicketRefundDTO;
 import com.ticketing.server.movie.service.dto.TicketReservationDTO;
 import com.ticketing.server.movie.service.dto.TicketSoldDTO;
 import com.ticketing.server.movie.service.dto.TicketsCancelDTO;
+import com.ticketing.server.movie.service.dto.TicketsRefundDTO;
 import com.ticketing.server.movie.service.dto.TicketsReservationDTO;
 import com.ticketing.server.movie.service.dto.TicketsSoldDTO;
 import com.ticketing.server.movie.service.interfaces.TicketService;
 import com.ticketing.server.payment.service.dto.TicketDetailDTO;
+import java.time.LocalDateTime;
 import java.util.List;
+import java.util.function.Function;
 import java.util.function.UnaryOperator;
 import java.util.stream.Collectors;
 import javax.validation.constraints.NotNull;
@@ -37,18 +42,20 @@ public class TicketServiceImpl implements TicketService {
 	private final MovieTimeRepository movieTimeRepository;
 
 	@Override
-	public List<TicketDTO> getTickets(@NotNull Long movieTimeId) {
+	public TicketListDTO getTickets(@NotNull Long movieTimeId) {
 		MovieTime movieTime = movieTimeRepository.findById(movieTimeId)
 			.orElseThrow(ErrorCode::throwMovieTimeNotFound);
 
-		return ticketRepository.findValidTickets(movieTime)
+		List<TicketDTO> tickets = ticketRepository.findValidTickets(movieTime)
 			.stream()
 			.map(TicketDTO::new)
 			.collect(Collectors.toList());
+
+		return new TicketListDTO(tickets);
 	}
 
 	@Override
-	public List<TicketDetailDTO> findTicketsByPaymentId(@NotNull Long paymentId) {
+	public TicketDetailsDTO findTicketsByPaymentId(@NotNull Long paymentId) {
 		List<TicketDetailDTO> ticketDetails = ticketRepository.findTicketFetchJoinByPaymentId(paymentId)
 			.stream()
 			.map(TicketDetailDTO::new)
@@ -58,7 +65,7 @@ public class TicketServiceImpl implements TicketService {
 			throw ErrorCode.throwPaymentIdNotFound();
 		}
 
-		return ticketDetails;
+		return new TicketDetailsDTO(ticketDetails);
 	}
 
 	@Override
@@ -99,18 +106,20 @@ public class TicketServiceImpl implements TicketService {
 		List<Ticket> tickets = getTicketsByInTicketIds(ticketIds);
 		tickets.forEach(Ticket::cancel);
 
-		return new TicketsCancelDTO(tickets);
+		return new TicketsCancelDTO(ticketIds);
 	}
 
 	@Override
 	@Transactional
-	public List<TicketRefundDTO> ticketsRefund(@NotNull Long paymentId, UnaryOperator<Ticket> refund) {
+	public TicketsRefundDTO ticketsRefund(@NotNull Long paymentId, UnaryOperator<Ticket> refund) {
 		List<Ticket> tickets = ticketRepository.findTicketFetchJoinByPaymentId(paymentId);
 
-		return tickets.stream()
+		List<TicketRefundDTO> refundDtoList = tickets.stream()
 			.map(refund)
 			.map(TicketRefundDTO::new)
 			.collect(Collectors.toList());
+
+		return new TicketsRefundDTO(refundDtoList);
 	}
 
 	private List<Ticket> getTicketsByInTicketIds(List<Long> ticketIds) {

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

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

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

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

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

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

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

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

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

@@ -1,22 +1,16 @@
 package com.ticketing.server.movie.service.dto;
 
 import com.ticketing.server.movie.application.response.TicketCancelResponse;
-import com.ticketing.server.movie.domain.Ticket;
 import java.util.List;
-import java.util.stream.Collectors;
+import lombok.AllArgsConstructor;
 import lombok.Getter;
 
 @Getter
+@AllArgsConstructor
 public class TicketsCancelDTO {
 
 	private final List<Long> ticketIds;
 
-	public TicketsCancelDTO(List<Ticket> tickets) {
-		ticketIds = tickets.stream()
-			.map(Ticket::getId)
-			.collect(Collectors.toList());
-	}
-
 	public TicketCancelResponse toResponse() {
 		return new TicketCancelResponse(ticketIds);
 	}

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

@@ -0,0 +1,16 @@
+package com.ticketing.server.movie.service.dto;
+
+import java.util.List;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public class TicketsRefundDTO {
+
+	private List<TicketRefundDTO> tickets;
+
+	public TicketsRefundResponse toResponse() {
+		return new TicketsRefundResponse(tickets);
+	}
+}

server/src/main/java/com/ticketing/server/movie/service/interfaces/MovieService.java

@@ -1,15 +1,14 @@
 package com.ticketing.server.movie.service.interfaces;
 
 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 java.util.List;
 
 public interface MovieService {
 
 	RegisteredMovieDTO registerMovie(String title, Long runningTime);
 
-	List<MovieDTO> getMovies();
+	MovieListDTO getMovies();
 
 	DeletedMovieDTO deleteMovie(Long id);
 }

server/src/main/java/com/ticketing/server/movie/service/interfaces/MovieTimeService.java

@@ -2,18 +2,17 @@ package com.ticketing.server.movie.service.interfaces;
 
 import com.ticketing.server.movie.domain.Movie;
 import com.ticketing.server.movie.domain.Theater;
-import com.ticketing.server.movie.service.dto.MovieTimeDTO;
+import com.ticketing.server.movie.service.dto.MovieTimeListDTO;
 import com.ticketing.server.movie.service.dto.MovieTimeRegisterDTO;
 import com.ticketing.server.movie.service.dto.RegisteredMovieTimeDTO;
 import java.time.LocalDate;
-import java.util.List;
 import javax.validation.Valid;
 
 public interface MovieTimeService {
 
 	RegisteredMovieTimeDTO registerMovieTime(@Valid MovieTimeRegisterDTO movieTimeRegisterDto);
 
-	List<MovieTimeDTO> getMovieTimes(Long movieId, LocalDate runningDate);
+	MovieTimeListDTO getMovieTimes(Long movieId, LocalDate runningDate);
 
 	Movie findMovieById(Long movieId);
 

server/src/main/java/com/ticketing/server/movie/service/interfaces/TicketService.java

@@ -2,21 +2,21 @@ package com.ticketing.server.movie.service.interfaces;
 
 import com.ticketing.server.global.validator.constraints.NotEmptyCollection;
 import com.ticketing.server.movie.domain.Ticket;
-import com.ticketing.server.movie.service.dto.TicketDTO;
-import com.ticketing.server.movie.service.dto.TicketRefundDTO;
+import com.ticketing.server.movie.service.dto.TicketDetailsDTO;
+import com.ticketing.server.movie.service.dto.TicketListDTO;
 import com.ticketing.server.movie.service.dto.TicketsCancelDTO;
+import com.ticketing.server.movie.service.dto.TicketsRefundDTO;
 import com.ticketing.server.movie.service.dto.TicketsReservationDTO;
 import com.ticketing.server.movie.service.dto.TicketsSoldDTO;
-import com.ticketing.server.payment.service.dto.TicketDetailDTO;
 import java.util.List;
 import java.util.function.UnaryOperator;
 import javax.validation.constraints.NotNull;
 
 public interface TicketService {
 
-	List<TicketDTO> getTickets(@NotNull Long movieTimeId);
+	TicketListDTO getTickets(@NotNull Long movieTimeId);
 
-	List<TicketDetailDTO> findTicketsByPaymentId(@NotNull Long paymentId);
+	TicketDetailsDTO findTicketsByPaymentId(@NotNull Long paymentId);
 
 	TicketsReservationDTO ticketReservation(@NotEmptyCollection List<Long> ticketIds);
 
@@ -24,6 +24,6 @@ public interface TicketService {
 
 	TicketsCancelDTO ticketCancel(@NotEmptyCollection List<Long> ticketIds);
 
-	List<TicketRefundDTO> ticketsRefund(@NotNull Long paymentId, UnaryOperator<Ticket> refund);
+	TicketsRefundDTO ticketsRefund(@NotNull Long paymentId, UnaryOperator<Ticket> refund);
 
 }

server/src/main/java/com/ticketing/server/payment/api/impl/MovieClientImpl.java

@@ -8,16 +8,15 @@ import com.ticketing.server.movie.application.response.TicketDetailsResponse;
 import com.ticketing.server.movie.application.response.TicketReservationResponse;
 import com.ticketing.server.movie.application.response.TicketSoldResponse;
 import com.ticketing.server.movie.domain.Ticket;
-import com.ticketing.server.movie.service.dto.TicketRefundDTO;
+import com.ticketing.server.movie.service.dto.TicketDetailsDTO;
 import com.ticketing.server.movie.service.dto.TicketsCancelDTO;
+import com.ticketing.server.movie.service.dto.TicketsRefundDTO;
 import com.ticketing.server.movie.service.dto.TicketsRefundResponse;
 import com.ticketing.server.movie.service.dto.TicketsReservationDTO;
 import com.ticketing.server.movie.service.dto.TicketsSoldDTO;
 import com.ticketing.server.movie.service.interfaces.TicketService;
 import com.ticketing.server.payment.api.MovieClient;
-import com.ticketing.server.payment.service.dto.TicketDetailDTO;
 import java.time.LocalDateTime;
-import java.util.List;
 import javax.validation.constraints.NotNull;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
@@ -32,8 +31,8 @@ public class MovieClientImpl implements MovieClient {
 
 	@Override
 	public TicketDetailsResponse getTicketsByPaymentId(@NotNull Long paymentId) {
-		List<TicketDetailDTO> ticketDetails = ticketService.findTicketsByPaymentId(paymentId);
-		return new TicketDetailsResponse(ticketDetails);
+		TicketDetailsDTO ticketDetails = ticketService.findTicketsByPaymentId(paymentId);
+		return ticketDetails.toResponse();
 	}
 
 	@Override
@@ -56,14 +55,14 @@ public class MovieClientImpl implements MovieClient {
 
 	@Override
 	public TicketsRefundResponse ticketRefundByDateTime(TicketsRefundRequest request, LocalDateTime dateTime) {
-		List<TicketRefundDTO> ticketRefundDTOS = ticketService.ticketsRefund(request.getPaymentId(), ticket -> ticket.refund(dateTime));
-		return new TicketsRefundResponse(ticketRefundDTOS);
+		TicketsRefundDTO ticketsRefundDto = ticketService.ticketsRefund(request.getPaymentId(), ticket -> ticket.refund(dateTime));
+		return ticketsRefundDto.toResponse();
 	}
 
 	@Override
 	public TicketsRefundResponse ticketRefund(TicketsRefundRequest request) {
-		List<TicketRefundDTO> ticketRefundDtos = ticketService.ticketsRefund(request.getPaymentId(), Ticket::refund);
-		return new TicketsRefundResponse(ticketRefundDtos);
+		TicketsRefundDTO ticketsRefundDto = ticketService.ticketsRefund(request.getPaymentId(), Ticket::refund);
+		return ticketsRefundDto.toResponse();
 	}
 
 }

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

@@ -1,23 +1,15 @@
 package com.ticketing.server.movie.service;
 
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyLong;
 import static org.mockito.Mockito.when;
 
-import com.ticketing.server.global.exception.TicketingException;
 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.RegisteredMovieDTO;
+import com.ticketing.server.movie.service.dto.MovieListDTO;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-import java.util.Optional;
-import org.hibernate.sql.Delete;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -29,7 +21,9 @@ import org.mockito.junit.jupiter.MockitoExtension;
 public class MovieServiceImplTest {
 
     Movie movie;
+    MovieDTO movieDto;
     List<Movie> movies = new ArrayList<>();
+    List<MovieDTO> movieDTOS = new ArrayList<>();
 
     @Mock
     MovieRepository movieRepository;
@@ -45,10 +39,10 @@ public class MovieServiceImplTest {
             .thenReturn(Collections.emptyList());
 
         // when
-        List<MovieDTO> movieDtos = movieService.getMovies();
+        MovieListDTO movieListDto = movieService.getMovies();
 
         // then
-        assertTrue(movieDtos.isEmpty());
+        assertTrue(movieListDto.getMovieDtos().isEmpty());
     }
 
     @Test
@@ -61,80 +55,11 @@ public class MovieServiceImplTest {
         when(movieRepository.findValidMovies())
             .thenReturn(movies);
 
-	    // when
-	    List<MovieDTO> movieDtos = movieService.getMovies();
+        // when
+	    MovieListDTO movieListDto = movieService.getMovies();
 
-	    // then
-	    assertTrue(!movieDtos.isEmpty());
+        // then
+        assertTrue(!movieListDto.getMovieDtos().isEmpty());
     }
 
-	@Test
-	@DisplayName("Movie Service Test - register movie")
-	void shouldAbleToRegisterMovie() {
-		// given
-		String title = "추가할 영화 제목";
-		movie = new Movie(title, 100L);
-
-		when(movieRepository.findValidMovieWithTitle(title))
-			.thenReturn(Optional.empty());
-		when(movieRepository.save(any()))
-			.thenReturn(movie);
-
-		// when
-		RegisteredMovieDTO registeredMovieDto =
-			movieService.registerMovie(title, movie.getRunningTime());
-
-		// then
-		assertThat(registeredMovieDto).isNotNull();
-		assertTrue(registeredMovieDto.getTitle().equals(title));
-	}
-
-	@Test
-	@DisplayName("Movie Service Test - register movie when there is same movie already")
-	void shouldThrowExceptionWhenRegistering() {
-		// given
-		String title = "이미 중복된 영화 제목";
-
-		Movie movie = new Movie(title, 100L);
-
-		when(movieRepository.findValidMovieWithTitle(title))
-			.thenReturn(Optional.of(movie));
-
-		// when
-		// then
-		assertThatThrownBy(() -> movieService.registerMovie(title, 100L))
-			.isInstanceOf(TicketingException.class);
-
-	}
-
-	@Test
-	@DisplayName("Movie Service Test - delete movie")
-	void shouldAbleToDeleteMovie() {
-		// given
-		Movie movie = new Movie("삭제할 영화 제목", 100L);
-
-		when(movieRepository.findByIdAndDeletedAtNull(1L))
-			.thenReturn(Optional.of(movie));
-
-		// when
-		DeletedMovieDTO deletedMovieDto =
-			movieService.deleteMovie(1L);
-
-		// then
-		assertTrue(deletedMovieDto.getTitle().equals("삭제할 영화 제목"));
-		assertThat(deletedMovieDto.getDeletedAt()).isNotNull();
-	}
-
-	@Test
-	@DisplayName("Movie Service Test - delete movie when there is no such movie")
-	void shouldThrowExceptionWhenDeleting() {
-		// given
-		when(movieRepository.findByIdAndDeletedAtNull(1L))
-			.thenReturn(Optional.empty());
-
-		// when
-		// then
-		assertThatThrownBy(() -> movieService.deleteMovie(1L))
-			.isInstanceOf(TicketingException.class);
-	}
 }

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

@@ -9,7 +9,7 @@ import com.ticketing.server.movie.domain.MovieTime;
 import com.ticketing.server.movie.domain.Theater;
 import com.ticketing.server.movie.domain.repository.MovieRepository;
 import com.ticketing.server.movie.domain.repository.MovieTimeRepository;
-import com.ticketing.server.movie.service.dto.MovieTimeDTO;
+import com.ticketing.server.movie.service.dto.MovieTimeListDTO;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
@@ -51,10 +51,10 @@ public class MovieTimeServiceImplTest {
             .thenReturn(Collections.emptyList());
 
         // when
-        List<MovieTimeDTO> movieTimeDtos = movieTimeService.getMovieTimes(any(), LocalDate.now());
+        MovieTimeListDTO movieTimeListDto = movieTimeService.getMovieTimes(any(), LocalDate.now());
 
         // then
-        assertTrue(movieTimeDtos.isEmpty());
+        assertTrue(movieTimeListDto.getMovieTimeDtos().isEmpty());
     }
 
     @Test
@@ -76,10 +76,10 @@ public class MovieTimeServiceImplTest {
             .thenReturn(movieTimes);
 
         // when
-	    List<MovieTimeDTO> movieTimeDtos = movieTimeService.getMovieTimes(any(), LocalDate.of(2022, 07, 01));
+	    MovieTimeListDTO movieTimeListDto = movieTimeService.getMovieTimes(any(), LocalDate.of(2022, 07, 01));
 
         // then
-        assertTrue(!movieTimeDtos.isEmpty());
+        assertTrue(!movieTimeListDto.getMovieTimeDtos().isEmpty());
     }
 
 }

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

@@ -10,6 +10,7 @@ import com.ticketing.server.global.exception.ErrorCode;
 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.movie.service.dto.TicketsReservationDTO;
 import com.ticketing.server.payment.service.dto.TicketDetailDTO;
 import java.util.Collections;
@@ -52,7 +53,8 @@ class TicketServiceImplTest {
 		when(ticketRepository.findTicketFetchJoinByPaymentId(1L)).thenReturn(List.of(tickets.get(0)));
 
 		// when
-		List<TicketDetailDTO> ticketDetails = ticketService.findTicketsByPaymentId(1L);
+		TicketDetailsDTO ticketDetailDto = ticketService.findTicketsByPaymentId(1L);
+		List<TicketDetailDTO> ticketDetails = ticketDetailDto.getTicketDetails();
 
 		// then
 		assertAll(
@@ -64,14 +66,14 @@ class TicketServiceImplTest {
 	@Test
 	@DisplayName("티켓목록 예약으로 변경 시 조회된 갯수랑 다른 경우")
 	void ticketReservationFail() {
-		// given
+	    // given
 		List<Ticket> tickets = setupTickets();
 		List<Ticket> list = List.of(tickets.get(0), tickets.get(1), tickets.get(2));
 		List<Long> ids = List.of(0L, 1L, 2L, 10000L);
 
 		when(ticketRepository.findTicketFetchJoinByTicketIds(ids)).thenReturn(list);
 
-		// when
+	    // when
 		// then
 		assertThatThrownBy(() -> ticketService.ticketReservation(ids))
 			.isInstanceOf(TicketingException.class)
@@ -82,14 +84,14 @@ class TicketServiceImplTest {
 	@Test
 	@DisplayName("티켓목록 예약으로 변경 완료")
 	void ticketReservationSuccess() {
-		// given
+	    // given
 		List<Ticket> tickets = setupTickets();
 		List<Ticket> list = List.of(tickets.get(0), tickets.get(1), tickets.get(2));
 		List<Long> ids = List.of(0L, 1L, 2L);
 
 		when(ticketRepository.findTicketFetchJoinByTicketIds(ids)).thenReturn(list);
 
-		// when
+	    // when
 		TicketsReservationDTO ticketReservationsDto = ticketService.ticketReservation(ids);
 
 		// then