diff --git a/docs/api-specs/class-api.md b/docs/api-specs/class-api.md index 16e53259..d3a2681e 100644 --- a/docs/api-specs/class-api.md +++ b/docs/api-specs/class-api.md @@ -117,10 +117,11 @@ - 이용 기간은 등록 시점부터 6개월이다. - 정원은 리워드 티어(5 / 15 / 30석)를 따른다. - 계정당 사용 중인(ACTIVE) 이용권은 1개다. -- 코드의 공백·하이픈·대소문자는 무시한다. +- 코드 형식은 `PKE` + 16진수 대문자 6자리다 (예: `PKE05D2E1`). 코드의 공백·하이픈·대소문자는 무시한다. +- **입력 5회 제한:** 코드 확인(1.1)과 등록(1.2)에서 없는 코드를 넣은 횟수를 계정별로 센다. 1시간 안에 5번 틀리면 그 응답부터 1시간 동안 429 `TICKET_429_LOCKED`다. 잠긴 동안에는 맞는 코드도 막힌다. 맞는 코드를 넣어도 틀린 횟수는 초기화되지 않는다. ### 1.1 이용권 코드 확인 (미리보기) -- `GET /api/v1/class-tickets/preview?code=PICKE-AB12-CD34` +- `GET /api/v1/class-tickets/preview?code=PKE05D2E1` - 코드를 소비하지 않고 정원과 등록 기한을 보여준다. ```json @@ -137,6 +138,7 @@ |---|---| | 빈 코드 | 400 `COMMON_400` | | 없는 코드 | 404 `TICKET_404_CODE` | +| 없는 코드를 1시간 안에 5번 넣음 (5번째부터 1시간) | 429 `TICKET_429_LOCKED` | | 재발급·환불로 무효화된 코드 | 409 `TICKET_409_REVOKED` | | 등록 기한 경과 | 409 `TICKET_409_REG_EXP` | | 다른 계정이 이미 등록 | 409 `TICKET_409_CLAIMED` | @@ -146,7 +148,7 @@ - `POST /api/v1/class-tickets/register` ```json -{ "code": "PICKE-AB12-CD34" } +{ "code": "PKE05D2E1" } ``` - 등록하면 즉시 ACTIVE가 되고 6개월 뒤 만료된다. @@ -210,7 +212,8 @@ - 정원은 이용권 정원을 그대로 쓴다. - 초대코드 6자는 서버가 만든다. -- 커스텀 배틀의 썸네일은 환경변수 `CLASS_CUSTOM_BATTLE_THUMBNAIL_URL`의 고정 이미지 1종이다. +- 커스텀 배틀의 썸네일은 환경변수 `CLASS_CUSTOM_BATTLE_THUMBNAIL_URL`의 고정 이미지 1종이다. 값이 비어 있으면 썸네일은 null이다. +- 커스텀 배틀에는 주제 카테고리가 카테고리 태그로 붙는다 (예: `#사회`). 클래스 배틀 상세(6.1)의 `battle.categoryTags`로 내려간다. - 응답: `ClassDetailResponse` (2.3 참고) - **중복 요청 방지**: 버튼 연타·네트워크 재전송 대비. 같은 운영자의 생성 요청은 이용권 행 잠금으로 하나씩 처리한다. - `requestKey`를 보내면: 같은 키·같은 내용이면 새로 만들지 않고 그 클래스를 200으로 돌려준다. 같은 키·다른 내용이면 409 `CLASS_409_REQUEST_KEY`다. 키가 다르면 내용이 같아도 새로 만든다. @@ -248,6 +251,7 @@ "battleThumbnailUrl": "https://...", "battleType": "TTS", "memberCount": 12, + "activeMemberCount": 11, "capacity": 30, "closeAt": "2026-12-31T23:59:59", "closed": false, @@ -257,7 +261,9 @@ } ``` -- `memberCount`: 좌석을 차지한 인원이다. 운영자가 참여하면 포함되고, 나갔지만 활동 이력이 있어 좌석을 유지한 멤버도 포함된다. +- `memberCount`: 사용 좌석 수다. 좌석을 차지한 인원으로, 운영자가 참여하면 포함되고 나갔거나 내보내졌지만 활동 이력이 있어 좌석을 유지한 멤버도 포함된다. 정원 판정에 쓰며 남은 자리는 `capacity - memberCount`다. +- `activeMemberCount`: 현재 명단 인원이다. 참여 중인 멤버(참여하는 운영자 포함)만 센다. 화면의 "멤버 N명"은 이 값을 쓴다 (PRD 15절 "참여 4명 / 사용 좌석 5석"). +- 두 값은 클래스 상세(2.3)와 참여 코드 확인(5.1), 참여(5.2) 응답에도 같은 뜻으로 들어간다. ### 2.3 클래스 상세 - `GET /api/v1/classes/{classId}` @@ -276,6 +282,7 @@ "battleType": "TTS", "topicVersionId": null, "memberCount": 12, + "activeMemberCount": 11, "capacity": 30, "deadline": "2026-12-31T23:59:59", "ticketExpiresAt": "2027-04-01T10:00:00", @@ -528,7 +535,7 @@ AI가 주제 후보를 제안하면 운영자가 하나를 고르거나 직접 | `draftId`, `versionNo` | 초안 ID, 초안 안의 버전 번호 (1부터) | | `source` | `CANDIDATE`(AI 후보 선택) / `EDITED`(직접 수정 후 검증 통과) | | `question`, `description`, `category`, `difficulty`, `createdAt` | | -| `options[]` | `position`(A/B), `label`, `rationale`, `philosopher`, `philosopherName`, `philosopherImageKey` | +| `options[]` | `position`(A/B), `label`, `rationale`, `philosopher`, `philosopherName`, `philosopherImageKey`, `philosopherImageUrl`. 이미지는 `philosopherImageUrl`을 그대로 쓴다 | --- @@ -549,6 +556,7 @@ AI가 주제 후보를 제안하면 운영자가 하나를 고르거나 직접 "battleThumbnailUrl": "https://...", "battleType": "TTS", "memberCount": 12, + "activeMemberCount": 11, "capacity": 30, "closeAt": "2026-12-31T23:59:59" } @@ -606,6 +614,7 @@ AI가 주제 후보를 제안하면 운영자가 하나를 고르거나 직접 ``` - `memberId`: 내보내기(5.6)에 쓴다. +- `characterUrl`: 회원 캐릭터 이미지 URL이다. 프로필이 없으면 null이다. - `me`: 조회한 사람 본인이면 true다 (이름 수정 버튼 노출용). - 권한이 없으면 403 `CLASS_403_MEMBER`다. @@ -952,7 +961,7 @@ AI가 주제 후보를 제안하면 운영자가 하나를 고르거나 직접 "round": 1, "canReply": true, "canRetry": false, - "philosopher": { "code": "KANT", "name": "칸트", "typeName": "...", "imageKey": "..." }, + "philosopher": { "code": "KANT", "name": "칸트", "typeName": "...", "imageKey": "images/philosophers/kant.png", "imageUrl": "https://..." }, "participantOption": { "optionId": 31, "position": "A", "title": "...", "stance": "..." }, "opponentOption": { "optionId": 32, "position": "B", "title": "...", "stance": "..." }, "messages": [ @@ -977,6 +986,7 @@ AI가 주제 후보를 제안하면 운영자가 하나를 고르거나 직접 | `FAILED` | AI 주장 생성 실패 | 재시도 버튼 (`canRetry`) | | `COMPLETED` | 3라운드 종료 | 대화 다시보기 / 사후투표 | +- `philosopher.imageUrl`: 철학자 얼굴 이미지 URL이다. 프론트가 `imageKey`로 이미지를 따로 찾지 말고 이 값을 그대로 쓴다. - `canReply`: `WAITING_USER`이고 마감 전일 때 true - `canRetry`: 실패했거나 생성이 오래 멈췄고 마감 전일 때 true - `content`: 전체 글이다. AI 주장은 말풍선 사이에 줄바꿈이 들어 있다. @@ -1003,6 +1013,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` @@ -1268,7 +1280,7 @@ AI가 주제 후보를 제안하면 운영자가 하나를 고르거나 직접 "ticketId": 3, "fundingOrderId": 1, "orderId": "T-0001", "supporterName": "홍길동", "supporterEmail": "...", "supporterPhone": "...", "capacity": 30, "registerBy": "2027-09-01T00:00:00", - "code": "XXXXXX-XXXXX-XXXXX-XXXXX-XXXXX" + "code": "PKE05D2E1" } ], "skipped": [ { "fundingOrderId": 2, "orderId": "T-0002", "reason": "ALREADY_ISSUED" } ] @@ -1463,6 +1475,7 @@ PRD "등록기한 30일·7일 전 알림은 허용된 연락 수단에서만 발 | 코드 | HTTP | 메시지 | |---|---|---| | `TICKET_404_CODE` | 404 | 유효하지 않은 이용권 코드입니다. | +| `TICKET_429_LOCKED` | 429 | 이용권 코드를 5번 잘못 입력해 1시간 동안 입력할 수 없어요. 잠시 후 다시 시도해 주세요. | | `TICKET_404` | 404 | 등록된 이용권이 없습니다. | | `TICKET_409_CLAIMED` | 409 | 이미 등록된 이용권 코드입니다. | | `TICKET_409_REVOKED` | 409 | 재발급되어 더 이상 사용할 수 없는 이용권 코드입니다. | diff --git a/src/main/java/com/swyp/picke/domain/classroom/converter/ClassMemberConverter.java b/src/main/java/com/swyp/picke/domain/classroom/converter/ClassMemberConverter.java index 219cdea7..ebb88572 100644 --- a/src/main/java/com/swyp/picke/domain/classroom/converter/ClassMemberConverter.java +++ b/src/main/java/com/swyp/picke/domain/classroom/converter/ClassMemberConverter.java @@ -10,13 +10,14 @@ public final class ClassMemberConverter { private ClassMemberConverter() { } - public static ClassMemberResponse toResponse(ClassMember member, Long viewerId) { + /** avatarUrl 은 회원 캐릭터 이미지 URL이다 ({@code ClassImageUrlResolver#avatar}). */ + public static ClassMemberResponse toResponse(ClassMember member, Long viewerId, String avatarUrl) { User user = member.getUser(); return new ClassMemberResponse( member.getId(), member.getDisplayName(), member.getRole(), - user.getCharacterUrl(), + avatarUrl, Objects.equals(user.getId(), viewerId), member.getJoinedAt() ); diff --git a/src/main/java/com/swyp/picke/domain/classroom/converter/ClassTopicConverter.java b/src/main/java/com/swyp/picke/domain/classroom/converter/ClassTopicConverter.java index d665fb93..612fda15 100644 --- a/src/main/java/com/swyp/picke/domain/classroom/converter/ClassTopicConverter.java +++ b/src/main/java/com/swyp/picke/domain/classroom/converter/ClassTopicConverter.java @@ -1,5 +1,9 @@ package com.swyp.picke.domain.classroom.converter; +import com.swyp.picke.domain.classroom.service.ClassImageUrlResolver; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Component; + import com.swyp.picke.domain.battle.enums.BattleCategory; import com.swyp.picke.domain.classroom.dto.response.ClassTopicDraftResponse; import com.swyp.picke.domain.classroom.dto.response.ClassTopicValidationResponse; @@ -12,12 +16,14 @@ import java.util.List; import java.util.Map; -public final class ClassTopicConverter { +/** 철학자 이미지 URL을 함께 내려주기 위해 빈으로 둔다. */ +@Component +@RequiredArgsConstructor +public class ClassTopicConverter { - private ClassTopicConverter() { - } + private final ClassImageUrlResolver imageUrls; - public static ClassTopicDraftResponse toDraft(ClassTopicDraft draft, ClassTopicVersion latestVersion) { + public ClassTopicDraftResponse toDraft(ClassTopicDraft draft, ClassTopicVersion latestVersion) { List> candidates = draft.getCandidates() == null ? List.of() : draft.getCandidates(); return new ClassTopicDraftResponse( draft.getId(), @@ -30,11 +36,11 @@ public static ClassTopicDraftResponse toDraft(ClassTopicDraft draft, ClassTopicV draft.getBatchNo(), draft.remainingSuggestions(), draft.remainingValidations(), - candidates.stream().map(ClassTopicConverter::toCandidate).toList(), + candidates.stream().map(this::toCandidate).toList(), latestVersion == null ? null : toVersion(latestVersion)); } - public static ClassTopicVersionResponse toVersion(ClassTopicVersion version) { + public ClassTopicVersionResponse toVersion(ClassTopicVersion version) { return new ClassTopicVersionResponse( version.getId(), version.getDraft().getId(), @@ -50,7 +56,7 @@ public static ClassTopicVersionResponse toVersion(ClassTopicVersion version) { version.getCreatedAt()); } - public static ClassTopicValidationResponse toValidation(List issues, ClassTopicVersion version, + public ClassTopicValidationResponse toValidation(List issues, ClassTopicVersion version, int remainingValidations) { return new ClassTopicValidationResponse( version != null, @@ -60,7 +66,7 @@ public static ClassTopicValidationResponse toValidation(List issues, version == null ? null : toVersion(version)); } - private static ClassTopicDraftResponse.Candidate toCandidate(Map map) { + private ClassTopicDraftResponse.Candidate toCandidate(Map map) { TopicContent content = TopicContent.fromMap(map); return new ClassTopicDraftResponse.Candidate( TopicContent.candidateIdOf(map), @@ -73,9 +79,10 @@ private static ClassTopicDraftResponse.Candidate toCandidate(Map option("B", content.optionB().label(), content.optionB().rationale(), content.optionB().philosopher()))); } - private static ClassTopicVersionResponse.Option option(String position, String label, String rationale, + private ClassTopicVersionResponse.Option option(String position, String label, String rationale, PhilosopherType philosopher) { return new ClassTopicVersionResponse.Option( - position, label, rationale, philosopher, philosopher.getLabel(), philosopher.getImageKey()); + position, label, rationale, philosopher, philosopher.getLabel(), philosopher.getImageKey(), + imageUrls.philosopher(philosopher)); } } diff --git a/src/main/java/com/swyp/picke/domain/classroom/converter/ClassroomConverter.java b/src/main/java/com/swyp/picke/domain/classroom/converter/ClassroomConverter.java index 68b04f9d..563aeaec 100644 --- a/src/main/java/com/swyp/picke/domain/classroom/converter/ClassroomConverter.java +++ b/src/main/java/com/swyp/picke/domain/classroom/converter/ClassroomConverter.java @@ -1,5 +1,7 @@ package com.swyp.picke.domain.classroom.converter; +import com.swyp.picke.domain.classroom.service.ClassMemberCounts; + import com.swyp.picke.domain.battle.entity.Battle; import com.swyp.picke.domain.classroom.dto.response.ClassDetailResponse; import com.swyp.picke.domain.classroom.dto.response.ClassSummaryResponse; @@ -12,8 +14,9 @@ public final class ClassroomConverter { private ClassroomConverter() { } - public static ClassSummaryResponse toSummary(Classroom classroom, ClassMemberRole myRole, long memberCount, - LocalDateTime now) { + /** thumbnailUrl 은 저장 키를 URL로 바꾼 값이다 ({@code ClassImageUrlResolver#battleThumbnail}). */ + public static ClassSummaryResponse toSummary(Classroom classroom, ClassMemberRole myRole, ClassMemberCounts counts, + LocalDateTime now, String thumbnailUrl) { Battle battle = classroom.getBattle(); return new ClassSummaryResponse( classroom.getId(), @@ -21,9 +24,10 @@ public static ClassSummaryResponse toSummary(Classroom classroom, ClassMemberRol myRole, battle.getId(), battle.getTitle(), - battle.getThumbnailUrl(), + thumbnailUrl, classroom.getBattleType(), - memberCount, + counts.seats(), + counts.activeMembers(), classroom.getCapacity(), classroom.getEffectiveCloseAt(), classroom.isClosed(now), @@ -32,8 +36,8 @@ public static ClassSummaryResponse toSummary(Classroom classroom, ClassMemberRol } /** 초대코드는 공유하기 버튼용으로 운영자·멤버 모두에게 내려간다. */ - public static ClassDetailResponse toDetail(Classroom classroom, ClassMemberRole myRole, long memberCount, - LocalDateTime now) { + public static ClassDetailResponse toDetail(Classroom classroom, ClassMemberRole myRole, ClassMemberCounts counts, + LocalDateTime now, String thumbnailUrl) { Battle battle = classroom.getBattle(); return new ClassDetailResponse( classroom.getId(), @@ -42,10 +46,11 @@ public static ClassDetailResponse toDetail(Classroom classroom, ClassMemberRole myRole, classroom.getOwner().getId(), new ClassDetailResponse.BattleInfo( - battle.getId(), battle.getTitle(), battle.getSummary(), battle.getThumbnailUrl()), + battle.getId(), battle.getTitle(), battle.getSummary(), thumbnailUrl), classroom.getBattleType(), classroom.getTopicVersion() == null ? null : classroom.getTopicVersion().getId(), - memberCount, + counts.seats(), + counts.activeMembers(), classroom.getCapacity(), classroom.getDeadline(), classroom.getTicket().getExpiresAt(), diff --git a/src/main/java/com/swyp/picke/domain/classroom/dto/response/ClassDebateResponse.java b/src/main/java/com/swyp/picke/domain/classroom/dto/response/ClassDebateResponse.java index 1d094e8d..5bae87a3 100644 --- a/src/main/java/com/swyp/picke/domain/classroom/dto/response/ClassDebateResponse.java +++ b/src/main/java/com/swyp/picke/domain/classroom/dto/response/ClassDebateResponse.java @@ -25,7 +25,8 @@ public record ClassDebateResponse( @Schema(description = "반박 최대 글자 수") int replyMaxLength ) { - public record Philosopher(PhilosopherType code, String name, String typeName, String imageKey) { + public record Philosopher(PhilosopherType code, String name, String typeName, String imageKey, + @Schema(description = "철학자 이미지 URL") String imageUrl) { } public record Side(Long optionId, @Schema(description = "A / B") String position, String title, String stance) { diff --git a/src/main/java/com/swyp/picke/domain/classroom/dto/response/ClassDetailResponse.java b/src/main/java/com/swyp/picke/domain/classroom/dto/response/ClassDetailResponse.java index fa98c59e..97a6a3b6 100644 --- a/src/main/java/com/swyp/picke/domain/classroom/dto/response/ClassDetailResponse.java +++ b/src/main/java/com/swyp/picke/domain/classroom/dto/response/ClassDetailResponse.java @@ -15,7 +15,8 @@ public record ClassDetailResponse( @Schema(description = "배틀 정보") BattleInfo battle, @Schema(description = "배틀 종류 (TTS / CUSTOM)") ClassBattleType battleType, @Schema(description = "커스텀 배틀의 주제 버전 ID. TTS 클래스는 null", nullable = true) Long topicVersionId, - @Schema(description = "좌석을 차지한 인원 (운영자 참여 시 포함)") long memberCount, + @Schema(description = "사용 좌석 수. 좌석을 차지한 인원으로, 활동 후 나가거나 내보내진 멤버도 포함한다 (운영자 참여 시 포함)") long memberCount, + @Schema(description = "현재 명단 인원 (참여하는 운영자 포함). 화면의 멤버 수는 이 값을 쓴다") long activeMemberCount, @Schema(description = "정원") int capacity, @Schema(description = "운영자가 설정한 마감일. null 이면 마감 없음") LocalDateTime deadline, @Schema(description = "이용권 종료일") LocalDateTime ticketExpiresAt, diff --git a/src/main/java/com/swyp/picke/domain/classroom/dto/response/ClassJoinPreviewResponse.java b/src/main/java/com/swyp/picke/domain/classroom/dto/response/ClassJoinPreviewResponse.java index 45ee73e2..20cef550 100644 --- a/src/main/java/com/swyp/picke/domain/classroom/dto/response/ClassJoinPreviewResponse.java +++ b/src/main/java/com/swyp/picke/domain/classroom/dto/response/ClassJoinPreviewResponse.java @@ -11,7 +11,8 @@ public record ClassJoinPreviewResponse( @Schema(description = "배틀 제목") String battleTitle, @Schema(description = "배틀 썸네일") String battleThumbnailUrl, @Schema(description = "배틀 종류 (TTS / CUSTOM)") ClassBattleType battleType, - @Schema(description = "좌석을 차지한 인원") long memberCount, + @Schema(description = "사용 좌석 수 (활동 후 나간 멤버 포함). 남은 자리 = capacity - memberCount") long memberCount, + @Schema(description = "현재 명단 인원 (참여하는 운영자 포함)") long activeMemberCount, @Schema(description = "정원") int capacity, @Schema(description = "실제 마감 시각 = min(마감일, 이용권 종료일)") LocalDateTime closeAt ) { diff --git a/src/main/java/com/swyp/picke/domain/classroom/dto/response/ClassSummaryResponse.java b/src/main/java/com/swyp/picke/domain/classroom/dto/response/ClassSummaryResponse.java index 38da375b..303e2e1a 100644 --- a/src/main/java/com/swyp/picke/domain/classroom/dto/response/ClassSummaryResponse.java +++ b/src/main/java/com/swyp/picke/domain/classroom/dto/response/ClassSummaryResponse.java @@ -14,7 +14,8 @@ public record ClassSummaryResponse( @Schema(description = "배틀 제목") String battleTitle, @Schema(description = "배틀 썸네일 URL") String battleThumbnailUrl, @Schema(description = "배틀 종류 (TTS / CUSTOM)") ClassBattleType battleType, - @Schema(description = "좌석을 차지한 인원 (운영자 참여 시 포함)") long memberCount, + @Schema(description = "사용 좌석 수. 좌석을 차지한 인원으로, 활동 후 나가거나 내보내진 멤버도 포함한다 (운영자 참여 시 포함)") long memberCount, + @Schema(description = "현재 명단 인원 (참여하는 운영자 포함). 화면의 멤버 수는 이 값을 쓴다") long activeMemberCount, @Schema(description = "정원") int capacity, @Schema(description = "실제 마감 시각 = min(마감일, 이용권 종료일)") LocalDateTime closeAt, @Schema(description = "마감 여부") boolean closed, diff --git a/src/main/java/com/swyp/picke/domain/classroom/dto/response/ClassTopicVersionResponse.java b/src/main/java/com/swyp/picke/domain/classroom/dto/response/ClassTopicVersionResponse.java index ed8381b0..89440181 100644 --- a/src/main/java/com/swyp/picke/domain/classroom/dto/response/ClassTopicVersionResponse.java +++ b/src/main/java/com/swyp/picke/domain/classroom/dto/response/ClassTopicVersionResponse.java @@ -29,7 +29,8 @@ public record Option( @Schema(description = "관점 설명 (40자 이하)") String rationale, @Schema(description = "철학자 코드") PhilosopherType philosopher, @Schema(description = "철학자 이름") String philosopherName, - @Schema(description = "철학자 이미지 키") String philosopherImageKey + @Schema(description = "철학자 이미지 키") String philosopherImageKey, + @Schema(description = "철학자 이미지 URL") String philosopherImageUrl ) { } } diff --git a/src/main/java/com/swyp/picke/domain/classroom/entity/ClassReport.java b/src/main/java/com/swyp/picke/domain/classroom/entity/ClassReport.java index 24e5e77b..8fff55bd 100644 --- a/src/main/java/com/swyp/picke/domain/classroom/entity/ClassReport.java +++ b/src/main/java/com/swyp/picke/domain/classroom/entity/ClassReport.java @@ -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; @@ -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 snapshot) { this.content = snapshot; diff --git a/src/main/java/com/swyp/picke/domain/classroom/enums/ClassBattleType.java b/src/main/java/com/swyp/picke/domain/classroom/enums/ClassBattleType.java index 4d267c0b..d0f23802 100644 --- a/src/main/java/com/swyp/picke/domain/classroom/enums/ClassBattleType.java +++ b/src/main/java/com/swyp/picke/domain/classroom/enums/ClassBattleType.java @@ -1,6 +1,6 @@ package com.swyp.picke.domain.classroom.enums; -/** 클래스에 붙는 배틀 종류. CUSTOM 은 2차 범위. */ +/** 클래스에 붙는 배틀 종류. TTS = 기존 콘텐츠, CUSTOM = 주제 버전으로 만든 클래스 전용 배틀(AI 철학자 토론). */ public enum ClassBattleType { TTS, CUSTOM } diff --git a/src/main/java/com/swyp/picke/domain/classroom/enums/ClassReportStatus.java b/src/main/java/com/swyp/picke/domain/classroom/enums/ClassReportStatus.java index c4f3bee0..da625bd3 100644 --- a/src/main/java/com/swyp/picke/domain/classroom/enums/ClassReportStatus.java +++ b/src/main/java/com/swyp/picke/domain/classroom/enums/ClassReportStatus.java @@ -5,5 +5,6 @@ public enum ClassReportStatus { GENERATING, SUCCEEDED, LIMITED, // 작성 글이 없어 서버 템플릿으로 대체, AI 호출 없음 - FAILED + FAILED, + CANCELED // 클래스가 삭제됐거나 멤버가 나가기·내보내기 되어 생성하지 않음. 재시도 대상 아님 (PRD F16·§18) } diff --git a/src/main/java/com/swyp/picke/domain/classroom/repository/ClassMemberRepository.java b/src/main/java/com/swyp/picke/domain/classroom/repository/ClassMemberRepository.java index 29496189..2bd11de0 100644 --- a/src/main/java/com/swyp/picke/domain/classroom/repository/ClassMemberRepository.java +++ b/src/main/java/com/swyp/picke/domain/classroom/repository/ClassMemberRepository.java @@ -42,6 +42,18 @@ public interface ClassMemberRepository extends JpaRepository /** 정원 판정용. 좌석을 쥐고 있는 인원(seatHeld = true) 수 */ long countByClassroomIdAndSeatHeldTrue(Long classroomId); + /** 현재 명단 인원 (ACTIVE 멤버, 참여하는 운영자 포함) */ + long countByClassroomIdAndStatus(Long classroomId, ClassMemberStatus status); + + /** 목록 화면용: 여러 클래스의 현재 명단 인원을 한 번에 */ + @Query(""" + select m.classroom.id, count(m) from ClassMember m + where m.classroom.id in :classroomIds + and m.status = com.swyp.picke.domain.classroom.enums.ClassMemberStatus.ACTIVE + group by m.classroom.id + """) + List countActiveMembersByClassroomIds(@Param("classroomIds") Collection classroomIds); + /** 목록 화면용: 여러 클래스의 좌석 소비 인원을 한 번에 */ @Query(""" select m.classroom.id, count(m) from ClassMember m diff --git a/src/main/java/com/swyp/picke/domain/classroom/service/ClassCustomBattleFactory.java b/src/main/java/com/swyp/picke/domain/classroom/service/ClassCustomBattleFactory.java index a7bf1779..6f283f1a 100644 --- a/src/main/java/com/swyp/picke/domain/classroom/service/ClassCustomBattleFactory.java +++ b/src/main/java/com/swyp/picke/domain/classroom/service/ClassCustomBattleFactory.java @@ -9,6 +9,12 @@ import com.swyp.picke.domain.classroom.entity.ClassTopicVersion; import com.swyp.picke.domain.user.entity.User; import com.swyp.picke.domain.user.enums.PhilosopherType; +import com.swyp.picke.domain.battle.entity.BattleTag; +import com.swyp.picke.domain.battle.enums.BattleCategory; +import com.swyp.picke.domain.battle.repository.BattleTagRepository; +import com.swyp.picke.domain.tag.entity.Tag; +import com.swyp.picke.domain.tag.enums.TagType; +import com.swyp.picke.domain.tag.repository.TagRepository; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; @@ -27,6 +33,8 @@ public class ClassCustomBattleFactory { private final BattleRepository battleRepository; private final BattleOptionRepository battleOptionRepository; + private final BattleTagRepository battleTagRepository; + private final TagRepository tagRepository; @Value("${picke.class.custom-battle-thumbnail-url:}") private String thumbnailUrl; @@ -46,9 +54,20 @@ public Battle create(ClassTopicVersion version, User owner) { version.getOptionAPhilosopher())); battle.getOptions().add(option(battle, 2, version.getOptionBLabel(), version.getOptionBRationale(), version.getOptionBPhilosopher())); + attachCategoryTag(battle, version.getCategory()); return battle; } + /** 주제 카테고리(예: 사회)를 카테고리 태그로 붙인다. 같은 이름의 카테고리 태그가 없으면 새로 만든다. */ + private void attachCategoryTag(Battle battle, BattleCategory category) { + if (category == null) { + return; + } + Tag tag = tagRepository.findFirstByNameAndTypeAndDeletedAtIsNullOrderByIdAsc(category.getValue(), TagType.CATEGORY) + .orElseGet(() -> tagRepository.save(Tag.builder().name(category.getValue()).type(TagType.CATEGORY).build())); + battleTagRepository.save(BattleTag.builder().battle(battle).tag(tag).build()); + } + private BattleOption option(Battle battle, int order, String label, String rationale, PhilosopherType philosopher) { return battleOptionRepository.save(BattleOption.builder() .battle(battle) diff --git a/src/main/java/com/swyp/picke/domain/classroom/service/ClassImageUrlResolver.java b/src/main/java/com/swyp/picke/domain/classroom/service/ClassImageUrlResolver.java new file mode 100644 index 00000000..571e8310 --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/classroom/service/ClassImageUrlResolver.java @@ -0,0 +1,35 @@ +package com.swyp.picke.domain.classroom.service; + +import com.swyp.picke.domain.battle.entity.Battle; +import com.swyp.picke.domain.user.enums.CharacterType; +import com.swyp.picke.domain.user.enums.PhilosopherType; +import com.swyp.picke.global.infra.s3.enums.FileCategory; +import com.swyp.picke.global.infra.s3.service.S3PresignedUrlService; +import com.swyp.picke.global.infra.s3.util.ResourceUrlProvider; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Component; + +/** + * 클래스 응답에 나가는 이미지(배틀 썸네일·철학자·아바타)를 저장 키가 아닌 URL로 바꾼다. + * 일반 배틀·의견 API와 같은 방식을 쓴다. + */ +@Component +@RequiredArgsConstructor +public class ClassImageUrlResolver { + + private final ResourceUrlProvider urlProvider; + private final S3PresignedUrlService s3PresignedUrlService; + + public String battleThumbnail(Battle battle) { + return battle == null ? null : urlProvider.getImageUrl(FileCategory.BATTLE, battle.getThumbnailUrl()); + } + + public String philosopher(PhilosopherType philosopher) { + return philosopher == null ? null : urlProvider.getImageUrl(FileCategory.PHILOSOPHER, philosopher.getImageKey()); + } + + public String avatar(CharacterType characterType) { + String imageKey = CharacterType.resolveImageKey(characterType); + return imageKey == null ? null : s3PresignedUrlService.generatePresignedUrl(imageKey); + } +} diff --git a/src/main/java/com/swyp/picke/domain/classroom/service/ClassMemberCounts.java b/src/main/java/com/swyp/picke/domain/classroom/service/ClassMemberCounts.java new file mode 100644 index 00000000..797b456f --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/classroom/service/ClassMemberCounts.java @@ -0,0 +1,12 @@ +package com.swyp.picke.domain.classroom.service; + +/** + * 클래스 인원 수 두 가지 (PRD §15 "참여 4명 / 사용 좌석 5석"). + * + * @param seats 좌석을 차지한 인원. 활동 후 나가거나 내보내진 멤버도 포함하며 정원 판정에 쓴다 + * @param activeMembers 현재 명단 인원(ACTIVE 멤버). 참여하는 운영자를 포함한다 + */ +public record ClassMemberCounts(long seats, long activeMembers) { + + public static final ClassMemberCounts EMPTY = new ClassMemberCounts(0, 0); +} diff --git a/src/main/java/com/swyp/picke/domain/classroom/service/ClassMemberServiceImpl.java b/src/main/java/com/swyp/picke/domain/classroom/service/ClassMemberServiceImpl.java index eb052cb5..3e6f83dc 100644 --- a/src/main/java/com/swyp/picke/domain/classroom/service/ClassMemberServiceImpl.java +++ b/src/main/java/com/swyp/picke/domain/classroom/service/ClassMemberServiceImpl.java @@ -15,7 +15,10 @@ import com.swyp.picke.domain.classroom.repository.ClassMemberRepository; import com.swyp.picke.domain.classroom.repository.ClassroomRepository; import com.swyp.picke.domain.user.entity.User; +import com.swyp.picke.domain.user.entity.UserProfile; +import com.swyp.picke.domain.user.enums.CharacterType; import com.swyp.picke.domain.user.repository.UserBattleRepository; +import com.swyp.picke.domain.user.repository.UserProfileRepository; import com.swyp.picke.domain.user.repository.UserRepository; import com.swyp.picke.domain.user.enums.UserStatus; import com.swyp.picke.global.common.exception.CustomException; @@ -24,8 +27,10 @@ import java.time.ZoneId; import java.util.List; import java.util.Locale; +import java.util.Map; import java.util.Objects; import java.util.Optional; +import java.util.stream.Collectors; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -50,8 +55,10 @@ public class ClassMemberServiceImpl implements ClassMemberService { private static final ZoneId KST = ZoneId.of("Asia/Seoul"); private final ClassroomRepository classroomRepository; + private final ClassImageUrlResolver imageUrls; private final ClassMemberRepository classMemberRepository; private final UserRepository userRepository; + private final UserProfileRepository userProfileRepository; private final UserBattleRepository userBattleRepository; @Override @@ -72,7 +79,8 @@ public ClassDetailResponse join(Long userId, ClassJoinRequest request) { Optional existing = classMemberRepository.findByClassroomIdAndUserId(classroom.getId(), userId); if (existing.isPresent() && existing.get().isActive()) { - return ClassroomConverter.toDetail(classroom, ClassMemberRole.MEMBER, seatCountOf(classroom), now); + return ClassroomConverter.toDetail(classroom, ClassMemberRole.MEMBER, countsOf(classroom), now, + imageUrls.battleThumbnail(classroom.getBattle())); } rejectRemovedOrClosed(classroom, existing, now); rejectDuplicateDisplayName(classroom.getId(), displayName); @@ -90,7 +98,8 @@ public ClassDetailResponse join(Long userId, ClassJoinRequest request) { .build()); } log.info("클래스 참여 - classId: {}, userId: {}, rejoin: {}", classroom.getId(), userId, existing.isPresent()); - return ClassroomConverter.toDetail(classroom, ClassMemberRole.MEMBER, seatCountOf(classroom), now); + return ClassroomConverter.toDetail(classroom, ClassMemberRole.MEMBER, countsOf(classroom), now, + imageUrls.battleThumbnail(classroom.getBattle())); } @Override @@ -116,9 +125,10 @@ public ClassJoinPreviewResponse previewJoin(Long userId, String rawInviteCode) { inviteCode, classroom.getName(), classroom.getBattle().getTitle(), - classroom.getBattle().getThumbnailUrl(), + imageUrls.battleThumbnail(classroom.getBattle()), classroom.getBattleType(), seatCountOf(classroom), + classMemberRepository.countByClassroomIdAndStatus(classroom.getId(), ClassMemberStatus.ACTIVE), classroom.getCapacity(), classroom.getEffectiveCloseAt()); } @@ -129,8 +139,13 @@ public List getMembers(Long userId, Long classId) { if (!isOwner(classroom, userId) && findActiveMember(classId, userId).isEmpty()) { throw new CustomException(ErrorCode.CLASS_MEMBER_ONLY); } - return classMemberRepository.findActiveMembers(classId).stream() - .map(m -> ClassMemberConverter.toResponse(m, userId)) + List members = classMemberRepository.findActiveMembers(classId); + Map characters = userProfileRepository.findAllByUserIdIn( + members.stream().map(m -> m.getUser().getId()).toList()).stream() + .collect(Collectors.toMap(p -> p.getUser().getId(), UserProfile::getCharacterType, (a, b) -> a)); + return members.stream() + .map(m -> ClassMemberConverter.toResponse(m, userId, + imageUrls.avatar(characters.get(m.getUser().getId())))) .toList(); } @@ -145,7 +160,10 @@ public ClassMemberResponse changeMyDisplayName(Long userId, Long classId, ClassM rejectDuplicateDisplayName(classId, displayName); me.changeDisplayName(displayName); } - return ClassMemberConverter.toResponse(me, userId); + CharacterType character = userProfileRepository.findByUserId(userId) + .map(UserProfile::getCharacterType) + .orElse(null); + return ClassMemberConverter.toResponse(me, userId, imageUrls.avatar(character)); } @Override @@ -261,4 +279,9 @@ private static boolean isOwner(Classroom classroom, Long userId) { private long seatCountOf(Classroom classroom) { return classMemberRepository.countByClassroomIdAndSeatHeldTrue(classroom.getId()); } + + private ClassMemberCounts countsOf(Classroom classroom) { + return new ClassMemberCounts(seatCountOf(classroom), + classMemberRepository.countByClassroomIdAndStatus(classroom.getId(), ClassMemberStatus.ACTIVE)); + } } diff --git a/src/main/java/com/swyp/picke/domain/classroom/service/ClassResultServiceImpl.java b/src/main/java/com/swyp/picke/domain/classroom/service/ClassResultServiceImpl.java index e3cfa59e..2eb5f163 100644 --- a/src/main/java/com/swyp/picke/domain/classroom/service/ClassResultServiceImpl.java +++ b/src/main/java/com/swyp/picke/domain/classroom/service/ClassResultServiceImpl.java @@ -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; }; } diff --git a/src/main/java/com/swyp/picke/domain/classroom/service/ClassroomServiceImpl.java b/src/main/java/com/swyp/picke/domain/classroom/service/ClassroomServiceImpl.java index a4f6daea..2c8da711 100644 --- a/src/main/java/com/swyp/picke/domain/classroom/service/ClassroomServiceImpl.java +++ b/src/main/java/com/swyp/picke/domain/classroom/service/ClassroomServiceImpl.java @@ -66,6 +66,7 @@ public class ClassroomServiceImpl implements ClassroomService { private static final long DUPLICATE_WINDOW_SECONDS = 10; private final ClassroomRepository classroomRepository; + private final ClassImageUrlResolver imageUrls; private final ClassMemberRepository classMemberRepository; private final ClassTicketRepository classTicketRepository; private final BattleRepository battleRepository; @@ -96,7 +97,8 @@ public ClassDetailResponse create(Long userId, ClassCreateRequest request) { : findRecentDuplicate(userId, request); if (duplicate != null) { log.info("클래스 중복 생성 요청 - 기존 클래스 반환 classId: {}, ownerId: {}", duplicate.getId(), userId); - return ClassroomConverter.toDetail(duplicate, ClassMemberRole.OWNER, seatCountOf(duplicate), now); + return ClassroomConverter.toDetail(duplicate, ClassMemberRole.OWNER, countsOf(duplicate), now, + imageUrls.battleThumbnail(duplicate.getBattle())); } ClassTopicVersion topicVersion = request.topicVersionId() == null ? null : findOwnTopicVersion(userId, request.topicVersionId()); Battle tts = topicVersion == null ? findClassBattle(request.battleId()) : null; @@ -119,7 +121,7 @@ public ClassDetailResponse create(Long userId, ClassCreateRequest request) { .createRequestHash(requestHash) .build()); - long memberCount = 0; + ClassMemberCounts counts = ClassMemberCounts.EMPTY; if (request.ownerParticipates()) { classMemberRepository.save(ClassMember.builder() .classroom(classroom) @@ -128,21 +130,23 @@ public ClassDetailResponse create(Long userId, ClassCreateRequest request) { .role(ClassMemberRole.OWNER) .joinedAt(now) .build()); - memberCount = 1; + counts = new ClassMemberCounts(1, 1); } log.info("클래스 생성 - classId: {}, ownerId: {}, ticketId: {}, battleId: {}, capacity: {}", classroom.getId(), userId, ticket.getId(), battle.getId(), classroom.getCapacity()); - return ClassroomConverter.toDetail(classroom, ClassMemberRole.OWNER, memberCount, now); + return ClassroomConverter.toDetail(classroom, ClassMemberRole.OWNER, counts, now, + imageUrls.battleThumbnail(classroom.getBattle())); } @Override public List getMyClasses(Long userId) { LocalDateTime now = LocalDateTime.now(KST); List classrooms = classroomRepository.findMyClasses(userId); - Map seatCounts = seatCountsOf(classrooms); + Map counts = countsOf(classrooms); return classrooms.stream() .map(c -> ClassroomConverter.toSummary( - c, roleOf(c, userId), seatCounts.getOrDefault(c.getId(), 0L), now)) + c, roleOf(c, userId), counts.getOrDefault(c.getId(), ClassMemberCounts.EMPTY), now, + imageUrls.battleThumbnail(c.getBattle()))) .toList(); } @@ -154,7 +158,8 @@ public ClassDetailResponse getDetail(Long userId, Long classId) { if (role == null) { throw new CustomException(ErrorCode.CLASS_MEMBER_ONLY); } - return ClassroomConverter.toDetail(classroom, role, seatCountOf(classroom), now); + return ClassroomConverter.toDetail(classroom, role, countsOf(classroom), now, + imageUrls.battleThumbnail(classroom.getBattle())); } @Override @@ -176,7 +181,8 @@ public ClassDetailResponse update(Long userId, Long classId, ClassUpdateRequest validateDeadlineExtension(request.deadline(), classroom, now); classroom.extendDeadline(request.deadline()); } - return ClassroomConverter.toDetail(classroom, ClassMemberRole.OWNER, seatCountOf(classroom), now); + return ClassroomConverter.toDetail(classroom, ClassMemberRole.OWNER, countsOf(classroom), now, + imageUrls.battleThumbnail(classroom.getBattle())); } @Override @@ -218,18 +224,28 @@ private ClassMemberRole roleOf(Classroom classroom, Long userId) { .orElse(null); } - private long seatCountOf(Classroom classroom) { - return classMemberRepository.countByClassroomIdAndSeatHeldTrue(classroom.getId()); + private ClassMemberCounts countsOf(Classroom classroom) { + return new ClassMemberCounts( + classMemberRepository.countByClassroomIdAndSeatHeldTrue(classroom.getId()), + classMemberRepository.countByClassroomIdAndStatus(classroom.getId(), ClassMemberStatus.ACTIVE)); } - private Map seatCountsOf(List classrooms) { - Map result = new HashMap<>(); + private Map countsOf(List classrooms) { + Map result = new HashMap<>(); if (classrooms.isEmpty()) { return result; } List ids = classrooms.stream().map(Classroom::getId).toList(); + Map seats = new HashMap<>(); for (Object[] row : classMemberRepository.countSeatsHeldByClassroomIds(ids)) { - result.put((Long) row[0], (Long) row[1]); + seats.put((Long) row[0], (Long) row[1]); + } + Map active = new HashMap<>(); + for (Object[] row : classMemberRepository.countActiveMembersByClassroomIds(ids)) { + active.put((Long) row[0], (Long) row[1]); + } + for (Long id : ids) { + result.put(id, new ClassMemberCounts(seats.getOrDefault(id, 0L), active.getOrDefault(id, 0L))); } return result; } diff --git a/src/main/java/com/swyp/picke/domain/classroom/service/debate/ClassDebateSessionService.java b/src/main/java/com/swyp/picke/domain/classroom/service/debate/ClassDebateSessionService.java index 1a17eecc..1969c7ae 100644 --- a/src/main/java/com/swyp/picke/domain/classroom/service/debate/ClassDebateSessionService.java +++ b/src/main/java/com/swyp/picke/domain/classroom/service/debate/ClassDebateSessionService.java @@ -17,10 +17,12 @@ 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; import com.swyp.picke.domain.classroom.service.ClassAccessService; +import com.swyp.picke.domain.classroom.service.ClassImageUrlResolver; import com.swyp.picke.domain.classroom.service.ClassAccessService.ClassAccess; import com.swyp.picke.domain.classroom.service.topic.AiUsage; import com.swyp.picke.domain.user.entity.User; @@ -65,6 +67,7 @@ public class ClassDebateSessionService { private final UserRepository userRepository; private final UserBattleService userBattleService; private final AiJobRepository aiJobRepository; + private final ClassImageUrlResolver imageUrls; /** AI 주장 1건을 만들 준비가 된 상태 */ public record PreparedTurn(Long sessionId, Long jobId, int round, DebatePromptInput input) { @@ -237,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) @@ -292,7 +301,8 @@ public ClassDebateResponse view(Long userId, Long classId, LocalDateTime now) { session.getRound(), writable && session.getStatus() == ClassDebateStatus.WAITING_USER, writable && session.isRetryable(now.minusMinutes(GENERATING_STALE_MINUTES)), - new ClassDebateResponse.Philosopher(philosopher, philosopher.getLabel(), philosopher.getTypeName(), philosopher.getImageKey()), + new ClassDebateResponse.Philosopher(philosopher, philosopher.getLabel(), philosopher.getTypeName(), philosopher.getImageKey(), + imageUrls.philosopher(philosopher)), side(session.getParticipantOption()), side(session.getOpponentOption()), messages.stream().map(m -> new ClassDebateResponse.Message( diff --git a/src/main/java/com/swyp/picke/domain/classroom/service/report/ClassReportPrompts.java b/src/main/java/com/swyp/picke/domain/classroom/service/report/ClassReportPrompts.java index 07986def..bf6aabc5 100644 --- a/src/main/java/com/swyp/picke/domain/classroom/service/report/ClassReportPrompts.java +++ b/src/main/java/com/swyp/picke/domain/classroom/service/report/ClassReportPrompts.java @@ -27,6 +27,7 @@ private ClassReportPrompts() { 4. 선택의 이유를 읽을 수 있는 글이 하나도 없으면(이유 없이 "몰라요", "그냥요"만 쓴 글, 주제와 무관한 글, 비속어나 의미 없는 문자만 있는 글) 피드백을 만들지 않고 {"analysis_status": "INSUFFICIENT"} 만 출력합니다. 원문의 *** 는 서버가 가린 비속어입니다. 비속어가 섞여 있어도 이유가 있으면 그 이유를 분석하고, *** 가 들어간 구간은 인용하지 않습니다. 이유를 읽을 수 있는 글이 하나라도 있으면 그 글의 범위 안에서만 쓰고, 근거가 적으면 analysis_status 를 LIMITED 로 하고 확인되지 않는 항목은 null 로 둡니다. 짧은 답변이라는 이유만으로 낮게 평가하지 않습니다. 5. 주제와 무관한 글은 근거로 쓰지 않습니다. 비속어를 다시 쓰거나 비속어 사용을 평가하지 않습니다. 입장이 바뀌었어도 그 이유가 글에 없으면 이유를 추론하지 않고 바뀐 사실만 씁니다. 글이 AI 로 작성된 것 같아도 이를 언급하거나 단정하지 않습니다. 6. 참가자에게 직접 말하듯 "~했어요" 체로 씁니다. 이름을 쓰지 않습니다. 본문에 source_id(p:1, d:2 같은 표시)를 쓰지 않습니다. next_question 은 보완점과 연결된 질문 1개로, 참가자의 실제 주장에서 출발합니다. + 7. next_focus 와 next_question 은 참가자가 아직 하지 않은 다음 생각을 제안합니다. 참가자가 이미 [내 발언] 에서 주장했거나 답한 논점·조건·예시를 그대로 다시 제안하지 않습니다. 이미 다룬 논점이라면 그 논점을 한 단계 더 나아가게 하는 것(빠진 근거, 반대 입장에서의 반론, 적용되지 않는 경우)을 제안합니다. next_focus 의 evidence_refs 는 보완이 필요한 지점을 보여주는 구절이지, 이미 충분히 말한 주장을 다시 권하는 근거가 아닙니다. 출력은 아래 형식의 JSON 객체 하나만 씁니다. 다른 텍스트를 붙이지 않습니다. { "headline": "내 판단의 기준을 한 문장으로 (40자 이하)", diff --git a/src/main/java/com/swyp/picke/domain/classroom/service/report/ClassReportSnapshotService.java b/src/main/java/com/swyp/picke/domain/classroom/service/report/ClassReportSnapshotService.java index 3c0bd6b0..8954462e 100644 --- a/src/main/java/com/swyp/picke/domain/classroom/service/report/ClassReportSnapshotService.java +++ b/src/main/java/com/swyp/picke/domain/classroom/service/report/ClassReportSnapshotService.java @@ -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()); @@ -172,6 +177,12 @@ public void complete(Long reportId, Long jobId, Map 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) { @@ -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) { @@ -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(); diff --git a/src/main/java/com/swyp/picke/domain/classroom/service/topic/ClassTopicDraftService.java b/src/main/java/com/swyp/picke/domain/classroom/service/topic/ClassTopicDraftService.java index f6f090a8..eca1a461 100644 --- a/src/main/java/com/swyp/picke/domain/classroom/service/topic/ClassTopicDraftService.java +++ b/src/main/java/com/swyp/picke/domain/classroom/service/topic/ClassTopicDraftService.java @@ -57,6 +57,7 @@ public class ClassTopicDraftService { private final AiJobRepository aiJobRepository; private final UserRepository userRepository; private final ClassTopicContentValidator validator; + private final ClassTopicConverter topicConverter; public record PreparedSuggest(Long draftId, Long jobId, TopicConditions conditions) { } @@ -81,14 +82,14 @@ public ClassTopicDraftResponse create(Long userId, ClassTopicDraftCreateRequest .difficulty(conditions.difficulty()) .categories(conditions.categoryNames()) .build()); - return ClassTopicConverter.toDraft(draft, null); + return topicConverter.toDraft(draft, null); } public ClassTopicDraftResponse get(Long userId, Long draftId) { ClassTopicDraft draft = draftRepository.findById(draftId) .filter(d -> d.isOwnedBy(userId)) .orElseThrow(() -> new CustomException(ErrorCode.CLASS_TOPIC_DRAFT_NOT_FOUND)); - return ClassTopicConverter.toDraft(draft, versionRepository.findTopByDraftIdOrderByVersionNoDesc(draftId).orElse(null)); + return topicConverter.toDraft(draft, versionRepository.findTopByDraftIdOrderByVersionNoDesc(draftId).orElse(null)); } // ---------- AI 주제 제안 ---------- @@ -179,7 +180,7 @@ public ClassTopicVersionResponse select(Long userId, Long draftId, ClassTopicSel ClassTopicVersion version = versionRepository.findFirstByDraftIdAndSourceRefOrderByVersionNoDesc(draftId, sourceRef) .orElseGet(() -> saveVersion(draft, ClassTopicVersionSource.CANDIDATE, sourceRef, TopicContent.fromMap(candidate))); - return ClassTopicConverter.toVersion(version); + return topicConverter.toVersion(version); } // ---------- 직접 수정 검증 ---------- @@ -195,10 +196,10 @@ public PreparedValidation prepareValidation(Long userId, Long draftId, ClassTopi List formatIssues = validator.formatIssues(edit); if (!formatIssues.isEmpty()) { - return immediate(draft, ClassTopicConverter.toValidation(formatIssues, null, draft.remainingValidations())); + return immediate(draft, topicConverter.toValidation(formatIssues, null, draft.remainingValidations())); } if (sameContent(base, edit)) { - return immediate(draft, ClassTopicConverter.toValidation(List.of(), base, draft.remainingValidations())); + return immediate(draft, topicConverter.toValidation(List.of(), base, draft.remainingValidations())); } if (draft.remainingValidations() == 0) { throw new CustomException(ErrorCode.CLASS_TOPIC_VALIDATION_LIMIT); @@ -222,7 +223,7 @@ public ClassTopicValidationResponse completeValidation(PreparedValidation prepar ClassTopicVersion base = versionRepository.findById(prepared.baseVersionId()).orElseThrow(); version = saveVersion(draft, ClassTopicVersionSource.EDITED, "v" + base.getVersionNo(), prepared.edit()); } - return ClassTopicConverter.toValidation(issues, version, draft.remainingValidations()); + return topicConverter.toValidation(issues, version, draft.remainingValidations()); } /** 제공자 장애로 판정을 얻지 못하면 검증 횟수를 돌려준다 */ diff --git a/src/main/java/com/swyp/picke/domain/tag/repository/TagRepository.java b/src/main/java/com/swyp/picke/domain/tag/repository/TagRepository.java index 5bfa66ab..9ea80841 100644 --- a/src/main/java/com/swyp/picke/domain/tag/repository/TagRepository.java +++ b/src/main/java/com/swyp/picke/domain/tag/repository/TagRepository.java @@ -12,4 +12,5 @@ public interface TagRepository extends JpaRepository { List findAllByDeletedAtIsNull(); Boolean existsByNameAndTypeAndDeletedAtIsNull(String name, TagType type); Optional findByIdAndDeletedAtIsNull(Long id); + Optional findFirstByNameAndTypeAndDeletedAtIsNullOrderByIdAsc(String name, TagType type); } \ No newline at end of file diff --git a/src/main/java/com/swyp/picke/domain/ticket/entity/TicketCodeAttempt.java b/src/main/java/com/swyp/picke/domain/ticket/entity/TicketCodeAttempt.java new file mode 100644 index 00000000..c6d8be9a --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/ticket/entity/TicketCodeAttempt.java @@ -0,0 +1,64 @@ +package com.swyp.picke.domain.ticket.entity; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import java.time.LocalDateTime; +import lombok.AccessLevel; +import lombok.Getter; +import lombok.NoArgsConstructor; + +/** + * 이용권 코드 입력 실패 횟수 (계정별 1행). 짧은 코드(PKE+6자리)를 추측해 가로채지 못하게, + * 1시간 안에 없는 코드를 5번 넣으면 1시간 동안 코드 확인·등록을 막는다 (기획 결정 2026-11-19). + */ +@Getter +@Entity +@Table(name = "ticket_code_attempts") +@NoArgsConstructor(access = AccessLevel.PROTECTED) +public class TicketCodeAttempt { + + @Id + @Column(name = "user_id") + private Long userId; + + @Column(name = "fail_count", nullable = false) + private int failCount; + + /** 실패 횟수를 세기 시작한 시각. 여기서 1시간이 지나면 횟수를 0부터 다시 센다 */ + @Column(name = "window_started_at") + private LocalDateTime windowStartedAt; + + @Column(name = "locked_until") + private LocalDateTime lockedUntil; + + @Column(name = "updated_at", nullable = false) + private LocalDateTime updatedAt; + + public TicketCodeAttempt(Long userId, LocalDateTime now) { + this.userId = userId; + this.updatedAt = now; + } + + public boolean isLocked(LocalDateTime now) { + return lockedUntil != null && now.isBefore(lockedUntil); + } + + /** 실패 1회를 기록하고, 이번 실패로 잠겼으면 true */ + public boolean recordFailure(LocalDateTime now, int maxFailures, long windowMinutes, long lockMinutes) { + if (windowStartedAt == null || !now.isBefore(windowStartedAt.plusMinutes(windowMinutes))) { + windowStartedAt = now; + failCount = 0; + } + failCount++; + updatedAt = now; + if (failCount >= maxFailures) { + lockedUntil = now.plusMinutes(lockMinutes); + failCount = 0; + windowStartedAt = null; + return true; + } + return false; + } +} diff --git a/src/main/java/com/swyp/picke/domain/ticket/repository/TicketCodeAttemptRepository.java b/src/main/java/com/swyp/picke/domain/ticket/repository/TicketCodeAttemptRepository.java new file mode 100644 index 00000000..34757574 --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/ticket/repository/TicketCodeAttemptRepository.java @@ -0,0 +1,17 @@ +package com.swyp.picke.domain.ticket.repository; + +import com.swyp.picke.domain.ticket.entity.TicketCodeAttempt; +import jakarta.persistence.LockModeType; +import java.util.Optional; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Lock; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; + +public interface TicketCodeAttemptRepository extends JpaRepository { + + /** 동시에 여러 번 틀려도 횟수가 빠지지 않도록 행을 잠그고 읽는다 */ + @Lock(LockModeType.PESSIMISTIC_WRITE) + @Query("select a from TicketCodeAttempt a where a.userId = :userId") + Optional findByUserIdForUpdate(@Param("userId") Long userId); +} diff --git a/src/main/java/com/swyp/picke/domain/ticket/service/ClassTicketServiceImpl.java b/src/main/java/com/swyp/picke/domain/ticket/service/ClassTicketServiceImpl.java index 71e13f76..68e338b1 100644 --- a/src/main/java/com/swyp/picke/domain/ticket/service/ClassTicketServiceImpl.java +++ b/src/main/java/com/swyp/picke/domain/ticket/service/ClassTicketServiceImpl.java @@ -18,6 +18,7 @@ import java.util.List; import java.util.Optional; import lombok.RequiredArgsConstructor; +import org.springframework.dao.DataIntegrityViolationException; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -37,6 +38,7 @@ public class ClassTicketServiceImpl implements ClassTicketService { private final ClassTicketRepository classTicketRepository; private final UserRepository userRepository; + private final TicketCodeAttemptGuard attemptGuard; @Override public ClassTicketPreviewResponse preview(Long userId, String code) { @@ -44,8 +46,9 @@ public ClassTicketPreviewResponse preview(Long userId, String code) { throw new CustomException(ErrorCode.COMMON_INVALID_PARAMETER); } LocalDateTime now = LocalDateTime.now(KST); + attemptGuard.checkNotLocked(userId, now); ClassTicket ticket = classTicketRepository.findByCodeHash(TicketCodeHasher.hash(code)) - .orElseThrow(() -> new CustomException(ErrorCode.TICKET_CODE_INVALID)); + .orElseThrow(() -> invalidCode(userId, now)); boolean registeredByMe = ticket.isRegisteredBy(userId); if (!registeredByMe) { @@ -71,8 +74,9 @@ public ClassTicketResponse register(Long userId, ClassTicketRegisterRequest requ User user = userRepository.findById(userId) .orElseThrow(() -> new CustomException(ErrorCode.USER_NOT_FOUND)); + attemptGuard.checkNotLocked(userId, now); ClassTicket ticket = classTicketRepository.findByCodeHashForUpdate(TicketCodeHasher.hash(request.code())) - .orElseThrow(() -> new CustomException(ErrorCode.TICKET_CODE_INVALID)); + .orElseThrow(() -> invalidCode(userId, now)); if (ticket.isRevoked()) { throw new CustomException(ErrorCode.TICKET_CODE_REVOKED); @@ -106,6 +110,20 @@ public ClassTicketResponse getMyTicket(Long userId) { return ClassTicketConverter.toResponse(ticket, now); } + /** + * 없는 코드 입력. 실패를 기록하고 404 를 돌려준다. 이번 실패로 5회가 차면 바로 429(1시간 잠금)를 돌려준다. + * 같은 계정의 첫 실패가 동시에 들어와 기록 행 생성이 충돌하면 한 번 더 기록한다. + */ + private CustomException invalidCode(Long userId, LocalDateTime now) { + boolean locked; + try { + locked = attemptGuard.recordFailure(userId, now); + } catch (DataIntegrityViolationException e) { + locked = attemptGuard.recordFailure(userId, now); + } + return new CustomException(locked ? ErrorCode.TICKET_CODE_LOCKED : ErrorCode.TICKET_CODE_INVALID); + } + /** 상태를 바꾸지 않는 순수 검사. preview 와 register 가 같이 쓴다 */ private void validateCodeRegistrable(ClassTicket ticket, LocalDateTime now) { if (ticket.isRevoked()) { diff --git a/src/main/java/com/swyp/picke/domain/ticket/service/TicketCodeAttemptGuard.java b/src/main/java/com/swyp/picke/domain/ticket/service/TicketCodeAttemptGuard.java new file mode 100644 index 00000000..53e8be5a --- /dev/null +++ b/src/main/java/com/swyp/picke/domain/ticket/service/TicketCodeAttemptGuard.java @@ -0,0 +1,59 @@ +package com.swyp.picke.domain.ticket.service; + +import com.swyp.picke.domain.ticket.entity.TicketCodeAttempt; +import com.swyp.picke.domain.ticket.repository.TicketCodeAttemptRepository; +import com.swyp.picke.global.common.exception.CustomException; +import com.swyp.picke.global.common.exception.ErrorCode; +import java.time.LocalDateTime; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; + +/** + * 이용권 코드 입력 5회 제한 (기획 결정 2026-11-19). 계정별로 1시간 안에 없는 코드를 5번 넣으면 1시간 동안 막는다. + *

실패 기록은 호출한 쪽이 예외로 롤백돼도 남아야 하므로 별도 트랜잭션(REQUIRES_NEW)으로 저장한다. + * 맞는 코드를 넣어도 횟수를 초기화하지 않는다. 초기화하면 본인 코드로 횟수를 지우며 계속 추측할 수 있기 때문이다.

+ */ +@Slf4j +@Component +@RequiredArgsConstructor +public class TicketCodeAttemptGuard { + + public static final int MAX_FAILURES = 5; + public static final long WINDOW_MINUTES = 60; + public static final long LOCK_MINUTES = 60; + + private final TicketCodeAttemptRepository attemptRepository; + + /** 잠겨 있으면 429 */ + @Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = true) + public void checkNotLocked(Long userId, LocalDateTime now) { + attemptRepository.findById(userId) + .filter(a -> a.isLocked(now)) + .ifPresent(a -> { + throw new CustomException(ErrorCode.TICKET_CODE_LOCKED); + }); + } + + /** 없는 코드 입력 1회 기록. 이번 실패로 잠기면 true */ + @Transactional(propagation = Propagation.REQUIRES_NEW) + public boolean recordFailure(Long userId, LocalDateTime now) { + TicketCodeAttempt attempt = attemptRepository.findByUserIdForUpdate(userId) + .orElseGet(() -> createRow(userId, now)); + boolean locked = attempt.recordFailure(now, MAX_FAILURES, WINDOW_MINUTES, LOCK_MINUTES); + if (locked) { + log.warn("이용권 코드 입력 잠금 - userId: {}, lockedUntil: {}", userId, attempt.getLockedUntil()); + } + return locked; + } + + /** + * 같은 계정의 첫 실패가 동시에 들어오면 한쪽은 PK 충돌(DataIntegrityViolationException)로 끝난다. + * 이 트랜잭션은 그대로 롤백되고, 호출한 쪽이 한 번 더 부르면 이미 만들어진 행을 잠그고 센다. + */ + private TicketCodeAttempt createRow(Long userId, LocalDateTime now) { + return attemptRepository.saveAndFlush(new TicketCodeAttempt(userId, now)); + } +} diff --git a/src/main/java/com/swyp/picke/domain/ticket/util/TicketCodeGenerator.java b/src/main/java/com/swyp/picke/domain/ticket/util/TicketCodeGenerator.java index f6d6bb81..1fcea4c5 100644 --- a/src/main/java/com/swyp/picke/domain/ticket/util/TicketCodeGenerator.java +++ b/src/main/java/com/swyp/picke/domain/ticket/util/TicketCodeGenerator.java @@ -3,40 +3,34 @@ import java.security.SecureRandom; /** - * 이용권 코드 생성. SecureRandom 130bit → Crockford Base32 26자 (0/O, 1/I/L 혼동 문자 제외). - * 표시 형식은 {@code XXXXXX-XXXXX-XXXXX-XXXXX-XXXXX} (6-5-5-5-5). 하이픈·소문자는 {@link TicketCodeHasher#normalize} 가 흡수한다. - * 원문은 관리자 발급/조회 응답으로만 노출하고 서버 로그에는 남기지 않는다. DB에는 별도 키로 암호화해 보관한다. + * 이용권 코드 생성. 형식은 {@code PKE} + 16진수 대문자 6자리 (예: {@code PKE05D2E1}, 기획 결정 2026-11-19). + *

무작위 부분이 24비트(약 1,678만 가지)라 추측 공격에 약하므로, 코드 확인·등록은 + * {@link com.swyp.picke.domain.ticket.service.TicketCodeAttemptGuard} 로 계정별 실패 횟수를 제한한다.

+ *

공백·하이픈·소문자는 {@link TicketCodeHasher#normalize} 가 흡수한다. 원문은 관리자 발급/조회 응답으로만 노출하고 + * 서버 로그에는 남기지 않는다. DB에는 별도 키로 암호화해 보관한다.

*/ public final class TicketCodeGenerator { - public static final int CODE_LENGTH = 26; - private static final String ALPHABET = "0123456789ABCDEFGHJKMNPQRSTVWXYZ"; - private static final int[] GROUPS = {6, 5, 5, 5, 5}; + public static final String PREFIX = "PKE"; + public static final int RANDOM_LENGTH = 6; + public static final int CODE_LENGTH = PREFIX.length() + RANDOM_LENGTH; + private static final String HEX = "0123456789ABCDEF"; private static final SecureRandom RANDOM = new SecureRandom(); private TicketCodeGenerator() { } - /** 하이픈 없는 26자 원문 (해시 입력·정규화 기준과 동일) */ + /** 정규화 기준과 같은 원문 (해시 입력) */ public static String generate() { - StringBuilder sb = new StringBuilder(CODE_LENGTH); - for (int i = 0; i < CODE_LENGTH; i++) { - sb.append(ALPHABET.charAt(RANDOM.nextInt(ALPHABET.length()))); + StringBuilder sb = new StringBuilder(CODE_LENGTH).append(PREFIX); + for (int i = 0; i < RANDOM_LENGTH; i++) { + sb.append(HEX.charAt(RANDOM.nextInt(HEX.length()))); } return sb.toString(); } - /** 사람이 받아 적기 쉬운 표시 형식 */ + /** 사람에게 보여주는 형식. 새 형식은 원문 그대로다 */ public static String format(String rawCode) { - StringBuilder sb = new StringBuilder(CODE_LENGTH + GROUPS.length - 1); - int pos = 0; - for (int i = 0; i < GROUPS.length; i++) { - if (i > 0) { - sb.append('-'); - } - sb.append(rawCode, pos, pos + GROUPS[i]); - pos += GROUPS[i]; - } - return sb.toString(); + return rawCode; } } diff --git a/src/main/java/com/swyp/picke/domain/user/repository/UserProfileRepository.java b/src/main/java/com/swyp/picke/domain/user/repository/UserProfileRepository.java index 79ab9c0c..c8e1cacc 100644 --- a/src/main/java/com/swyp/picke/domain/user/repository/UserProfileRepository.java +++ b/src/main/java/com/swyp/picke/domain/user/repository/UserProfileRepository.java @@ -1,6 +1,8 @@ package com.swyp.picke.domain.user.repository; import com.swyp.picke.domain.user.entity.UserProfile; +import java.util.Collection; +import java.util.List; import java.util.Optional; import org.springframework.data.jpa.repository.JpaRepository; @@ -9,4 +11,6 @@ public interface UserProfileRepository extends JpaRepository Optional findByUserId(Long userId); Optional findByRecapShareKey(String recapShareKey); + + List findAllByUserIdIn(Collection userIds); } diff --git a/src/main/java/com/swyp/picke/global/common/exception/ErrorCode.java b/src/main/java/com/swyp/picke/global/common/exception/ErrorCode.java index d2403026..76568f8e 100644 --- a/src/main/java/com/swyp/picke/global/common/exception/ErrorCode.java +++ b/src/main/java/com/swyp/picke/global/common/exception/ErrorCode.java @@ -134,6 +134,7 @@ public enum ErrorCode { // ClassTicket (클래스 이용권) TICKET_CODE_INVALID(HttpStatus.NOT_FOUND, "TICKET_404_CODE", "유효하지 않은 이용권 코드입니다."), + TICKET_CODE_LOCKED(HttpStatus.TOO_MANY_REQUESTS, "TICKET_429_LOCKED", "이용권 코드를 5번 잘못 입력해 1시간 동안 입력할 수 없어요. 잠시 후 다시 시도해 주세요."), TICKET_CODE_ALREADY_CLAIMED(HttpStatus.CONFLICT, "TICKET_409_CLAIMED", "이미 등록된 이용권 코드입니다."), TICKET_CODE_REVOKED(HttpStatus.CONFLICT, "TICKET_409_REVOKED", "재발급되어 더 이상 사용할 수 없는 이용권 코드입니다."), TICKET_REGISTER_EXPIRED(HttpStatus.CONFLICT, "TICKET_409_REG_EXP", "등록 기한이 지난 이용권 코드입니다."), diff --git a/src/main/resources/db/migration/V20261119_01__custom_battles_category_tags.sql b/src/main/resources/db/migration/V20261119_01__custom_battles_category_tags.sql new file mode 100644 index 00000000..5102a035 --- /dev/null +++ b/src/main/resources/db/migration/V20261119_01__custom_battles_category_tags.sql @@ -0,0 +1,31 @@ +-- #647 기존 커스텀 배틀(creator_type = USER)에 주제 카테고리를 카테고리 태그로 붙인다. +-- 새로 만드는 커스텀 배틀은 서버가 생성 시 붙인다. 이 SQL 은 배포 전에 만든 커스텀 배틀용이다. +-- battles.category 는 enum 이름(SOCIETY 등)이고, 태그 이름은 한글(사회 등)이다. +-- 같은 이름의 카테고리 태그가 없으면 만든다. 이미 붙어 있으면 건너뛰므로 재실행해도 안전하다. + +WITH category_names(category, name) AS ( + VALUES ('PHILOSOPHY', '철학'), ('LITERATURE', '문학'), ('ART', '예술'), + ('SCIENCE', '과학'), ('SOCIETY', '사회'), ('HISTORY', '역사') +) +INSERT INTO tags (name, type, created_at, updated_at) +SELECT DISTINCT cn.name, 'CATEGORY', NOW(), NOW() +FROM battles b +JOIN category_names cn ON cn.category = b.category +WHERE b.creator_type = 'USER' + AND NOT EXISTS ( + SELECT 1 FROM tags t WHERE t.name = cn.name AND t.type = 'CATEGORY' AND t.deleted_at IS NULL); + +WITH category_names(category, name) AS ( + VALUES ('PHILOSOPHY', '철학'), ('LITERATURE', '문학'), ('ART', '예술'), + ('SCIENCE', '과학'), ('SOCIETY', '사회'), ('HISTORY', '역사') +) +INSERT INTO battle_tags (battle_id, tag_id, created_at, updated_at) +SELECT b.id, + (SELECT MIN(t.id) FROM tags t WHERE t.name = cn.name AND t.type = 'CATEGORY' AND t.deleted_at IS NULL), + NOW(), NOW() +FROM battles b +JOIN category_names cn ON cn.category = b.category +WHERE b.creator_type = 'USER' + AND NOT EXISTS ( + SELECT 1 FROM battle_tags bt JOIN tags t ON t.id = bt.tag_id + WHERE bt.battle_id = b.id AND t.type = 'CATEGORY'); diff --git a/src/main/resources/db/migration/V20261119_02__class_reports_status_canceled.sql b/src/main/resources/db/migration/V20261119_02__class_reports_status_canceled.sql new file mode 100644 index 00000000..7a22d3f3 --- /dev/null +++ b/src/main/resources/db/migration/V20261119_02__class_reports_status_canceled.sql @@ -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 $$; diff --git a/src/main/resources/db/migration/V20261119_03__create_ticket_code_attempts.sql b/src/main/resources/db/migration/V20261119_03__create_ticket_code_attempts.sql new file mode 100644 index 00000000..77b6934e --- /dev/null +++ b/src/main/resources/db/migration/V20261119_03__create_ticket_code_attempts.sql @@ -0,0 +1,20 @@ +-- #653 이용권 코드 입력 실패 횟수 (계정별 1행). +-- 코드가 PKE+16진수 6자리로 짧아져, 1시간 안에 없는 코드를 5번 넣으면 1시간 동안 코드 확인·등록을 막는다. +-- 서버 배포 전에 먼저 실행해야 한다 (없으면 코드 확인·등록이 500). +-- 멱등하게 작성되어 재실행해도 안전하다. + +CREATE TABLE IF NOT EXISTS ticket_code_attempts ( + user_id BIGINT PRIMARY KEY, + fail_count INT NOT NULL DEFAULT 0, + window_started_at TIMESTAMP, + locked_until TIMESTAMP, + updated_at TIMESTAMP NOT NULL +); + +DO $$ +BEGIN + IF NOT EXISTS (SELECT 1 FROM pg_constraint WHERE conname = 'fk_ticket_code_attempts_user') THEN + ALTER TABLE ticket_code_attempts ADD CONSTRAINT fk_ticket_code_attempts_user + FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE CASCADE; + END IF; +END $$; diff --git a/src/main/resources/db/migration/V20261119_rollback__class_reports_status_canceled.sql b/src/main/resources/db/migration/V20261119_rollback__class_reports_status_canceled.sql new file mode 100644 index 00000000..7b1bafb8 --- /dev/null +++ b/src/main/resources/db/migration/V20261119_rollback__class_reports_status_canceled.sql @@ -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 $$; diff --git a/src/main/resources/db/migration/V20261119_rollback__create_ticket_code_attempts.sql b/src/main/resources/db/migration/V20261119_rollback__create_ticket_code_attempts.sql new file mode 100644 index 00000000..80578cc1 --- /dev/null +++ b/src/main/resources/db/migration/V20261119_rollback__create_ticket_code_attempts.sql @@ -0,0 +1,3 @@ +-- Rollback for V20261119_03__create_ticket_code_attempts.sql +-- 애플리케이션 코드를 #653 이전으로 되돌린 뒤 실행할 것. +DROP TABLE IF EXISTS ticket_code_attempts; diff --git a/src/main/resources/db/migration/V20261119_rollback__custom_battles_category_tags.sql b/src/main/resources/db/migration/V20261119_rollback__custom_battles_category_tags.sql new file mode 100644 index 00000000..2fee1b45 --- /dev/null +++ b/src/main/resources/db/migration/V20261119_rollback__custom_battles_category_tags.sql @@ -0,0 +1,9 @@ +-- #647 V20261119_01 되돌리기. 커스텀 배틀(creator_type = USER)에 붙은 카테고리 태그 연결을 지운다. +-- 배포 전 커스텀 배틀에는 태그가 없었으므로 USER 배틀의 카테고리 태그 연결만 지운다. 태그 자체(tags)는 남긴다. + +DELETE FROM battle_tags bt +USING battles b, tags t +WHERE bt.battle_id = b.id + AND bt.tag_id = t.id + AND b.creator_type = 'USER' + AND t.type = 'CATEGORY'; diff --git a/src/test/java/com/swyp/picke/domain/admin/controller/AdminFundingApiIntegrationTest.java b/src/test/java/com/swyp/picke/domain/admin/controller/AdminFundingApiIntegrationTest.java index c89cf226..515596b6 100644 --- a/src/test/java/com/swyp/picke/domain/admin/controller/AdminFundingApiIntegrationTest.java +++ b/src/test/java/com/swyp/picke/domain/admin/controller/AdminFundingApiIntegrationTest.java @@ -55,7 +55,7 @@ class AdminFundingApiIntegrationTest { private static final String HEADER = "platform,campaign_id,order_id,reward_tier,quantity,supporter_name,supporter_email,supporter_phone,payment_status,paid_at\n"; - private static final String CODE_PATTERN = "[0-9A-Z]{6}-[0-9A-Z]{5}-[0-9A-Z]{5}-[0-9A-Z]{5}-[0-9A-Z]{5}"; + private static final String CODE_PATTERN = "PKE[0-9A-F]{6}"; @Autowired private MockMvc mockMvc; diff --git a/src/test/java/com/swyp/picke/domain/classroom/controller/ClassCustomBattleApiIntegrationTest.java b/src/test/java/com/swyp/picke/domain/classroom/controller/ClassCustomBattleApiIntegrationTest.java index f6ac210c..b060c8d7 100644 --- a/src/test/java/com/swyp/picke/domain/classroom/controller/ClassCustomBattleApiIntegrationTest.java +++ b/src/test/java/com/swyp/picke/domain/classroom/controller/ClassCustomBattleApiIntegrationTest.java @@ -1,6 +1,7 @@ package com.swyp.picke.domain.classroom.controller; import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.tuple; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.ArgumentMatchers.eq; @@ -15,10 +16,12 @@ import com.swyp.picke.domain.battle.entity.Battle; import com.swyp.picke.domain.battle.entity.BattleOption; import com.swyp.picke.domain.battle.enums.BattleCategory; +import com.swyp.picke.domain.tag.enums.TagType; import com.swyp.picke.domain.battle.enums.BattleCreatorType; import com.swyp.picke.domain.battle.enums.BattleDifficulty; import com.swyp.picke.domain.battle.enums.BattleStatus; import com.swyp.picke.domain.battle.repository.BattleOptionRepository; +import com.swyp.picke.domain.battle.repository.BattleTagRepository; import com.swyp.picke.domain.battle.repository.BattleRepository; import com.swyp.picke.domain.classroom.repository.AiJobRepository; import com.swyp.picke.domain.classroom.repository.ClassMemberRepository; @@ -87,6 +90,7 @@ class ClassCustomBattleApiIntegrationTest { @Autowired private ClassMemberRepository classMemberRepository; @Autowired private BattleRepository battleRepository; @Autowired private BattleOptionRepository battleOptionRepository; + @Autowired private BattleTagRepository battleTagRepository; @Autowired private BattleVoteRepository battleVoteRepository; @Autowired private UserBattleRepository userBattleRepository; @@ -122,6 +126,8 @@ private void cleanUp() { versionRepository.deleteAll(); draftRepository.deleteAll(); aiJobRepository.deleteAll(); + battleTagRepository.deleteAll(battleTagRepository.findAll().stream() + .filter(t -> customBattleIds.contains(t.getBattle().getId())).toList()); battleOptionRepository.deleteAll(battleOptionRepository.findAll().stream() .filter(o -> customBattleIds.contains(o.getBattle().getId())).toList()); battleRepository.deleteAllById(customBattleIds); @@ -158,6 +164,10 @@ void createCustomClass() throws Exception { assertThat(options).extracting(BattleOption::getImageUrl) .containsExactly("images/philosophers/plato.png", "images/philosophers/aristotle.png"); + // 주제 카테고리가 카테고리 태그로 붙는다 (#철학) + assertThat(battleTagRepository.findByBattleIdIn(List.of(battle.getId()))).extracting(t -> t.getTag().getName(), t -> t.getTag().getType()) + .containsExactly(tuple("철학", TagType.CATEGORY)); + // 앱 일반 상세·목록, 어드민 목록에 나오지 않는다 mockMvc.perform(get("/api/v1/battles/" + battle.getId()).header("Authorization", "Bearer " + ownerToken)) .andExpect(status().isNotFound()); @@ -196,7 +206,8 @@ void customClassBattleFlow() throws Exception { .andExpect(status().isConflict()) .andExpect(jsonPath("$.error.code").value("CLASS_409_TTS")); mockMvc.perform(get("/api/v1/classes/" + classId + "/battle").header("Authorization", "Bearer " + member)) - .andExpect(status().isOk()); + .andExpect(status().isOk()) + .andExpect(jsonPath("$.data.battle.categoryTags[0].name").value("철학")); } @Test diff --git a/src/test/java/com/swyp/picke/domain/classroom/controller/ClassDebateApiIntegrationTest.java b/src/test/java/com/swyp/picke/domain/classroom/controller/ClassDebateApiIntegrationTest.java index ecd46866..7b35200a 100644 --- a/src/test/java/com/swyp/picke/domain/classroom/controller/ClassDebateApiIntegrationTest.java +++ b/src/test/java/com/swyp/picke/domain/classroom/controller/ClassDebateApiIntegrationTest.java @@ -20,8 +20,10 @@ import com.swyp.picke.domain.battle.entity.BattleOption; import com.swyp.picke.domain.battle.enums.BattleCreatorType; import com.swyp.picke.domain.battle.repository.BattleOptionRepository; +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; @@ -106,6 +108,7 @@ class ClassDebateApiIntegrationTest { @Autowired private ClassMemberRepository classMemberRepository; @Autowired private BattleRepository battleRepository; @Autowired private BattleOptionRepository battleOptionRepository; + @Autowired private BattleTagRepository battleTagRepository; @Autowired private BattleVoteRepository battleVoteRepository; @Autowired private UserBattleRepository userBattleRepository; @Autowired private ClassDebateSessionRepository sessionRepository; @@ -173,6 +176,8 @@ private void cleanUp() { classroomRepository.deleteAll(); versionRepository.deleteAll(); draftRepository.deleteAll(); + battleTagRepository.deleteAll(battleTagRepository.findAll().stream() + .filter(t -> customBattleIds.contains(t.getBattle().getId())).toList()); battleOptionRepository.deleteAll(battleOptionRepository.findAll().stream() .filter(o -> customBattleIds.contains(o.getBattle().getId())).toList()); battleRepository.deleteAllById(customBattleIds); @@ -197,6 +202,7 @@ void fullDebate() throws Exception { .andExpect(jsonPath("$.data.opponentOption.optionId").value(optionB)) .andExpect(jsonPath("$.data.philosopher.code").value("ARISTOTLE")) .andExpect(jsonPath("$.data.philosopher.name").value("아리스토텔레스")) + .andExpect(jsonPath("$.data.philosopher.imageUrl").value(org.hamcrest.Matchers.endsWith("/api/v1/resources/images/PHILOSOPHER/aristotle.png"))) .andExpect(jsonPath("$.data.aiNotice").exists()) .andExpect(jsonPath("$.data.messages", hasSize(1))) .andExpect(jsonPath("$.data.messages[0].speaker").value("AI")) @@ -430,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 { diff --git a/src/test/java/com/swyp/picke/domain/classroom/controller/ClassMemberApiIntegrationTest.java b/src/test/java/com/swyp/picke/domain/classroom/controller/ClassMemberApiIntegrationTest.java index 8f218fd3..26e243bc 100644 --- a/src/test/java/com/swyp/picke/domain/classroom/controller/ClassMemberApiIntegrationTest.java +++ b/src/test/java/com/swyp/picke/domain/classroom/controller/ClassMemberApiIntegrationTest.java @@ -22,6 +22,9 @@ import com.swyp.picke.domain.ticket.repository.ClassTicketRepository; import com.swyp.picke.domain.ticket.repository.FundingOrderRepository; import com.swyp.picke.domain.user.entity.User; +import com.swyp.picke.domain.user.repository.UserBattleRepository; +import com.swyp.picke.domain.user.enums.UserBattleStep; +import com.swyp.picke.domain.user.entity.UserBattle; import com.swyp.picke.domain.user.enums.UserRole; import com.swyp.picke.domain.user.enums.UserStatus; import com.swyp.picke.domain.user.repository.UserRepository; @@ -89,6 +92,8 @@ class ClassMemberApiIntegrationTest { private ClassMemberRepository classMemberRepository; @Autowired private ClassMemberService classMemberService; + @Autowired + private UserBattleRepository userBattleRepository; private final List createdBattleIds = new ArrayList<>(); private User owner; @@ -112,6 +117,7 @@ void tearDown() { } private void cleanUp() { + userBattleRepository.deleteAll(); classMemberRepository.deleteAll(); classroomRepository.deleteAll(); classTicketRepository.deleteAll(); @@ -427,6 +433,42 @@ void join_lastSeat_concurrent_onlyOneSucceeds() throws Exception { assertThat(classMemberRepository.countByClassroomIdAndSeatHeldTrue(cls.classId)).isEqualTo(5); } + @Test + @DisplayName("활동한 멤버를 내보내면 사용 좌석(memberCount)은 유지되고 명단 인원(activeMemberCount)만 줄어든다 (PRD §15)") + void removeActiveMember_keepsSeat_butActiveMemberCountDrops() throws Exception { + ClassInfo cls = createClass(true); + User active = newUser("활동학생"); + User quiet = newUser("조용학생"); + join(tokenOf(active), cls.inviteCode, "활동학생").andExpect(status().isOk()); + join(tokenOf(quiet), cls.inviteCode, "조용학생").andExpect(status().isOk()); + Classroom classroom = classroomRepository.findById(cls.classId).orElseThrow(); + userBattleRepository.save(UserBattle.builder() + .user(active).battle(battle).classroom(classroom).step(UserBattleStep.TTS_LISTENING).build()); + + mockMvc.perform(get("/api/v1/classes/" + cls.classId).header("Authorization", "Bearer " + ownerToken)) + .andExpect(jsonPath("$.data.memberCount").value(3)) + .andExpect(jsonPath("$.data.activeMemberCount").value(3)); + + mockMvc.perform(delete("/api/v1/classes/" + cls.classId + "/members/" + memberIdOf(cls.classId, active)) + .header("Authorization", "Bearer " + ownerToken)) + .andExpect(status().isOk()); + + // 상세·목록: 좌석 3석 유지, 명단은 운영자+조용학생 2명 + mockMvc.perform(get("/api/v1/classes/" + cls.classId).header("Authorization", "Bearer " + ownerToken)) + .andExpect(jsonPath("$.data.memberCount").value(3)) + .andExpect(jsonPath("$.data.activeMemberCount").value(2)); + mockMvc.perform(get("/api/v1/classes").header("Authorization", "Bearer " + ownerToken)) + .andExpect(jsonPath("$.data[0].memberCount").value(3)) + .andExpect(jsonPath("$.data[0].activeMemberCount").value(2)); + mockMvc.perform(get("/api/v1/classes/" + cls.classId + "/members").header("Authorization", "Bearer " + ownerToken)) + .andExpect(jsonPath("$.data", hasSize(2))); + // 참여 코드 확인도 같은 값 + preview(tokenOf(newUser("새학생")), cls.inviteCode) + .andExpect(status().isOk()) + .andExpect(jsonPath("$.data.memberCount").value(3)) + .andExpect(jsonPath("$.data.activeMemberCount").value(2)); + } + // ===== 헬퍼 ===== private record ClassInfo(long classId, String inviteCode) { diff --git a/src/test/java/com/swyp/picke/domain/classroom/controller/ClassResultApiIntegrationTest.java b/src/test/java/com/swyp/picke/domain/classroom/controller/ClassResultApiIntegrationTest.java index 0becec41..e3756652 100644 --- a/src/test/java/com/swyp/picke/domain/classroom/controller/ClassResultApiIntegrationTest.java +++ b/src/test/java/com/swyp/picke/domain/classroom/controller/ClassResultApiIntegrationTest.java @@ -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; @@ -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; @@ -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; @@ -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; @@ -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))); diff --git a/src/test/java/com/swyp/picke/domain/classroom/service/ClassMemberServiceImplTest.java b/src/test/java/com/swyp/picke/domain/classroom/service/ClassMemberServiceImplTest.java index e15bb370..92f4efea 100644 --- a/src/test/java/com/swyp/picke/domain/classroom/service/ClassMemberServiceImplTest.java +++ b/src/test/java/com/swyp/picke/domain/classroom/service/ClassMemberServiceImplTest.java @@ -21,9 +21,12 @@ import com.swyp.picke.domain.ticket.enums.PaymentStatus; import com.swyp.picke.domain.ticket.enums.RewardTier; import com.swyp.picke.domain.user.entity.User; +import com.swyp.picke.domain.user.entity.UserProfile; +import com.swyp.picke.domain.user.enums.CharacterType; import com.swyp.picke.domain.user.enums.UserRole; import com.swyp.picke.domain.user.enums.UserStatus; import com.swyp.picke.domain.user.repository.UserBattleRepository; +import com.swyp.picke.domain.user.repository.UserProfileRepository; import com.swyp.picke.domain.user.repository.UserRepository; import com.swyp.picke.global.common.exception.CustomException; import com.swyp.picke.global.common.exception.ErrorCode; @@ -67,6 +70,10 @@ class ClassMemberServiceImplTest { private UserRepository userRepository; @Mock private UserBattleRepository userBattleRepository; + @Mock + private UserProfileRepository userProfileRepository; + @Mock + private ClassImageUrlResolver imageUrls; @InjectMocks private ClassMemberServiceImpl service; @@ -271,7 +278,7 @@ void join_rejoinWithSeatHeld_skipsCapacityCheck() { // ===== 명단 ===== @Test - @DisplayName("명단은 운영자·멤버만 볼 수 있고 본인 행에 me=true, 계정 ID 는 내려가지 않는다") + @DisplayName("명단은 운영자·멤버만 볼 수 있고 본인 행에 me=true, 계정 ID 는 내려가지 않으며 아바타는 이미지 URL이다") void getMembers_ownerAndMemberOnly() { when(classroomRepository.findByIdAndStatus(CLASS_ID, ClassStatus.ACTIVE)).thenReturn(Optional.of(classroom)); ClassMember ownerRow = withId(member(owner, "선생님", ClassMemberRole.OWNER), 11L); @@ -279,10 +286,16 @@ void getMembers_ownerAndMemberOnly() { when(classMemberRepository.findByClassroomIdAndUserIdAndStatus(CLASS_ID, STUDENT_ID, ClassMemberStatus.ACTIVE)) .thenReturn(Optional.of(studentRow)); when(classMemberRepository.findActiveMembers(CLASS_ID)).thenReturn(List.of(ownerRow, studentRow)); + UserProfile studentProfile = UserProfile.builder().user(student).nickname("학생").characterType(CharacterType.FOX).build(); + when(userProfileRepository.findAllByUserIdIn(List.of(OWNER_ID, STUDENT_ID))).thenReturn(List.of(studentProfile)); + lenient().when(imageUrls.avatar(CharacterType.FOX)).thenReturn("https://cdn.test/images/characters/fox.png"); List members = service.getMembers(STUDENT_ID, CLASS_ID); assertThat(members).extracting(ClassMemberResponse::memberId).containsExactly(11L, 12L); + // 아바타는 저장 값이 아니라 캐릭터 타입으로 만든 이미지 URL이다. 프로필이 없으면 null + assertThat(members).extracting(ClassMemberResponse::characterUrl) + .containsExactly(null, "https://cdn.test/images/characters/fox.png"); assertThat(members).extracting(ClassMemberResponse::me).containsExactly(false, true); assertThat(members.get(0).role()).isEqualTo(ClassMemberRole.OWNER); diff --git a/src/test/java/com/swyp/picke/domain/classroom/service/ClassroomServiceImplTest.java b/src/test/java/com/swyp/picke/domain/classroom/service/ClassroomServiceImplTest.java index 38974282..e0facbd4 100644 --- a/src/test/java/com/swyp/picke/domain/classroom/service/ClassroomServiceImplTest.java +++ b/src/test/java/com/swyp/picke/domain/classroom/service/ClassroomServiceImplTest.java @@ -70,6 +70,8 @@ class ClassroomServiceImplTest { private BattleRepository battleRepository; @Mock private UserRepository userRepository; + @Mock + private ClassImageUrlResolver imageUrls; @InjectMocks private ClassroomServiceImpl service; diff --git a/src/test/java/com/swyp/picke/domain/ticket/controller/ClassTicketApiIntegrationTest.java b/src/test/java/com/swyp/picke/domain/ticket/controller/ClassTicketApiIntegrationTest.java index a19b8b89..253f5d40 100644 --- a/src/test/java/com/swyp/picke/domain/ticket/controller/ClassTicketApiIntegrationTest.java +++ b/src/test/java/com/swyp/picke/domain/ticket/controller/ClassTicketApiIntegrationTest.java @@ -11,6 +11,11 @@ import com.swyp.picke.domain.ticket.repository.ClassTicketRepository; import com.swyp.picke.domain.ticket.repository.FundingOrderRepository; import com.swyp.picke.domain.ticket.util.TicketCodeHasher; +import org.springframework.test.util.ReflectionTestUtils; +import com.swyp.picke.domain.ticket.util.TicketCodeGenerator; +import com.swyp.picke.domain.ticket.service.TicketCodeAttemptGuard; +import com.swyp.picke.domain.ticket.repository.TicketCodeAttemptRepository; +import com.swyp.picke.domain.ticket.entity.TicketCodeAttempt; import com.swyp.picke.domain.user.entity.User; import com.swyp.picke.domain.user.enums.UserRole; import com.swyp.picke.domain.user.enums.UserStatus; @@ -54,9 +59,12 @@ class ClassTicketApiIntegrationTest { private FundingOrderRepository fundingOrderRepository; @Autowired private ClassTicketRepository classTicketRepository; + @Autowired + private TicketCodeAttemptRepository ticketCodeAttemptRepository; @BeforeEach void setUp() { + ticketCodeAttemptRepository.deleteAll(); classTicketRepository.deleteAll(); fundingOrderRepository.deleteAll(); } @@ -147,7 +155,7 @@ void register_validation() throws Exception { mockMvc.perform(post("/api/v1/class-tickets/register") .header("Authorization", "Bearer " + token) .contentType(MediaType.APPLICATION_JSON) - .content(objectMapper.writeValueAsString(Map.of("code", "PICKE-NOPE-0000")))) + .content(objectMapper.writeValueAsString(Map.of("code", "PKE000000")))) .andExpect(status().isNotFound()) .andExpect(jsonPath("$.error.code").value("TICKET_404_CODE")); @@ -262,6 +270,85 @@ void preview_rejections() throws Exception { .andExpect(status().isUnauthorized()); } + @Test + @DisplayName("없는 코드를 5번 넣으면 1시간 잠금(429): 맞는 코드도 막히고, 다른 계정은 영향 없고, 잠금이 풀리면 등록된다") + void wrongCodeFiveTimes_locksForAnHour() throws Exception { + User user = newUser(); + String token = jwtProvider.createAccessToken(user.getId(), UserRole.USER.name()); + String code = newCode(); + issueTicket(code, RewardTier.SEAT_5, LocalDateTime.now().minusDays(1)); + + for (int i = 0; i < TicketCodeAttemptGuard.MAX_FAILURES - 1; i++) { + register(token, wrongCode(code)).andExpect(status().isNotFound()) + .andExpect(jsonPath("$.error.code").value("TICKET_404_CODE")); + } + // 5번째 실패(미리보기도 같이 센다)에서 바로 잠긴다 + mockMvc.perform(get("/api/v1/class-tickets/preview").param("code", wrongCode(code)) + .header("Authorization", "Bearer " + token)) + .andExpect(status().isTooManyRequests()) + .andExpect(jsonPath("$.error.code").value("TICKET_429_LOCKED")); + // 잠긴 동안에는 맞는 코드도 막힌다 + register(token, code).andExpect(status().isTooManyRequests()); + mockMvc.perform(get("/api/v1/class-tickets/preview").param("code", code) + .header("Authorization", "Bearer " + token)) + .andExpect(status().isTooManyRequests()); + + // 다른 계정은 영향 없다 + String other = userToken(); + mockMvc.perform(get("/api/v1/class-tickets/preview").param("code", code) + .header("Authorization", "Bearer " + other)) + .andExpect(status().isOk()); + + // 1시간이 지나면 다시 등록할 수 있다 + TicketCodeAttempt attempt = ticketCodeAttemptRepository.findById(user.getId()).orElseThrow(); + ReflectionTestUtils.setField(attempt, "lockedUntil", LocalDateTime.now().minusSeconds(1)); + ticketCodeAttemptRepository.save(attempt); + register(token, code).andExpect(status().isOk()) + .andExpect(jsonPath("$.data.status").value("ACTIVE")); + } + + @Test + @DisplayName("맞는 코드를 넣어도 실패 횟수는 초기화되지 않는다 (본인 코드로 횟수를 지우며 추측하지 못하게)") + void validCode_doesNotResetFailures() throws Exception { + User user = newUser(); + String token = jwtProvider.createAccessToken(user.getId(), UserRole.USER.name()); + String code = newCode(); + issueTicket(code, RewardTier.SEAT_5, LocalDateTime.now().minusDays(1)); + + for (int i = 0; i < TicketCodeAttemptGuard.MAX_FAILURES - 1; i++) { + register(token, wrongCode(code)).andExpect(status().isNotFound()); + } + mockMvc.perform(get("/api/v1/class-tickets/preview").param("code", code) + .header("Authorization", "Bearer " + token)) + .andExpect(status().isOk()); + register(token, wrongCode(code)).andExpect(status().isTooManyRequests()); + } + + private org.springframework.test.web.servlet.ResultActions register(String token, String code) throws Exception { + return mockMvc.perform(post("/api/v1/class-tickets/register") + .header("Authorization", "Bearer " + token) + .contentType(MediaType.APPLICATION_JSON) + .content(objectMapper.writeValueAsString(Map.of("code", code)))); + } + + /** 발급한 코드와 다른, 같은 형식의 코드 */ + private static String wrongCode(String issued) { + String candidate; + do { + candidate = TicketCodeGenerator.generate(); + } while (candidate.equals(issued)); + return candidate; + } + + private User newUser() { + return userRepository.save(User.builder() + .userTag("tk-" + UUID.randomUUID().toString().substring(0, 8)) + .nickname("tester") + .role(UserRole.USER) + .status(UserStatus.ACTIVE) + .build()); + } + private void registerOk(String token, String code) throws Exception { mockMvc.perform(post("/api/v1/class-tickets/register") .header("Authorization", "Bearer " + token) @@ -271,7 +358,7 @@ private void registerOk(String token, String code) throws Exception { } private static String newCode() { - return "PICKE-" + UUID.randomUUID().toString().substring(0, 8).toUpperCase(); + return TicketCodeGenerator.generate(); } private void issueTicket(String code, RewardTier tier, LocalDateTime paidAt) { diff --git a/src/test/java/com/swyp/picke/domain/ticket/service/ClassTicketServiceImplTest.java b/src/test/java/com/swyp/picke/domain/ticket/service/ClassTicketServiceImplTest.java index 3f85fbe3..22d4a87d 100644 --- a/src/test/java/com/swyp/picke/domain/ticket/service/ClassTicketServiceImplTest.java +++ b/src/test/java/com/swyp/picke/domain/ticket/service/ClassTicketServiceImplTest.java @@ -41,13 +41,15 @@ class ClassTicketServiceImplTest { private static final Long USER_ID = 1L; - private static final String CODE = "PICKE-AB12-CD34"; + private static final String CODE = "PKE05D2E1"; private static final String HASH = TicketCodeHasher.hash(CODE); @Mock private ClassTicketRepository classTicketRepository; @Mock private UserRepository userRepository; + @Mock + private TicketCodeAttemptGuard attemptGuard; @InjectMocks private ClassTicketServiceImpl service; @@ -102,7 +104,7 @@ void register_activatesTicket() { when(classTicketRepository.findByRegisteredUserIdAndStatus(USER_ID, TicketStatus.ACTIVE)) .thenReturn(Optional.empty()); - ClassTicketResponse response = service.register(USER_ID, new ClassTicketRegisterRequest(" picke-ab12-cd34 ")); + ClassTicketResponse response = service.register(USER_ID, new ClassTicketRegisterRequest(" pke-05d2e1 ")); assertThat(ticket.getStatus()).isEqualTo(TicketStatus.ACTIVE); assertThat(ticket.getCodeStatus()).isEqualTo(TicketCodeStatus.CLAIMED); @@ -302,7 +304,7 @@ void preview_returnsCapacityAndRegisterBy() { when(classTicketRepository.findByRegisteredUserIdAndStatus(USER_ID, TicketStatus.ACTIVE)) .thenReturn(Optional.empty()); - ClassTicketPreviewResponse response = service.preview(USER_ID, " picke-ab12-cd34 "); + ClassTicketPreviewResponse response = service.preview(USER_ID, " pke-05d2e1 "); assertThat(response.capacity()).isEqualTo(5); assertThat(response.registerBy()).isEqualTo(paidAt.plusYears(1)); diff --git a/src/test/java/com/swyp/picke/domain/ticket/util/TicketCodeGeneratorTest.java b/src/test/java/com/swyp/picke/domain/ticket/util/TicketCodeGeneratorTest.java index fa4b53d2..f9e5ba36 100644 --- a/src/test/java/com/swyp/picke/domain/ticket/util/TicketCodeGeneratorTest.java +++ b/src/test/java/com/swyp/picke/domain/ticket/util/TicketCodeGeneratorTest.java @@ -10,31 +10,31 @@ class TicketCodeGeneratorTest { @Test - @DisplayName("26자 Crockford Base32 (혼동 문자 I/L/O/U 없음) 로 생성된다") - void generatesCrockfordBase32() { + @DisplayName("PKE + 16진수 대문자 6자리(예: PKE05D2E1)로 생성된다") + void generatesPkePlusSixHex() { for (int i = 0; i < 200; i++) { String raw = TicketCodeGenerator.generate(); - assertThat(raw).hasSize(26).matches("[0-9A-HJKMNP-TV-Z]{26}"); + assertThat(raw).hasSize(TicketCodeGenerator.CODE_LENGTH).matches("PKE[0-9A-F]{6}"); } } @Test - @DisplayName("표시 형식은 6-5-5-5-5 이고, 정규화하면 원문과 같아 해시가 일치한다") + @DisplayName("표시 형식은 원문 그대로이고, 소문자·공백·하이픈을 섞어 입력해도 정규화하면 같은 해시가 된다") void formatIsReversibleThroughNormalize() { String raw = TicketCodeGenerator.generate(); - String shown = TicketCodeGenerator.format(raw); - assertThat(shown).matches("[0-9A-Z]{6}-[0-9A-Z]{5}-[0-9A-Z]{5}-[0-9A-Z]{5}-[0-9A-Z]{5}"); - assertThat(TicketCodeHasher.normalize(shown)).isEqualTo(raw); - assertThat(TicketCodeHasher.hash(shown.toLowerCase())).isEqualTo(TicketCodeHasher.hash(raw)); + assertThat(TicketCodeGenerator.format(raw)).isEqualTo(raw); + assertThat(TicketCodeHasher.normalize(" pke-" + raw.substring(3).toLowerCase() + " ")).isEqualTo(raw); + assertThat(TicketCodeHasher.hash(raw.toLowerCase())).isEqualTo(TicketCodeHasher.hash(raw)); } @Test - @DisplayName("연속 생성 시 중복이 없다") - void noDuplicates() { - Set seen = new HashSet<>(); - for (int i = 0; i < 5000; i++) { - assertThat(seen.add(TicketCodeGenerator.generate())).isTrue(); + @DisplayName("무작위 6자리가 고르게 나온다 (한 글자 위치에 16가지가 모두 나온다)") + void randomPartUsesAllHexDigits() { + Set seen = new HashSet<>(); + for (int i = 0; i < 2000; i++) { + seen.add(TicketCodeGenerator.generate().charAt(3)); } + assertThat(seen).hasSize(16); } }