mindol1004/Ticketing
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Feature/get movie times list (#42)

Browse Source 
* refactor: 영화 시작, 종료 시간 LocalTime 적용

* refactor: 영화 시간표 테이블 이름 변경 movie_times -> movie_time

* feat: getMovieTimes API

* refactor: 영화 시간표 조회 runningDate ApiParam 상영 날짜로 변경

* fix: MovieTimeRepositoryTest 오타 수정

* refactor: MovieTime start_at, end_at LocalDateTime으로 변경

* refactor: find List<MovieTime> with native query

* add: comment for endOfDay variable

* add: MovieTimeDto - AccessLevel.PRIVATE for static factory method

* refactor: startOfDay 06:00 설정

* refactor: removed tmdb settings

* refactor: removed unnecessary comments

* refactor: removed unnecessary comments

* refactor: removed unnecessary imports

* add: MovieDto - AcessLevel.PRIVATE for static factory method
This commit is contained in:
손창현
2022-07-04 00:36:07 +09:00
committed by GitHub
parent 6f14c96931
commit 648638860c
26 changed files with 235 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
server/src/main/java/com/ticketing/server/global/exception/ErrorCode.java
View File

@@ -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 의 현재 상태와 충돌. 보통 중복된 데이터 존재 */

1
server/src/main/java/com/ticketing/server/global/security/WebSecurityConfig.java
View File

@@ -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()

39
server/src/main/java/com/ticketing/server/movie/application/MovieTimeController.java Normal file
View File

@@ -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)));
}
}

8
server/src/main/java/com/ticketing/server/movie/application/MovieTimesController.java
View File

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

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

@@ -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) {

21
server/src/main/java/com/ticketing/server/movie/application/response/MovieTimeListResponse.java Normal file
View File

@@ -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);
}
}

4
server/src/main/java/com/ticketing/server/movie/domain/Movie.java
View File

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

7
server/src/main/java/com/ticketing/server/movie/domain/MovieTimes.java → server/src/main/java/com/ticketing/server/movie/domain/MovieTime.java
View File

@@ -1,7 +1,7 @@
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;
@@ -11,7 +11,7 @@ import lombok.Getter;
@Entity
@Getter
public class MovieTimes extends AbstractEntity {
public class MovieTime extends AbstractEntity {
@NotNull
@ManyToOne
@@ -23,9 +23,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;

2
server/src/main/java/com/ticketing/server/movie/domain/Ticket.java
View File

@@ -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)

21
server/src/main/java/com/ticketing/server/movie/domain/repository/MovieTimeRepository.java Normal file
View File

@@ -0,0 +1,21 @@
package com.ticketing.server.movie.domain.repository;
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 * "
+ "FROM movie_time "
+ "WHERE movie_id = :movieId "
+ "AND start_at "
+ "BETWEEN date_format(start_at, :startOfDay) "
+ "AND date_format(start_at, :endOfDay)", nativeQuery = true)
List<MovieTime> findValidMovieTimes(long movieId, LocalDateTime startOfDay, LocalDateTime endOfDay);
}

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

@@ -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> {
}

2
server/src/main/java/com/ticketing/server/movie/service/MovieServiceImpl.java
View File

@@ -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());
}

49
server/src/main/java/com/ticketing/server/movie/service/MovieTimeServiceImpl.java Normal file
View File

@@ -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.getId(), startOfDay, endOfDay);
return movieTimes.stream()
.map(MovieTimeDto::from)
.collect(Collectors.toList());
}
private static RuntimeException throwMovieNotFound() {
throw new TicketingException(MOVIE_NOT_FOUND);
}
}

9
server/src/main/java/com/ticketing/server/movie/service/MovieTimesServiceImpl.java
View File

@@ -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 {
}

9
server/src/main/java/com/ticketing/server/movie/service/TMBDServiceImpl.java
View File

@@ -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 {
}

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

@@ -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());
}
}

28
server/src/main/java/com/ticketing/server/movie/service/dto/MovieTimeDto.java Normal file
View File

@@ -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());
}
}

11
server/src/main/java/com/ticketing/server/movie/service/interfaces/MovieTimeService.java Normal file
View File

@@ -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);
}

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

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

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

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

18
server/src/test/java/com/ticketing/server/movie/domain/repository/MovieTimeRepositoryTest.java Normal file
View File

@@ -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;
}

5
server/src/test/java/com/ticketing/server/movie/domain/repository/MovieTimesRepositoryTest.java
View File

@@ -1,5 +0,0 @@
package com.ticketing.server.movie.domain.repository;
public class MovieTimesRepositoryTest {
}

1
server/src/test/java/com/ticketing/server/movie/service/MovieServiceImplTest.java
View File

@@ -42,7 +42,6 @@ public class MovieServiceImplTest {
// then
assertTrue(movieDtoList.isEmpty());
}
@Test

33
server/src/test/java/com/ticketing/server/movie/service/MovieTimeServiceImplTest.java Normal file
View File

@@ -0,0 +1,33 @@
package com.ticketing.server.movie.service;
import com.ticketing.server.movie.domain.repository.MovieTimeRepository;
import java.time.LocalDate;
import java.time.LocalDateTime;
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;
import org.springframework.test.annotation.Rollback;
@ExtendWith(MockitoExtension.class)
public class MovieTimeServiceImplTest {
LocalDateTime startOfDay = LocalDate.now().atStartOfDay().plusHours(6);
LocalDateTime endOfDay = startOfDay.plusDays(1);
@Mock
MovieTimeRepository movieTimeRepository;
@InjectMocks
MovieTimeServiceImpl movieTimeService;
@Test
@Rollback
@DisplayName("MovieTime Service Test - get empty list when there is no valid movie times")
void shouldGetEmptyList() {
}
}

94
server/src/test/java/com/ticketing/server/movie/service/TMDBServiceImplTest.java
View File

@@ -1,94 +0,0 @@
package com.ticketing.server.movie.service;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.http.HttpEntity;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpMethod;
import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity;
import org.springframework.web.client.RestTemplate;
@SpringBootTest
public class TMDBServiceImplTest {
@Value("${tmdb.api-key}")
private String apiKey;
@Value("${tmdb.read-access-token}")
private String readAccessToken;
@Autowired
RestTemplate restTemplate;
@Test
@DisplayName("TMDB Service Test - Get [Now Playing] movies")
void shouldAbleToGetMovieList() throws Exception {
// given
assertNotNull(apiKey);
assertNotNull(readAccessToken);
ArrayList<Charset> acceptCharset = new ArrayList<>();
acceptCharset.add(StandardCharsets.UTF_8);
HttpHeaders headers = new HttpHeaders();
headers.setAcceptCharset(acceptCharset);
headers.setContentType(MediaType.APPLICATION_JSON);
headers.setBearerAuth(readAccessToken);
Map<String, String> params = new HashMap<>();
params.put("api_key", apiKey);
params.put("language", "ko");
HttpEntity<?> request = new HttpEntity<>(headers);
// when
ResponseEntity<?> response = restTemplate.exchange(
"https://api.themoviedb.org/3/movie/now_playing?" + mapToUrlParam(params),
HttpMethod.GET,
request,
String.class
);
// JSONParser parser = new JSONParser();
// Object obj = parser.parse(String.valueOf(response));
// Object results = ((JSONObject) obj).get("results");
//
// ArrayList<String> movieList = new ArrayList<>();
//
// ArrayList<JSONObject> jsonMovieList = new ArrayList<>();
// then
assertTrue(response.getStatusCode().is2xxSuccessful());
}
private static String mapToUrlParam(Map<String, String> params) {
StringBuffer paramData = new StringBuffer();
for (Map.Entry<String, String> param : params.entrySet()) {
if (paramData.length() != 0) {
paramData.append('&');
}
paramData.append(param.getKey());
paramData.append('=');
paramData.append(param.getValue());
}
return paramData.toString();
}
}

4
server/src/test/resources/application.yml
View File

@@ -31,7 +31,3 @@ jwt:
secret-key: Zi1sYWItdGlja2V0aW5nLXByb2plY3Qtc3ByaW5nLWJvb3Qtc2VjdXJpdHktand0LXNlY3JldC1rZXktZi1sYWItdGlja2V0aW5nLXByb2plY3Qtc3ByaW5nLWJvb3Qtc2VjdXJpdHktand0LXNlY3JldC1rZXkK
access-token-validity-in-seconds: 60
refresh-token-validity-in-seconds: 259200
tmdb:
api-key: 0d1503b6dcbfe1c514299b5564c649b8
read-access-token: eyJhbGciOiJIUzI1NiJ9.eyJhdWQiOiIwZDE1MDNiNmRjYmZlMWM1MTQyOTliNTU2NGM2NDliOCIsInN1YiI6IjYyOWYwODRlNzI2ZmIxMTA2NDA4MjI2NCIsInNjb3BlcyI6WyJhcGlfcmVhZCJdLCJ2ZXJzaW9uIjoxfQ.rs8KZea8QLyashILiggWFx2s46lgUtzo-xSWoDgE58A