From ef693fcf4a62f78ca788c8ba2c5fc22c18e289da Mon Sep 17 00:00:00 2001 From: dahyeon Date: Sun, 7 Jun 2026 07:44:59 -0700 Subject: [PATCH] feat(auction): cancel active auction --- .../src/modules/auction/auction.controller.ts | 1 + .../src/modules/auction/auction.gateway.ts | 5 + apps/web/src/api/hooks.ts | 9 + apps/web/src/api/useAuctionSocket.ts | 14 ++ apps/web/src/pages/AuctionPage.tsx | 155 +++++++++++++++++- 5 files changed, 182 insertions(+), 2 deletions(-) diff --git a/apps/api/src/modules/auction/auction.controller.ts b/apps/api/src/modules/auction/auction.controller.ts index 86acec54..70fd1560 100644 --- a/apps/api/src/modules/auction/auction.controller.ts +++ b/apps/api/src/modules/auction/auction.controller.ts @@ -164,6 +164,7 @@ export class AuctionController { ) { this.assertSameCommunity(currentUser, communityId); await this.auctionService.reset({ matchId, communityId }); + this.auctionGateway.broadcastReset(matchId.toString()); } private resolveBidder( diff --git a/apps/api/src/modules/auction/auction.gateway.ts b/apps/api/src/modules/auction/auction.gateway.ts index aad113e4..91c0c613 100644 --- a/apps/api/src/modules/auction/auction.gateway.ts +++ b/apps/api/src/modules/auction/auction.gateway.ts @@ -364,6 +364,11 @@ export class AuctionGateway this.syncRoomTimer(matchId, auction); } + public broadcastReset(matchId: string) { + this.clearRoomTimer(matchId); + this.server.to(matchId).emit('reset', { matchId }); + } + private emitChatHistory(socket: Socket, auction: AuctionDocument) { socket.emit('chat-history', { messages: (auction.chatMessages ?? []).map((message) => diff --git a/apps/web/src/api/hooks.ts b/apps/web/src/api/hooks.ts index 8546bf22..34e604bf 100644 --- a/apps/web/src/api/hooks.ts +++ b/apps/web/src/api/hooks.ts @@ -171,6 +171,15 @@ export function useUndoAuction(communityId = DEFAULT_COMMUNITY_ID) { }); } +export function useResetAuction(communityId = DEFAULT_COMMUNITY_ID) { + return useMutation({ + mutationFn: ({ matchId }: { matchId: string }) => + apiFetch(`/communities/${communityId}/matches/${matchId}/auction`, { + method: 'DELETE', + }), + }); +} + export function useCreateMatch(communityId = DEFAULT_COMMUNITY_ID) { return useMutation({ mutationFn: (body: MatchMutationRequest) => diff --git a/apps/web/src/api/useAuctionSocket.ts b/apps/web/src/api/useAuctionSocket.ts index e6fa1af0..6bc32f9f 100644 --- a/apps/web/src/api/useAuctionSocket.ts +++ b/apps/web/src/api/useAuctionSocket.ts @@ -26,6 +26,10 @@ interface ChatHistoryPayload { messages?: ApiAuctionChatMessage[]; } +interface ResetPayload { + matchId?: string; +} + const MAX_CHAT_MESSAGES = 200; function mergeChatMessages( @@ -47,6 +51,7 @@ export function useAuctionSocket(matchId: string | undefined) { const socketRef = useRef(null); const [auction, setAuction] = useState(null); const [chatMessages, setChatMessages] = useState([]); + const [resetAt, setResetAt] = useState(null); const [connectionStatus, setConnectionStatus] = useState('idle'); const [error, setError] = useState(null); @@ -103,6 +108,14 @@ export function useAuctionSocket(matchId: string | undefined) { setChatMessages((current) => mergeChatMessages(current, [message])); }); + socket.on('reset', (payload: ResetPayload) => { + if (payload.matchId && payload.matchId !== matchId) return; + setAuction(null); + setChatMessages([]); + setResetAt(Date.now()); + setError('경매가 취소되었습니다.'); + }); + socket.on('error', (payload: { message?: string }) => { setConnectionStatus('error'); setError(payload.message ?? '실시간 경매 연결 중 오류가 발생했습니다.'); @@ -144,6 +157,7 @@ export function useAuctionSocket(matchId: string | undefined) { return { auction: visibleAuction, chatMessages: visibleAuction ? chatMessages : [], + resetAt, connectionStatus: visibleConnectionStatus, error, placeBid(payload: BidPayload) { diff --git a/apps/web/src/pages/AuctionPage.tsx b/apps/web/src/pages/AuctionPage.tsx index a42f8955..e1bd5f85 100644 --- a/apps/web/src/pages/AuctionPage.tsx +++ b/apps/web/src/pages/AuctionPage.tsx @@ -7,14 +7,15 @@ import { type KeyboardEvent, } from 'react'; import { useQueryClient } from '@tanstack/react-query'; -import { SendHorizontal } from 'lucide-react'; -import { Link, useLocation, useParams } from 'react-router'; +import { AlertTriangle, SendHorizontal } from 'lucide-react'; +import { Link, useLocation, useNavigate, useParams } from 'react-router'; import { useAuction, useAuctionHistory, useDdragonManifest, useMatch, useMe, + useResetAuction, useUndoAuction, } from '../api/hooks'; import { @@ -728,6 +729,7 @@ function BidLog({ bids }: { bids: AuctionStateView['bids'] }) { export default function AuctionPage() { const { id } = useParams(); const location = useLocation(); + const navigate = useNavigate(); const queryClient = useQueryClient(); const meQuery = useMe(); const currentUser = @@ -747,17 +749,42 @@ export default function AuctionPage() { refetchInterval: 3000, }); const undoMutation = useUndoAuction(DEFAULT_COMMUNITY_ID); + const resetAuctionMutation = useResetAuction(DEFAULT_COMMUNITY_ID); const socket = useAuctionSocket(id); const captainTeamIndex = useDevCaptainTeamIndex(); const [now, setNow] = useState(() => Date.now()); const [assignedPosition, setAssignedPosition] = useState('MID'); + const [showCancelModal, setShowCancelModal] = useState(false); + const [cancelConfirmText, setCancelConfirmText] = useState(''); + const cancelConfirmInputRef = useRef(null); const historyBackTo = `${location.pathname}${location.search}${location.hash}`; + const canConfirmAuctionCancel = cancelConfirmText.trim() === '예'; + + async function invalidateAuctionData() { + if (!id) return; + await Promise.all([ + queryClient.invalidateQueries({ + queryKey: ['auction', DEFAULT_COMMUNITY_ID, id], + }), + queryClient.invalidateQueries({ + queryKey: ['auction-history', DEFAULT_COMMUNITY_ID, id], + }), + queryClient.invalidateQueries({ + queryKey: ['match', DEFAULT_COMMUNITY_ID, id], + }), + ]); + } useEffect(() => { const timer = window.setInterval(() => setNow(Date.now()), 1000); return () => window.clearInterval(timer); }, []); + useEffect(() => { + if (!showCancelModal) return; + cancelConfirmInputRef.current?.focus(); + }, [showCancelModal]); + const liveAuction = pickLatestAuction(socket.auction, auctionQuery.data); const auctionState = liveAuction && matchQuery.data @@ -788,6 +815,13 @@ export default function AuctionPage() { } }, [availableTeamIndexes, captainTeamIndex]); + useEffect(() => { + if (!socket.resetAt || !id) return; + void invalidateAuctionData().finally(() => { + navigate(`/match/${id}`, { replace: true }); + }); + }, [id, navigate, socket.resetAt]); + if (!DEFAULT_COMMUNITY_ID) { return (
@@ -862,6 +896,21 @@ export default function AuctionPage() { ); } + function handleResetAuction() { + if (!id || !canConfirmAuctionCancel) return; + resetAuctionMutation.mutate( + { matchId: id }, + { + onSuccess: async () => { + setShowCancelModal(false); + setCancelConfirmText(''); + await invalidateAuctionData(); + navigate(`/match/${id}`, { replace: true }); + }, + }, + ); + } + const undoPanel = canManageAuction ? (
@@ -930,6 +979,12 @@ export default function AuctionPage() {
)} + {resetAuctionMutation.error instanceof Error && ( +
+ {resetAuctionMutation.error.message} +
+ )} +

@@ -1101,6 +1156,23 @@ export default function AuctionPage() { 다음 선수 )} +
+ +

+ 경매 데이터와 진행 기록을 삭제하고 내전을 모집 상태로 되돌립니다. +

+

)} {undoPanel} @@ -1138,6 +1210,85 @@ export default function AuctionPage() { className="h-[420px]" />
+ + {showCancelModal && ( +
+
+
+ + + +
+

+ 경매 진행 취소 +

+

+ 정말 경매를 취소하고 모집 상태로 되돌리시겠습니까? + 경매 데이터, 입찰 기록, 팀 배정 정보가 삭제됩니다. +

+
+
+ + + setCancelConfirmText(event.target.value)} + onKeyDown={(event) => { + if (event.key === 'Escape') { + setShowCancelModal(false); + setCancelConfirmText(''); + } + if (event.key === 'Enter' && canConfirmAuctionCancel) { + handleResetAuction(); + } + }} + className="mt-2 h-10 w-full border border-base-content/15 bg-base-100 px-3 text-sm text-base-content outline-none transition-colors focus:border-red-400/60" + placeholder="예" + /> + +
+ + +
+
+
+ )}
); }