-
Notifications
You must be signed in to change notification settings - Fork 0
fix: 줌 출석 조회조건 수정 #135
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.
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
Open
dongwooooooo
wants to merge
10
commits into
develop
Choose a base branch
from
BACKEND-198
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+357
−65
Open
fix: 줌 출석 조회조건 수정 #135
Changes from 7 commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
2f3a749
fix: 줌 기존 세션조회에서 IsNull 조건 삭제
dongwooooooo 63ecc36
spotlessApply
dongwooooooo 1b78c9b
디버깅 추가
dongwooooooo e0e8722
feat: Webhook breakout room event 추가
dongwooooooo da2938e
spotlessApply
dongwooooooo 899f464
fix: 히카리풀, 레디스 로그 info 이상으로 변경
dongwooooooo 67c1679
fix: log 통일
dongwooooooo 549c1ca
fix: race condition, schedule 무결성 문제 수정
dongwooooooo c2b1636
fix: zoom redis 퇴장 ttl 증가 및 uuid null 체크
dongwooooooo 00a1a71
spotless
dongwooooooo File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Some comments aren't visible on the classic Files Changed page.
There are no files selected for viewing
83 changes: 83 additions & 0 deletions
83
...rzip/src/main/java/backend/techeerzip/domain/zoom/events/ZoomAttendanceEventListener.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,83 @@ | ||
| package backend.techeerzip.domain.zoom.events; | ||
|
|
||
| import java.time.Instant; | ||
|
|
||
| import org.springframework.context.event.EventListener; | ||
| import org.springframework.scheduling.TaskScheduler; | ||
| import org.springframework.stereotype.Component; | ||
|
|
||
| import backend.techeerzip.domain.zoom.service.ZoomAttendanceService; | ||
| import backend.techeerzip.infra.redis.service.RedisService; | ||
| import backend.techeerzip.infra.zoom.dto.ZoomAttendanceEvents; | ||
| import backend.techeerzip.infra.zoom.dto.ZoomWebhookEvent.WebhookParticipant; | ||
| import lombok.RequiredArgsConstructor; | ||
| import lombok.extern.slf4j.Slf4j; | ||
|
|
||
| @Component | ||
| @RequiredArgsConstructor | ||
| @Slf4j | ||
| public class ZoomAttendanceEventListener { | ||
| private final RedisService redisService; | ||
| private final TaskScheduler scheduler; | ||
| private final ZoomAttendanceService zoomAttendanceService; | ||
|
|
||
| // 퇴장 이벤트 (줌 나가기 / 회의실 이동) | ||
| @EventListener | ||
| public void handleLeftAttempt(ZoomAttendanceEvents.ParticipantLeftAttempt attempt) { | ||
| WebhookParticipant participant = attempt.participant(); | ||
| String uuid = participant.getParticipantUuid(); | ||
| String uuidShort = uuid != null ? uuid.substring(0, 8) : "N/A"; | ||
| String userName = participant.getUserName(); | ||
|
|
||
| // 이미 펜딩 상태면 패스 | ||
| if (redisService.hasZoomPendingLeave(uuid)) { | ||
| log.debug("[ZOOM] [LEFT] [SKIP] 이미 펜딩 상태 - userName={} uuid={}", userName, uuidShort); | ||
| return; | ||
| } | ||
|
|
||
| // 보류 등록 (동시성 체크) | ||
| boolean isNewPending = redisService.setZoomPendingLeave(uuid, 10L); | ||
| if (!isNewPending) { | ||
| log.debug("[ZOOM] [LEFT] [SKIP] 다른 스레드에서 이미 등록됨 - userName={} uuid={}", userName, uuidShort); | ||
| return; | ||
| } | ||
|
|
||
| log.info("[ZOOM] [LEFT] [PENDING] userName={} uuid={} delay=10s", userName, uuidShort); | ||
|
|
||
| // 스케줄러 등록 | ||
| scheduler.schedule( | ||
| () -> { | ||
| if (!redisService.hasZoomPendingLeave(uuid)) { | ||
| log.info("[ZOOM] [LEFT] [CANCELLED] 사용자 복귀 - userName={} uuid={}", userName, uuidShort); | ||
| return; | ||
| } | ||
| zoomAttendanceService.handleParticipantLeft(participant); | ||
| redisService.deleteZoomPendingLeave(uuid); | ||
| log.info("[ZOOM] [LEFT] [CONFIRMED] 세션 종료 처리 완료 - userName={} uuid={}", userName, uuidShort); | ||
| }, | ||
| Instant.now().plusSeconds(10)); | ||
| } | ||
|
|
||
| // 입장 이벤트 (줌 접속 / 회의실 이동) | ||
| @EventListener | ||
| public void handleJoined(ZoomAttendanceEvents.ParticipantJoined joined) { | ||
| WebhookParticipant participant = joined.participant(); | ||
| String uuid = participant.getParticipantUuid(); | ||
| String uuidShort = uuid != null ? uuid.substring(0, 8) : "N/A"; | ||
| String userName = participant.getUserName(); | ||
|
|
||
| // 보류 상태면 보류 삭제 (연속 접속으로 간주) | ||
| if (redisService.hasZoomPendingLeave(uuid)) { | ||
| log.info( | ||
| "[ZOOM] [JOIN] [SESSION_KEPT] 연속 접속으로 간주, DB 기록 안함 - userName={} uuid={}", | ||
| userName, | ||
| uuidShort); | ||
| redisService.deleteZoomPendingLeave(uuid); | ||
| return; | ||
| } | ||
|
|
||
| // 새 세션 시작 | ||
| log.info("[ZOOM] [JOIN] [NEW_SESSION] 새 세션 시작 - userName={} uuid={}", userName, uuidShort); | ||
| zoomAttendanceService.handleParticipantJoined(participant); | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
10 changes: 10 additions & 0 deletions
10
techeerzip/src/main/java/backend/techeerzip/infra/zoom/dto/ZoomAttendanceEvents.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| package backend.techeerzip.infra.zoom.dto; | ||
|
|
||
| public class ZoomAttendanceEvents { | ||
|
|
||
| public record ParticipantJoined( | ||
| ZoomWebhookEvent.WebhookParticipant participant, Long timestamp) {} | ||
|
|
||
| public record ParticipantLeftAttempt( | ||
| ZoomWebhookEvent.WebhookParticipant participant, Long timestamp) {} | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.