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 @@ -7,6 +7,7 @@

import org.springframework.data.domain.Pageable;
import org.springframework.security.core.annotation.AuthenticationPrincipal;
import org.springframework.web.bind.annotation.CrossOrigin;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
Expand All @@ -18,6 +19,7 @@

import io.swagger.v3.oas.annotations.Operation;
import lombok.RequiredArgsConstructor;
import umc.th.juinjang.api.checklist.service.response.ReportWithLimjangResponseDTO;
import umc.th.juinjang.api.dto.ApiResponse;
import umc.th.juinjang.api.note.shared.controller.request.ExploreSortType;
import umc.th.juinjang.api.note.shared.controller.request.NoteType;
Expand Down Expand Up @@ -100,11 +102,20 @@ public ApiResponse<UserSharedNotesGetResponse> findUsersSharedNotes(@Authenticat
}

@Operation(summary = "체크리스트 및 상세 후기 API")
@GetMapping("shared-note/{sharedNoteId}/checklist")
@GetMapping("/shared-note/{sharedNoteId}/checklist")
public ApiResponse<SharedNoteCheckListAndReviewResponse> findChecklistAndReview(
@AuthenticationPrincipal Member member,
@PathVariable("sharedNoteId") Long sharedNoteId) {
return ApiResponse.onSuccess(
sharedNoteQueryService.findChecklistAndReview(member, sharedNoteId));
}

@CrossOrigin
@Operation(summary = "둘러보기 리포트 조회")
@GetMapping("/shared-notes/{sharedNoteId}/report")
public ApiResponse<ReportWithLimjangResponseDTO> getReport(
@PathVariable(name = "sharedNoteId") Long sharedNoteId) {
return ApiResponse.onSuccess(sharedNoteQueryService.getReportBySharedNoteId(sharedNoteId));
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,21 @@

import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import umc.th.juinjang.api.checklist.service.ChecklistAnswerFinder;
import umc.th.juinjang.api.checklist.service.ReportFinder;
import umc.th.juinjang.api.checklist.service.response.ChecklistAnswerResponseDTO;
import umc.th.juinjang.api.checklist.service.response.ReportGetResponse;
import umc.th.juinjang.api.checklist.service.response.ReportWithLimjangResponseDTO;
import umc.th.juinjang.api.limjang.service.response.LimjangDetailGetResponse;
import umc.th.juinjang.api.note.liked.service.LikedNoteFinder;
import umc.th.juinjang.api.note.shared.service.response.SharedNoteCheckListAndReviewResponse;
import umc.th.juinjang.api.note.shared.controller.request.ExploreSortType;
import umc.th.juinjang.api.note.shared.controller.request.NoteType;
import umc.th.juinjang.api.note.shared.service.response.SharedNoteCheckListAndReviewResponse;
import umc.th.juinjang.api.note.shared.service.response.SharedNoteExploreGetResponse;
import umc.th.juinjang.api.note.shared.service.response.SharedNoteGetResponse;
import umc.th.juinjang.api.note.shared.service.response.UserSharedNotesGetResponse;
Expand All @@ -35,6 +38,7 @@
import umc.th.juinjang.domain.note.liked.model.LikedNote;
import umc.th.juinjang.domain.note.shared.model.SharedNote;
import umc.th.juinjang.domain.pencil.used.model.UsedPencil;
import umc.th.juinjang.domain.report.model.Report;
import umc.th.juinjang.event.publisher.ApplicationRewardViewCountPublisherAdapter;

@Service
Expand All @@ -48,6 +52,7 @@ public class SharedNoteQueryService {
private final ChecklistAnswerFinder checklistAnswerFinder;
private final ViewCountService viewCountService;
private final ApplicationRewardViewCountPublisherAdapter applicationRewardViewCountPublisherAdapter;
private final ReportFinder reportFinder;

@Transactional(readOnly = true)
public SharedNoteGetResponse findSharedNote(Member member, Long sharedNoteId) {
Expand Down Expand Up @@ -200,4 +205,11 @@ public SharedNoteCheckListAndReviewResponse findChecklistAndReview(Member member
String review = isOwned ? sharedNote.getReview() : null;
return new SharedNoteCheckListAndReviewResponse(review, answers);
}

public ReportWithLimjangResponseDTO getReportBySharedNoteId(Long sharedNoteId) {
SharedNote sharedNote = sharedNoteFinder.findByIdWithNoteAndAddress(sharedNoteId);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

확인했습니다 고생하셨습니다!

Limjang note = sharedNote.getLimjang();
Report report = reportFinder.findReportByNote(note);
return new ReportWithLimjangResponseDTO(ReportGetResponse.of(report), LimjangDetailGetResponse.of(note));
}
}