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
7 changes: 6 additions & 1 deletion docs/api-specs/class-api.md
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,7 @@
"battleThumbnailUrl": "https://...",
"battleType": "TTS",
"memberCount": 12,
"activeMemberCount": 11,
"capacity": 30,
"closeAt": "2026-12-31T23:59:59",
"closed": false,
Expand All @@ -258,7 +259,9 @@
}
```

- `memberCount`: 좌석을 차지한 인원이다. 운영자가 참여하면 포함되고, 나갔지만 활동 이력이 있어 좌석을 유지한 멤버도 포함된다.
- `memberCount`: 사용 좌석 수다. 좌석을 차지한 인원으로, 운영자가 참여하면 포함되고 나갔거나 내보내졌지만 활동 이력이 있어 좌석을 유지한 멤버도 포함된다. 정원 판정에 쓰며 남은 자리는 `capacity - memberCount`다.
- `activeMemberCount`: 현재 명단 인원이다. 참여 중인 멤버(참여하는 운영자 포함)만 센다. 화면의 "멤버 N명"은 이 값을 쓴다 (PRD 15절 "참여 4명 / 사용 좌석 5석").
- 두 값은 클래스 상세(2.3)와 참여 코드 확인(5.1), 참여(5.2) 응답에도 같은 뜻으로 들어간다.

### 2.3 클래스 상세
- `GET /api/v1/classes/{classId}`
Expand All @@ -277,6 +280,7 @@
"battleType": "TTS",
"topicVersionId": null,
"memberCount": 12,
"activeMemberCount": 11,
"capacity": 30,
"deadline": "2026-12-31T23:59:59",
"ticketExpiresAt": "2027-04-01T10:00:00",
Expand Down Expand Up @@ -550,6 +554,7 @@ AI가 주제 후보를 제안하면 운영자가 하나를 고르거나 직접
"battleThumbnailUrl": "https://...",
"battleType": "TTS",
"memberCount": 12,
"activeMemberCount": 11,
"capacity": 30,
"closeAt": "2026-12-31T23:59:59"
}
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -13,7 +15,7 @@ private ClassroomConverter() {
}

/** thumbnailUrl 은 저장 키를 URL로 바꾼 값이다 ({@code ClassImageUrlResolver#battleThumbnail}). */
public static ClassSummaryResponse toSummary(Classroom classroom, ClassMemberRole myRole, long memberCount,
public static ClassSummaryResponse toSummary(Classroom classroom, ClassMemberRole myRole, ClassMemberCounts counts,
LocalDateTime now, String thumbnailUrl) {
Battle battle = classroom.getBattle();
return new ClassSummaryResponse(
Expand All @@ -24,7 +26,8 @@ public static ClassSummaryResponse toSummary(Classroom classroom, ClassMemberRol
battle.getTitle(),
thumbnailUrl,
classroom.getBattleType(),
memberCount,
counts.seats(),
counts.activeMembers(),
classroom.getCapacity(),
classroom.getEffectiveCloseAt(),
classroom.isClosed(now),
Expand All @@ -33,7 +36,7 @@ public static ClassSummaryResponse toSummary(Classroom classroom, ClassMemberRol
}

/** 초대코드는 공유하기 버튼용으로 운영자·멤버 모두에게 내려간다. */
public static ClassDetailResponse toDetail(Classroom classroom, ClassMemberRole myRole, long memberCount,
public static ClassDetailResponse toDetail(Classroom classroom, ClassMemberRole myRole, ClassMemberCounts counts,
LocalDateTime now, String thumbnailUrl) {
Battle battle = classroom.getBattle();
return new ClassDetailResponse(
Expand All @@ -46,7 +49,8 @@ public static ClassDetailResponse toDetail(Classroom classroom, ClassMemberRole
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(),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,18 @@ public interface ClassMemberRepository extends JpaRepository<ClassMember, Long>
/** 정원 판정용. 좌석을 쥐고 있는 인원(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<Object[]> countActiveMembersByClassroomIds(@Param("classroomIds") Collection<Long> classroomIds);

/** 목록 화면용: 여러 클래스의 좌석 소비 인원을 한 번에 */
@Query("""
select m.classroom.id, count(m) from ClassMember m
Expand Down
Original file line number Diff line number Diff line change
@@ -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);
}
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ 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, countsOf(classroom), now,
imageUrls.battleThumbnail(classroom.getBattle()));
}
rejectRemovedOrClosed(classroom, existing, now);
Expand All @@ -98,7 +98,7 @@ 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()));
}

Expand Down Expand Up @@ -128,6 +128,7 @@ public ClassJoinPreviewResponse previewJoin(Long userId, String rawInviteCode) {
imageUrls.battleThumbnail(classroom.getBattle()),
classroom.getBattleType(),
seatCountOf(classroom),
classMemberRepository.countByClassroomIdAndStatus(classroom.getId(), ClassMemberStatus.ACTIVE),
classroom.getCapacity(),
classroom.getEffectiveCloseAt());
}
Expand Down Expand Up @@ -278,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));
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ 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());
Expand All @@ -121,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)
Expand All @@ -130,22 +130,22 @@ 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<ClassSummaryResponse> getMyClasses(Long userId) {
LocalDateTime now = LocalDateTime.now(KST);
List<Classroom> classrooms = classroomRepository.findMyClasses(userId);
Map<Long, Long> seatCounts = seatCountsOf(classrooms);
Map<Long, ClassMemberCounts> 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();
}
Expand All @@ -158,7 +158,7 @@ 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()));
}

Expand All @@ -181,7 +181,7 @@ 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()));
}

Expand Down Expand Up @@ -224,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<Long, Long> seatCountsOf(List<Classroom> classrooms) {
Map<Long, Long> result = new HashMap<>();
private Map<Long, ClassMemberCounts> countsOf(List<Classroom> classrooms) {
Map<Long, ClassMemberCounts> result = new HashMap<>();
if (classrooms.isEmpty()) {
return result;
}
List<Long> ids = classrooms.stream().map(Classroom::getId).toList();
Map<Long, Long> 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<Long, Long> 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;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -89,6 +92,8 @@ class ClassMemberApiIntegrationTest {
private ClassMemberRepository classMemberRepository;
@Autowired
private ClassMemberService classMemberService;
@Autowired
private UserBattleRepository userBattleRepository;

private final List<Long> createdBattleIds = new ArrayList<>();
private User owner;
Expand All @@ -112,6 +117,7 @@ void tearDown() {
}

private void cleanUp() {
userBattleRepository.deleteAll();
classMemberRepository.deleteAll();
classroomRepository.deleteAll();
classTicketRepository.deleteAll();
Expand Down Expand Up @@ -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) {
Expand Down
Loading