From f1382597deff8f24f97c522b6fddd044030648e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=86=90=EC=B0=BD=ED=98=84?= Date: Mon, 18 Jul 2022 17:16:00 +0900 Subject: [PATCH] Refactor/list dto (#78) * refactor: removed MovieListDTO: * refactor: removed MovieTimeListDTO * refactor: MovieTimeServiceImplTest - removed MovieTimeListDto --- .../movie/application/MovieController.java | 7 ++++--- .../movie/application/MovieTimeController.java | 7 ++++--- .../server/movie/service/MovieServiceImpl.java | 7 ++----- .../movie/service/MovieTimeServiceImpl.java | 8 ++------ .../server/movie/service/dto/MovieListDTO.java | 18 ------------------ .../movie/service/dto/MovieTimeListDTO.java | 18 ------------------ .../movie/service/interfaces/MovieService.java | 5 +++-- .../service/interfaces/MovieTimeService.java | 5 +++-- .../movie/service/MovieServiceImplTest.java | 12 ++++++------ .../service/MovieTimeServiceImplTest.java | 10 +++++----- 10 files changed, 29 insertions(+), 68 deletions(-) delete mode 100644 server/src/main/java/com/ticketing/server/movie/service/dto/MovieListDTO.java delete mode 100644 server/src/main/java/com/ticketing/server/movie/service/dto/MovieTimeListDTO.java diff --git a/server/src/main/java/com/ticketing/server/movie/application/MovieController.java b/server/src/main/java/com/ticketing/server/movie/application/MovieController.java index 5ab9090..4cc37ee 100644 --- a/server/src/main/java/com/ticketing/server/movie/application/MovieController.java +++ b/server/src/main/java/com/ticketing/server/movie/application/MovieController.java @@ -8,11 +8,12 @@ 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.MovieDTO; 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; @@ -51,11 +52,11 @@ public class MovieController { @GetMapping() @ApiOperation(value = "영화 목록 조회") public ResponseEntity getMovies() { - MovieListDTO movieListDto = movieService.getMovies(); + List movieDtos = movieService.getMovies(); return ResponseEntity.status(HttpStatus.OK) .body( - movieListDto.toResponse() + new MovieListResponse(movieDtos) ); } 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 593900a..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; @@ -39,14 +38,12 @@ public class MovieServiceImpl implements MovieService { } @Override - public MovieListDTO getMovies() { + public List getMovies() { List movies = movieRepository.findValidMovies(); - List movieDtos = movies.stream() + return movies.stream() .map(movie -> movie.toMovieDTO()) .collect(Collectors.toList()); - - return new MovieListDTO(movieDtos); } @Override 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/MovieListDTO.java b/server/src/main/java/com/ticketing/server/movie/service/dto/MovieListDTO.java deleted file mode 100644 index fdd03fd..0000000 --- a/server/src/main/java/com/ticketing/server/movie/service/dto/MovieListDTO.java +++ /dev/null @@ -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 movieDtos; - - public MovieListResponse toResponse() { - return new MovieListResponse(movieDtos); - } - -} 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/MovieService.java b/server/src/main/java/com/ticketing/server/movie/service/interfaces/MovieService.java index ca461c7..7916735 100644 --- a/server/src/main/java/com/ticketing/server/movie/service/interfaces/MovieService.java +++ b/server/src/main/java/com/ticketing/server/movie/service/interfaces/MovieService.java @@ -1,14 +1,15 @@ 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.MovieDTO; import com.ticketing.server.movie.service.dto.RegisteredMovieDTO; +import java.util.List; public interface MovieService { RegisteredMovieDTO registerMovie(String title, Long runningTime); - MovieListDTO getMovies(); + List getMovies(); DeletedMovieDTO deleteMovie(Long id); } 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); diff --git a/server/src/test/java/com/ticketing/server/movie/service/MovieServiceImplTest.java b/server/src/test/java/com/ticketing/server/movie/service/MovieServiceImplTest.java index 959f4e0..8798a42 100644 --- a/server/src/test/java/com/ticketing/server/movie/service/MovieServiceImplTest.java +++ b/server/src/test/java/com/ticketing/server/movie/service/MovieServiceImplTest.java @@ -39,10 +39,10 @@ public class MovieServiceImplTest { .thenReturn(Collections.emptyList()); // when - MovieListDTO movieListDto = movieService.getMovies(); + List movieDtos = movieService.getMovies(); // then - assertTrue(movieListDto.getMovieDtos().isEmpty()); + assertTrue(movieDtos.isEmpty()); } @Test @@ -55,11 +55,11 @@ public class MovieServiceImplTest { when(movieRepository.findValidMovies()) .thenReturn(movies); - // when - MovieListDTO movieListDto = movieService.getMovies(); + // when + List movieDtos = movieService.getMovies(); - // then - assertTrue(!movieListDto.getMovieDtos().isEmpty()); + // then + assertTrue(movieDtos.isEmpty()); } } diff --git a/server/src/test/java/com/ticketing/server/movie/service/MovieTimeServiceImplTest.java b/server/src/test/java/com/ticketing/server/movie/service/MovieTimeServiceImplTest.java index a53f83e..1b318b2 100644 --- a/server/src/test/java/com/ticketing/server/movie/service/MovieTimeServiceImplTest.java +++ b/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.MovieTimeListDTO; +import com.ticketing.server.movie.service.dto.MovieTimeDTO; import java.time.LocalDate; import java.time.LocalDateTime; import java.util.ArrayList; @@ -51,10 +51,10 @@ public class MovieTimeServiceImplTest { .thenReturn(Collections.emptyList()); // when - MovieTimeListDTO movieTimeListDto = movieTimeService.getMovieTimes(any(), LocalDate.now()); + List movieTimeDtos = movieTimeService.getMovieTimes(any(), LocalDate.now()); // then - assertTrue(movieTimeListDto.getMovieTimeDtos().isEmpty()); + assertTrue(movieTimeDtos.isEmpty()); } @Test @@ -76,10 +76,10 @@ public class MovieTimeServiceImplTest { .thenReturn(movieTimes); // when - MovieTimeListDTO movieTimeListDto = movieTimeService.getMovieTimes(any(), LocalDate.of(2022, 07, 01)); + List movieTimeDtos = movieTimeService.getMovieTimes(any(), LocalDate.of(2022, 07, 01)); // then - assertTrue(!movieTimeListDto.getMovieTimeDtos().isEmpty()); + assertTrue(!movieTimeDtos.isEmpty()); } }