-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #216 from ITA-OneByte/dev
[Release] 드라이브 휴지통 API 로직 변경
- Loading branch information
Showing
10 changed files
with
245 additions
and
170 deletions.
There are no files selected for viewing
This file contains 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 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 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 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 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
63 changes: 43 additions & 20 deletions
63
src/main/java/classfit/example/classfit/drive/service/DriveDeleteService.java
This file contains 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,43 +1,66 @@ | ||
| package classfit.example.classfit.drive.service; | ||
|
|
||
| import classfit.example.classfit.common.exception.ClassfitException; | ||
| import classfit.example.classfit.common.util.DriveUtil; | ||
| import classfit.example.classfit.drive.domain.DriveType; | ||
| import classfit.example.classfit.member.domain.Member; | ||
| import com.amazonaws.services.s3.AmazonS3; | ||
| import lombok.RequiredArgsConstructor; | ||
| import org.springframework.beans.factory.annotation.Value; | ||
| import org.springframework.http.HttpStatus; | ||
| import org.springframework.stereotype.Service; | ||
| import software.amazon.awssdk.services.s3.S3Client; | ||
| import software.amazon.awssdk.services.s3.model.DeleteObjectRequest; | ||
| import software.amazon.awssdk.services.s3.model.ListObjectVersionsRequest; | ||
| import software.amazon.awssdk.services.s3.model.ListObjectVersionsResponse; | ||
| import software.amazon.awssdk.services.s3.model.S3Exception; | ||
|
|
||
| import java.util.List; | ||
|
|
||
| @Service | ||
| @RequiredArgsConstructor | ||
| public class DriveDeleteService { | ||
| private final AmazonS3 amazonS3; | ||
| private final S3Client s3Client; | ||
|
|
||
| @Value("${cloud.aws.s3.bucket}") | ||
| private String bucketName; | ||
|
|
||
| public void deleteFromTrash(Member member, DriveType driveType, List<String> fileNames) { | ||
| for (String fileName : fileNames) { | ||
| public void deleteFromTrash(Member member, DriveType driveType, String folderPath, List<String> fileNames) { | ||
|
|
||
| fileNames.forEach(fileName -> { | ||
| String key = DriveUtil.generatedOriginPath(member, driveType, folderPath, fileName); | ||
|
|
||
| try { | ||
| String trashPath = generateTrashPath(member, driveType, fileName); | ||
| amazonS3.deleteObject(bucketName, trashPath); | ||
| } catch (Exception e) { | ||
| System.err.println("파일 삭제 중 오류 발생: " + fileName); | ||
| ListObjectVersionsRequest listVersionsRequest = ListObjectVersionsRequest.builder() | ||
| .bucket(bucketName) | ||
| .prefix(key) | ||
| .build(); | ||
|
|
||
| ListObjectVersionsResponse response = s3Client.listObjectVersions(listVersionsRequest); | ||
|
|
||
| response.versions().forEach(version -> { | ||
| DeleteObjectRequest deleteRequest = DeleteObjectRequest.builder() | ||
| .bucket(bucketName) | ||
| .key(version.key()) | ||
| .versionId(version.versionId()) | ||
| .build(); | ||
|
|
||
| s3Client.deleteObject(deleteRequest); | ||
| }); | ||
|
|
||
| response.deleteMarkers().forEach(deleteMarker -> { | ||
| DeleteObjectRequest deleteMarkerRequest = DeleteObjectRequest.builder() | ||
| .bucket(bucketName) | ||
| .key(deleteMarker.key()) | ||
| .versionId(deleteMarker.versionId()) | ||
| .build(); | ||
|
|
||
| s3Client.deleteObject(deleteMarkerRequest); | ||
| }); | ||
|
|
||
| } catch (S3Exception e) { | ||
| System.err.println("Error deleting file: " + key + ", Error: " + e.awsErrorDetails().errorMessage()); | ||
| } | ||
| } | ||
| }); | ||
| } | ||
|
|
||
| private String generateTrashPath(Member member, DriveType driveType, String fileName) { | ||
| if (driveType == DriveType.PERSONAL) { | ||
| return String.format("trash/personal/%d/%s", member.getId(), fileName); | ||
| } else if (driveType == DriveType.SHARED) { | ||
| Long academyId = member.getAcademy().getId(); | ||
| return String.format("trash/shared/%d/%s", academyId, fileName); | ||
| } | ||
| throw new ClassfitException("지원하지 않는 드라이브 타입입니다.", HttpStatus.NO_CONTENT); | ||
| } | ||
|
|
||
| } | ||
|
|
This file contains 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
Oops, something went wrong.