Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions docs/api-specs/class-api.md
Original file line number Diff line number Diff line change
Expand Up @@ -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`다. 키가 다르면 내용이 같아도 새로 만든다.
Expand Down Expand Up @@ -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`을 그대로 쓴다 |

---

Expand Down Expand Up @@ -606,6 +607,7 @@ AI가 주제 후보를 제안하면 운영자가 하나를 고르거나 직접
```

- `memberId`: 내보내기(5.6)에 쓴다.
- `characterUrl`: 회원 캐릭터 이미지 URL이다. 프로필이 없으면 null이다.
- `me`: 조회한 사람 본인이면 true다 (이름 수정 버튼 노출용).
- 권한이 없으면 403 `CLASS_403_MEMBER`다.

Expand Down Expand Up @@ -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": [
Expand All @@ -977,6 +979,7 @@ AI가 주제 후보를 제안하면 운영자가 하나를 고르거나 직접
| `FAILED` | AI 주장 생성 실패 | 재시도 버튼 (`canRetry`) |
| `COMPLETED` | 3라운드 종료 | 대화 다시보기 / 사후투표 |

- `philosopher.imageUrl`: 철학자 얼굴 이미지 URL이다. 프론트가 `imageKey`로 이미지를 따로 찾지 말고 이 값을 그대로 쓴다.
- `canReply`: `WAITING_USER`이고 마감 전일 때 true
- `canRetry`: 실패했거나 생성이 오래 멈췄고 마감 전일 때 true
- `content`: 전체 글이다. AI 주장은 말풍선 사이에 줄바꿈이 들어 있다.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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()
);
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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<Map<String, Object>> candidates = draft.getCandidates() == null ? List.of() : draft.getCandidates();
return new ClassTopicDraftResponse(
draft.getId(),
Expand All @@ -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(),
Expand All @@ -50,7 +56,7 @@ public static ClassTopicVersionResponse toVersion(ClassTopicVersion version) {
version.getCreatedAt());
}

public static ClassTopicValidationResponse toValidation(List<TopicIssue> issues, ClassTopicVersion version,
public ClassTopicValidationResponse toValidation(List<TopicIssue> issues, ClassTopicVersion version,
int remainingValidations) {
return new ClassTopicValidationResponse(
version != null,
Expand All @@ -60,7 +66,7 @@ public static ClassTopicValidationResponse toValidation(List<TopicIssue> issues,
version == null ? null : toVersion(version));
}

private static ClassTopicDraftResponse.Candidate toCandidate(Map<String, Object> map) {
private ClassTopicDraftResponse.Candidate toCandidate(Map<String, Object> map) {
TopicContent content = TopicContent.fromMap(map);
return new ClassTopicDraftResponse.Candidate(
TopicContent.candidateIdOf(map),
Expand All @@ -73,9 +79,10 @@ private static ClassTopicDraftResponse.Candidate toCandidate(Map<String, Object>
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));
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,17 @@ 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(),
classroom.getName(),
myRole,
battle.getId(),
battle.getTitle(),
battle.getThumbnailUrl(),
thumbnailUrl,
classroom.getBattleType(),
memberCount,
classroom.getCapacity(),
Expand All @@ -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(),
Expand All @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
) {
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -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)
Expand Down
Original file line number Diff line number Diff line change
@@ -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);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -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
Expand All @@ -72,7 +79,8 @@ public ClassDetailResponse join(Long userId, ClassJoinRequest request) {

Optional<ClassMember> 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);
Expand All @@ -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
Expand All @@ -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(),
Expand All @@ -129,8 +138,13 @@ public List<ClassMemberResponse> 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<ClassMember> members = classMemberRepository.findActiveMembers(classId);
Map<Long, CharacterType> 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();
}

Expand All @@ -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
Expand Down
Loading
Loading