[FEAT] poster, notice, casting 이미지 수정, dto로 받은 공연관련 이미지의 imageUrl을 db에 저장안하던 기존 로직 수정 #120
+181
−58
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -65,13 +65,13 @@ public Map<String, String> createPresignedPutUrl(String imageExtension, FilePath | |
| throw new GeneralException(ErrorStatus.INVALID_FILE_EXTENSION); | ||
| } | ||
|
|
||
| // // MIME 타입 처리 (jpg는 image/jpeg) | ||
| // String mimeType = switch (ext) { | ||
| // case "jpg", "jpeg" -> "image/jpeg"; | ||
| // case "png" -> "image/png"; | ||
| // case "gif" -> "image/gif"; | ||
| // default -> throw new GeneralException(ErrorStatus.INVALID_FILE_EXTENSION); | ||
| // }; | ||
|
|
||
| PutObjectRequest objectRequest = PutObjectRequest.builder() | ||
| .bucket(bucketName) | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| package cc.backend.image; | ||
|
|
||
| public enum FilePath { | ||
| board, photoAlbum, amateurShow, notice, casting | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -19,6 +19,7 @@ | |
| import java.util.List; | ||
| import java.util.Map; | ||
|
|
||
| import java.util.Optional; | ||
| import java.util.stream.Collectors; | ||
| @Slf4j | ||
| @Service | ||
|
|
@@ -40,18 +41,29 @@ public class ImageService { | |
| @Transactional | ||
| public ImageResponseDTO.ImageResultWithPresignedUrlDTO saveImage(Long memberId, ImageRequestDTO.FullImageRequestDTO requestDTO) { | ||
|
|
||
| return saveImageWithImageUrl(memberId, requestDTO, Optional.empty()); | ||
| } | ||
|
|
||
| @Transactional | ||
| public ImageResponseDTO.ImageResultWithPresignedUrlDTO saveImageWithImageUrl( | ||
| Long memberId, | ||
| ImageRequestDTO.FullImageRequestDTO requestDTO, | ||
| Optional<String> imageUrlOpt) { | ||
|
|
||
| memberRepository.findById(memberId).orElseThrow(() -> new GeneralException(ErrorStatus.MEMBER_NOT_FOUND)); | ||
| //S3에 실제 존재하는 이미지인지 검증 | ||
| if(!s3Service.doesObjectExist(requestDTO.getKeyName(), memberId)) { | ||
| throw new GeneralException(ErrorStatus.NOT_FOUND_IN_S3); | ||
| } | ||
|
|
||
| String imageUrl = imageUrlOpt.orElse(null); | ||
| Image image = Image.builder() | ||
| .keyName(requestDTO.getKeyName()) | ||
| .filePath(requestDTO.getFilePath()) | ||
| .contentId(requestDTO.getContentId()) | ||
| .uploadedAt(LocalDateTime.now()) | ||
| .memberId(memberId) | ||
| .imageUrl(imageUrl) | ||
| .build(); | ||
|
|
||
| Image newImage = imageRepository.save(image); | ||
|
|
@@ -161,4 +173,47 @@ public void deleteImage(Long imageId, Long memberId) { | |
| } | ||
| } | ||
|
|
||
| //amateurShow(poster, notice, casting) 이미지 수정 | ||
| @Transactional | ||
| public void updateShowImage( | ||
| Long memberId, | ||
| String keyName, | ||
| Optional<String> imageUrlOpt, | ||
| Long contentId, | ||
| FilePath filePath) { | ||
| if (keyName == null || keyName.isBlank()) { | ||
| return; // keyName 없으면 처리하지 않음 | ||
| } | ||
|
|
||
| if (!s3Service.doesObjectExist(keyName, memberId)) { | ||
| throw new GeneralException(ErrorStatus.NOT_FOUND_IN_S3); | ||
| } | ||
| String imageUrl = imageUrlOpt.orElse(null); | ||
|
|
||
| // 기존 이미지 조회 (filePath + contentId 기준) | ||
| Image existingImage = imageRepository | ||
| .findByFilePathAndContentId(filePath, contentId); | ||
|
|
||
| // 기존 이미지가 있고, keyName이 다르면 삭제 후 새로 저장 | ||
| if (existingImage != null) { | ||
| // keyName 변경이면 S3/DB 모두 삭제 | ||
| if (!existingImage.getKeyName().equals(keyName)) { | ||
| deleteImage(existingImage.getId(), memberId);} | ||
| else {// 같은 keyName이면 DB row만 교체(중복 방지), S3는 유지 | ||
| imageRepository.delete(existingImage); | ||
| } | ||
| } | ||
|
Comment on lines
+193
to
+205
There was a problem hiding this comment. 🧩 Analysis chain🏁 Script executed: #!/bin/bash
set -euo pipefail
# 1) Find ImageRepository interface definition
echo "=== Searching for ImageRepository interface ==="
rg -n "interface ImageRepository|findByFilePathAndContentId" --type=java -A 5
# 2) Find Image entity class
echo "=== Searching for Image entity class ==="
rg -n "class Image\b" --type=java -B 3 -A 30 | head -100
# 3) Search for unique constraints or indexes in entity or annotations
echo "=== Searching for unique constraints/indexes ==="
rg -n "@UniqueConstraint|@Index|uniqueConstraints|@Column.*unique" --type=java -B 2 -A 2Repository: SeeATheater/CC_Backend Length of output: 8773 🏁 Script executed: #!/bin/bash
set -euo pipefail
# Search for migration files or SQL schema definitions
echo "=== Searching for migrations or schema files ==="
fd -e 'sql' -e 'yml' -e 'yaml' | head -20
echo ""
echo "=== Searching for Flyway/Liquibase migrations ==="
find . -type f \( -name "V*.sql" -o -name "*.sql" \) 2>/dev/null | head -20
echo ""
echo "=== Checking for unique constraint in schema files ==="
rg -n "UNIQUE|unique|constraint" -g '*.sql' -C 2 | grep -i "file_path\|content_id\|image" -C 2 || echo "No matches found"Repository: SeeATheater/CC_Backend Length of output: 565 Add unique constraint on
Add 🤖 Prompt for AI Agents |
||
| // 새 이미지 저장 | ||
| Image image = Image.builder() | ||
| .keyName(keyName) | ||
| .imageUrl(imageUrl) | ||
| .filePath(filePath) | ||
| .contentId(contentId) | ||
| .uploadedAt(LocalDateTime.now()) | ||
| .memberId(memberId) | ||
| .build(); | ||
|
|
||
| imageRepository.save(image); | ||
| } | ||
|
|
||
| } | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Poster update via
updateShowImageis cleaner than delete+insert; watch for nullimageUrl.If FE ever sends
keyNamebut omitsimageUrl, you’ll setamateurShow.posterImageUrlto null (Line 210-211). If poster URL is required for reads, consider requiringimageUrlwhenkeyNameis provided (or derive URL server-side).🤖 Prompt for AI Agents