From e7b002784dbaf92598ebee687af9710d713bb175 Mon Sep 17 00:00:00 2001 From: si-zero Date: Thu, 19 Nov 2026 10:12:15 +0900 Subject: [PATCH] =?UTF-8?q?#647=20[Fix]=20=ED=81=B4=EB=9E=98=EC=8A=A4=20?= =?UTF-8?q?=EC=9D=B4=EB=AF=B8=EC=A7=80=20URL=C2=B7=EC=BB=A4=EC=8A=A4?= =?UTF-8?q?=ED=85=80=20=EB=B0=B0=ED=8B=80=20=EC=B9=B4=ED=85=8C=EA=B3=A0?= =?UTF-8?q?=EB=A6=AC=20=ED=83=9C=EA=B7=B8=C2=B7=EB=A6=AC=ED=8F=AC=ED=8A=B8?= =?UTF-8?q?=20=EB=8B=A4=EC=9D=8C=20=EA=B1=B8=EC=9D=8C=20=EC=A4=91=EB=B3=B5?= =?UTF-8?q?=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/api-specs/class-api.md | 9 +++-- .../converter/ClassMemberConverter.java | 5 +-- .../converter/ClassTopicConverter.java | 27 ++++++++------ .../converter/ClassroomConverter.java | 9 ++--- .../dto/response/ClassDebateResponse.java | 3 +- .../response/ClassTopicVersionResponse.java | 3 +- .../service/ClassCustomBattleFactory.java | 19 ++++++++++ .../service/ClassImageUrlResolver.java | 35 +++++++++++++++++++ .../service/ClassMemberServiceImpl.java | 29 +++++++++++---- .../service/ClassroomServiceImpl.java | 16 ++++++--- .../debate/ClassDebateSessionService.java | 5 ++- .../service/report/ClassReportPrompts.java | 1 + .../service/topic/ClassTopicDraftService.java | 13 +++---- .../domain/tag/repository/TagRepository.java | 1 + .../repository/UserProfileRepository.java | 4 +++ ...61119_01__custom_battles_category_tags.sql | 31 ++++++++++++++++ ...rollback__custom_battles_category_tags.sql | 9 +++++ .../ClassCustomBattleApiIntegrationTest.java | 13 ++++++- .../ClassDebateApiIntegrationTest.java | 5 +++ .../service/ClassMemberServiceImplTest.java | 15 +++++++- .../service/ClassroomServiceImplTest.java | 2 ++ 21 files changed, 213 insertions(+), 41 deletions(-) create mode 100644 src/main/java/com/swyp/picke/domain/classroom/service/ClassImageUrlResolver.java create mode 100644 src/main/resources/db/migration/V20261119_01__custom_battles_category_tags.sql create mode 100644 src/main/resources/db/migration/V20261119_rollback__custom_battles_category_tags.sql diff --git a/docs/api-specs/class-api.md b/docs/api-specs/class-api.md index 16e53259..607b18df 100644 --- a/docs/api-specs/class-api.md +++ b/docs/api-specs/class-api.md @@ -210,7 +210,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`다. 키가 다르면 내용이 같아도 새로 만든다. @@ -528,7 +529,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`을 그대로 쓴다 | --- @@ -606,6 +607,7 @@ AI가 주제 후보를 제안하면 운영자가 하나를 고르거나 직접 ``` - `memberId`: 내보내기(5.6)에 쓴다. +- `characterUrl`: 회원 캐릭터 이미지 URL이다. 프로필이 없으면 null이다. - `me`: 조회한 사람 본인이면 true다 (이름 수정 버튼 노출용). - 권한이 없으면 403 `CLASS_403_MEMBER`다. @@ -952,7 +954,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 +979,7 @@ AI가 주제 후보를 제안하면 운영자가 하나를 고르거나 직접 | `FAILED` | AI 주장 생성 실패 | 재시도 버튼 (`canRetry`) | | `COMPLETED` | 3라운드 종료 | 대화 다시보기 / 사후투표 | +- `philosopher.imageUrl`: 철학자 얼굴 이미지 URL이다. 프론트가 `imageKey`로 이미지를 따로 찾지 말고 이 값을 그대로 쓴다. - `canReply`: `WAITING_USER`이고 마감 전일 때 true - `canRetry`: 실패했거나 생성이 오래 멈췄고 마감 전일 때 true - `content`: 전체 글이다. AI 주장은 말풍선 사이에 줄바꿈이 들어 있다. 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..caa42154 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 @@ -12,8 +12,9 @@ public final class ClassroomConverter { private ClassroomConverter() { } + /** thumbnailUrl 은 저장 키를 URL로 바꾼 값이다 ({@code ClassImageUrlResolver#battleThumbnail}). */ public static ClassSummaryResponse toSummary(Classroom classroom, ClassMemberRole myRole, long memberCount, - LocalDateTime now) { + LocalDateTime now, String thumbnailUrl) { Battle battle = classroom.getBattle(); return new ClassSummaryResponse( classroom.getId(), @@ -21,7 +22,7 @@ public static ClassSummaryResponse toSummary(Classroom classroom, ClassMemberRol myRole, battle.getId(), battle.getTitle(), - battle.getThumbnailUrl(), + thumbnailUrl, classroom.getBattleType(), memberCount, classroom.getCapacity(), @@ -33,7 +34,7 @@ public static ClassSummaryResponse toSummary(Classroom classroom, ClassMemberRol /** 초대코드는 공유하기 버튼용으로 운영자·멤버 모두에게 내려간다. */ public static ClassDetailResponse toDetail(Classroom classroom, ClassMemberRole myRole, long memberCount, - LocalDateTime now) { + LocalDateTime now, String thumbnailUrl) { Battle battle = classroom.getBattle(); return new ClassDetailResponse( classroom.getId(), @@ -42,7 +43,7 @@ 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, 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/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/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/ClassMemberServiceImpl.java b/src/main/java/com/swyp/picke/domain/classroom/service/ClassMemberServiceImpl.java index eb052cb5..159224cc 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, seatCountOf(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, seatCountOf(classroom), now, + imageUrls.battleThumbnail(classroom.getBattle())); } @Override @@ -116,7 +125,7 @@ public ClassJoinPreviewResponse previewJoin(Long userId, String rawInviteCode) { inviteCode, classroom.getName(), classroom.getBattle().getTitle(), - classroom.getBattle().getThumbnailUrl(), + imageUrls.battleThumbnail(classroom.getBattle()), classroom.getBattleType(), seatCountOf(classroom), classroom.getCapacity(), @@ -129,8 +138,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 +159,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 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..7071f35d 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, seatCountOf(duplicate), now, + imageUrls.battleThumbnail(duplicate.getBattle())); } ClassTopicVersion topicVersion = request.topicVersionId() == null ? null : findOwnTopicVersion(userId, request.topicVersionId()); Battle tts = topicVersion == null ? findClassBattle(request.battleId()) : null; @@ -132,7 +134,8 @@ public ClassDetailResponse create(Long userId, ClassCreateRequest request) { } 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, memberCount, now, + imageUrls.battleThumbnail(classroom.getBattle())); } @Override @@ -142,7 +145,8 @@ public List getMyClasses(Long userId) { Map seatCounts = seatCountsOf(classrooms); return classrooms.stream() .map(c -> ClassroomConverter.toSummary( - c, roleOf(c, userId), seatCounts.getOrDefault(c.getId(), 0L), now)) + c, roleOf(c, userId), seatCounts.getOrDefault(c.getId(), 0L), 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, seatCountOf(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, seatCountOf(classroom), now, + imageUrls.battleThumbnail(classroom.getBattle())); } @Override 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..9336d510 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 @@ -21,6 +21,7 @@ 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 +66,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) { @@ -292,7 +294,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/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/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/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_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/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..499ff0ac 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,6 +20,7 @@ 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.ClassDebateMessage; @@ -106,6 +107,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 +175,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 +201,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")) 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;