#8 Store CRUD 및 이미지 업로드 기능 추가

build.gradle

@@ -51,6 +51,15 @@ dependencies {
     // Validation
     implementation 'org.springframework.boot:spring-boot-starter-validation'
 
+    // S3
+    implementation 'org.springframework.cloud:spring-cloud-starter-aws:2.2.6.RELEASE'
+    implementation 'com.amazonaws:aws-java-sdk-s3:1.12.683'
+    // Resilience4j
+    implementation 'io.github.resilience4j:resilience4j-spring-boot2:1.7.1'
+    implementation 'io.github.resilience4j:resilience4j-bulkhead:1.7.1'
+    // 비동기 실행
+    implementation 'org.springframework.boot:spring-boot-starter-aop'
+
     testImplementation 'org.springframework.security:spring-security-test'
     testImplementation 'org.awaitility:awaitility:4.3.0'
     testImplementation 'com.h2database:h2'

src/main/java/com/example/gtable/global/config/AsyncConfig.java

@@ -0,0 +1,21 @@
+package com.example.gtable.global.config;
+
+import java.util.concurrent.Executor;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
+
+@Configuration
+public class AsyncConfig {
+	@Bean(name = "s3UploadExecutor")
+	public Executor s3UploadExecutor() {
+		ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
+		executor.setCorePoolSize(5);
+		executor.setMaxPoolSize(10);
+		executor.setQueueCapacity(100);
+		executor.setThreadNamePrefix("S3Upload-");
+		executor.initialize();
+		return executor;
+	}
+}

src/main/java/com/example/gtable/global/config/AwsS3Config.java

@@ -0,0 +1,33 @@
+package com.example.gtable.global.config;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import com.amazonaws.auth.AWSStaticCredentialsProvider;
+import com.amazonaws.auth.BasicAWSCredentials;
+import com.amazonaws.services.s3.AmazonS3Client;
+import com.amazonaws.services.s3.AmazonS3ClientBuilder;
+
+@Configuration
+public class AwsS3Config {
+
+	@Value("${cloud.aws.credentials.access-key}")
+	private String accessKey;
+
+	@Value("${cloud.aws.credentials.secret-key}")
+	private String secretKey;
+
+	@Value("${cloud.aws.region.static}")
+	private String region;
+
+	@Bean
+	public AmazonS3Client amazonS3Client() {
+		BasicAWSCredentials awsCredentials = new BasicAWSCredentials(accessKey, secretKey);
+		return (AmazonS3Client)AmazonS3ClientBuilder.standard()
+			.withRegion(region)
+			.withCredentials(new AWSStaticCredentialsProvider(awsCredentials))
+			.build();
+	}
+
+}

src/main/java/com/example/gtable/global/config/SecurityConfig.java

@@ -51,7 +51,8 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
 				.requestMatchers(
 					"/oauth2/authorization/kakao", // 카카오 로그인 요청
 					"/login/oauth2/code/**", // 카카오 인증 콜백
-					"/api/refresh-token")  // refresh token (토큰 갱신)
+					"/api/refresh-token",
+					"/stores/**")  // refresh token (토큰 갱신)
 				.permitAll()
 				.anyRequest().authenticated() // 그외 요청은 허가된 사람만 인가
 			)

src/main/java/com/example/gtable/global/s3/S3Service.java

@@ -0,0 +1,57 @@
+package com.example.gtable.global.s3;
+
+import java.io.InputStream;
+import java.util.UUID;
+import java.util.concurrent.CompletableFuture;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+
+import com.amazonaws.services.s3.AmazonS3Client;
+import com.amazonaws.services.s3.model.ObjectMetadata;
+
+import io.github.resilience4j.bulkhead.annotation.Bulkhead;
+import lombok.RequiredArgsConstructor;
+
+@Service
+@RequiredArgsConstructor
+public class S3Service {
+	private final AmazonS3Client amazonS3Client;
+
+	@Value("${cloud.aws.s3.bucket}")
+	private String bucket;
+
+	public record S3UploadResult(String key, String url) {
+	}
+
+	@Bulkhead(name = "s3UploadBulkhead", type = Bulkhead.Type.THREADPOOL)
+	@Async("s3UploadExecutor")
+	public CompletableFuture<S3UploadResult> upload(Long storeId, MultipartFile file) {
+		try (InputStream inputStream = file.getInputStream()) {
+			String key = createFileKey(storeId, file.getOriginalFilename());
+			ObjectMetadata metadata = new ObjectMetadata();
+			metadata.setContentLength(file.getSize());
+
+			amazonS3Client.putObject(bucket, key, inputStream, metadata);
+			String url = amazonS3Client.getUrl(bucket, key).toString();
+
+			return CompletableFuture.completedFuture(new S3UploadResult(key, url));
+		} catch (Exception e) {
+			throw new RuntimeException("S3 업로드 실패", e);
+		}
+	}
+
+	public void delete(String filename) {
+		try {
+			amazonS3Client.deleteObject(bucket, filename);
+		} catch (Exception e) {
+			throw new RuntimeException("S3 파일 삭제 실패", e);
+		}
+	}
+
+	private String createFileKey(Long storeId, String filename) {
+		return "store/" + storeId + "/" + UUID.randomUUID() + "-" + filename;
+	}
+}

src/main/java/com/example/gtable/store/dto/StoreCreateRequest.java

@@ -23,15 +23,12 @@ public class StoreCreateRequest {
 
 	private String description;
 
-	private String storeImageUrl;
-
 	public Store toEntity() {
 		return Store.builder()
 			.departmentId(departmentId)
 			.name(name)
 			.location(location)
 			.description(description)
-			.storeImageUrl(storeImageUrl)
 			.isActive(false)
 			.deleted(false)
 			.build();

src/main/java/com/example/gtable/store/dto/StoreCreateResponse.java

@@ -18,7 +18,6 @@ public class StoreCreateResponse {
 	private String name;
 	private String location;
 	private String description;
-	private String storeImageUrl;
 	private Boolean isActive;
 	private Boolean deleted;
 	private LocalDateTime createdAt;
@@ -31,7 +30,6 @@ public static StoreCreateResponse fromEntity(Store store) {
 			.name(store.getName())
 			.location(store.getLocation())
 			.description(store.getDescription())
-			.storeImageUrl(store.getStoreImageUrl())
 			.isActive(store.getIsActive())
 			.deleted(store.getDeleted())
 			.build();

src/main/java/com/example/gtable/store/dto/StoreReadDto.java

@@ -1,8 +1,10 @@
 package com.example.gtable.store.dto;
 
 import java.time.LocalDateTime;
+import java.util.List;
 
 import com.example.gtable.store.model.Store;
+import com.example.gtable.storeImage.dto.StoreImageUploadResponse;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -17,22 +19,22 @@ public class StoreReadDto {
 	private String name;
 	private String location;
 	private String description;
-	private String storeImageUrl;
+	private List<StoreImageUploadResponse> images;
 	private Boolean isActive;
 	private Boolean deleted;
 	private LocalDateTime createdAt;
 
-	public static StoreReadDto fromEntity(Store store) {
+	public static StoreReadDto fromEntity(Store store, List<StoreImageUploadResponse> images) {
 		return StoreReadDto.builder()
 			.createdAt(store.getCreatedAt())
 			.storeId(store.getStoreId())
 			.departmentId(store.getDepartmentId())
 			.name(store.getName())
 			.location(store.getLocation())
 			.description(store.getDescription())
-			.storeImageUrl(store.getStoreImageUrl())
 			.isActive(store.getIsActive())
 			.deleted(store.getDeleted())
+			.images(images)
 			.build();
 	}
 }

src/main/java/com/example/gtable/store/dto/StoreReadResponse.java

@@ -14,7 +14,7 @@ public class StoreReadResponse {
 	private List<StoreReadDto> storeReadDtos;
 	private boolean hasNext;
 
-	public static StoreReadResponse fromEntity(List<StoreReadDto> storeReadDtos, boolean hasNext) {
+	public static StoreReadResponse of(List<StoreReadDto> storeReadDtos, boolean hasNext) {
 		return StoreReadResponse.builder()
 			.storeReadDtos(storeReadDtos)
 			.hasNext(hasNext)

src/main/java/com/example/gtable/store/dto/StoreUpdateRequest.java

@@ -13,6 +13,5 @@ public class StoreUpdateRequest {
 	private String name;
 	private String location;
 	private String description;
-	private String storeImageUrl;
 	private Boolean isActive;
 }

src/main/java/com/example/gtable/store/model/Store.java

@@ -36,48 +36,39 @@ public class Store extends BaseTimeEntity {
 
 	private String description;
 
-	private String storeImageUrl;
-
 	@Column(name = "is_active", nullable = false)
 	private Boolean isActive = false;
 
 	@Column
 	private Boolean deleted = false;
 
 	public Store(LocalDateTime createdAt, Long storeId, Long departmentId, String name, String location,
-		String description, String storeImageUrl, Boolean isActive, Boolean deleted) {
+		String description, Boolean isActive, Boolean deleted) {
 		super(createdAt);
 		this.storeId = storeId;
 		this.departmentId = departmentId;
 		this.name = name;
 		this.location = location;
 		this.description = description;
-		this.storeImageUrl = storeImageUrl;
 		this.isActive = isActive;
 		this.deleted = deleted;
 	}
 
-	public void setName(String name) {
+	public void updateInfo(String name, String location, String description) {
 		this.name = name;
-	}
-
-	public void setLocation(String location) {
 		this.location = location;
-	}
-
-	public void setDescription(String description) {
 		this.description = description;
 	}
 
-	public void setStoreImageUrl(String url) {
-		this.storeImageUrl = url;
+	public void markAsDeleted() {
+		this.deleted = true;
 	}
 
-	public void setIsActive(Boolean isActive) {
-		this.isActive = isActive;
+	public void activate() {
+		this.isActive = true;
 	}
 
-	public void setDeleted(Boolean deleted) {
-		this.deleted = deleted;
+	public void deactivate() {
+		this.isActive = false;
 	}
 }

src/main/java/com/example/gtable/store/service/StoreServiceImpl.java

@@ -12,6 +12,9 @@
 import com.example.gtable.store.dto.StoreUpdateRequest;
 import com.example.gtable.store.model.Store;
 import com.example.gtable.store.repository.StoreRepository;
+import com.example.gtable.storeImage.dto.StoreImageUploadResponse;
+import com.example.gtable.storeImage.model.StoreImage;
+import com.example.gtable.storeImage.repository.StoreImageRepository;
 
 import jakarta.persistence.EntityNotFoundException;
 import lombok.RequiredArgsConstructor;
@@ -21,6 +24,7 @@
 public class StoreServiceImpl implements StoreService {
 
 	private final StoreRepository storeRepository;
+	private final StoreImageRepository storeImageRepository;
 
 	@Override
 	@Transactional
@@ -38,15 +42,18 @@ public StoreReadResponse getAllStores() {
 		List<Store> stores = storeRepository.findAllByDeletedFalse();
 
 		List<StoreReadDto> storeRead = stores.stream()
-			.map(StoreReadDto::fromEntity)
+			.map(store -> {
+				List<StoreImage> images = storeImageRepository.findByStore(store);
+				List<StoreImageUploadResponse> imageDto = images.stream()
+					.map(StoreImageUploadResponse::fromEntity)
+					.toList();
+				return StoreReadDto.fromEntity(store, imageDto);
+			})
 			.toList();
 
 		boolean hasNext = false;
 
-		return StoreReadResponse.fromEntity(
-			storeRead,
-			hasNext
-		);
+		return StoreReadResponse.of(storeRead, hasNext);
 	}
 
 	@Override
@@ -55,7 +62,12 @@ public StoreReadDto getStoreByStoreId(Long storeId) {
 		Store store = storeRepository.findByStoreIdAndDeletedFalse(storeId)
 			.orElseThrow(() -> new EntityNotFoundException(storeId + " store not found."));
 
-		return StoreReadDto.fromEntity(store);
+		List<StoreImage> images = storeImageRepository.findByStore(store);
+		List<StoreImageUploadResponse> imageDto = images.stream()
+			.map(StoreImageUploadResponse::fromEntity)
+			.toList();
+
+		return StoreReadDto.fromEntity(store, imageDto);
 	}
 
 	@Override
@@ -64,20 +76,20 @@ public StoreReadDto updateStore(Long storeId, StoreUpdateRequest request) {
 		Store store = storeRepository.findByStoreIdAndDeletedFalse(storeId)
 			.orElseThrow(() -> new EntityNotFoundException(storeId + " store not found."));
 
-		if (request.getName() != null)
-			store.setName(request.getName());
-		if (request.getLocation() != null)
-			store.setLocation(request.getLocation());
-		if (request.getDescription() != null)
-			store.setDescription(request.getDescription());
-		if (request.getStoreImageUrl() != null)
-			store.setStoreImageUrl(request.getStoreImageUrl());
-		if (request.getIsActive() != null)
-			store.setIsActive(request.getIsActive());
+		store.updateInfo(
+			request.getName(),
+			request.getLocation(),
+			request.getDescription()
+		);
 
 		Store updatedStore = storeRepository.save(store);
 
-		return StoreReadDto.fromEntity(updatedStore);
+		List<StoreImage> images = storeImageRepository.findByStore(updatedStore);
+		List<StoreImageUploadResponse> imageDto = images.stream()
+			.map(StoreImageUploadResponse::fromEntity)
+			.toList();
+
+		return StoreReadDto.fromEntity(updatedStore, imageDto);
 	}
 
 	@Override
@@ -86,7 +98,7 @@ public String deleteStore(Long storeId) {
 		Store store = storeRepository.findByStoreIdAndDeletedFalse(storeId)
 			.orElseThrow(() -> new EntityNotFoundException(storeId + " store not found."));
 
-		store.setDeleted(true);
+		store.markAsDeleted();
 		storeRepository.save(store);
 
 		return "Store ID " + storeId + " 삭제되었습니다.";