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 @@ -112,9 +112,12 @@ public ResponseEntity<ApiResponse<Void>> updateDiary(

@DeleteMapping("/{diaryId}")
public ResponseEntity<ApiResponse<Void>> deleteDiary(
@Authenticated final Long memberId,
@PathVariable final Long groupId,
@PathVariable final Long diaryId
) {
diaryService.deleteDiary(memberId, groupId, diaryId);

return ResponseEntity.ok(
ApiResponse.success(DELETE_DIARY)
);
Expand Down
13 changes: 13 additions & 0 deletions src/main/java/com/petlog/diary/service/DiaryService.java
Original file line number Diff line number Diff line change
Expand Up @@ -139,4 +139,17 @@ private void validateIsDairyWriter(final Member member, final Diary diary) {
throw new IllegalArgumentException("일기 작성자만 수정할 수 있습니다.");
}
}

@Transactional
public void deleteDiary(final Long memberId, final Long groupId, final Long diaryId) {
final Member member = getMember(memberId);
final PetGroup petGroup = getPetGroup(groupId);
getPetGroupMember(member, petGroup);

final Diary diary = getDiaryDetail(diaryId);
validateIsDairyWriter(member, diary);

diaryImageRepository.deleteAllByDiary(diary);
diaryRepository.deleteById(diaryId);
}
}
4 changes: 2 additions & 2 deletions src/main/java/com/petlog/docs/DiaryControllerDocs.java
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
@Tag(name = "일기 API")
public interface DiaryControllerDocs {

@io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "200", description = "일기 생성에 성공하였습니다.")
@io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "201", description = "일기 생성에 성공하였습니다.")
@Operation(summary = "일기 생성 API")
ResponseEntity<ApiResponse<Void>> createDiary(@Authenticated final Long memberId, @PathVariable final Long groupId, @RequestBody final CreateDiaryRequestDto request);

Expand All @@ -33,5 +33,5 @@ public interface DiaryControllerDocs {

@io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "200", description = "일기 삭제가 성공하였습니다.")
@Operation(summary = "일기 삭제 API")
ResponseEntity<ApiResponse<Void>> deleteDiary(@PathVariable final Long groupId, @PathVariable final Long diaryId);
ResponseEntity<ApiResponse<Void>> deleteDiary(@Authenticated final Long memberId, @PathVariable final Long groupId, @PathVariable final Long diaryId);
}
Loading