From 8d3f1b7208d01ffb4be7d6a6b2dbc1bb21c19cff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=86=90=EC=B0=BD=ED=98=84?= Date: Sat, 2 Jul 2022 02:37:39 +0900 Subject: [PATCH] refactor: removed tmdb settings --- .../server/movie/service/TMBDServiceImpl.java | 9 -- .../movie/service/interfaces/TMDBService.java | 5 - .../repository/MovieTimeRepositoryTest.java | 5 + .../movie/service/MovieServiceImplTest.java | 1 - .../service/MovieTimeServiceImplTest.java | 48 ++++++++++ .../movie/service/TMDBServiceImplTest.java | 94 ------------------- server/src/test/resources/application.yml | 4 - 7 files changed, 53 insertions(+), 113 deletions(-) delete mode 100644 server/src/main/java/com/ticketing/server/movie/service/TMBDServiceImpl.java delete mode 100644 server/src/main/java/com/ticketing/server/movie/service/interfaces/TMDBService.java delete mode 100644 server/src/test/java/com/ticketing/server/movie/service/TMDBServiceImplTest.java diff --git a/server/src/main/java/com/ticketing/server/movie/service/TMBDServiceImpl.java b/server/src/main/java/com/ticketing/server/movie/service/TMBDServiceImpl.java deleted file mode 100644 index 40537a3..0000000 --- a/server/src/main/java/com/ticketing/server/movie/service/TMBDServiceImpl.java +++ /dev/null @@ -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 { - -} diff --git a/server/src/main/java/com/ticketing/server/movie/service/interfaces/TMDBService.java b/server/src/main/java/com/ticketing/server/movie/service/interfaces/TMDBService.java deleted file mode 100644 index 0c30708..0000000 --- a/server/src/main/java/com/ticketing/server/movie/service/interfaces/TMDBService.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.ticketing.server.movie.service.interfaces; - -public interface TMDBService { - -} diff --git a/server/src/test/java/com/ticketing/server/movie/domain/repository/MovieTimeRepositoryTest.java b/server/src/test/java/com/ticketing/server/movie/domain/repository/MovieTimeRepositoryTest.java index 190b9c7..eff21a3 100644 --- a/server/src/test/java/com/ticketing/server/movie/domain/repository/MovieTimeRepositoryTest.java +++ b/server/src/test/java/com/ticketing/server/movie/domain/repository/MovieTimeRepositoryTest.java @@ -3,6 +3,7 @@ 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 @@ -10,4 +11,8 @@ import org.springframework.boot.test.context.SpringBootTest; @TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class MovieTimeRepositoryTest { + @Autowired + MovieTimeRepository movieTimeRepository; + + } 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 116e0e7..1c98e32 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 @@ -42,7 +42,6 @@ public class MovieServiceImplTest { // then assertTrue(movieDtoList.isEmpty()); - } @Test 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 1f78290..7f28c20 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 @@ -1,5 +1,53 @@ package com.ticketing.server.movie.service; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.Mockito.when; + +import com.ticketing.server.movie.domain.repository.MovieRepository; +import com.ticketing.server.movie.domain.repository.MovieTimeRepository; +import com.ticketing.server.movie.service.dto.MovieDto; +import com.ticketing.server.movie.service.dto.MovieTimeDto; +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.util.Collections; +import java.util.List; +import org.apache.tomcat.jni.Local; +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 { + LocalDateTime startOfDay = LocalDate.now().atStartOfDay().plusHours(6); + LocalDateTime endOfDay = startOfDay.plusDays(1); + + @Mock + MovieRepository movieRepository; + + @Mock + MovieTimeRepository movieTimeRepository; + + @InjectMocks + MovieTimeServiceImpl movieTimeService; + + @Test + @DisplayName("MovieTime Service Test - get movie times when there is no valid movie times") + void shouldGetEmptyList() { + // given + long movieId = 1L; + + when(movieTimeRepository.findValidMovieTimes(movieId, startOfDay, endOfDay)) + .thenReturn(Collections.emptyList()); + + // when + List movieTimes = movieTimeService.getMovieTimes(); + + // then + assertTrue(movieDtoList.isEmpty()); + } + } diff --git a/server/src/test/java/com/ticketing/server/movie/service/TMDBServiceImplTest.java b/server/src/test/java/com/ticketing/server/movie/service/TMDBServiceImplTest.java deleted file mode 100644 index 4c7f558..0000000 --- a/server/src/test/java/com/ticketing/server/movie/service/TMDBServiceImplTest.java +++ /dev/null @@ -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 acceptCharset = new ArrayList<>(); - acceptCharset.add(StandardCharsets.UTF_8); - - HttpHeaders headers = new HttpHeaders(); - headers.setAcceptCharset(acceptCharset); - headers.setContentType(MediaType.APPLICATION_JSON); - headers.setBearerAuth(readAccessToken); - - Map 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 movieList = new ArrayList<>(); -// -// ArrayList jsonMovieList = new ArrayList<>(); - - // then - assertTrue(response.getStatusCode().is2xxSuccessful()); - } - - private static String mapToUrlParam(Map params) { - StringBuffer paramData = new StringBuffer(); - - for (Map.Entry param : params.entrySet()) { - if (paramData.length() != 0) { - paramData.append('&'); - } - - paramData.append(param.getKey()); - paramData.append('='); - paramData.append(param.getValue()); - } - - return paramData.toString(); - } - -} - - diff --git a/server/src/test/resources/application.yml b/server/src/test/resources/application.yml index 2a8778c..0b37794 100644 --- a/server/src/test/resources/application.yml +++ b/server/src/test/resources/application.yml @@ -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