fix: 리프레쉬 토큰 업데이트 시 ROLE_이 중복으로 붙여서 나오는 부분 수정

server/src/main/java/com/ticketing/server/global/redis/RefreshToken.java

@@ -28,8 +28,9 @@ public class RefreshToken {
 		this.token = token;
 	}
 
-	public void changeToken(String token) {
+	public RefreshToken changeToken(String token) {
 		this.token = token;
+		return this;
 	}
 
 }

server/src/main/java/com/ticketing/server/global/security/jwt/JwtProvider.java

@@ -27,6 +27,7 @@ public class JwtProvider {
 
 	private static final String AUTHORITIES_KEY = "auth";
 	private static final String AUTHORITIES_DELIMITER = ",";
+	private static final String ROLE = "ROLE_";
 
 	private final Key key;
 	private final String prefix;
@@ -89,7 +90,7 @@ public class JwtProvider {
 	}
 
 	private String makeRoleName(String role) {
-		return "ROLE_" + role.toUpperCase();
+		return role.contains(ROLE) ? role.toUpperCase() : ROLE + role.toUpperCase();
 	}
 
 	public Authentication getAuthentication(String token) {

server/src/main/java/com/ticketing/server/user/service/AuthenticationServiceImpl.java

@@ -5,8 +5,8 @@ import com.ticketing.server.global.redis.RefreshRedisRepository;
 import com.ticketing.server.global.redis.RefreshToken;
 import com.ticketing.server.global.security.jwt.JwtProperties;
 import com.ticketing.server.global.security.jwt.JwtProvider;
-import com.ticketing.server.user.service.dto.TokenDTO;
 import com.ticketing.server.user.service.dto.DeleteRefreshTokenDTO;
+import com.ticketing.server.user.service.dto.TokenDTO;
 import com.ticketing.server.user.service.interfaces.AuthenticationService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
@@ -40,8 +40,14 @@ public class AuthenticationServiceImpl implements AuthenticationService {
 		// refresh 토큰이 있으면 수정, 없으면 생성
 		refreshRedisRepository.findByEmail(email)
 			.ifPresentOrElse(
-				tokenEntity -> tokenEntity.changeToken(tokenDto.getRefreshToken()),
+				tokenEntity -> refreshRedisRepository.save(
-				() -> refreshRedisRepository.save(new RefreshToken(email, tokenDto.getRefreshToken()))
+					tokenEntity.changeToken(
+						tokenDto.getRefreshToken()
+					)
+				),
+				() -> refreshRedisRepository.save(
+					new RefreshToken(email, tokenDto.getRefreshToken())
+				)
 			);
 
 		return tokenDto;

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

@@ -4,7 +4,6 @@ import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyLong;
 import static org.mockito.Mockito.when;
 
 import com.ticketing.server.global.exception.TicketingException;

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

@@ -1,15 +1,23 @@
 package com.ticketing.server.movie.service;
 
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.anyLong;
 import static org.mockito.Mockito.when;
 import static org.mockito.ArgumentMatchers.any;
 
+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.Theater;
 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.MovieTimeRegisterDTO;
+import com.ticketing.server.movie.service.dto.RegisteredMovieTimeDTO;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
@@ -27,11 +35,15 @@ import org.mockito.junit.jupiter.MockitoExtension;
 public class MovieTimeServiceImplTest {
 
     String title = "범죄도시2";
+	LocalDateTime startAt = LocalDateTime.now();
     List<MovieTime> movieTimes = new ArrayList<>();
 
     @Mock
     MovieRepository movieRepository;
 
+	@Mock
+	TheaterRepository theaterRepository;
+
     @Mock
     MovieTimeRepository movieTimeRepository;
 
@@ -39,7 +51,7 @@ public class MovieTimeServiceImplTest {
     MovieTimeServiceImpl movieTimeService;
 
     @Test
-    @DisplayName("MovieTime Service Test - get empty list when there are no valid movie times")
+    @DisplayName("MovieTime Service Test - get empty list when there is no valid movie time")
     void shouldGetEmptyList() {
         // given
         Movie movie = new Movie(title, 106L);
@@ -82,4 +94,76 @@ public class MovieTimeServiceImplTest {
         assertTrue(!movieTimeDtos.isEmpty());
     }
 
+	@Test
+	@DisplayName("MovieTime Service Test - register movie time")
+	void shouldAbleToRegisterMovieTime() {
+		// given
+		Movie movie = new Movie(title, 100L);
+		Theater theater = new Theater(1);
+		MovieTime movieTime = new MovieTime(movie, theater, 1, startAt);
+
+		when(movieRepository.findByIdAndDeletedAtNull(anyLong()))
+			.thenReturn(Optional.of(movie));
+
+		when(theaterRepository.findByTheaterNumber(anyInt()))
+			.thenReturn(Optional.of(theater));
+
+		when(movieTimeRepository.findByMovieAndTheaterAndRoundAndDeletedAtNull(any(), any(), anyInt()))
+			.thenReturn(Optional.empty());
+
+		when(movieTimeRepository.save(any()))
+			.thenReturn(movieTime);
+
+		// when
+		RegisteredMovieTimeDTO registeredMovieTimeDto =
+			movieTimeService.registerMovieTime(
+				new MovieTimeRegisterDTO(1L, 1, 1, startAt)
+			);
+
+		// then
+		assertThat(registeredMovieTimeDto).isNotNull();
+		assertTrue(registeredMovieTimeDto.getTheaterNumber() == 1);
+		assertTrue(registeredMovieTimeDto.getStartAt() == startAt);
+		assertTrue(registeredMovieTimeDto.getRound() == 1);
+	}
+
+	@Test
+	@DisplayName("MovieTime Service Test - register movie time when there is same movie time already")
+	void shouldThrowExceptionWhenRegisteringDuplicateMovieTime() {
+		// given
+		Movie movie = new Movie(title, 100L);
+		Theater theater = new Theater(1);
+		MovieTime movieTime = new MovieTime(movie, theater, 1, startAt);
+		MovieTimeRegisterDTO movieTimeRegisterDto = new MovieTimeRegisterDTO(1L, 1, 1, startAt);
+
+		when(movieRepository.findByIdAndDeletedAtNull(anyLong()))
+			.thenReturn(Optional.of(movie));
+
+		when(theaterRepository.findByTheaterNumber(anyInt()))
+			.thenReturn(Optional.of(theater));
+
+		when(movieTimeRepository.findByMovieAndTheaterAndRoundAndDeletedAtNull(any(), any(), anyInt()))
+			.thenReturn(Optional.of(movieTime));
+
+		// when
+		// then
+		assertThatThrownBy(() -> movieTimeService.registerMovieTime(movieTimeRegisterDto))
+			.isInstanceOf(TicketingException.class);
+	}
+
+	@Test
+	@DisplayName("MovieTime Service Test - register movie time when there is no such movie")
+	void shouldThrowExceptionWhenRegisteringMovieTimeWithNoSuchMovie() {
+		// given
+		Theater theater = new Theater(1);
+		MovieTimeRegisterDTO movieTimeRegisterDto = new MovieTimeRegisterDTO(1L, 1, 1, startAt);
+
+		when(movieRepository.findByIdAndDeletedAtNull(1L))
+			.thenReturn(Optional.empty());
+
+		// when
+		// then
+		assertThatThrownBy(() -> movieTimeService.registerMovieTime(movieTimeRegisterDto))
+			.isInstanceOf(TicketingException.class);
+	}
 }