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 a41f7d1..a5e9c98 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 @@ -1,11 +1,9 @@ package com.ticketing.server.movie.application; import com.ticketing.server.movie.application.response.MovieListResponse; -import com.ticketing.server.movie.service.dto.MovieDTO; import com.ticketing.server.movie.service.interfaces.MovieService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import java.util.List; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.http.HttpStatus; diff --git a/server/src/main/java/com/ticketing/server/movie/application/response/MovieListResponse.java b/server/src/main/java/com/ticketing/server/movie/application/response/MovieListResponse.java index 57a77e3..56d117a 100644 --- a/server/src/main/java/com/ticketing/server/movie/application/response/MovieListResponse.java +++ b/server/src/main/java/com/ticketing/server/movie/application/response/MovieListResponse.java @@ -1,6 +1,6 @@ package com.ticketing.server.movie.application.response; -import com.ticketing.server.movie.service.dto.MovieDTO; +import com.ticketing.server.movie.service.dto.MovieDto; import io.swagger.annotations.ApiModelProperty; import java.util.List; import lombok.AccessLevel; @@ -12,10 +12,10 @@ import lombok.Getter; public class MovieListResponse { @ApiModelProperty(value = "영화 제목") - private List movieDTOs; + private List movieDtos; - public static MovieListResponse from(List movieDTOs) { - return new MovieListResponse(movieDTOs); + public static MovieListResponse from(List movieDtos) { + return new MovieListResponse(movieDtos); } } diff --git a/server/src/main/java/com/ticketing/server/movie/domain/Movie.java b/server/src/main/java/com/ticketing/server/movie/domain/Movie.java index 88c5d8e..f2d6f64 100644 --- a/server/src/main/java/com/ticketing/server/movie/domain/Movie.java +++ b/server/src/main/java/com/ticketing/server/movie/domain/Movie.java @@ -1,7 +1,7 @@ package com.ticketing.server.movie.domain; import com.ticketing.server.global.dto.repository.AbstractEntity; -import com.ticketing.server.movie.service.dto.MovieDTO; +import com.ticketing.server.movie.service.dto.MovieDto; import javax.persistence.Column; import javax.persistence.Entity; import javax.validation.constraints.NotNull; @@ -22,8 +22,8 @@ public class Movie extends AbstractEntity { @NotNull private Integer runningTime; - public MovieDTO toDTO() { - return new MovieDTO(this.getId(), this.title); + public MovieDto toDto() { + return new MovieDto(this.title); } } 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 1c4500d..1f5fcd2 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 @@ -2,9 +2,8 @@ package com.ticketing.server.movie.service; 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.MovieDto; import com.ticketing.server.movie.service.interfaces.MovieService; -import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; import lombok.RequiredArgsConstructor; @@ -18,11 +17,11 @@ public class MovieServiceImpl implements MovieService { private final MovieRepository movieRepository; - public List getMovies() { + public List getMovies() { List movies = movieRepository.findByDeletedAt(null); return movies.stream() - .map(movie -> movie.toDTO()) + .map(movie -> movie.toDto()) .collect(Collectors.toList()); } diff --git a/server/src/main/java/com/ticketing/server/movie/service/dto/MovieDTO.java b/server/src/main/java/com/ticketing/server/movie/service/dto/MovieDto.java similarity index 74% rename from server/src/main/java/com/ticketing/server/movie/service/dto/MovieDTO.java rename to server/src/main/java/com/ticketing/server/movie/service/dto/MovieDto.java index 6ae453d..2632ee0 100644 --- a/server/src/main/java/com/ticketing/server/movie/service/dto/MovieDTO.java +++ b/server/src/main/java/com/ticketing/server/movie/service/dto/MovieDto.java @@ -3,9 +3,7 @@ package com.ticketing.server.movie.service.dto; import lombok.AllArgsConstructor; @AllArgsConstructor -public class MovieDTO { - - private long id; +public class MovieDto { private String title; 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 f3055d6..6294731 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,10 +1,10 @@ package com.ticketing.server.movie.service.interfaces; -import com.ticketing.server.movie.service.dto.MovieDTO; +import com.ticketing.server.movie.service.dto.MovieDto; import java.util.List; public interface MovieService { - List getMovies(); + List getMovies(); } diff --git a/server/src/test/java/com/ticketing/server/movie/domain/repository/MovieRepositoryTest.java b/server/src/test/java/com/ticketing/server/movie/domain/repository/MovieRepositoryTest.java index df0ccb5..ac022fa 100644 --- a/server/src/test/java/com/ticketing/server/movie/domain/repository/MovieRepositoryTest.java +++ b/server/src/test/java/com/ticketing/server/movie/domain/repository/MovieRepositoryTest.java @@ -27,7 +27,7 @@ public class MovieRepositoryTest { @Order(1) @Test @Rollback(value = false) - @DisplayName("Movie Repository - test saving movie") + @DisplayName("Movie Repository Test - saving movie") void shouldAbleToSaveMovie() { // given Movie movie = new Movie("범죄도시 2", 106); 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 f3d75e6..309bfa3 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 @@ -1,9 +1,55 @@ package com.ticketing.server.movie.service; +import static org.junit.jupiter.api.Assertions.assertFalse; +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 java.util.ArrayList; +import java.util.List; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.InjectMocks; +import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; @ExtendWith(MockitoExtension.class) public class MovieServiceImplTest { + Movie movie; + MovieDto movieDto; + List movies = new ArrayList<>(); + List movieDtos = new ArrayList<>(); + + @Mock + MovieRepository movieRepository; + + @InjectMocks + MovieServiceImpl movieService; + + @BeforeEach + void init() { + movie = new Movie("범죄도시2", 106); + movieDto = movie.toDto(); + + movies.add(movie); + movieDtos.add(movieDto); + } + + @Test + @DisplayName("Movie Service Test - get movies") + void shouldAbleToGetMovies() { + // given + when(movieRepository.findByDeletedAt(null)).thenReturn(movies); + + // when + List movieDtoList = movieService.getMovies(); + + // then + assertFalse(movieDtoList.isEmpty()); + } + }