Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

#336 [fix] 규칙 이미지 버킷 저장 경로 수정 #337

Merged
merged 1 commit into from
Jul 16, 2023
Merged

#336 [fix] 규칙 이미지 버킷 저장 경로 수정 #337

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion hous-api/src/main/java/hous/api/service/image/client/S3FileStorageClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
@Component
public class S3FileStorageClient implements FileStorageClient {

@Value("${cloud.aws.s3.rule-bucket}")
@Value("${cloud.aws.s3.bucket}")
public String bucket; // S3 버킷 이름

private final AmazonS3 amazonS3;
Expand Down
5 changes: 3 additions & 2 deletions hous-api/src/main/java/hous/api/service/image/provider/S3Provider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,10 @@ public class S3Provider {

private final S3FileStorageClient fileStorageClient;

public UploadResponseDto uploadFile(UploadFileRequest request, MultipartFile file) {
public UploadResponseDto uploadFile(UploadFileRequest request, MultipartFile file, String dirName) {
request.validateAvailableContentType(file.getContentType());
String fileName = request.getFileNameWithBucketDirectory(file.getOriginalFilename());
String fileName = String.join("/", dirName,
request.getFileNameWithBucketDirectory(file.getOriginalFilename()));
String originalFileName = request.getCreateOriginalFileNameWithDate(file.getOriginalFilename());
validateImageMaxSize(file);
fileStorageClient.uploadFile(file, fileName);
Expand Down
8 changes: 6 additions & 2 deletions hous-api/src/main/java/hous/api/service/rule/RuleService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@
@Transactional
public class RuleService {

private static final String RULE_IMAGE_S3_DIR = "rule-image";

private final RedisTemplate<String, Object> redisTemplate;

private final UserRepository userRepository;
Expand Down Expand Up @@ -113,7 +115,8 @@ public void createRule(CreateRuleInfoRequestDto request, Long userId, List<Multi
Rule rule = Rule.newInstance(room, request.getName(), 0, request.getDescription());
ruleRepository.save(rule);
List<RuleImage> s3ImageUrls = maybeImages.orElse(Collections.emptyList()).stream().map(image -> {
UploadResponseDto response = s3Provider.uploadFile(ImageUploadFileRequest.of(FileType.IMAGE), image);
UploadResponseDto response = s3Provider.uploadFile(ImageUploadFileRequest.of(FileType.IMAGE), image,
RULE_IMAGE_S3_DIR);
return ruleImageRepository.save(
RuleImage.newInstance(rule, response.getOriginalFileName(), response.getUploadFileName()));
}).collect(Collectors.toList());
Expand Down Expand Up @@ -182,7 +185,8 @@ public void updateRule(UpdateRuleInfoRequestDto request, Long ruleId, Long userI

// 이미지 s3에 추가
List<RuleImage> s3ImageUrls = maybeRequestImages.stream().map(image -> {
UploadResponseDto response = s3Provider.uploadFile(ImageUploadFileRequest.of(FileType.IMAGE), image);
UploadResponseDto response = s3Provider.uploadFile(ImageUploadFileRequest.of(FileType.IMAGE), image,
RULE_IMAGE_S3_DIR);
return ruleImageRepository.save(
RuleImage.newInstance(rule, response.getOriginalFileName(), response.getUploadFileName()));
}).collect(Collectors.toList());
Expand Down