feat: MovieTimeServiceImplTest - get movie time list 케이스 작성

* refactor: 통합테스트, 유닛테스트 환경 분리

* refactor: testImplementation 와 다른 게 없어서 통합

README.md

@@ -1,5 +1,5 @@
 # 🍿 Ticketing
-영화 예매 서비스
+영화 예매 사이트를 대용량 트래픽에 대응할 수 있도록 설계.
 
 <br/>
 
@@ -8,13 +8,37 @@
 - 기획 및 설계 : 22.04.13 ~ 
 - 프로젝트 구현 :   
 
+<br/>
 
-<br/><br/>
+## 🎯 프로젝트 주요 관심사
+- OOP(객체 지향 프로그래밍)의 장점을 최대한 활용
+- 테스트 코드를 통한 믿을 수 있는 코드 작성
+- 대용량 트래픽을 고려한 확장 가능한 설계 및 성능 튜닝
+- 코드리뷰를 통해 코드 품질 향상
+- 코드 컨벤션 준수하여 코드 통일성 유지
 
-## 🎯 프로젝트 목표
+<br/>
 
+## 🛠 기술스택
+- Java 11
+- Spring Boot 2.6.7 (당시 최신 GA 버전)
+- Gradle Kotlin DSL
+- Spring Security
+- Junit 5
+- Hibernate / SpringJPA
+- MySQL 8.0
+- Redis
 
-<br/><br/>
+<br/>
+
+## Wiki
+- [Git Branch 전략](https://github.com/f-lab-edu/Ticketing/wiki#-git-branch-%EC%A0%84%EB%9E%B5)
+- [Code Convention](https://github.com/f-lab-edu/Ticketing/wiki#-code-convention)
+- [패키지 구조](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)
+
+<br/>
 
 ## 🧩 ERD
 
@@ -51,7 +75,6 @@ erDiagram
         bigint id PK "상영시간표 ID"
         bigint movie_id FK "영화 ID"
         bigint theater_id FK "상영관 ID"
-        date running_date "상영 날짜"
         int round "회차"
         time start_at "시작 시간"
         time end_at "종료 시간"
@@ -94,5 +117,3 @@ erDiagram
         datetime updated_at "수정일시"
     }
 ```
-
-<br/><br/>

server/src/main/java/com/ticketing/server/global/exception/ErrorCode.java

@@ -19,6 +19,7 @@ public enum ErrorCode {
 
 	/* 404 NOT_FOUND : Resource 를 찾을 수 없음 */
 	EMAIL_NOT_FOUND(NOT_FOUND, "해당 이메일을 찾을 수 없습니다."),
+	MOVIE_NOT_FOUND(NOT_FOUND, "해당 제목의 영화를 찾을 수 없습니다."),
 	REFRESH_TOKEN_NOT_FOUND(NOT_FOUND, "리프레쉬 토큰을 찾을 수 없습니다."),
 
 	/* 409 CONFLICT : Resource 의 현재 상태와 충돌. 보통 중복된 데이터 존재 */

server/src/main/java/com/ticketing/server/global/security/WebSecurityConfig.java

@@ -54,6 +54,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
 			.antMatchers(HttpMethod.POST, "/api/auth/refresh").permitAll()
 			.antMatchers(HttpMethod.POST, "/api/users").permitAll()
 			.antMatchers("/api/movies/**").permitAll()
+			.antMatchers("/api/movieTimes/**").permitAll()
 			.antMatchers("/l7check").permitAll()
 			.antMatchers("/actuator/**").permitAll()
 			.antMatchers("/api/v3/", "/swagger-ui/**", "/swagger/", "/swagger-resources/**", "/v3/api-docs").permitAll()

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

@@ -0,0 +1,39 @@
+package com.ticketing.server.movie.application;
+
+import com.ticketing.server.movie.application.response.MovieTimeListResponse;
+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 lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/api/movieTimes")
+@Api(value = "MovieTime API", tags = {"Movie Time"})
+@RequiredArgsConstructor
+@Slf4j
+public class MovieTimeController {
+
+    private final MovieTimeService movieTimeService;
+
+    @GetMapping
+    @ApiOperation(value = "영화 시간표 조회")
+    @Validated
+    public ResponseEntity<MovieTimeListResponse> getMovieTimes(
+        @ApiParam(value = "영화 제목", required = true) @RequestParam String title,
+        @ApiParam(value = "상영 날짜", required = true) @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") LocalDate runningDate) {
+        return ResponseEntity.status(HttpStatus.OK).body(MovieTimeListResponse.from(movieTimeService.getMovieTimes(title, runningDate)));
+    }
+
+
+}

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

@@ -1,8 +0,0 @@
-package com.ticketing.server.movie.application;
-
-import org.springframework.web.bind.annotation.RestController;
-
-@RestController
-public class MovieTimesController {
-
-}

server/src/main/java/com/ticketing/server/movie/application/response/MovieListResponse.java

@@ -1,6 +1,5 @@
 package com.ticketing.server.movie.application.response;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
 import com.ticketing.server.movie.service.dto.MovieDto;
 import io.swagger.annotations.ApiModelProperty;
 import java.util.List;
@@ -13,7 +12,6 @@ import lombok.Getter;
 public class MovieListResponse {
 
     @ApiModelProperty(value = "영화 제목")
-    @JsonProperty
     private List<MovieDto> movieDtos;
 
     public static MovieListResponse from(List<MovieDto> movieDtos) {

server/src/main/java/com/ticketing/server/movie/application/response/MovieTimeListResponse.java

@@ -0,0 +1,21 @@
+package com.ticketing.server.movie.application.response;
+
+import com.ticketing.server.movie.service.dto.MovieTimeDto;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.List;
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
+public class MovieTimeListResponse {
+
+    @ApiModelProperty(value = "영화 시간표 정보")
+    private List<MovieTimeDto> movieTimeDtos;
+
+    public static MovieTimeListResponse from(List<MovieTimeDto> movieTimeDtos) {
+        return new MovieTimeListResponse(movieTimeDtos);
+    }
+
+}

server/src/main/java/com/ticketing/server/movie/domain/Movie.java

@@ -22,8 +22,4 @@ public class Movie extends AbstractEntity {
     @NotNull
     private Integer runningTime;
 
-    public MovieDto toDto() {
-        return new MovieDto(this.title);
-    }
-
 }

server/src/main/java/com/ticketing/server/movie/domain/MovieTime.java

@@ -1,17 +1,21 @@
 package com.ticketing.server.movie.domain;
 
 import com.ticketing.server.global.dto.repository.AbstractEntity;
-import java.time.LocalDate;
+import com.ticketing.server.movie.service.dto.MovieTimeDto;
 import java.time.LocalDateTime;
 import javax.persistence.Entity;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.validation.constraints.NotNull;
+import lombok.AllArgsConstructor;
 import lombok.Getter;
+import lombok.NoArgsConstructor;
 
 @Entity
 @Getter
-public class MovieTimes extends AbstractEntity {
+@NoArgsConstructor
+@AllArgsConstructor
+public class MovieTime extends AbstractEntity {
 
 	@NotNull
 	@ManyToOne
@@ -23,9 +27,6 @@ public class MovieTimes extends AbstractEntity {
 	@JoinColumn(name = "theater_id", referencedColumnName = "id", updatable = false)
 	private Theater theater;
 
-	@NotNull
-	private LocalDate runningDate;
-
 	@NotNull
 	private Integer round;
 

server/src/main/java/com/ticketing/server/movie/domain/Ticket.java

@@ -20,7 +20,7 @@ public class Ticket extends AbstractEntity {
 	@NotNull
 	@ManyToOne
 	@JoinColumn(name = "movie_times_id", referencedColumnName = "id", updatable = false)
-	private MovieTimes movieTimes;
+	private MovieTime movieTime;
 
 	@ManyToOne
 	@JoinColumn(name = "payment_id", referencedColumnName = "id", updatable = false)

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

@@ -0,0 +1,21 @@
+package com.ticketing.server.movie.domain.repository;
+
+import com.ticketing.server.movie.domain.Movie;
+import com.ticketing.server.movie.domain.MovieTime;
+import java.time.LocalDateTime;
+import java.util.List;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface MovieTimeRepository extends JpaRepository<MovieTime, Long> {
+
+    @Query(value = "SELECT mt "
+        + "FROM MovieTime mt "
+        + "JOIN FETCH mt.movie "
+        + "WHERE mt.movie = :movie "
+        + "AND mt.startAt BETWEEN :startOfDay AND :endOfDay ")
+    List<MovieTime> findValidMovieTimes(Movie movie, LocalDateTime startOfDay, LocalDateTime endOfDay);
+
+}

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

@@ -1,10 +0,0 @@
-package com.ticketing.server.movie.domain.repository;
-
-import com.ticketing.server.movie.domain.MovieTimes;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.stereotype.Repository;
-
-@Repository
-public interface MovieTimesRepository extends JpaRepository<MovieTimes, Long> {
-
-}

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

@@ -21,7 +21,7 @@ public class MovieServiceImpl implements MovieService {
         List<Movie> movies = movieRepository.findValidMovies();
 
         return movies.stream()
-            .map(movie -> movie.toDto())
+            .map(MovieDto::from)
             .collect(Collectors.toList());
 
     }

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

@@ -0,0 +1,49 @@
+package com.ticketing.server.movie.service;
+
+import static com.ticketing.server.global.exception.ErrorCode.MOVIE_NOT_FOUND;
+
+import com.ticketing.server.global.exception.TicketingException;
+import com.ticketing.server.movie.domain.Movie;
+import com.ticketing.server.movie.domain.MovieTime;
+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.interfaces.MovieTimeService;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.stream.Collectors;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+@Service
+@RequiredArgsConstructor
+@Slf4j
+public class MovieTimeServiceImpl implements MovieTimeService {
+
+    private final MovieRepository movieRepository;
+
+    private final MovieTimeRepository movieTimeRepository;
+
+    @Override
+    public List<MovieTimeDto> getMovieTimes(String title, LocalDate runningDate) {
+        Movie movie = movieRepository.findByTitle(title)
+            .orElseThrow(MovieTimeServiceImpl::throwMovieNotFound);
+
+        LocalDateTime startOfDay = runningDate.atStartOfDay().plusHours(6);
+        LocalDateTime endOfDay = startOfDay.plusDays(1);
+
+        List<MovieTime> movieTimes = movieTimeRepository.findValidMovieTimes(movie, startOfDay, endOfDay);
+
+        return movieTimes.stream()
+            .map(MovieTimeDto::from)
+            .collect(Collectors.toList());
+
+    }
+
+    private static RuntimeException throwMovieNotFound() {
+        throw new TicketingException(MOVIE_NOT_FOUND);
+    }
+
+}

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

@@ -1,9 +0,0 @@
-package com.ticketing.server.movie.service;
-
-import com.ticketing.server.movie.service.interfaces.MovieTimesService;
-import org.springframework.stereotype.Service;
-
-@Service
-public class MovieTimesServiceImpl implements MovieTimesService {
-
-}

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

@@ -1,9 +0,0 @@
-package com.ticketing.server.movie.service;
-
-import com.ticketing.server.movie.service.interfaces.TMDBService;
-import org.springframework.stereotype.Service;
-
-@Service
-public class TMBDServiceImpl implements TMDBService {
-
-}

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

@@ -1,12 +1,18 @@
 package com.ticketing.server.movie.service.dto;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
+import com.ticketing.server.movie.domain.Movie;
+import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
+import lombok.Getter;
 
-@AllArgsConstructor
+@Getter
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
 public class MovieDto {
 
-    @JsonProperty
     private String title;
 
+    public static MovieDto from(Movie movie) {
+        return new MovieDto(movie.getTitle());
+    }
+
 }

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

@@ -0,0 +1,28 @@
+package com.ticketing.server.movie.service.dto;
+
+import com.ticketing.server.movie.domain.MovieTime;
+import java.time.LocalDateTime;
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
+public class MovieTimeDto {
+
+    private Long movieTimeId;
+
+    private Integer theaterNumber;
+
+    private Integer round;
+
+    private LocalDateTime startAt;
+
+    private LocalDateTime endAt;
+
+    public static MovieTimeDto from(MovieTime movieTime) {
+        return new MovieTimeDto(movieTime.getId(), movieTime.getTheater().getTheaterNumber(),
+            movieTime.getRound(), movieTime.getStartAt(), movieTime.getEndAt());
+    }
+
+}

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

@@ -0,0 +1,11 @@
+package com.ticketing.server.movie.service.interfaces;
+
+import com.ticketing.server.movie.service.dto.MovieTimeDto;
+import java.time.LocalDate;
+import java.util.List;
+
+public interface MovieTimeService {
+
+    List<MovieTimeDto> getMovieTimes(String title, LocalDate runningDate);
+
+}

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

@@ -1,5 +0,0 @@
-package com.ticketing.server.movie.service.interfaces;
-
-public interface MovieTimesService {
-
-}

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

@@ -1,5 +0,0 @@
-package com.ticketing.server.movie.service.interfaces;
-
-public interface TMDBService {
-
-}

server/src/test/java/com/ticketing/server/movie/domain/repository/MovieTimeRepositoryTest.java

@@ -0,0 +1,18 @@
+package com.ticketing.server.movie.domain.repository;
+
+import javax.transaction.Transactional;
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.TestMethodOrder;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+
+@SpringBootTest
+@Transactional
+@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
+public class MovieTimeRepositoryTest {
+
+    @Autowired
+    MovieTimeRepository movieTimeRepository;
+
+
+}

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

@@ -35,14 +35,14 @@ public class MovieServiceImplTest {
     @DisplayName("Movie Service Test - get movies when there is no movie")
     void shouldGetEmptyList() {
         // given
-        when(movieRepository.findValidMovies()).thenReturn(Collections.emptyList());
+        when(movieRepository.findValidMovies())
+            .thenReturn(Collections.emptyList());
 
         // when
         List<MovieDto> movieDtoList = movieService.getMovies();
 
         // then
         assertTrue(movieDtoList.isEmpty());
-
     }
 
     @Test
@@ -50,11 +50,12 @@ public class MovieServiceImplTest {
     void shouldAbleToGetMovies() {
         // given
         movie = new Movie("범죄도시2", 106);
-        movieDto = movie.toDto();
+        movieDto = movieDto.from(movie);
         movies.add(movie);
         movieDtos.add(movieDto);
 
-        when(movieRepository.findValidMovies()).thenReturn(movies);
+        when(movieRepository.findValidMovies())
+            .thenReturn(movies);
 
         // when
         List<MovieDto> movieDtoList = movieService.getMovies();

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

@@ -0,0 +1,86 @@
+package com.ticketing.server.movie.service;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.when;
+import static org.mockito.ArgumentMatchers.any;
+
+import com.ticketing.server.movie.domain.Movie;
+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 java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+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 MovieTimeServiceImplTest {
+
+    String title = "범죄도시2";
+    List<MovieTime> movieTimes = new ArrayList<>();
+
+    @Mock
+    MovieRepository movieRepository;
+
+    @Mock
+    MovieTimeRepository movieTimeRepository;
+
+    @InjectMocks
+    MovieTimeServiceImpl movieTimeService;
+
+    @Test
+    @DisplayName("MovieTime Service Test - get empty list when there is no valid movie times")
+    void shouldGetEmptyList() {
+        // given
+        Movie movie = new Movie(title, 106);
+
+        when(movieRepository.findByTitle(title))
+            .thenReturn(Optional.of(movie));
+
+        when(movieTimeRepository.findValidMovieTimes(any(), any(), any()))
+            .thenReturn(Collections.emptyList());
+
+        // when
+        List<MovieTimeDto> movieTimeDtoList = movieTimeService.getMovieTimes(title, LocalDate.now());
+
+        // then
+        assertTrue(movieTimeDtoList.isEmpty());
+    }
+
+    @Test
+    @DisplayName("MovieTime Service Test - get list when there is valid movie times")
+    void shouldGetMovieTimeList() {
+        // given
+        Movie movie = new Movie(title, 106);
+        Theater theater = new Theater(1, 100);
+        MovieTime movieTime = new MovieTime(movie, theater, 1,
+            LocalDateTime.of(2022, 7, 1, 17, 0, 0),
+            LocalDateTime.of(2022, 7, 1, 18, 56, 0)
+        );
+
+        movieTimes.add(movieTime);
+
+        when(movieRepository.findByTitle(title))
+            .thenReturn(Optional.of(movie));
+
+        when(movieTimeRepository.findValidMovieTimes(any(), any(), any()))
+            .thenReturn(movieTimes);
+
+        // when
+        List<MovieTimeDto> movieTimeDtoList = movieTimeService.getMovieTimes(title, LocalDate.of(2022, 07, 01));
+
+        // then
+        assertTrue(!movieTimeDtoList.isEmpty());
+    }
+
+}