feat: 참가자 퇴장 시간 저장 및 웹소켓, 발표방 리팩토링 (#64)

* docs: 발표방 관련 스웨거 설명 추가, 비밀코드 방 참가 조건 수정
* refactor: 발표방 리팩토링
* refactor: 회원, 인증 리팩토링
* refactor: websocket 패키지 구조 변경
* feat: 방 삭제 이벤트로 수정
* feat: 참가자 퇴장 시간 기록 구현

Author: rjswjddn

src/main/java/com/oronaminc/join/document/service/DocumentService.java

@@ -1,6 +1,9 @@
 package com.oronaminc.join.document.service;
 
+import java.util.UUID;
+
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import com.oronaminc.join.document.dao.DocumentRepository;
 import com.oronaminc.join.document.dto.DocumentRequest;
@@ -11,20 +14,17 @@
 import com.oronaminc.join.infra.service.S3Service;
 import com.oronaminc.join.member.domain.MemberType;
 import com.oronaminc.join.room.domain.Room;
-import jakarta.transaction.Transactional;
 
 import lombok.RequiredArgsConstructor;
 
-import java.util.UUID;
-
-
 @Service
 @RequiredArgsConstructor
 public class DocumentService {
 
     private final DocumentRepository documentRepository;
     private final S3Service s3Service;
 
+    @Transactional
     public void deleteByRoomId(Long roomId) {
         documentRepository.deleteByRoomId(roomId);
     }

src/main/java/com/oronaminc/join/member/domain/Member.java

@@ -30,4 +30,8 @@ public class Member extends BaseEntity {
     public void updateNickname(String nickname) {
         this.nickname = nickname;
     }
+
+    public void registerGuest() {
+        this.email = "GUEST_" + this.id;
+    }
 }

src/main/java/com/oronaminc/join/member/security/AuthService.java

@@ -1,5 +1,7 @@
 package com.oronaminc.join.member.security;
 
+import static com.oronaminc.join.member.util.MemberMapper.*;
+
 import java.util.Map;
 import java.util.Optional;
 
@@ -12,7 +14,6 @@
 
 import com.oronaminc.join.member.dao.MemberRepository;
 import com.oronaminc.join.member.domain.Member;
-import com.oronaminc.join.member.domain.MemberType;
 import com.oronaminc.join.member.dto.GuestLoginRequest;
 import com.oronaminc.join.member.service.MemberReader;
 
@@ -39,45 +40,19 @@ public OAuth2User loadUser(OAuth2UserRequest userRequest) throws OAuth2Authentic
 
         Optional<Member> optionalMember = memberReader.findByEmail(kakaoAccount.get("email").toString());
 
-        Member member = optionalMember.orElseGet(
-                () -> memberRepository.save(
-                        Member.builder()
-                                .email(kakaoAccount.get("email").toString())
-                                .nickname(profile.get("nickname").toString())
-                                .profileImage(profile.get("profile_image_url").toString())
-                                .memberType(MemberType.MEMBER)
-                                .build()
-                )
-        );
-
-        return MemberDetails.builder()
-                .id(member.getId())
-                .name(member.getEmail())
-                .nickname(member.getNickname())
-                .role(member.getMemberType())
-                .build();
+        Member member = optionalMember.orElseGet(() -> memberRepository.save(toKakaoMember(kakaoAccount, profile)));
+
+        return toOAuth2MemberDetails(member);
     }
 
     @Transactional
     public MemberDetails loadGuest(GuestLoginRequest guestLoginRequest) {
-        Member guest = Member.builder()
-                .email(null)
-                .nickname(guestLoginRequest.nickname())
-                .profileImage(null)
-                .memberType(MemberType.GUEST)
-                .build();
+        Member guest = toGuestMember(guestLoginRequest);
 
         memberRepository.save(guest);
+        guest.registerGuest();
 
-        // 1. 비회원 MemberDetails 생성
-        MemberDetails memberDetails = MemberDetails.builder()
-                .id(guest.getId())
-                .name("GUEST_" + guest.getId())
-                .nickname(guest.getNickname())
-                .role(MemberType.GUEST)
-                .build();
-
-        return memberDetails;
+        return toGuestMemberDetails(guest);
     }
 
 }

src/main/java/com/oronaminc/join/member/util/MemberMapper.java

@@ -0,0 +1,50 @@
+package com.oronaminc.join.member.util;
+
+import java.util.Map;
+
+import com.oronaminc.join.member.domain.Member;
+import com.oronaminc.join.member.domain.MemberType;
+import com.oronaminc.join.member.dto.GuestLoginRequest;
+import com.oronaminc.join.member.security.MemberDetails;
+
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
+public class MemberMapper {
+    public static MemberDetails toOAuth2MemberDetails(Member member) {
+        return MemberDetails.builder()
+                .id(member.getId())
+                .name(member.getEmail())
+                .nickname(member.getNickname())
+                .role(member.getMemberType())
+                .build();
+    }
+
+    public static MemberDetails toGuestMemberDetails(Member guest) {
+        return MemberDetails.builder()
+                .id(guest.getId())
+                .name(guest.getEmail())
+                .nickname(guest.getNickname())
+                .role(MemberType.GUEST)
+                .build();
+    }
+
+    public static Member toGuestMember(GuestLoginRequest guestLoginRequest) {
+        return Member.builder()
+                .email(null)
+                .nickname(guestLoginRequest.nickname())
+                .profileImage(null)
+                .memberType(MemberType.GUEST)
+                .build();
+    }
+
+    public static Member toKakaoMember(Map<String, Object> kakaoAccount, Map<String, Object> profile) {
+        return Member.builder()
+                .email(kakaoAccount.get("email").toString())
+                .nickname(profile.get("nickname").toString())
+                .profileImage(profile.get("profile_image_url").toString())
+                .memberType(MemberType.MEMBER)
+                .build();
+    }
+}

src/main/java/com/oronaminc/join/participant/domain/Participant.java

@@ -1,15 +1,23 @@
 package com.oronaminc.join.participant.domain;
 
-import jakarta.persistence.Column;
-import jakarta.persistence.FetchType;
-import jakarta.persistence.Index;
-import jakarta.persistence.Table;
 import java.time.LocalDateTime;
 
 import com.oronaminc.join.global.entity.BaseEntity;
 import com.oronaminc.join.member.domain.Member;
 import com.oronaminc.join.room.domain.Room;
-import jakarta.persistence.*;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Index;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -44,4 +52,8 @@ public class Participant extends BaseEntity {
     private ParticipantType participantType;
 
     private LocalDateTime exitedAt;
+
+    public void updateExitAt() {
+        this.exitedAt = LocalDateTime.now();
+    }
 }

src/main/java/com/oronaminc/join/participant/event/ParticipantEventHandler.java

@@ -0,0 +1,21 @@
+package com.oronaminc.join.participant.event;
+
+import org.springframework.context.event.EventListener;
+import org.springframework.stereotype.Component;
+
+import com.oronaminc.join.participant.service.ParticipantService;
+import com.oronaminc.join.room.event.RoomExitEvent;
+
+import lombok.RequiredArgsConstructor;
+
+@Component
+@RequiredArgsConstructor
+public class ParticipantEventHandler {
+
+    private final ParticipantService participantService;
+
+    @EventListener
+    public void exitRoomEvent(RoomExitEvent roomExitEvent) {
+        participantService.updateExitAt(roomExitEvent.roomId(), roomExitEvent.memberId());
+    }
+}

src/main/java/com/oronaminc/join/participant/service/ParticipantService.java

@@ -20,20 +20,22 @@
 import lombok.RequiredArgsConstructor;
 
 @Service
-@Transactional
+@Transactional(readOnly=true)
 @RequiredArgsConstructor
 public class ParticipantService {
     private final ParticipantRepository participantRepository;
     private final ParticipantReader participantReader;
     private final MemberReader memberReader;
 
+    @Transactional
     public void savePresenterAndTeam(String presenterEmail, List<String> teamEmail, Room room) {
         saveMemberParticipantByEmail(presenterEmail, room, ParticipantType.PRESENTER);
         for (String email : teamEmail) {
             saveMemberParticipantByEmail(email, room, ParticipantType.TEAM);
         }
     }
 
+    @Transactional
     public void saveMemberParticipantByEmail(String email, Room room, ParticipantType participantType) {
         Member participantMember = memberReader.getByEmail(email);
         if (participantMember.getMemberType().equals(MemberType.GUEST)) {
@@ -42,7 +44,8 @@ public void saveMemberParticipantByEmail(String email, Room room, ParticipantTyp
         Participant participant = ParticipantMapper.toParticipant(participantMember, room, participantType);
         participantRepository.save(participant);
     }
-    
+
+    @Transactional
     public void saveParticipantById(Long memberId, Room room, ParticipantType participantType) {
         Member participantMember = memberReader.getById(memberId);
         if (participantReader.existsByRoomIdAndMemberId(room.getId(), participantMember.getId())) {
@@ -67,6 +70,7 @@ public List<Participant> getTeam(Long roomId) {
         return participantReader.findAllByRoomIdAndParticipantType(roomId, ParticipantType.TEAM);
     }
 
+    @Transactional
     public void updateTeam(Room room, List<String> emails) {
         List<Participant> team = this.getTeam(room.getId());
         for (Participant participant : team) {
@@ -87,7 +91,14 @@ public void validatePresenter(Long roomId, Long memberId) {
         }
     }
 
+    @Transactional
     public void deleteParticipantByRoomId(Long roomId) {
         participantRepository.deleteByRoomId(roomId);
     }
+
+    @Transactional
+    public void updateExitAt(Long roomId, Long memberId) {
+        Participant participant = participantReader.getByRoomIdAndMemberId(roomId, memberId);
+        participant.updateExitAt();
+    }
 }

src/main/java/com/oronaminc/join/question/dao/QuestionRepository.java

@@ -4,7 +4,6 @@
 import java.util.Optional;
 import java.util.List;
 
-import com.oronaminc.join.room.dto.TopQnADto;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;

src/main/java/com/oronaminc/join/question/service/QuestionReader.java

@@ -1,18 +1,20 @@
 package com.oronaminc.join.question.service;
 
+import java.util.List;
+import java.util.Optional;
+
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
+import org.springframework.stereotype.Component;
+
 import com.oronaminc.join.global.exception.ErrorCode;
 import com.oronaminc.join.global.exception.ErrorException;
 import com.oronaminc.join.question.dao.QuestionRepository;
 import com.oronaminc.join.question.domain.Question;
 import com.oronaminc.join.question.domain.QuestionSort;
 import com.oronaminc.join.question.dto.QuestionFlatResponse;
-import com.oronaminc.join.room.dto.TopQnADto;
-import java.util.List;
-import java.util.Optional;
+
 import lombok.RequiredArgsConstructor;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.data.domain.Pageable;
-import org.springframework.stereotype.Component;
 
 @Component
 @RequiredArgsConstructor

src/main/java/com/oronaminc/join/question/service/QuestionService.java

@@ -1,5 +1,13 @@
 package com.oronaminc.join.question.service;
 
+import java.util.List;
+
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Slice;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
 import com.oronaminc.join.answer.service.AnswerService;
 import com.oronaminc.join.global.exception.ErrorCode;
 import com.oronaminc.join.global.exception.ErrorException;
@@ -17,13 +25,8 @@
 import com.oronaminc.join.question.util.QuestionMapper;
 import com.oronaminc.join.room.domain.Room;
 import com.oronaminc.join.room.service.RoomReader;
-import java.util.List;
+
 import lombok.RequiredArgsConstructor;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.domain.Slice;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 @Service
 @Transactional(readOnly = true)
@@ -117,7 +120,6 @@ public Long delete(Long memberId, Long roomId, Long questionId) {
         return question.getId();
     }
 
-
     @Transactional
     public void deleteByRoomId(Long roomId) {
         List<Question> questions = questionReader.findByRoomId(roomId);