Skip to content

Commit 9678925

Browse files
Merge pull request #188 from prgrms-web-devcourse-final-project/feature/EA3-161-study-image
[EA3-161] refactor: 스터디 생성, 수정 이미지 업로드 환경 분기 처리 수정
2 parents a6f4685 + 4de7c44 commit 9678925

File tree

1 file changed

+9
-35
lines changed

1 file changed

+9
-35
lines changed

src/main/java/grep/neogul_coder/domain/study/service/StudyService.java

Lines changed: 9 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package grep.neogul_coder.domain.study.service;
22

3-
import grep.neogul_coder.domain.buddy.service.BuddyEnergyService;
43
import grep.neogul_coder.domain.recruitment.post.repository.RecruitmentPostRepository;
54
import grep.neogul_coder.domain.study.Study;
65
import grep.neogul_coder.domain.study.StudyMember;
@@ -17,13 +16,10 @@
1716
import grep.neogul_coder.domain.users.repository.UserRepository;
1817
import grep.neogul_coder.global.exception.business.BusinessException;
1918
import grep.neogul_coder.global.exception.business.NotFoundException;
19+
import grep.neogul_coder.global.utils.upload.AbstractFileManager;
2020
import grep.neogul_coder.global.utils.upload.FileUploadResponse;
2121
import grep.neogul_coder.global.utils.upload.FileUsageType;
22-
import grep.neogul_coder.global.utils.upload.uploader.GcpFileUploader;
23-
import grep.neogul_coder.global.utils.upload.uploader.LocalFileUploader;
2422
import lombok.RequiredArgsConstructor;
25-
import org.springframework.beans.factory.annotation.Autowired;
26-
import org.springframework.core.env.Environment;
2723
import org.springframework.data.domain.Page;
2824
import org.springframework.data.domain.Pageable;
2925
import org.springframework.stereotype.Service;
@@ -43,22 +39,13 @@
4339
@Service
4440
public class StudyService {
4541

42+
private final AbstractFileManager fileUploader;
4643
private final StudyRepository studyRepository;
4744
private final StudyMemberRepository studyMemberRepository;
4845
private final StudyQueryRepository studyQueryRepository;
4946
private final RecruitmentPostRepository recruitmentPostRepository;
5047
private final StudyMemberQueryRepository studyMemberQueryRepository;
5148
private final UserRepository userRepository;
52-
private final BuddyEnergyService buddyEnergyService;
53-
54-
@Autowired(required = false)
55-
private GcpFileUploader gcpFileUploader;
56-
57-
@Autowired(required = false)
58-
private LocalFileUploader localFileUploader;
59-
60-
@Autowired
61-
private Environment environment;
6249

6350
public StudyItemPagingResponse getMyStudiesPaging(Pageable pageable, Long userId) {
6451
Page<StudyItemResponse> page = studyQueryRepository.findMyStudiesPaging(pageable, userId);
@@ -203,38 +190,25 @@ private void validateStudyDeletable(Long studyId) {
203190
}
204191
}
205192

206-
private boolean isProductionEnvironment() {
207-
for (String profile : environment.getActiveProfiles()) {
208-
if ("prod".equals(profile)) {
209-
return true;
210-
}
211-
}
212-
return false;
213-
}
214-
215193
private String createImageUrl(Long userId, MultipartFile image) throws IOException {
216-
String imageUrl = null;
194+
FileUploadResponse response = null;
217195
if (isImgExists(image)) {
218-
FileUploadResponse uploadResult = isProductionEnvironment()
219-
? gcpFileUploader.upload(image, userId, FileUsageType.STUDY_COVER, userId)
220-
: localFileUploader.upload(image, userId, FileUsageType.STUDY_COVER, userId);
221-
imageUrl = uploadResult.getFileUrl();
196+
response = fileUploader.upload(image, userId, FileUsageType.STUDY_COVER, userId);
197+
return response.getFileUrl();
222198
}
223-
return imageUrl;
199+
return null;
224200
}
225201

226202
private String updateImageUrl(Long userId, MultipartFile image, String originalImageUrl) throws IOException {
227203
if (isImgExists(image)) {
228-
FileUploadResponse uploadResult = isProductionEnvironment()
229-
? gcpFileUploader.upload(image, userId, FileUsageType.STUDY_COVER, userId)
230-
: localFileUploader.upload(image, userId, FileUsageType.STUDY_COVER, userId);
231-
return uploadResult.getFileUrl();
204+
FileUploadResponse response = fileUploader.upload(image, userId, FileUsageType.STUDY_COVER, userId);
205+
return response.getFileUrl();
232206
}
233207
return originalImageUrl;
234208
}
235209

236-
237210
private boolean isImgExists(MultipartFile image) {
238211
return image != null && !image.isEmpty();
239212
}
213+
240214
}

0 commit comments

Comments
 (0)