Skip to content

fix: 모각방 참여 인원 수정 #60

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pkl0912 merged 1 commit into from
Nov 24, 2025
Merged

fix: 모각방 참여 인원 수정 #60

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 6 additions & 2 deletions src/main/java/com/example/mogakserver/room/application/service/RoomRetrieveService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import com.example.mogakserver.common.exception.enums.ErrorCode;
import com.example.mogakserver.common.exception.model.ConflictException;
import com.example.mogakserver.common.exception.model.NotFoundException;
import com.example.mogakserver.external.socket.WebRtcWebSocketHandler;
import com.example.mogakserver.room.application.dto.TimerDTO;
import com.example.mogakserver.room.application.response.RoomDTO;
import com.example.mogakserver.room.application.response.RoomListDTO;
Expand All @@ -25,6 +26,7 @@
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.socket.WebSocketSession;

import java.util.*;
import java.util.stream.Collectors;
Expand All @@ -40,6 +42,7 @@ public class RoomRetrieveService {
private final JpaRoomUserRepository roomUserRepository;
private final RedisTemplate<String, String> redisTemplate;
private final JpaUserRepository jpaUserRepository;
private final WebRtcWebSocketHandler webRtcWebSocketHandler;

@Transactional(readOnly = true)
public ScreenShareUsersListDTO getScreenShareUsers(Long roomId, int page, int size) {
Expand Down Expand Up @@ -192,12 +195,13 @@ public List<RoomDTO> getRecentRooms() {
}

private RoomDTO toRoomDTO(Long userId, Room room) {
List<WebSocketSession> roomSessions = webRtcWebSocketHandler.getSessionsByRoomId(room.getId());
return RoomDTO.builder()
.roomId(room.getId())
.roomName(room.getRoomName())
.roomExplain(room.getRoomExplain())
.isLocked(room.isLocked())
.userCnt(room.getUserCnt())
.userCnt(roomSessions.size())
.roomImg(getRoomImgUrl(room.getId()))
.workHours(workTimeRepository.findWorkHoursByRoomId(room.getId()))
.isHost(userId != null && isUserHost(userId, room.getId()))
Expand All @@ -206,7 +210,7 @@ private RoomDTO toRoomDTO(Long userId, Room room) {

private String getRoomImgUrl(Long roomId) {
RoomImgType roomImgType = roomImgRepository.findRoomImgTypeByRoomId(roomId);
return roomImgType.getRoomImgUrl();
return roomImgType==null?null:roomImgType.getRoomImgUrl();
}

private boolean isUserHost(Long userId, Long roomId) {
Expand Down