fix: 이미지 회전 방향 조정 로직 수정

Author: fakerdeft

src/main/java/com/tnt/application/s3/S3Service.java

@@ -21,6 +21,7 @@
 import javax.imageio.metadata.IIOMetadata;
 import javax.imageio.plugins.tiff.TIFFDirectory;
 import javax.imageio.plugins.tiff.TIFFField;
+import javax.imageio.plugins.tiff.TIFFTag;
 import javax.imageio.stream.ImageInputStream;
 
 import org.springframework.lang.Nullable;
@@ -146,8 +147,9 @@ private byte[] processImage(MultipartFile image, String extension) throws IOExce
 
 		// 방향에 따라 이미지 회전
 		if (orientation != null) {
-			int orientationValue = orientation.getAsInt(0);
-			originalImage = rotateImageByOrientation(originalImage, orientationValue);
+			dir.removeTIFFField(274);
+			dir.addTIFFField(new TIFFField(new TIFFTag("Orientation", 274, TIFFTag.TIFF_SHORT), TIFFTag.TIFF_SHORT, 1,
+				new int[] {1}));
 		}
 
 		ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
@@ -161,16 +163,4 @@ private byte[] processImage(MultipartFile image, String extension) throws IOExce
 
 		return outputStream.toByteArray();
 	}
-
-	private BufferedImage rotateImageByOrientation(BufferedImage image, int orientation) throws IOException {
-		return switch (orientation) {
-			case 3 -> // 180도 회전
-				Thumbnails.of(image).scale(1.0).rotate(180).asBufferedImage();
-			case 6 -> // 90도 시계방향
-				Thumbnails.of(image).scale(1.0).rotate(90).asBufferedImage();
-			case 8 -> // 270도 시계방향
-				Thumbnails.of(image).scale(1.0).rotate(270).asBufferedImage();
-			default -> image;
-		};
-	}
 }

src/main/java/com/tnt/gateway/config/SecurityConfig.java

@@ -19,6 +19,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.tnt.common.error.model.ErrorResponse;
 import com.tnt.gateway.filter.SessionAuthenticationFilter;
+import com.tnt.gateway.service.CustomOAuth2UserService;
 import com.tnt.gateway.service.SessionService;
 
 import lombok.RequiredArgsConstructor;
@@ -42,6 +43,7 @@ public class SecurityConfig {
 	};
 
 	private final ObjectMapper objectMapper;
+	private final CustomOAuth2UserService customOAuth2UserService;
 	private final SessionService sessionService;
 
 	@Bean
@@ -55,6 +57,7 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
 			.headers(headers -> headers.frameOptions(HeadersConfigurer.FrameOptionsConfig::sameOrigin))
 			.sessionManagement(sessionManagement ->
 				sessionManagement.sessionCreationPolicy(SessionCreationPolicy.STATELESS))
+			.oauth2Login(oauth2 -> oauth2.userInfoEndpoint(userInfo -> userInfo.userService(customOAuth2UserService)))
 			.authorizeHttpRequests(request -> request
 				.requestMatchers(ALLOWED_URIS).permitAll().anyRequest().authenticated())
 			.addFilterAfter(sessionAuthenticationFilter(), LogoutFilter.class)

src/test/java/com/tnt/application/s3/S3ServiceTest.java

@@ -3,16 +3,13 @@
 import static com.tnt.common.constant.ImageConstant.TRAINEE_DEFAULT_IMAGE;
 import static com.tnt.domain.member.MemberType.TRAINEE;
 import static com.tnt.domain.member.MemberType.TRAINER;
-import static java.util.Objects.requireNonNull;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.BDDMockito.any;
 import static org.mockito.BDDMockito.given;
 import static org.springframework.http.MediaType.IMAGE_JPEG_VALUE;
 
-import java.awt.Color;
-import java.awt.Graphics2D;
 import java.awt.image.BufferedImage;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -26,7 +23,6 @@
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.mock.web.MockMultipartFile;
-import org.springframework.test.util.ReflectionTestUtils;
 
 import com.tnt.common.error.exception.ImageException;
 import com.tnt.infrastructure.s3.S3Adapter;
@@ -83,28 +79,4 @@ void upload_profile_image_unsupported_format_error() throws IOException {
 		// when & then
 		assertThrows(ImageException.class, () -> s3Service.uploadProfileImage(image, TRAINER));
 	}
-
-	@Test
-	@DisplayName("orientation이 3일 때 이미지 180도 회전 성공")
-	void rotate_image_orientation_3_success() {
-		// given
-		BufferedImage originalImage = new BufferedImage(100, 100, BufferedImage.TYPE_INT_RGB);
-		Graphics2D graphics = originalImage.createGraphics();
-
-		// 위쪽은 흰색, 아래쪽은 검은색으로 채워서 회전 확인이 가능하도록 함
-		graphics.setColor(Color.WHITE);
-		graphics.fillRect(0, 0, 100, 50);
-		graphics.setColor(Color.BLACK);
-		graphics.fillRect(0, 50, 100, 50);
-		graphics.dispose();
-
-		// when
-		BufferedImage rotatedImage = ReflectionTestUtils.invokeMethod(s3Service, "rotateImageByOrientation",
-			originalImage, 3);
-
-		// then
-		// 회전 후에는 위쪽이 검은색, 아래쪽이 흰색이어야 함
-		assertThat(requireNonNull(rotatedImage).getRGB(50, 25)).isEqualTo(Color.BLACK.getRGB()); // 원래 아래쪽 색
-		assertThat(requireNonNull(rotatedImage).getRGB(50, 75)).isEqualTo(Color.WHITE.getRGB()); // 원래 위쪽 색
-	}
 }