Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -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) ->
Expand Down
3 changes: 3 additions & 0 deletions src/main/java/com/tiki/server/team/service/TeamService.java
Original file line number Diff line number Diff line change
Expand Up @@ -97,13 +97,16 @@ public CategoriesGetResponse getCategories() {

@Transactional
public void deleteTeam(final long memberId, final long teamId) {
Team team = teamFinder.findById(teamId);
checkIsAdmin(memberId, teamId);
List<MemberTeamManager> memberTeamManagers = memberTeamManagerFinder.findAllByTeamId(teamId);
memberTeamManagerDeleter.deleteAll(memberTeamManagers);
deleteDocuments(teamId);
deleteTimeBlocks(teamId);
noteDeleter.deleteAllByTeamId(teamId);
folderDeleter.deleteAllByTeamId(teamId);
awsHandler.deleteFile(team.getIconImageKey());
awsHandler.deleteFile(team.getImageKey());
teamDeleter.deleteById(teamId);
}

Expand Down