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
2 changes: 2 additions & 0 deletions docs/api-specs/class-api.md
Original file line number Diff line number Diff line change
Expand Up @@ -1006,6 +1006,8 @@ AI가 주제 후보를 제안하면 운영자가 하나를 고르거나 직접
| `LIMITED` | 분석 불가라 템플릿으로 대신함. 개인 리포트는 사유가 `feedback.limitedReason`에 있다 | 개인 리포트: `feedback.headline`·`limitedMessage`·`limitedNotice` (PRD 엣지 케이스 3.3) / 인사이트: "판단의 이유를 살펴볼 글이 아직 충분하지 않아요" |
| `FAILED` | 생성 실패 | "AI 요약을 준비하지 못했어요" |

- 마감 뒤 클래스가 삭제됐거나 멤버가 나가기·내보내기 되면, 아직 만들지 않은 리포트는 AI를 호출하지 않고 건너뛴다(서버 내부 상태 `CANCELED`). 생성 중이었다면 비용만 기록하고 결과는 게시하지 않는다 (PRD F16·18절). 이 리포트는 조회되더라도 `NOT_ELIGIBLE`로 보이며 재시도 대상이 아니다. AI 토론도 생성 중에 클래스가 삭제되면 주장을 저장하지 않는다.

### 8.1 클래스 결과 (정량 통계)
- `GET /api/v1/classes/{classId}/result`

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.swyp.picke.domain.classroom.entity;

import com.swyp.picke.domain.classroom.enums.ClassReportStatus;
import com.swyp.picke.domain.classroom.enums.ClassStatus;
import com.swyp.picke.domain.classroom.enums.ClassReportType;
import com.swyp.picke.global.common.BaseEntity;
import jakarta.persistence.Column;
Expand Down Expand Up @@ -93,6 +94,16 @@ public void fail() {
this.status = ClassReportStatus.FAILED;
}

/** 클래스 삭제·멤버 나가기로 볼 사람이 없어 생성하지 않거나 결과를 게시하지 않는다 (PRD F16·§18) */
public void cancel() {
this.status = ClassReportStatus.CANCELED;
}

/** 클래스가 삭제됐거나 개인 리포트 대상 멤버가 더 이상 참여 중이 아니면 true */
public boolean isObsolete() {
return classroom.getStatus() == ClassStatus.DELETED || (member != null && !member.isActive());
}

/** 마감 스냅샷(정량 통계) 저장. 아직 AI 결과는 없으므로 상태는 PENDING 그대로 (PRD §14 "같은 종료 스냅샷") */
public void attachSnapshot(Map<String, Object> snapshot) {
this.content = snapshot;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.swyp.picke.domain.classroom.enums;

/** 클래스에 붙는 배틀 종류. CUSTOM 은 2차 범위. */
/** 클래스에 붙는 배틀 종류. TTS = 기존 콘텐츠, CUSTOM = 주제 버전으로 만든 클래스 전용 배틀(AI 철학자 토론). */
public enum ClassBattleType {
TTS, CUSTOM
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,6 @@ public enum ClassReportStatus {
GENERATING,
SUCCEEDED,
LIMITED, // 작성 글이 없어 서버 템플릿으로 대체, AI 호출 없음
FAILED
FAILED,
CANCELED // 클래스가 삭제됐거나 멤버가 나가기·내보내기 되어 생성하지 않음. 재시도 대상 아님 (PRD F16·§18)
}
Original file line number Diff line number Diff line change
Expand Up @@ -260,6 +260,7 @@ private static ClassReportViewState toViewState(ClassReportStatus status) {
case SUCCEEDED -> ClassReportViewState.SUCCEEDED;
case LIMITED -> ClassReportViewState.LIMITED;
case FAILED -> ClassReportViewState.FAILED;
case CANCELED -> ClassReportViewState.NOT_ELIGIBLE;
};
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import com.swyp.picke.domain.classroom.enums.ClassDebateResponseType;
import com.swyp.picke.domain.classroom.enums.ClassDebateSpeaker;
import com.swyp.picke.domain.classroom.enums.ClassDebateStatus;
import com.swyp.picke.domain.classroom.enums.ClassStatus;
import com.swyp.picke.domain.classroom.repository.AiJobRepository;
import com.swyp.picke.domain.classroom.repository.ClassDebateMessageRepository;
import com.swyp.picke.domain.classroom.repository.ClassDebateSessionRepository;
Expand Down Expand Up @@ -239,6 +240,12 @@ public void completeTurn(PreparedTurn turn, ClassDebateContentValidator.Argument
|| session.getStatus() != ClassDebateStatus.GENERATING || session.getRound() != turn.round()) {
return;
}
if (session.getClassroom().getStatus() == ClassStatus.DELETED) {
// 생성 중에 클래스가 삭제됐다. AI 호출 자체는 끝났으니 작업은 성공으로 두어 토큰 비용을 남기고, 주장은 게시하지 않는다 (PRD F16)
addExtraAttempts(job, usage);
job.succeed(usage.inputTokens(), usage.outputTokens(), now);
return;
}
if (messageRepository.findBySessionIdAndRoundIndexAndSpeaker(session.getId(), turn.round(), ClassDebateSpeaker.AI).isEmpty()) {
Long replyTo = turn.round() == 1 ? null
: messageRepository.findBySessionIdAndRoundIndexAndSpeaker(session.getId(), turn.round() - 1, ClassDebateSpeaker.USER)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,11 @@ public Prepared prepare(Long reportId, LocalDateTime now) {
if (report == null || report.getStatus() != ClassReportStatus.PENDING) {
return null;
}
if (report.isObsolete()) {
report.cancel();
log.info("[ClassReport] canceled before generation reportId={} type={}", reportId, report.getType());
return null;
}
Classroom classroom = report.getClassroom();
if (report.getType() == ClassReportType.MEMBER_FEEDBACK) {
MemberFeedbackInput input = buildMemberInput(classroom, report.getMember());
Expand Down Expand Up @@ -172,6 +177,12 @@ public void complete(Long reportId, Long jobId, Map<String, Object> validated, C
ClassReport report = classReportRepository.findById(reportId).orElseThrow();
AiJob job = aiJobRepository.findById(jobId).orElseThrow();
job.succeed(result.inputTokens(), result.outputTokens(), now);
if (report.isObsolete()) {
// 생성 중에 클래스가 삭제됐거나 멤버가 나갔다. 비용은 기록하되 결과는 게시하지 않는다 (PRD F16)
report.cancel();
log.info("[ClassReport] canceled after generation reportId={} type={}", reportId, report.getType());
return;
}
if (report.getType() == ClassReportType.MEMBER_FEEDBACK && validated.get("limited_reason") != null) {
report.limit(validated, now); // AI 가 분석할 이유가 없다고 판단해 서버 템플릿으로 대체한 경우
} else if (report.getType() == ClassReportType.MEMBER_FEEDBACK) {
Expand All @@ -198,6 +209,10 @@ public void fail(Long reportId, Long jobId, String errorCode, boolean rejected,
}
log.warn("[ClassReport] generation failed reportId={} type={} attempt={} code={} rejected={}",
reportId, report.getType(), job.getAttempt(), errorCode, rejected);
if (report.isObsolete()) {
report.cancel();
return;
}
if (job.getAttempt() < MAX_AUTO_ATTEMPTS) {
report.requeue();
} else if (fallbackContent != null) {
Expand All @@ -217,7 +232,9 @@ public int recoverStale(LocalDateTime now) {
continue;
}
job.fail("STALE", now);
if (job.getAttempt() < MAX_AUTO_ATTEMPTS) {
if (report.isObsolete()) {
report.cancel();
} else if (job.getAttempt() < MAX_AUTO_ATTEMPTS) {
report.requeue();
} else {
report.fail();
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
-- #651 class_reports.status 에 CANCELED(클래스 삭제·멤버 나가기로 생성하지 않은 리포트) 추가.
-- 마이그레이션 SQL 로 만든 class_reports 에는 status 제약이 없다. Hibernate 가 테이블을 만든 환경에는 class_reports_status_check 가 있을 수 있어,
-- 있으면 새 값을 포함해 다시 만든다. 없으면 아무것도 하지 않는다. 멱등하게 작성되어 재실행해도 안전하다.

DO $$
BEGIN
IF EXISTS (SELECT 1 FROM pg_constraint WHERE conname = 'class_reports_status_check' AND conrelid = 'class_reports'::regclass) THEN
ALTER TABLE class_reports DROP CONSTRAINT class_reports_status_check;
ALTER TABLE class_reports ADD CONSTRAINT class_reports_status_check CHECK (status IN (
'PENDING', 'GENERATING', 'SUCCEEDED', 'LIMITED', 'FAILED', 'CANCELED'));
END IF;
END $$;
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
-- #651 V20261119_02 되돌리기. CANCELED 리포트를 FAILED 로 바꾼 뒤, 제약이 있는 환경이면 이전 값 목록으로 다시 만든다.
-- FAILED 로 바뀐 리포트는 운영자 재시도 대상이 되므로, 되돌린 뒤에는 삭제된 클래스의 리포트를 재시도하지 않도록 주의한다.

UPDATE class_reports SET status = 'FAILED' WHERE status = 'CANCELED';

DO $$
BEGIN
IF EXISTS (SELECT 1 FROM pg_constraint WHERE conname = 'class_reports_status_check' AND conrelid = 'class_reports'::regclass) THEN
ALTER TABLE class_reports DROP CONSTRAINT class_reports_status_check;
ALTER TABLE class_reports ADD CONSTRAINT class_reports_status_check CHECK (status IN (
'PENDING', 'GENERATING', 'SUCCEEDED', 'LIMITED', 'FAILED'));
END IF;
END $$;
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import com.swyp.picke.domain.battle.repository.BattleTagRepository;
import com.swyp.picke.domain.battle.repository.BattleRepository;
import com.swyp.picke.domain.classroom.entity.AiJob;
import com.swyp.picke.domain.classroom.entity.Classroom;
import com.swyp.picke.domain.classroom.entity.ClassDebateMessage;
import com.swyp.picke.domain.classroom.enums.AiJobStatus;
import com.swyp.picke.domain.classroom.enums.AiJobType;
Expand Down Expand Up @@ -435,6 +436,26 @@ void argumentValidation() throws Exception {
assertThat(job.getAttempt()).isEqualTo(2);
}

@Test
@DisplayName("AI 주장 생성 중에 클래스가 삭제되면 비용은 기록하고 주장은 저장하지 않는다 (PRD F16)")
void classDeletedDuringDebateTurn_doesNotPublish() throws Exception {
preVote(optionA);
when(aiClient.chatJson(eq("test-debate-model"), eq(ClassDebatePrompts.SYSTEM), anyString(), anyInt()))
.thenAnswer(inv -> {
Classroom classroom = classroomRepository.findById(classId).orElseThrow();
classroom.delete(LocalDateTime.now());
classroomRepository.save(classroom);
return result(argument(1));
});

start();

assertThat(messageRepository.findAll()).noneMatch(m -> m.getSpeaker() == ClassDebateSpeaker.AI);
AiJob job = aiJobRepository.findAll().stream().filter(j -> j.getType() == AiJobType.DEBATE_ARGUMENT).findFirst().orElseThrow();
assertThat(job.getStatus()).isEqualTo(AiJobStatus.SUCCEEDED);
assertThat(job.getInputTokens()).isEqualTo(300);
}

@Test
@DisplayName("접근: 사전투표 전 시작 409, 참여하지 않은 운영자 403")
void access() throws Exception {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import com.swyp.picke.domain.scenario.entity.InteractiveOption;
import com.swyp.picke.domain.classroom.repository.ClassMidVoteRepository;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.tuple;
import static org.hamcrest.Matchers.hasSize;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.argThat;
Expand All @@ -17,6 +18,7 @@
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
Expand Down Expand Up @@ -44,6 +46,7 @@
import com.swyp.picke.domain.classroom.repository.AiJobRepository;
import com.swyp.picke.domain.classroom.repository.ClassDebateMessageRepository;
import com.swyp.picke.domain.classroom.repository.ClassDebateSessionRepository;
import com.swyp.picke.domain.classroom.service.report.ClassReportSnapshotService;
import com.swyp.picke.domain.classroom.repository.ClassMemberRepository;
import com.swyp.picke.domain.classroom.repository.ClassReportRepository;
import com.swyp.picke.domain.classroom.repository.ClassroomRepository;
Expand Down Expand Up @@ -131,6 +134,7 @@ class ClassResultApiIntegrationTest {
@Autowired private ClassDebateSessionRepository debateSessionRepository;
@Autowired private ClassDebateMessageRepository debateMessageRepository;
@Autowired private ClassReportGenerationService generationService;
@Autowired private ClassReportSnapshotService snapshotService;

@MockitoBean
private ClassReportAiClient aiClient;
Expand Down Expand Up @@ -768,6 +772,81 @@ void midVote_reflectedInStatsAndReports() throws Exception {
.value("처음부터 끝까지 선택지 2를 선택했어요. 콘텐츠 중간에는 '유죄' 쪽을 골랐어요."));
}

@Test
@DisplayName("마감 스냅샷 뒤 클래스가 삭제되면 대기 리포트는 AI 호출 없이 CANCELED 가 된다 (PRD F16)")
void deletedClass_cancelsPendingReports() throws Exception {
ClassInfo cls = createClass(false);
User writer = newUser("학생A");
String writerToken = tokenOf(writer);
join(writerToken, cls.inviteCode, "학생A");
completeParticipation(writerToken, cls, optionA, optionB, "효과가 입증되지 않아 반대합니다. 표본이 너무 작아요.");
closeClass(cls.classId);
LocalDateTime now = LocalDateTime.now();
assertThat(snapshotService.createSnapshots(cls.classId, now)).isEqualTo(2);

mockMvc.perform(delete("/api/v1/classes/" + cls.classId).header("Authorization", "Bearer " + ownerToken))
.andExpect(status().isOk());
generationService.runOnce(now.plusMinutes(1));

assertThat(classReportRepository.findAll()).extracting(ClassReport::getStatus)
.containsOnly(ClassReportStatus.CANCELED);
verify(aiClient, never()).chatJson(anyString(), anyString(), anyInt());
assertThat(aiJobRepository.count()).isZero();
// 다시 돌려도 살아나지 않는다
assertThat(generationService.runOnce(now.plusMinutes(2))).isZero();
}

@Test
@DisplayName("마감 스냅샷 뒤 내보내진 멤버의 개인 리포트는 AI 호출 없이 CANCELED, 클래스 인사이트는 그대로 만든다 (PRD §18)")
void removedMember_cancelsOwnReportOnly() throws Exception {
ClassInfo cls = createClass(false);
User writer = newUser("학생A");
String writerToken = tokenOf(writer);
join(writerToken, cls.inviteCode, "학생A");
completeParticipation(writerToken, cls, optionA, optionB, "효과가 입증되지 않아 반대합니다. 표본이 너무 작아요.");
closeClass(cls.classId);
LocalDateTime now = LocalDateTime.now();
snapshotService.createSnapshots(cls.classId, now);

ClassMember member = classMemberRepository.findByClassroomIdAndUserId(cls.classId, writer.getId()).orElseThrow();
member.remove(now, true);
classMemberRepository.save(member);
generationService.runOnce(now.plusMinutes(1));

assertThat(classReportRepository.findAll())
.extracting(ClassReport::getType, ClassReport::getStatus)
.containsExactlyInAnyOrder(
tuple(ClassReportType.MEMBER_FEEDBACK, ClassReportStatus.CANCELED),
tuple(ClassReportType.CLASS_SUMMARY, ClassReportStatus.LIMITED));
verify(aiClient, never()).chatJson(eq(ClassReportPrompts.MEMBER_FEEDBACK_SYSTEM), anyString(), anyInt());
}

@Test
@DisplayName("AI 생성 중에 클래스가 삭제되면 비용은 기록하고 결과는 게시하지 않는다 (CANCELED)")
void classDeletedDuringGeneration_doesNotPublish() throws Exception {
ClassInfo cls = createClass(false);
User writer = newUser("학생A");
String writerToken = tokenOf(writer);
join(writerToken, cls.inviteCode, "학생A");
completeParticipation(writerToken, cls, optionA, optionB, "효과가 입증되지 않아 반대합니다. 표본이 너무 작아요.");
when(aiClient.chatJson(eq(ClassReportPrompts.MEMBER_FEEDBACK_SYSTEM), anyString(), anyInt()))
.thenAnswer(inv -> {
Classroom classroom = classroomRepository.findById(cls.classId).orElseThrow();
classroom.delete(LocalDateTime.now());
classroomRepository.save(classroom);
return memberFeedbackAnswer(inv.getArgument(1));
});
closeClass(cls.classId);
generationService.runOnce(LocalDateTime.now());

ClassReport memberReport = classReportRepository.findAll().stream()
.filter(r -> r.getType() == ClassReportType.MEMBER_FEEDBACK).findFirst().orElseThrow();
assertThat(memberReport.getStatus()).isEqualTo(ClassReportStatus.CANCELED);
AiJob job = aiJobRepository.findAll().get(0);
assertThat(job.getStatus()).isEqualTo(AiJobStatus.SUCCEEDED);
assertThat(job.getInputTokens()).isEqualTo(120);
}

private void stubMemberFeedback() {
when(aiClient.chatJson(eq(ClassReportPrompts.MEMBER_FEEDBACK_SYSTEM), anyString(), anyInt()))
.thenAnswer(inv -> memberFeedbackAnswer(inv.getArgument(1)));
Expand Down
Loading