Skip to content

Commit

Permalink
Merge pull request #80 from Na-o-man/fix/#79/photo-uplaod-api
Browse files Browse the repository at this point in the history 
[FIX] Elasticsearch 벌크 저장, 얼굴 인식 서비스 호출
  • Loading branch information
@bflykky
bflykky authored Aug 11, 2024
2 parents 23ea3a3 + 8e679b5 commit bf81984
Show file tree
Hide file tree
Showing 2 changed files with 35 additions and 27 deletions.
61 changes: 34 additions & 27 deletions src/main/java/com/umc/naoman/domain/photo/service/PhotoServiceImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,11 @@
import com.amazonaws.services.s3.Headers;
import com.amazonaws.services.s3.model.CannedAccessControlList;
import com.amazonaws.services.s3.model.GeneratePresignedUrlRequest;
import com.amazonaws.services.s3.model.GetObjectRequest;
import com.amazonaws.services.s3.model.S3Object;
import com.umc.naoman.domain.member.entity.Member;
import com.umc.naoman.domain.photo.converter.PhotoConverter;
import com.umc.naoman.domain.photo.dto.PhotoRequest;
import com.umc.naoman.domain.photo.dto.PhotoResponse;
import com.umc.naoman.domain.photo.elasticsearch.repository.PhotoEsClientRepository;
import com.umc.naoman.domain.photo.entity.Photo;
import com.umc.naoman.domain.photo.repository.PhotoRepository;
import com.umc.naoman.domain.shareGroup.entity.ShareGroup;
Expand All @@ -31,13 +30,16 @@
import static com.umc.naoman.global.error.code.S3ErrorCode.*;

@Service
@Transactional(readOnly = true)
@RequiredArgsConstructor
public class PhotoServiceImpl implements PhotoService {
private final AmazonS3 amazonS3;
private final S3Template s3Template;
private final PhotoRepository photoRepository;
private final ShareGroupService shareGroupService;
private final PhotoEsClientRepository photoEsClientRepository;
private final PhotoConverter photoConverter;
private final FaceDetectionService faceDetectionService;

@Value("${spring.cloud.aws.s3.bucket}")
private String bucketName;
Expand All @@ -49,7 +51,6 @@ public class PhotoServiceImpl implements PhotoService {
public static final String W400_PATH_PREFIX = "w400";

@Override
@Transactional(readOnly = true)
public Photo findPhoto(Long photoId) {
return photoRepository.findById(photoId).orElseThrow(() -> new BusinessException(PHOTO_NOT_FOUND));
}
Expand All @@ -67,24 +68,33 @@ public List<PhotoResponse.PreSignedUrlInfo> getPreSignedUrlList(PhotoRequest.Pre
@Override
@Transactional
public PhotoResponse.PhotoUploadInfo uploadPhotoList(PhotoRequest.PhotoUploadRequest request, Member member) {

validateShareGroupAndProfile(request.getShareGroupId(), member);
int uploadCount = 0;
ShareGroup shareGroup = shareGroupService.findShareGroup(request.getShareGroupId());

for (String photoUrl : request.getPhotoUrlList()) {
String photoName = extractPhotoNameFromUrl(photoUrl);
if (checkAndSavePhoto(photoUrl, photoName, request.getShareGroupId())) {
uploadCount++;
}
}
// 사진 URL 리스트를 기반으로 사진 엔티티를 생성하고 DB에 저장
List<Photo> photoList = request.getPhotoUrlList().stream()
.map(photoUrl -> checkAndSavePhotoInDB(photoUrl, extractPhotoNameFromUrl(photoUrl), shareGroup))
.toList();

// Elasticsearch 벌크 저장
photoEsClientRepository.savePhotoBulk(photoList);

// 사진 이름 리스트 생성
List<String> photoNameList = photoList.stream()
.map(Photo::getName)
.toList();

return new PhotoResponse.PhotoUploadInfo(request.getShareGroupId(), uploadCount);
// 얼굴 인식 서비스 호출
faceDetectionService.detectFaceUploadPhoto(photoNameList, request.getShareGroupId());

return new PhotoResponse.PhotoUploadInfo(request.getShareGroupId(), photoList.size());
}

@Override
@Transactional
public List<Photo> deletePhotoList(PhotoRequest.PhotoDeletedRequest request, Member member) {
validateShareGroupAndProfile(request.getShareGroupId(), member);

// 요청된 사진 ID 목록과 공유 그룹 ID를 기반으로 사진 목록 조회
List<Photo> photoList = photoRepository.findByIdInAndShareGroupId(request.getPhotoIdList(), request.getShareGroupId());

Expand All @@ -102,6 +112,7 @@ public List<Photo> deletePhotoList(PhotoRequest.PhotoDeletedRequest request, Mem
return photoList; // 삭제된 사진 목록 반환
}

@Override
public PhotoResponse.PhotoDownloadUrlListInfo getPhotoDownloadUrlList(List<Long> photoIdList, Long shareGroupId, Member member) {
validateShareGroupAndProfile(shareGroupId, member);
List<Photo> photoList = photoRepository.findByIdIn(photoIdList);
Expand All @@ -114,6 +125,12 @@ public PhotoResponse.PhotoDownloadUrlListInfo getPhotoDownloadUrlList(List<Long>
return photoConverter.toPhotoDownloadUrlListInfo(photoList);
}

// 해당 공유 그룹이 존재하는지 확인 & 멤버가 해당 공유 그룹에 속해있는지 확인
private void validateShareGroupAndProfile(Long shareGroupId, Member member) {
shareGroupService.findShareGroup(shareGroupId);
shareGroupService.findProfile(shareGroupId, member.getId());
}

private PhotoResponse.PreSignedUrlInfo getPreSignedUrl(String originalFilename) {
String fileName = createPath(originalFilename);

Expand Down Expand Up @@ -166,24 +183,14 @@ private String extractPhotoNameFromUrl(String photoUrl) {
return photoUrl.substring(lastSlashIndex + 1);
}

// S3에 객체의 존재 여부 확인 및 저장하는 메서드
private boolean checkAndSavePhoto(String photoUrl, String photoName, Long shareGroupId) {
S3Object s3Object = amazonS3.getObject(new GetObjectRequest(bucketName + "/" + RAW_PATH_PREFIX, photoName));
ShareGroup shareGroup = shareGroupService.findShareGroup(shareGroupId);
if (s3Object != null) {
Photo photo = photoConverter.toEntity(photoUrl, photoName, shareGroup);
photoRepository.save(photo);
return true;
} else {
// S3에 객체의 존재 여부 확인 및 DB에 사진을 저장하고 객체를 반환하는 메서드
private Photo checkAndSavePhotoInDB(String photoUrl, String photoName, ShareGroup shareGroup) {
if (amazonS3.doesObjectExist(bucketName, RAW_PATH_PREFIX + "/" + photoName)) {
throw new BusinessException(PHOTO_NOT_FOUND_S3);
}
}

private void validateShareGroupAndProfile(Long shareGroupId, Member member) {
// 해당 공유 그룹이 존재하는지 확인
shareGroupService.findShareGroup(shareGroupId);
// 멤버가 해당 공유 그룹에 속해있는지 확인
shareGroupService.findProfile(shareGroupId, member.getId());
Photo photo = photoConverter.toEntity(photoUrl, photoName, shareGroup);
return photoRepository.save(photo); // 저장된 Photo 객체 반환
}

private void deletePhoto(Photo photo) {
Expand Down
1 change: 1 addition & 0 deletions src/main/java/com/umc/naoman/global/error/code/S3ErrorCode.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
@RequiredArgsConstructor
public enum S3ErrorCode implements ErrorCode {
FAILED_UPLOAD_S3(500, "ES3000", "S3에 업로드를 실패하였습니다."),
FAILED_UPLOAD(500, "ES3000", "사진 업로드를 실패하였습니다."),
PHOTO_NOT_FOUND_S3(404, "ES3000", "S3에서 파일을 찾을 수 없습니다."),
UNAUTHORIZED_GET(403, "ES3000", "사진을 조회할 권한이 없습니다."),
UNAUTHORIZED_DELETE(403, "ES3000", "사진을 삭제할 권한이 없습니다."),
Expand Down

0 comments on commit bf81984

Please sign in to comment.