feat: redesign auction engine with redis sot

This commit is contained in:
dahyeon committed 2026-06-23 03:16:04 -07:00
1 parent 737702d78c
commit e8bb20d988
75 files changed
+12737 -542

No files matched your search

+98 -8
View File
@@ -64,6 +64,13 @@ function formatPoints(value: number) {
return value.toLocaleString();
}
function createClientRequestId(): string {
if (typeof crypto !== 'undefined' && 'randomUUID' in crypto) {
return crypto.randomUUID();
}
return `${Date.now()}-${Math.random().toString(16).slice(2)}`;
}
function relativeTime(dateLike: string) {
const seconds = Math.max(
0,
@@ -114,12 +121,27 @@ function getAuctionUpdatedAt(auction: ApiAuction | null | undefined) {
return Date.parse(auction.updatedAt ?? auction.createdAt ?? '') || 0;
}
function getAuctionRevision(auction: ApiAuction | null | undefined) {
return typeof auction?.revision === 'number' ? auction.revision : null;
}
function pickLatestAuction(
socketAuction: ApiAuction | null,
queryAuction: ApiAuction | undefined,
) {
if (!socketAuction) return queryAuction ?? null;
if (!queryAuction) return socketAuction;
if (
socketAuction.auctionLifecycleId &&
queryAuction.auctionLifecycleId &&
socketAuction.auctionLifecycleId === queryAuction.auctionLifecycleId
) {
const socketRevision = getAuctionRevision(socketAuction);
const queryRevision = getAuctionRevision(queryAuction);
if (socketRevision !== null && queryRevision !== null) {
return queryRevision > socketRevision ? queryAuction : socketAuction;
}
}
return getAuctionUpdatedAt(queryAuction) > getAuctionUpdatedAt(socketAuction)
? queryAuction
: socketAuction;
@@ -574,10 +596,12 @@ function PlayerSpotlight({
function BidControls({
state,
captainRole,
isBidPending,
onBid,
}: {
state: AuctionStateView;
captainRole: CaptainRole | null;
isBidPending: boolean;
onBid: (teamIndex: number, amount: number) => void;
}) {
const [bidAmount, setBidAmount] = useState(100);
@@ -641,7 +665,11 @@ function BidControls({
<button
key={preset}
onClick={() => setBidAmount(Math.min(maxBid, Math.max(minBid, preset)))}
disabled={!canAffordNextBid || Math.max(minBid, preset) > maxBid}
disabled={
isBidPending ||
!canAffordNextBid ||
Math.max(minBid, preset) > maxBid
}
className={`text-xs px-2.5 py-1 border transition-colors ${
bidAmount === preset
? 'border-primary/40 bg-primary/10 text-primary'
@@ -659,13 +687,14 @@ function BidControls({
}
min={minBid}
max={maxBid}
disabled={!canAffordNextBid}
disabled={isBidPending || !canAffordNextBid}
className="w-24 text-xs px-2 py-1 border border-base-content/10 bg-transparent text-base-content tabular-nums text-right focus:outline-none focus:border-primary/30"
/>
</div>
<button
onClick={() => onBid(activeTeam.teamIndex, bidAmount)}
disabled={
isBidPending ||
!canAffordNextBid ||
bidAmount > maxBid ||
bidAmount <= state.currentBid
@@ -676,6 +705,8 @@ function BidControls({
>
{isActiveTeamFull
? `${teamIndexLabel(activeTeam.teamIndex, activeTeam.name)} 정원 완료 (${activeTeamSize}/${AUCTION_MAX_TEAM_SIZE})`
: isBidPending
? '입찰 반영 중...'
: !canAffordNextBid
? `입찰 불가 (다음 ${formatPoints(minBid)}P · 최대 ${formatPoints(maxBid)}P)`
: `${teamIndexLabel(activeTeam.teamIndex, activeTeam.name)} 입찰 (${formatPoints(bidAmount)}P)`}
@@ -872,12 +903,26 @@ export default function AuctionPage() {
const errorMessage =
socket.error ??
(auctionQuery.error instanceof Error ? auctionQuery.error.message : null);
const matchSideEffectMessage = resolveMatchSideEffectMessage(
auctionState.matchSideEffectStatus,
);
function handleUndo(sequence: number) {
if (!id) return;
if (!window.confirm(`${sequence}번 액션 직전으로 되돌릴까요?`)) return;
undoMutation.mutate(
{ matchId: id, sequence },
{
auctionActionRequestId: createClientRequestId(),
clientObservedAuctionLifecycleId: liveAuction?.auctionLifecycleId,
clientObservedCurrentAuctionPlayerOrderIndex:
liveAuction?.currentAuctionPlayerOrderIndex,
clientObservedCurrentBidRoundPlayerUserId:
liveAuction?.currentBidRoundPlayerUserId,
clientObservedPhase: liveAuction?.phase,
clientObservedRevision: liveAuction?.revision,
matchId: id,
sequence,
},
{
onSuccess: async () => {
await Promise.all([
@@ -899,7 +944,17 @@ export default function AuctionPage() {
function handleResetAuction() {
if (!id || !canConfirmAuctionCancel) return;
resetAuctionMutation.mutate(
{ matchId: id },
{
auctionActionRequestId: createClientRequestId(),
clientObservedAuctionLifecycleId: liveAuction?.auctionLifecycleId,
clientObservedCurrentAuctionPlayerOrderIndex:
liveAuction?.currentAuctionPlayerOrderIndex,
clientObservedCurrentBidRoundPlayerUserId:
liveAuction?.currentBidRoundPlayerUserId,
clientObservedPhase: liveAuction?.phase,
clientObservedRevision: liveAuction?.revision,
matchId: id,
},
{
onSuccess: async () => {
setShowCancelModal(false);
@@ -1074,6 +1129,11 @@ export default function AuctionPage() {
<div className="text-xs text-base-content/40">
모든 선수가 팀에 배정되었습니다.
</div>
{matchSideEffectMessage && (
<div className="mt-3 border border-amber-500/20 bg-amber-500/10 px-3 py-2 text-xs text-amber-600">
{matchSideEffectMessage}
</div>
)}
<Link
to={`/match/${id}`}
className="btn btn-primary btn-sm mt-4 px-6 text-xs"
@@ -1104,8 +1164,12 @@ export default function AuctionPage() {
<BidControls
state={auctionState}
captainRole={captainRole}
isBidPending={socket.isBidPending}
onBid={(teamIndex, amount) =>
socket.placeBid({ teamIndex, amount })
socket.placeBid({
bidderTeamIndex: teamIndex,
bidPointAmount: amount,
})
}
/>
<BidLog bids={auctionState.bids} />
@@ -1120,8 +1184,9 @@ export default function AuctionPage() {
type="button"
className="btn btn-primary btn-sm px-5 text-xs"
onClick={() => socket.openBidding()}
disabled={socket.isAuctionActionPending}
>
입찰 열기
{socket.isAuctionActionPending ? '반영 중...' : '입찰 열기'}
</button>
)}
{auctionState.phase === 'bidding' && (
@@ -1141,8 +1206,20 @@ export default function AuctionPage() {
type="button"
className="btn btn-primary btn-sm px-5 text-xs"
onClick={() => socket.markSold(assignedPosition)}
disabled={socket.isAuctionActionPending}
>
낙찰 처리
{socket.isAuctionActionPending ? '반영 중...' : '낙찰 처리'}
</button>
<button
type="button"
className="btn btn-outline btn-sm px-5 text-xs"
onClick={() => socket.markPassed()}
disabled={
socket.isAuctionActionPending ||
auctionState.currentBid > 0
}
>
{socket.isAuctionActionPending ? '반영 중...' : '유찰 처리'}
</button>
</div>
)}
@@ -1152,8 +1229,9 @@ export default function AuctionPage() {
type="button"
className="btn btn-primary btn-sm px-5 text-xs"
onClick={() => socket.next()}
disabled={socket.isAuctionActionPending}
>
다음 선수
{socket.isAuctionActionPending ? '반영 중...' : '다음 선수'}
</button>
)}
<div className="border-t border-base-content/10 pt-3">
@@ -1562,3 +1640,15 @@ function ChatPanel({
</div>
);
}
function resolveMatchSideEffectMessage(
status: AuctionStateView['matchSideEffectStatus'],
): string | null {
if (status === 'pending' || status === 'processing') {
return '팀 편성, 토너먼트 코드, 결과 수집 예약을 반영 중입니다.';
}
if (status === 'failed') {
return '팀 편성 후속 처리에 실패했습니다. 운영진 확인이 필요합니다.';
}
return null;
}
+91 -57
View File
@@ -52,7 +52,7 @@ type CaptainSelectionSlot = {
type CaptainSelection = {
userId: string;
initialPoints: string;
initialTeamBidPointAmountInput: string;
};
const DEFAULT_AUCTION_MAX_TIMER_SECONDS = 30;
@@ -2387,17 +2387,23 @@ export default function MatchDetailPage() {
const [captainSelections, setCaptainSelections] = useState<
Record<string, CaptainSelection>
>({});
const [topTierThreshold, setTopTierThreshold] =
const [
topTierAuctionPriorityThreshold,
setTopTierAuctionPriorityThreshold,
] =
useState<AuctionTopTierThreshold>("NONE");
const [manualTopTierUserIds, setManualTopTierUserIds] = useState<string[]>(
[],
);
const [maxTimerSeconds, setMaxTimerSeconds] = useState(
const [
manualTopTierAuctionPriorityUserIds,
setManualTopTierAuctionPriorityUserIds,
] = useState<string[]>([]);
const [
maximumBidRoundDurationSecondsInput,
setMaximumBidRoundDurationSecondsInput,
] = useState(
String(DEFAULT_AUCTION_MAX_TIMER_SECONDS),
);
const [bidExtensionSeconds, setBidExtensionSeconds] = useState(
String(DEFAULT_AUCTION_BID_EXTENSION_SECONDS),
);
const [bidRoundExtensionSecondsInput, setBidRoundExtensionSecondsInput] =
useState(String(DEFAULT_AUCTION_BID_EXTENSION_SECONDS));
const [manualResultStartTime, setManualResultStartTime] = useState("");
const [manualResultEndTime, setManualResultEndTime] = useState("");
const [manualRiotMatchId, setManualRiotMatchId] = useState("");
@@ -2550,29 +2556,33 @@ export default function MatchDetailPage() {
});
const startAuctionMutation = useMutation({
mutationFn: () =>
mutationFn: (startAuctionRequestId: string) =>
apiFetch(`/communities/${DEFAULT_COMMUNITY_ID}/matches/${id}/auction`, {
method: "POST",
body: JSON.stringify({
startAuctionRequestId,
captains: buildCaptainSlots(matchQuery.data?.participants ?? []).map(
(slot) => ({
teamIndex: slot.teamIndex,
userId: captainSelections[captainSlotKey(slot)]?.userId,
initialPoints:
initialTeamBidPointAmount:
parseInitialPointsInput(
captainSelections[captainSlotKey(slot)]?.initialPoints ?? "",
captainSelections[captainSlotKey(slot)]
?.initialTeamBidPointAmountInput ?? "",
) ?? 1000,
}),
),
initialPoints: 1000,
topTierThreshold,
manualTopTierUserIds:
topTierThreshold === "MANUAL" ? selectedManualTopTierUserIds : [],
maxTimerSeconds:
parseAuctionSecondsInput(maxTimerSeconds, 5) ??
initialTeamBidPointAmount: 1000,
topTierAuctionPriorityThreshold,
manualTopTierAuctionPriorityUserIds:
topTierAuctionPriorityThreshold === "MANUAL"
? selectedManualTopTierUserIds
: [],
maximumBidRoundDurationSeconds:
parseAuctionSecondsInput(maximumBidRoundDurationSecondsInput, 5) ??
DEFAULT_AUCTION_MAX_TIMER_SECONDS,
bidExtensionSeconds:
parseAuctionSecondsInput(bidExtensionSeconds, 0) ??
bidRoundExtensionSeconds:
parseAuctionSecondsInput(bidRoundExtensionSecondsInput, 0) ??
DEFAULT_AUCTION_BID_EXTENSION_SECONDS,
}),
}),
@@ -2681,7 +2691,8 @@ export default function MatchDetailPage() {
if (currentIsValid) {
next[key] = {
userId: currentUserId,
initialPoints: currentSelection?.initialPoints ?? "1000",
initialTeamBidPointAmountInput:
currentSelection?.initialTeamBidPointAmountInput ?? "1000",
};
usedUserIds.add(currentUserId);
continue;
@@ -2692,7 +2703,8 @@ export default function MatchDetailPage() {
);
next[key] = {
userId: fallback?.userId ?? "",
initialPoints: currentSelection?.initialPoints ?? "1000",
initialTeamBidPointAmountInput:
currentSelection?.initialTeamBidPointAmountInput ?? "1000",
};
if (fallback) usedUserIds.add(fallback.userId);
}
@@ -2754,7 +2766,8 @@ export default function MatchDetailPage() {
const hasValidCaptainInitialPoints = captainSlots.every((slot) =>
Boolean(
parseInitialPointsInput(
captainSelections[captainSlotKey(slot)]?.initialPoints ?? "",
captainSelections[captainSlotKey(slot)]
?.initialTeamBidPointAmountInput ?? "",
),
),
);
@@ -2764,12 +2777,16 @@ export default function MatchDetailPage() {
const manualPriorityCandidateIds = new Set(
manualPriorityCandidates.map((participant) => participant.userId),
);
const selectedManualTopTierUserIds = manualTopTierUserIds.filter((userId) =>
manualPriorityCandidateIds.has(userId),
const selectedManualTopTierUserIds =
manualTopTierAuctionPriorityUserIds.filter((userId) =>
manualPriorityCandidateIds.has(userId),
);
const parsedMaxTimerSeconds = parseAuctionSecondsInput(
maximumBidRoundDurationSecondsInput,
5,
);
const parsedMaxTimerSeconds = parseAuctionSecondsInput(maxTimerSeconds, 5);
const parsedBidExtensionSeconds = parseAuctionSecondsInput(
bidExtensionSeconds,
bidRoundExtensionSecondsInput,
0,
);
const hasValidAuctionTimerSettings =
@@ -2997,8 +3014,9 @@ export default function MatchDetailPage() {
...current,
[key]: {
userId: event.target.value,
initialPoints:
current[key]?.initialPoints ??
initialTeamBidPointAmountInput:
current[key]
?.initialTeamBidPointAmountInput ??
"1000",
},
}))
@@ -3035,28 +3053,34 @@ export default function MatchDetailPage() {
step={50}
className="w-full border border-base-content/10 bg-transparent px-2 py-2 text-sm tabular-nums"
value={
currentSelection?.initialPoints ?? "1000"
currentSelection
?.initialTeamBidPointAmountInput ??
"1000"
}
onChange={(event) =>
setCaptainSelections((current) => ({
...current,
[key]: {
userId: current[key]?.userId ?? "",
initialPoints: event.target.value,
initialTeamBidPointAmountInput:
event.target.value,
},
}))
}
onBlur={() =>
setCaptainSelections((current) => {
const points = parseInitialPointsInput(
current[key]?.initialPoints ?? "",
current[key]
?.initialTeamBidPointAmountInput ??
"",
);
if (points !== null) return current;
return {
...current,
[key]: {
userId: current[key]?.userId ?? "",
initialPoints: "1000",
initialTeamBidPointAmountInput:
"1000",
},
};
})
@@ -3082,17 +3106,22 @@ export default function MatchDetailPage() {
max={MAX_AUCTION_TIMER_SECONDS}
step={5}
className="min-w-0 flex-1 bg-transparent px-2 py-2 text-sm tabular-nums focus:outline-none"
value={maxTimerSeconds}
value={maximumBidRoundDurationSecondsInput}
onChange={(event) =>
setMaxTimerSeconds(event.target.value)
setMaximumBidRoundDurationSecondsInput(
event.target.value,
)
}
onBlur={() => {
if (
parseAuctionSecondsInput(maxTimerSeconds, 5)
parseAuctionSecondsInput(
maximumBidRoundDurationSecondsInput,
5,
)
) {
return;
}
setMaxTimerSeconds(
setMaximumBidRoundDurationSecondsInput(
String(DEFAULT_AUCTION_MAX_TIMER_SECONDS),
);
}}
@@ -3111,20 +3140,22 @@ export default function MatchDetailPage() {
max={MAX_AUCTION_TIMER_SECONDS}
step={1}
className="min-w-0 flex-1 bg-transparent px-2 py-2 text-sm tabular-nums focus:outline-none"
value={bidExtensionSeconds}
value={bidRoundExtensionSecondsInput}
onChange={(event) =>
setBidExtensionSeconds(event.target.value)
setBidRoundExtensionSecondsInput(
event.target.value,
)
}
onBlur={() => {
if (
parseAuctionSecondsInput(
bidExtensionSeconds,
bidRoundExtensionSecondsInput,
0,
) !== null
) {
return;
}
setBidExtensionSeconds(
setBidRoundExtensionSecondsInput(
String(DEFAULT_AUCTION_BID_EXTENSION_SECONDS),
);
}}
@@ -3142,9 +3173,9 @@ export default function MatchDetailPage() {
상위 티어 우선 등장
<select
className="mt-1 h-[38px] w-full border border-base-content/10 bg-transparent px-2 py-2 text-sm focus:border-primary/30 focus:outline-none"
value={topTierThreshold}
value={topTierAuctionPriorityThreshold}
onChange={(event) =>
setTopTierThreshold(
setTopTierAuctionPriorityThreshold(
event.target.value as AuctionTopTierThreshold,
)
}
@@ -3157,7 +3188,7 @@ export default function MatchDetailPage() {
</select>
</label>
</div>
{topTierThreshold === "MANUAL" && (
{topTierAuctionPriorityThreshold === "MANUAL" && (
<div className="border border-base-content/10 bg-base-200/20 p-3">
<div className="mb-2 text-xs font-bold uppercase tracking-wider text-base-content/35">
우선 등장 선수
@@ -3193,18 +3224,19 @@ export default function MatchDetailPage() {
className="checkbox checkbox-primary checkbox-xs"
checked={checked}
onChange={(event) =>
setManualTopTierUserIds((current) =>
event.target.checked
? [
...new Set([
...current,
participant.userId,
]),
]
: current.filter(
(userId) =>
userId !== participant.userId,
),
setManualTopTierAuctionPriorityUserIds(
(current) =>
event.target.checked
? [
...new Set([
...current,
participant.userId,
]),
]
: current.filter(
(userId) =>
userId !== participant.userId,
),
)
}
/>
@@ -3226,7 +3258,9 @@ export default function MatchDetailPage() {
disabled={
!canStartAuction || startAuctionMutation.isPending
}
onClick={() => startAuctionMutation.mutate()}
onClick={() =>
startAuctionMutation.mutate(crypto.randomUUID())
}
>
{startAuctionMutation.isPending
? "시작 중..."