diff --git a/server/src/main/java/com/ticketing/server/movie/application/MovieTimeController.java b/server/src/main/java/com/ticketing/server/movie/application/MovieTimeController.java index 2eb9100..6844fc9 100644 --- a/server/src/main/java/com/ticketing/server/movie/application/MovieTimeController.java +++ b/server/src/main/java/com/ticketing/server/movie/application/MovieTimeController.java @@ -5,13 +5,14 @@ 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.MovieTimeListDTO; +import com.ticketing.server.movie.service.dto.MovieTimeDTO; 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; @@ -58,11 +59,11 @@ public class MovieTimeController { public ResponseEntity getMovieTimes( @ApiParam(value = "영화 ID", required = true) @RequestParam @NotNull Long movieId, @ApiParam(value = "상영 날짜", required = true) @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") LocalDate runningDate) { - MovieTimeListDTO movieTimeListDto = movieTimeService.getMovieTimes(movieId, runningDate); + List movieTimeDtos = movieTimeService.getMovieTimes(movieId, runningDate); return ResponseEntity.status(HttpStatus.OK) .body( - movieTimeListDto.toResponse() + new MovieTimeListResponse(movieTimeDtos) ); } diff --git a/server/src/main/java/com/ticketing/server/movie/service/MovieServiceImpl.java b/server/src/main/java/com/ticketing/server/movie/service/MovieServiceImpl.java index 11a4056..0cae643 100644 --- a/server/src/main/java/com/ticketing/server/movie/service/MovieServiceImpl.java +++ b/server/src/main/java/com/ticketing/server/movie/service/MovieServiceImpl.java @@ -5,7 +5,6 @@ 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; diff --git a/server/src/main/java/com/ticketing/server/movie/service/MovieTimeServiceImpl.java b/server/src/main/java/com/ticketing/server/movie/service/MovieTimeServiceImpl.java index 93b78fe..d36e553 100644 --- a/server/src/main/java/com/ticketing/server/movie/service/MovieTimeServiceImpl.java +++ b/server/src/main/java/com/ticketing/server/movie/service/MovieTimeServiceImpl.java @@ -8,9 +8,7 @@ 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; @@ -56,7 +54,7 @@ public class MovieTimeServiceImpl implements MovieTimeService { } @Override - public MovieTimeListDTO getMovieTimes(Long movieId, LocalDate runningDate) { + public List getMovieTimes(Long movieId, LocalDate runningDate) { Movie movie = findMovieById(movieId); LocalDateTime startOfDay = runningDate.atStartOfDay().plusHours(6); @@ -64,11 +62,9 @@ public class MovieTimeServiceImpl implements MovieTimeService { List movieTimes = movieTimeRepository.findValidMovieTimes(movie, startOfDay, endOfDay); - List movieTimeDtos = movieTimes.stream() + return movieTimes.stream() .map(movieTime -> movieTime.toMovieTimeDTO()) .collect(Collectors.toList()); - - return new MovieTimeListDTO(movieTimeDtos); } @Override diff --git a/server/src/main/java/com/ticketing/server/movie/service/dto/MovieTimeListDTO.java b/server/src/main/java/com/ticketing/server/movie/service/dto/MovieTimeListDTO.java deleted file mode 100644 index 73c0554..0000000 --- a/server/src/main/java/com/ticketing/server/movie/service/dto/MovieTimeListDTO.java +++ /dev/null @@ -1,18 +0,0 @@ -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 movieTimeDtos; - - public MovieTimeListResponse toResponse() { - return new MovieTimeListResponse(movieTimeDtos); - } - -} diff --git a/server/src/main/java/com/ticketing/server/movie/service/interfaces/MovieTimeService.java b/server/src/main/java/com/ticketing/server/movie/service/interfaces/MovieTimeService.java index 2ef1d18..fad8d3c 100644 --- a/server/src/main/java/com/ticketing/server/movie/service/interfaces/MovieTimeService.java +++ b/server/src/main/java/com/ticketing/server/movie/service/interfaces/MovieTimeService.java @@ -2,17 +2,18 @@ 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.MovieTimeListDTO; +import com.ticketing.server.movie.service.dto.MovieTimeDTO; 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); - MovieTimeListDTO getMovieTimes(Long movieId, LocalDate runningDate); + List getMovieTimes(Long movieId, LocalDate runningDate); Movie findMovieById(Long movieId);