Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public class StoreImageController {

private final StoreImageService storeImageService;

@PostMapping("/store-images/{storeId}")
@PostMapping("/banner-images/{storeId}")
@Operation(
summary = "주점 이미지 업로드",
description = "주점에 이미지를 업로드합니다. 최대 10개의 이미지 파일을 업로드할 수 있습니다."
Expand All @@ -40,19 +40,8 @@ public ResponseEntity<?> uploadStoreImage(
@RequestParam("files") List<MultipartFile> files
) {
// TODO 관련 정책 확정되면 메서드로 분리 예정
// 파일 개수 제한 검증
if (files.isEmpty() || files.size() > 10) {
throw new IllegalArgumentException("파일은 1개 이상 10개 이하로 업로드해 주세요.");
}
// 파일 크기 검증
for (MultipartFile file : files) {
if (file.isEmpty()) {
throw new IllegalArgumentException("빈 파일은 업로드할 수 없습니다.");
}
if (file.getSize() > 10 * 1024 * 1024) { // 10MB 제한
throw new IllegalArgumentException("파일 크기는 10MB를 초과할 수 없습니다.");
}
}
validateFiles(files);

List<StoreImageUploadResponse> response = storeImageService.saveAll(storeId, files);
return ResponseEntity
Expand All @@ -64,6 +53,28 @@ public ResponseEntity<?> uploadStoreImage(
);
}

@PostMapping("/profile-images/{storeId}")
@Operation(
summary = "주점 프로필 이미지 업로드",
description = "주점의 프로필 이미지를 업로드합니다. 단일 이미지 파일을 업로드할 수 있습니다."
)
@ApiResponse(responseCode = "201", description = "주점 프로필 이미지 업로드 성공")
public ResponseEntity<?> uploadStoreProfileImage(
@PathVariable Long storeId,
@RequestParam("file") MultipartFile file
) {
validateFileSize(file);

StoreImageUploadResponse response = storeImageService.saveProfileImage(storeId, file);
return ResponseEntity
.status(HttpStatus.CREATED)
.body(
ApiUtils.success(
response
)
);
}

@DeleteMapping("/store-images/{storeImageId}")
@Operation(
summary = "주점 이미지 삭제",
Expand All @@ -81,4 +92,22 @@ public ResponseEntity<?> deleteStoreImage(@PathVariable Long imageId) {
)
);
}

private void validateFileSize(MultipartFile file) {
if (file == null || file.isEmpty()) {
throw new IllegalArgumentException("빈 파일은 업로드할 수 없습니다.");
}
if (file.getSize() > 10 * 1024 * 1024) { // 10MB 제한
throw new IllegalArgumentException("파일 크기는 10MB를 초과할 수 없습니다.");
}
}

private void validateFiles(List<MultipartFile> files) {
if (files.isEmpty() || files.size() > 10) {
throw new IllegalArgumentException("파일은 1개 이상 10개 이하로 업로드해 주세요.");
}
for (MultipartFile file : files) {
validateFileSize(file);
}
}
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.nowait.applicationadmin.store.dto;

import com.nowait.domaincorerdb.store.entity.ImageType;
import com.nowait.domaincorerdb.store.entity.StoreImage;

import lombok.Builder;
Expand All @@ -10,11 +11,13 @@
public class StoreImageUploadResponse {
private final Long id;
private final String imageUrl;
private final ImageType imageType;

public static StoreImageUploadResponse fromEntity(StoreImage storeImage) {
return StoreImageUploadResponse.builder()
.id(storeImage.getId())
.imageUrl(storeImage.getImageUrl())
.imageType(storeImage.getImageType())
.build();
}
Comment thread
Jjiggu marked this conversation as resolved.
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import java.time.LocalDateTime;
import java.util.List;

import com.nowait.domaincorerdb.store.entity.ImageType;
import com.nowait.domaincorerdb.store.entity.Store;

import lombok.AllArgsConstructor;
Expand All @@ -18,12 +19,23 @@ public class StoreReadDto {
private String name;
private String location;
private String description;
private List<StoreImageUploadResponse> images;
private StoreImageUploadResponse profileImage;
private List<StoreImageUploadResponse> bannerImages;
private Boolean isActive;
private Boolean deleted;
private LocalDateTime createdAt;

public static StoreReadDto fromEntity(Store store, List<StoreImageUploadResponse> images) {
public static StoreReadDto fromEntity(Store store, List<StoreImageUploadResponse> allImages) {

StoreImageUploadResponse profile = allImages.stream()
.filter(image -> image.getImageType() == ImageType.PROFILE)
.findFirst()
.orElse(null);

List<StoreImageUploadResponse> banners = allImages.stream()
.filter(image -> image.getImageType() == ImageType.BANNER)
.toList();

return StoreReadDto.builder()
.createdAt(store.getCreatedAt())
.storeId(store.getStoreId())
Expand All @@ -33,7 +45,8 @@ public static StoreReadDto fromEntity(Store store, List<StoreImageUploadResponse
.description(store.getDescription())
.isActive(store.getIsActive())
.deleted(store.getDeleted())
.images(images)
.profileImage(profile)
.bannerImages(banners)
.build();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import java.util.ArrayList;
import java.util.List;
import java.util.Optional;
import java.util.concurrent.CompletableFuture;

import org.springframework.stereotype.Service;
Expand All @@ -10,6 +11,7 @@

import com.nowait.applicationadmin.store.dto.StoreImageUploadResponse;

import com.nowait.domaincorerdb.store.entity.ImageType;
import com.nowait.domaincorerdb.store.entity.Store;
import com.nowait.domaincorerdb.store.entity.StoreImage;
import com.nowait.domaincorerdb.store.exception.StoreImageEmptyException;
Expand All @@ -31,7 +33,8 @@ public class StoreImageService {

@Transactional
public List<StoreImageUploadResponse> saveAll(Long storeId, List<MultipartFile> files) {
if (files == null || files.isEmpty()) throw new StoreImageEmptyException();
if (files == null || files.isEmpty())
throw new StoreImageEmptyException();

String type = "store";
Store store = storeRepository.findById(storeId)
Expand Down Expand Up @@ -60,6 +63,7 @@ public List<StoreImageUploadResponse> saveAll(Long storeId, List<MultipartFile>
.store(store)
.imageUrl(uploadResult.url())
.fileKey(uploadResult.key())
.imageType(ImageType.BANNER)
.build();

storeImageRepository.save(storeImage);
Expand All @@ -69,6 +73,36 @@ public List<StoreImageUploadResponse> saveAll(Long storeId, List<MultipartFile>
return imageUploadResponses;
}

@Transactional
public StoreImageUploadResponse saveProfileImage(Long storeId, MultipartFile file) {

String type = "store";
Store store = storeRepository.findById(storeId)
.orElseThrow(StoreNotFoundException::new);

Optional<StoreImage> existingProfileImage = storeImageRepository.findByStoreStoreIdAndImageType(store.getStoreId(),
ImageType.PROFILE);

existingProfileImage.ifPresent(profile -> {
s3Service.delete(profile.getFileKey());
storeImageRepository.delete(profile);
});

S3Service.S3UploadResult uploadResult = s3Service.upload(type, storeId, file).join();

// StoreImage 엔티티 생성 및 저장
StoreImage storeImage = StoreImage.builder()
.store(store)
.imageUrl(uploadResult.url())
.fileKey(uploadResult.key())
.imageType(ImageType.PROFILE)
.build();

storeImageRepository.save(storeImage);

return StoreImageUploadResponse.fromEntity(storeImage);
}
Comment on lines +76 to +104

@coderabbitai coderabbitai Bot Jul 16, 2025

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🛠️ Refactor suggestion

프로필 이미지 업로드 메소드 구현 검토

프로필 이미지 교체 로직이 올바르게 구현되었습니다. 기존 이미지 삭제 후 새 이미지 업로드하는 플로우가 적절합니다.

동시성 문제를 해결하기 위한 개선사항을 제안합니다:

@Transactional
public StoreImageUploadResponse saveProfileImage(Long storeId, MultipartFile file) {
	String type = "store";
	Store store = storeRepository.findById(storeId)
		.orElseThrow(StoreNotFoundException::new);

+	// 동시성 문제 해결을 위한 락 사용 고려
	Optional<StoreImage> existingProfileImage = storeImageRepository.findByStoreStoreIdAndImageType(store.getStoreId(),
		ImageType.PROFILE);

	existingProfileImage.ifPresent(profile -> {
		s3Service.delete(profile.getFileKey());
		storeImageRepository.delete(profile);
	});

-	S3Service.S3UploadResult uploadResult = s3Service.upload(type, storeId, file).join();
+	// 트랜잭션 외부에서 S3 업로드 수행하거나 비동기 처리 개선 고려
+	S3Service.S3UploadResult uploadResult = s3Service.upload(type, storeId, file).join();

추가적으로 비동기 업로드 처리를 개선하여 성능을 향상시킬 수 있습니다.

📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
@Transactional
public StoreImageUploadResponse saveProfileImage(Long storeId, MultipartFile file) {
String type = "store";
Store store = storeRepository.findById(storeId)
.orElseThrow(StoreNotFoundException::new);
Optional<StoreImage> existingProfileImage = storeImageRepository.findByStoreStoreIdAndImageType(store.getStoreId(),
ImageType.PROFILE);
existingProfileImage.ifPresent(profile -> {
s3Service.delete(profile.getFileKey());
storeImageRepository.delete(profile);
});
S3Service.S3UploadResult uploadResult = s3Service.upload(type, storeId, file).join();
// StoreImage 엔티티 생성 및 저장
StoreImage storeImage = StoreImage.builder()
.store(store)
.imageUrl(uploadResult.url())
.fileKey(uploadResult.key())
.imageType(ImageType.PROFILE)
.build();
storeImageRepository.save(storeImage);
return StoreImageUploadResponse.fromEntity(storeImage);
}
@Transactional
public StoreImageUploadResponse saveProfileImage(Long storeId, MultipartFile file) {
String type = "store";
Store store = storeRepository.findById(storeId)
.orElseThrow(StoreNotFoundException::new);
// 동시성 문제 해결을 위한 락 사용 고려
Optional<StoreImage> existingProfileImage = storeImageRepository.findByStoreStoreIdAndImageType(store.getStoreId(),
ImageType.PROFILE);
existingProfileImage.ifPresent(profile -> {
s3Service.delete(profile.getFileKey());
storeImageRepository.delete(profile);
});
// 트랜잭션 외부에서 S3 업로드 수행하거나 비동기 처리 개선 고려
S3Service.S3UploadResult uploadResult = s3Service.upload(type, storeId, file).join();
// StoreImage 엔티티 생성 및 저장
StoreImage storeImage = StoreImage.builder()
.store(store)
.imageUrl(uploadResult.url())
.fileKey(uploadResult.key())
.imageType(ImageType.PROFILE)
.build();
storeImageRepository.save(storeImage);
return StoreImageUploadResponse.fromEntity(storeImage);
}
🤖 Prompt for AI Agents
In
nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/store/service/StoreImageService.java
between lines 76 and 104, the current saveProfileImage method deletes the
existing profile image and uploads a new one sequentially, which may cause
concurrency issues if multiple requests happen simultaneously. To fix this, wrap
the deletion and saving of the new StoreImage entity in a synchronized block or
use database-level locking to prevent race conditions. Additionally, improve the
asynchronous upload by handling exceptions from the join() call and consider
using CompletableFuture chaining to better manage the upload process without
blocking.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

이건 나중에 개선할게 이슈로 등록해줘

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🧩 Analysis chain

@Jjiggu 동시성 문제 개선을 위한 이슈를 생성하겠습니다.

이슈가 생성되었습니다. 나중에 동시성 문제 개선 작업을 진행하실 수 있습니다!


🏁 Script executed:

#!/bin/bash
# Create GitHub issue for concurrency improvements in saveProfileImage method
gh issue create \
  --title "StoreImageService.saveProfileImage 메소드 동시성 문제 개선" \
  --body "## 문제 상황
프로필 이미지 업로드 메소드에서 동시성 문제가 발생할 수 있습니다.

## 개선 필요 사항
1. **동시성 문제 해결**: 여러 요청이 동시에 발생할 때 기존 이미지 삭제와 새 이미지 저장 간의 경쟁 조건 방지
2. **데이터베이스 레벨 락킹**: synchronized 블록 또는 데이터베이스 락 사용
3. **비동기 업로드 개선**: join() 호출 시 예외 처리 및 CompletableFuture 체이닝으로 블로킹 없는 처리
4. **트랜잭션 범위 최적화**: S3 업로드를 트랜잭션 외부에서 수행하거나 비동기 처리 개선

## 관련 코드
\`nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/store/service/StoreImageService.java\`의 \`saveProfileImage\` 메소드

## 백링크
- PR: https://github.com/GTable/NoWait_BE_MultiModule/pull/113
- 코멘트: https://github.com/GTable/NoWait_BE_MultiModule/pull/113#discussion_r2210800060
- 요청자: @Jjiggu" \
  --assignee "Jjiggu"

Length of output: 777


@Jjiggu 이슈가 성공적으로 생성되었습니다!

이슈 URL: #114

동시성 문제 개선 작업을 나중에 진행하실 때 참고하시면 됩니다. 이슈에 상세한 개선 사항과 관련 코드 위치가 포함되어 있습니다.


🧬 Code Graph Analysis Results

Relevant snippet from nowait-app-user-api/src/main/java/com/nowait/applicationuser/security/jwt/JwtAuthorizationFilter.java (lines 24-99)

@RequiredArgsConstructor
@Slf4j
public class JwtAuthorizationFilter extends OncePerRequestFilter {
	private final JwtUtil jwtUtil;

	@Override
	protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain)
		throws ServletException, IOException {
		String header = request.getHeader("Authorization");

		// 인증헤더 Bearer가 없다면, 다음 필터로 넘김
		if (header == null || !header.startsWith("Bearer ")) {
			filterChain.doFilter(request, response);

			log.debug("JwtAuthorizationFilter: Authorization 헤더가 없거나 Bearer 토큰 형식이 아님. JWT 인증 필터를 건너뜁니다. [header={}] ", header);
			return;
		}

		log.info("header :: {}, header.substring(7) :: {}", header, header.substring(7));
		String accessToken = header.substring(7);

		// 토큰 만료 여부 확인, 만료 시 다음 필터로 넘기지 않음
		try {
			jwtUtil.isExpired(accessToken);
		} catch (ExpiredJwtException e) {

			// response status code + msg
			response.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
			response.getWriter().print("access token expired");

			log.warn("JwtAuthorizationFilter: 만료된 AccessToken 입니다. 토큰 인증 거부, URI: {}", request.getRequestURI());
			return;
		}

		// 토큰이 accessToken 종류인지 확인
		String tokenCategory = jwtUtil.getTokenCategory(accessToken);

		if (!tokenCategory.equals("accessToken")) {
			//response status code
			response.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
			response.getWriter().print("invalid access token");

			log.warn("JwtAuthorizationFilter: 잘못된 토큰 유형(accessToken 아님)으로 인증 요청. URI: {}, tokenCategory: {}", request.getRequestURI(), tokenCategory);
			return;
		}

		// userId와 role 값 추출
		Long userId = jwtUtil.getUserId(accessToken);
		String roleString = jwtUtil.getRole(accessToken);

		if (userId == null || roleString == null) {
			log.warn("JwtAuthorizationFilter: JWT에서 userId 또는 role 추출 실패. 토큰: {}", accessToken);
			response.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
			response.getWriter().print("invalid token");
			return;
		}

		User user = User.createUserWithId(userId, "sampleEmail", "sampleNickname", "sampleProfileImg"
			, SocialType.KAKAO, Role.fromString(roleString),5000L);

		CustomOAuth2User customOAuth2User = new CustomOAuth2User(user);

		// 스프링 시큐리티 인증 토큰 생성
		UsernamePasswordAuthenticationToken usernamePasswordAuthenticationToken = new UsernamePasswordAuthenticationToken(
			customOAuth2User, null, customOAuth2User.getAuthorities());

		// 생성한 인증 정보를 SecurityContext에 설정
		SecurityContextHolder.getContext().setAuthentication(usernamePasswordAuthenticationToken);

		log.info("JwtAuthorizationFilter: 인증 성공. userId={}, role={}, URI={}", userId, roleString, request.getRequestURI());

		filterChain.doFilter(request, response);

	}

}

Summary:

  • This class is a Spring Security filter that intercepts HTTP requests to perform JWT token validation.
  • It checks for the presence of an "Authorization" header with a Bearer token.
  • Validates token expiration and token type (must be "accessToken").
  • Extracts userId and role from the token.
  • Creates a Spring Security Authentication object and sets it in the SecurityContext.
  • Handles error cases by setting HTTP 401 Unauthorized status and appropriate messages.
  • Logs relevant information for debugging and auditing.

This snippet is relevant because the StoreImageService likely requires authenticated access, and this filter is part of the authentication mechanism ensuring that only authorized users can perform operations such as uploading or deleting store images. Understanding this filter helps contextualize security concerns related to the service.


@Transactional
public void delete(Long storeImageId) {
StoreImage storeImage = storeImageRepository.findById(storeImageId)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ public class StoreController {

private final StoreService storeService;


@GetMapping("/all-stores")
@Operation(summary = "모든 주점 조회", description = "모든 주점을 조회합니다.")
@ApiResponse(responseCode = "200", description = "모든 주점 조회 성공")
Expand All @@ -50,7 +49,11 @@ public ResponseEntity<?> getAllStores() {
public ResponseEntity<?> getAllStores(Pageable pageable) {
return ResponseEntity
.ok()
.body(ApiUtils.success(storeService.getAllStoresByPage(pageable)));
.body(
ApiUtils.success(
storeService.getAllStoresByPage(pageable)
)
);
}

@GetMapping("/{storeId}")
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.nowait.applicationuser.store.dto;

import com.nowait.domaincorerdb.store.entity.ImageType;
import com.nowait.domaincorerdb.store.entity.StoreImage;

import lombok.Builder;
Expand All @@ -10,11 +11,13 @@
public class StoreImageUploadResponse {
private final Long id;
private final String imageUrl;
private final ImageType imageType;

public static StoreImageUploadResponse fromEntity(StoreImage storeImage) {
return StoreImageUploadResponse.builder()
.id(storeImage.getId())
.imageUrl(storeImage.getImageUrl())
.imageType(storeImage.getImageType())
.build();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import java.time.LocalDateTime;
import java.util.List;

import com.nowait.domaincorerdb.store.entity.ImageType;
import com.nowait.domaincorerdb.store.entity.Store;

import lombok.AllArgsConstructor;
Expand All @@ -18,12 +19,23 @@ public class StoreReadDto {
private String name;
private String location;
private String description;
private List<StoreImageUploadResponse> images;
private StoreImageUploadResponse profileImage;
private List<StoreImageUploadResponse> bannerImages;
private Boolean isActive;
private Boolean deleted;
private LocalDateTime createdAt;

public static StoreReadDto fromEntity(Store store, List<StoreImageUploadResponse> images) {
public static StoreReadDto fromEntity(Store store, List<StoreImageUploadResponse> allImages) {

StoreImageUploadResponse profile = allImages.stream()
.filter(image -> image.getImageType() == ImageType.PROFILE)
.findFirst()
.orElse(null);

List<StoreImageUploadResponse> banners = allImages.stream()
.filter(image -> image.getImageType() == ImageType.BANNER)
.toList();

return StoreReadDto.builder()
.createdAt(store.getCreatedAt())
.storeId(store.getStoreId())
Expand All @@ -33,7 +45,8 @@ public static StoreReadDto fromEntity(Store store, List<StoreImageUploadResponse
.description(store.getDescription())
.isActive(store.getIsActive())
.deleted(store.getDeleted())
.images(images)
.profileImage(profile)
.bannerImages(banners)
.build();
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
package com.nowait.domaincorerdb.store.entity;

import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Getter;
import lombok.RequiredArgsConstructor;

@Getter
@RequiredArgsConstructor
@Schema(description = "이미지 타입 Enum")
public enum ImageType {
@Schema(description = "주점 프로필 사진")
PROFILE("프로필 사진"),

@Schema(description = "주점 배너 사진")
BANNER("배너 사진"),

@Schema(description = "주점 배너 사진")
NONE("이미지 없음");

private final String description;
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@

import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.EnumType;
import jakarta.persistence.Enumerated;
import jakarta.persistence.FetchType;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.GenerationType;
Expand Down Expand Up @@ -36,4 +38,8 @@ public class StoreImage extends BaseTimeEntity {

@Column(nullable = false, length = 500)
private String fileKey;

@Column(nullable = false)
@Enumerated(EnumType.STRING)
private ImageType imageType;
Comment thread
Jjiggu marked this conversation as resolved.
}
Original file line number Diff line number Diff line change
@@ -1,15 +1,19 @@
package com.nowait.domaincorerdb.store.repository;

import java.util.List;
import java.util.Optional;

import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.stereotype.Repository;

import com.nowait.domaincorerdb.store.entity.ImageType;
import com.nowait.domaincorerdb.store.entity.Store;
import com.nowait.domaincorerdb.store.entity.StoreImage;

@Repository
public interface StoreImageRepository extends JpaRepository<StoreImage, Long> {

List<StoreImage> findByStore(Store store);

Optional<StoreImage> findByStoreStoreIdAndImageType(Long storeId, ImageType imageType);
}