diff --git a/src/main/java/com/tiki/server/external/util/AwsHandler.java b/src/main/java/com/tiki/server/external/util/AwsHandler.java index 0373aac6..da8724b7 100644 --- a/src/main/java/com/tiki/server/external/util/AwsHandler.java +++ b/src/main/java/com/tiki/server/external/util/AwsHandler.java @@ -62,7 +62,7 @@ public String getDownloadPreSignedUrl(final String fileKey) { } public void deleteFile(final String request) { - if (request.equals("file/갓슈.png")) return; // 임시 로직 + if (Objects.isNull(request) || request.equals("file/갓슈.png") || request.isBlank()) return; // 임시 로직 try { S3Client s3Client = awsConfig.getS3Client(); s3Client.deleteObject((DeleteObjectRequest.Builder builder) -> diff --git a/src/main/java/com/tiki/server/team/service/TeamService.java b/src/main/java/com/tiki/server/team/service/TeamService.java index 6c75abfc..86464613 100644 --- a/src/main/java/com/tiki/server/team/service/TeamService.java +++ b/src/main/java/com/tiki/server/team/service/TeamService.java @@ -97,6 +97,7 @@ public CategoriesGetResponse getCategories() { @Transactional public void deleteTeam(final long memberId, final long teamId) { + Team team = teamFinder.findById(teamId); checkIsAdmin(memberId, teamId); List memberTeamManagers = memberTeamManagerFinder.findAllByTeamId(teamId); memberTeamManagerDeleter.deleteAll(memberTeamManagers); @@ -104,6 +105,8 @@ public void deleteTeam(final long memberId, final long teamId) { deleteTimeBlocks(teamId); noteDeleter.deleteAllByTeamId(teamId); folderDeleter.deleteAllByTeamId(teamId); + awsHandler.deleteFile(team.getIconImageKey()); + awsHandler.deleteFile(team.getImageKey()); teamDeleter.deleteById(teamId); }