From 3264958f2e915098b023c811307f4f265cd0b858 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9D=B4=EC=84=9C=EC=A4=80?= <104981505+xeoxxn@users.noreply.github.com> Date: Tue, 3 Nov 2026 19:13:00 +0900 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=ED=95=99=EC=83=9D=20=EC=95=B1=20?= =?UTF-8?q?=EC=97=B4=EB=A6=B0=ED=94=BC=EB=93=9C=EB=B0=B1=20=EC=A1=B0?= =?UTF-8?q?=ED=9A=8C=EC=97=90=EC=84=9C=20=EA=B3=B5=EA=B0=9C=20=EC=A0=84=20?= =?UTF-8?q?=ED=9A=8C=EC=B0=A8=EC=9D=98=20=EB=8B=B5=EB=B3=80=20=EC=88=A8?= =?UTF-8?q?=EA=B9=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/feedback/domain/Feedback.java | 5 ++++ .../feedback/service/FeedbackService.java | 2 ++ .../service/impl/FeedbackServiceImpl.java | 26 +++++++++++++++++-- 3 files changed, 31 insertions(+), 2 deletions(-) diff --git a/core/domain/welfare/src/main/java/kr/ac/kookmin/stream/welfare/domain/feedback/domain/Feedback.java b/core/domain/welfare/src/main/java/kr/ac/kookmin/stream/welfare/domain/feedback/domain/Feedback.java index 635d1f5bf..9a9bf03d6 100644 --- a/core/domain/welfare/src/main/java/kr/ac/kookmin/stream/welfare/domain/feedback/domain/Feedback.java +++ b/core/domain/welfare/src/main/java/kr/ac/kookmin/stream/welfare/domain/feedback/domain/Feedback.java @@ -49,6 +49,11 @@ public boolean isAnswered() { return answer != null; } + // 답변(내용·시각·작성자)을 비운 사본. 원본은 바꾸지 않는다 + public Feedback withoutAnswer() { + return new Feedback(id, year, round, question, questionedAt, null, null, createdBy, null); + } + // 답변을 작성한다. 이미 답변이 있으면 덮어쓴다 — 답변 수정이 같은 경로로 들어오기 때문이다 public void writeAnswer(String answer, Long answeredBy, LocalDateTime answeredAt) { this.answer = answer; diff --git a/core/domain/welfare/src/main/java/kr/ac/kookmin/stream/welfare/domain/feedback/service/FeedbackService.java b/core/domain/welfare/src/main/java/kr/ac/kookmin/stream/welfare/domain/feedback/service/FeedbackService.java index c33ec77e1..cb78c43f1 100644 --- a/core/domain/welfare/src/main/java/kr/ac/kookmin/stream/welfare/domain/feedback/service/FeedbackService.java +++ b/core/domain/welfare/src/main/java/kr/ac/kookmin/stream/welfare/domain/feedback/service/FeedbackService.java @@ -11,8 +11,10 @@ */ public interface FeedbackService { + // 답변을 공개하지 않은 회차의 질문은 답변을 비워서 돌려준다 Feedback getById(Long id); + // 답변을 공개하지 않은 회차의 질문은 답변을 비워서 돌려준다 PageResult search(FeedbackPeriod period, PageOffset pageOffset); // 회차는 현재 열려 있는 회차로 서버가 자동 배정한다 diff --git a/core/domain/welfare/src/main/java/kr/ac/kookmin/stream/welfare/domain/feedback/service/impl/FeedbackServiceImpl.java b/core/domain/welfare/src/main/java/kr/ac/kookmin/stream/welfare/domain/feedback/service/impl/FeedbackServiceImpl.java index 454424d4d..67f0b8ea1 100644 --- a/core/domain/welfare/src/main/java/kr/ac/kookmin/stream/welfare/domain/feedback/service/impl/FeedbackServiceImpl.java +++ b/core/domain/welfare/src/main/java/kr/ac/kookmin/stream/welfare/domain/feedback/service/impl/FeedbackServiceImpl.java @@ -2,6 +2,8 @@ import java.time.LocalDateTime; import java.util.List; +import java.util.Set; +import java.util.stream.Collectors; import kr.ac.kookmin.stream.common.BusinessException; import kr.ac.kookmin.stream.common.DateUtil; import kr.ac.kookmin.stream.common.PageOffset; @@ -26,13 +28,17 @@ class FeedbackServiceImpl implements FeedbackService { @Override public Feedback getById(Long id) { - return feedbackRepository.findById(id) + Feedback feedback = feedbackRepository.findById(id) .orElseThrow(() -> new BusinessException(FeedbackErrorCode.FEEDBACK_NOT_FOUND)); + return hideUnpublishedAnswer(feedback, findPublishedPeriods(feedback.getYear())); } @Override public PageResult search(FeedbackPeriod period, PageOffset pageOffset) { - return feedbackRepository.search(period.year(), period.round(), pageOffset); + // 한 페이지에 여러 회차가 섞일 수 있어 공개 여부를 질문마다 조회하지 않고 미리 한 번에 구한다 + Set publishedPeriods = findPublishedPeriods(period.year()); + return feedbackRepository.search(period.year(), period.round(), pageOffset) + .map(feedback -> hideUnpublishedAnswer(feedback, publishedPeriods)); } @Override @@ -58,4 +64,20 @@ public List getAvailableYears() { public List getRoundsOf(int year) { return feedbackRoundRepository.findRoundsByYear(year); } + + // 학생에게는 공개된 회차의 답변만 보인다. 공개 전 답변은 운영진이 임시저장한 것이다 + private static Feedback hideUnpublishedAnswer(Feedback feedback, Set publishedPeriods) { + if (publishedPeriods.contains(FeedbackPeriod.of(feedback.getYear(), feedback.getRound()))) { + return feedback; + } + return feedback.withoutAnswer(); + } + + // year가 null이면 전체 연도. 회차는 연 5~10개라 연도 단위로 다 읽어도 부담이 없다 + private Set findPublishedPeriods(Integer year) { + return feedbackRoundRepository.findAllByYear(year).stream() + .filter(FeedbackRound::isAnswersPublished) + .map(round -> FeedbackPeriod.of(round.getYear(), round.getRound())) + .collect(Collectors.toSet()); + } } From 297eb79beaebffdfe2f6682fa59cdb7c5fbc7964 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9D=B4=EC=84=9C=EC=A4=80?= <104981505+xeoxxn@users.noreply.github.com> Date: Tue, 3 Nov 2026 19:14:49 +0900 Subject: [PATCH 2/2] =?UTF-8?q?docs:=20=ED=95=99=EC=83=9D=20=EC=95=B1=20?= =?UTF-8?q?=EC=97=B4=EB=A6=B0=ED=94=BC=EB=93=9C=EB=B0=B1=20=EC=A1=B0?= =?UTF-8?q?=ED=9A=8C=20API=20=EC=84=A4=EB=AA=85=EC=97=90=20=EB=8B=B5?= =?UTF-8?q?=EB=B3=80=20=EA=B3=B5=EA=B0=9C=20=EC=A1=B0=EA=B1=B4=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../stream/api/app/welfare/feedback/AppFeedbackApi.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/api/app-api/src/main/java/kr/ac/kookmin/stream/api/app/welfare/feedback/AppFeedbackApi.java b/api/app-api/src/main/java/kr/ac/kookmin/stream/api/app/welfare/feedback/AppFeedbackApi.java index 0d54b4f64..19d739138 100644 --- a/api/app-api/src/main/java/kr/ac/kookmin/stream/api/app/welfare/feedback/AppFeedbackApi.java +++ b/api/app-api/src/main/java/kr/ac/kookmin/stream/api/app/welfare/feedback/AppFeedbackApi.java @@ -26,7 +26,8 @@ public interface AppFeedbackApi { /** 피드백 목록. year/round로 필터링하고 페이지 단위로 조회한다. */ @Operation(summary = "피드백 목록 조회", description = "연도(year)·회차(round)로 필터링해 열린피드백 목록을 페이지 단위로 조회한다. " - + "year를 생략하면 전체 연도, round를 생략하면 그 안의 전체 회차를 대상으로 한다.") + + "year를 생략하면 전체 연도, round를 생략하면 그 안의 전체 회차를 대상으로 한다. " + + "답변(answer·answeredAt)은 답변을 공개한 회차에서만 내려가고, 공개 전이면 null이다.") @ApiErrorCode(type = FeedbackErrorCode.class, codes = {"INVALID_FEEDBACK_ROUND"}) ApiResponse> getFeedbacks( AppApiUser apiUser, @@ -36,7 +37,8 @@ ApiResponse> getFeedbacks( ); /** 피드백 상세. */ - @Operation(summary = "피드백 상세 조회") + @Operation(summary = "피드백 상세 조회", + description = "답변(answer·answeredAt)은 답변을 공개한 회차에서만 내려가고, 공개 전이면 null이다.") @ApiErrorCode(type = FeedbackErrorCode.class, codes = {"FEEDBACK_NOT_FOUND"}) ApiResponse getFeedback(AppApiUser apiUser, Long feedbackId);