Skip to content
Merged
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
15 changes: 2 additions & 13 deletions src/main/java/umc/th/juinjang/service/record/RecordService.java
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import java.io.FileNotFoundException;
import java.io.IOException;
import java.util.List;
import java.util.Objects;
import java.util.UUID;

@Service
Expand Down Expand Up @@ -85,27 +86,19 @@ public RecordResponseDTO.RecordDTO uploadRecord(Member member, RecordRequestDTO.


public String deleteRecord(Member member, Long recordId) {
//db에서 id 찾기



Record record = recordRepository.findById(recordId)
.orElseThrow(() -> new ExceptionHandler(ErrorStatus.RECORD_NOT_FOUND));

Limjang limjang = limjangRepository.findById(record.getLimjangId().getLimjangId()).orElseThrow(()
-> new ExceptionHandler(ErrorStatus.LIMJANG_NOTFOUND_ERROR));

if(limjang.getMemberId().getMemberId() != member.getMemberId()){
if (!Objects.equals(record.getLimjangId().getMemberId().getMemberId(), member.getMemberId())) {
throw new ExceptionHandler(ErrorStatus.RECORD_NOT_FOUND);
}

try{
String keyName = record.getRecordUrl().replace(defaultUrl+"/", "");
log.info("Record deleted: {}", keyName);

boolean isObjectExist = amazonS3Client.doesObjectExist(bucket, keyName);

log.info("Record isObjectExist: {}", isObjectExist);
if (!isObjectExist) {
throw new FileNotFoundException();
} else {
Expand All @@ -114,15 +107,11 @@ public String deleteRecord(Member member, Long recordId) {

//db에서 삭제
recordRepository.deleteById(recordId);


log.info("Record deleted: {}", recordId); // 추가
}

} catch (Exception e) {
// throw new Exception(e);
}
log.info("Record deleted: {}", recordId); // 추가
return "삭제 성공했습니다.";
}

Expand Down