From 905e72fbed399c3dac4603576598881841edd5fc Mon Sep 17 00:00:00 2001 From: dahyeon Date: Sat, 2 May 2026 14:16:00 -0700 Subject: [PATCH] . --- .../src/modules/auction/auction.controller.ts | 3 + .../src/modules/auction/auction.service.ts | 18 ++ .../src/modules/auction/dto/auction.dto.ts | 6 + .../20260502-auction-pass-history.ts | 4 + .../api/src/modules/global/database/schema.ts | 8 + apps/web/src/api/types.ts | 4 +- .../src/assets/position/position-bottom.svg | 6 + .../src/assets/position/position-jungle.svg | 5 + .../src/assets/position/position-middle.svg | 5 + .../src/assets/position/position-support.svg | 6 + apps/web/src/assets/position/position-top.svg | 6 + apps/web/src/pages/MatchDetailPage.tsx | 251 +++++++++++++++--- apps/web/src/pages/UserHistoryPage.tsx | 107 +++++++- 13 files changed, 389 insertions(+), 40 deletions(-) create mode 100644 apps/web/src/assets/position/position-bottom.svg create mode 100644 apps/web/src/assets/position/position-jungle.svg create mode 100644 apps/web/src/assets/position/position-middle.svg create mode 100644 apps/web/src/assets/position/position-support.svg create mode 100644 apps/web/src/assets/position/position-top.svg diff --git a/apps/api/src/modules/auction/auction.controller.ts b/apps/api/src/modules/auction/auction.controller.ts index a72e9fc8..8a4e28d0 100644 --- a/apps/api/src/modules/auction/auction.controller.ts +++ b/apps/api/src/modules/auction/auction.controller.ts @@ -55,6 +55,9 @@ export class AuctionController { initialPoints: body.initialPoints ?? 1000, maxTimerSeconds: body.maxTimerSeconds ?? 30, topTierThreshold: body.topTierThreshold ?? 'NONE', + manualTopTierUserIds: (body.manualTopTierUserIds ?? []).map( + (userId) => new mongoose.Types.ObjectId(userId), + ), }); } diff --git a/apps/api/src/modules/auction/auction.service.ts b/apps/api/src/modules/auction/auction.service.ts index c459d6d6..83625137 100644 --- a/apps/api/src/modules/auction/auction.service.ts +++ b/apps/api/src/modules/auction/auction.service.ts @@ -38,6 +38,7 @@ interface StartAuctionParams { initialPoints: number; maxTimerSeconds: number; topTierThreshold: AuctionTopTierThreshold; + manualTopTierUserIds: mongoose.Types.ObjectId[]; } interface PlaceBidParams { @@ -168,6 +169,7 @@ export class AuctionService { const prioritizedOrder = this.applyTopTierPriority( order, params.topTierThreshold, + params.manualTopTierUserIds, ); const auction = await AuctionModel.create({ @@ -188,6 +190,8 @@ export class AuctionService { maxTimerSeconds: params.maxTimerSeconds, initialPoints: params.initialPoints, topTierThreshold: params.topTierThreshold, + manualTopTierUserIds: + params.topTierThreshold === 'MANUAL' ? params.manualTopTierUserIds : [], startedAt: new Date(), }); await this.recordSnapshot(auction, 'start'); @@ -532,8 +536,22 @@ export class AuctionService { private applyTopTierPriority( order: AuctionPlayerSnapshot[], threshold: AuctionTopTierThreshold, + manualTopTierUserIds: mongoose.Types.ObjectId[], ): AuctionPlayerSnapshot[] { if (threshold === 'NONE') return order; + if (threshold === 'MANUAL') { + const manualIds = new Set( + manualTopTierUserIds.map((userId) => userId.toString()), + ); + if (manualIds.size === 0) return order; + const selected = order.filter((snap) => + manualIds.has(snap.userId.toString()), + ); + const rest = order.filter( + (snap) => !manualIds.has(snap.userId.toString()), + ); + return [...selected, ...rest]; + } const ranks = [ 'IRON', diff --git a/apps/api/src/modules/auction/dto/auction.dto.ts b/apps/api/src/modules/auction/dto/auction.dto.ts index 82422bdb..3474988e 100644 --- a/apps/api/src/modules/auction/dto/auction.dto.ts +++ b/apps/api/src/modules/auction/dto/auction.dto.ts @@ -49,6 +49,12 @@ export class StartAuctionDto { @IsEnum(AUCTION_TOP_TIER_THRESHOLDS) topTierThreshold?: AuctionTopTierThreshold; + @IsOptional() + @IsArray() + @ArrayMaxSize(100) + @IsMongoId({ each: true }) + manualTopTierUserIds?: string[]; + @IsOptional() @IsInt() @Min(5) diff --git a/apps/api/src/modules/global/database/migrations/20260502-auction-pass-history.ts b/apps/api/src/modules/global/database/migrations/20260502-auction-pass-history.ts index 4560ce95..95f0bbce 100644 --- a/apps/api/src/modules/global/database/migrations/20260502-auction-pass-history.ts +++ b/apps/api/src/modules/global/database/migrations/20260502-auction-pass-history.ts @@ -62,6 +62,10 @@ export async function migrateAuctionPassHistory( set.topTierThreshold = 'NONE'; changed = true; } + if (!Array.isArray(doc.manualTopTierUserIds)) { + set.manualTopTierUserIds = []; + changed = true; + } const order = Array.isArray(doc.order) ? doc.order.map((player) => { diff --git a/apps/api/src/modules/global/database/schema.ts b/apps/api/src/modules/global/database/schema.ts index ef2781e6..6442bc96 100644 --- a/apps/api/src/modules/global/database/schema.ts +++ b/apps/api/src/modules/global/database/schema.ts @@ -112,6 +112,7 @@ export const AUCTION_TOP_TIER_THRESHOLDS = [ 'EMERALD', 'DIAMOND', 'MASTER', + 'MANUAL', ] as const; export type AuctionTopTierThreshold = (typeof AUCTION_TOP_TIER_THRESHOLDS)[number]; @@ -535,6 +536,7 @@ export interface Auction extends MongooseTimestamps { currentDeadline?: Date; initialPoints: number; topTierThreshold: AuctionTopTierThreshold; + manualTopTierUserIds: mongoose.Types.ObjectId[]; startedAt?: Date; completedAt?: Date; } @@ -1306,6 +1308,12 @@ export const AuctionSchema = new Schema( required: true, default: 'NONE', }, + manualTopTierUserIds: { + type: [Schema.Types.ObjectId], + ref: 'user', + required: true, + default: [], + }, startedAt: { type: Date, required: false }, completedAt: { type: Date, required: false }, }, diff --git a/apps/web/src/api/types.ts b/apps/web/src/api/types.ts index 4adafc49..2888ab99 100644 --- a/apps/web/src/api/types.ts +++ b/apps/web/src/api/types.ts @@ -18,7 +18,8 @@ export type AuctionTopTierThreshold = | 'NONE' | 'EMERALD' | 'DIAMOND' - | 'MASTER'; + | 'MASTER' + | 'MANUAL'; export type CommunityRole = 'owner' | 'admin' | 'member'; export interface ApiPositionPreference { @@ -271,6 +272,7 @@ export interface ApiAuction { currentDeadline?: string; initialPoints: number; topTierThreshold: AuctionTopTierThreshold; + manualTopTierUserIds: string[]; startedAt?: string; completedAt?: string; createdAt: string; diff --git a/apps/web/src/assets/position/position-bottom.svg b/apps/web/src/assets/position/position-bottom.svg new file mode 100644 index 00000000..4c3917a4 --- /dev/null +++ b/apps/web/src/assets/position/position-bottom.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/apps/web/src/assets/position/position-jungle.svg b/apps/web/src/assets/position/position-jungle.svg new file mode 100644 index 00000000..1beaf9bd --- /dev/null +++ b/apps/web/src/assets/position/position-jungle.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/apps/web/src/assets/position/position-middle.svg b/apps/web/src/assets/position/position-middle.svg new file mode 100644 index 00000000..abfd95cc --- /dev/null +++ b/apps/web/src/assets/position/position-middle.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/apps/web/src/assets/position/position-support.svg b/apps/web/src/assets/position/position-support.svg new file mode 100644 index 00000000..4e31d1cb --- /dev/null +++ b/apps/web/src/assets/position/position-support.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/apps/web/src/assets/position/position-top.svg b/apps/web/src/assets/position/position-top.svg new file mode 100644 index 00000000..442f48da --- /dev/null +++ b/apps/web/src/assets/position/position-top.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/apps/web/src/pages/MatchDetailPage.tsx b/apps/web/src/pages/MatchDetailPage.tsx index aaa337fb..5a9bf411 100644 --- a/apps/web/src/pages/MatchDetailPage.tsx +++ b/apps/web/src/pages/MatchDetailPage.tsx @@ -8,11 +8,11 @@ import { useMe, usePollTournamentResult, useTournamentCodeStats, + useUserHistoryProfile, } from '../api/hooks'; import { buildDefaultPreferredPositions, formatTierLabel, - getTierColorToken, mapApiMatchToMatchDetail, type MatchDetailView, type ParticipantView, @@ -31,6 +31,7 @@ import { import type { AuctionTopTierThreshold, ApiMatchParticipant, + ApiTierInfo, Position, TeamSide, TournamentCodeSlotView, @@ -40,10 +41,24 @@ type CaptainSelectionSlot = { teamIndex: number; }; +type CaptainSelection = { + userId: string; + initialPoints: string; +}; + function captainSlotKey(slot: CaptainSelectionSlot) { return String(slot.teamIndex); } +function parseInitialPointsInput(value: string) { + if (!value.trim()) return null; + const points = Number(value); + if (!Number.isInteger(points) || points < 100 || points > 100000) { + return null; + } + return points; +} + function buildAuctionParticipantPool(participants: ApiMatchParticipant[]) { const ordered = [...participants].sort( (left, right) => @@ -81,25 +96,120 @@ function PosBadge({ pos, sub }: { pos: Position; sub?: boolean }) { ); } -function TierCell({ participant }: { participant: ParticipantView }) { - if (!participant.tier) { - return ( -
- 티어 정보 없음 -
- ); +function tierByQueue(tiers: ApiTierInfo[], queueType: string) { + return tiers.find((tier) => tier.queueType === queueType); +} + +function normalizeRank(rank: string | undefined) { + switch (rank) { + case 'I': + return '1'; + case 'II': + return '2'; + case 'III': + return '3'; + case 'IV': + return '4'; + default: + return rank; } +} + +function formatRankTooltip(tier: ApiTierInfo | undefined) { + if (!tier) return '언랭크'; + const highTier = ['MASTER', 'GRANDMASTER', 'CHALLENGER'].includes(tier.tier); + const normalizedTier = { + ...tier, + rank: normalizeRank(tier.rank) ?? tier.rank, + }; + const label = highTier + ? formatTierLabel({ ...normalizedTier, leaguePoints: 0 }) + : formatTierLabel(normalizedTier); + return `${label} - ${tier.leaguePoints}LP`; +} + +function formatRankBadge(tier: ApiTierInfo | undefined) { + if (!tier) return 'U'; + const tierInitial = + tier.tier === 'GRANDMASTER' ? 'GM' : tier.tier.slice(0, 1); + const rank = normalizeRank(tier.rank); + return rank ? `${tierInitial}${rank}` : tierInitial; +} + +function rankBadgeClass(tier: ApiTierInfo | undefined) { + switch (tier?.tier) { + case 'CHALLENGER': + return 'border-amber-500/60 bg-amber-100 text-amber-900 dark:border-amber-400/40 dark:bg-amber-400/20 dark:text-amber-200'; + case 'GRANDMASTER': + return 'border-red-500/60 bg-red-100 text-red-800 dark:border-red-400/40 dark:bg-red-400/20 dark:text-red-200'; + case 'MASTER': + return 'border-fuchsia-500/60 bg-fuchsia-100 text-fuchsia-800 dark:border-fuchsia-400/40 dark:bg-fuchsia-400/20 dark:text-fuchsia-200'; + case 'DIAMOND': + return 'border-cyan-500/60 bg-cyan-100 text-cyan-800 dark:border-cyan-400/40 dark:bg-cyan-400/20 dark:text-cyan-200'; + case 'EMERALD': + return 'border-emerald-500/60 bg-emerald-100 text-emerald-800 dark:border-emerald-400/40 dark:bg-emerald-400/20 dark:text-emerald-200'; + case 'PLATINUM': + return 'border-teal-500/60 bg-teal-100 text-teal-800 dark:border-teal-400/40 dark:bg-teal-400/20 dark:text-teal-200'; + case 'GOLD': + return 'border-amber-500/70 bg-amber-100 text-amber-900 dark:border-yellow-400/40 dark:bg-yellow-400/20 dark:text-yellow-200'; + case 'SILVER': + return 'border-slate-400/60 bg-slate-100 text-slate-700 dark:border-slate-300/40 dark:bg-slate-300/15 dark:text-slate-200'; + case 'BRONZE': + return 'border-orange-600/60 bg-orange-100 text-orange-800 dark:border-orange-500/40 dark:bg-orange-500/20 dark:text-orange-200'; + case 'IRON': + return 'border-stone-500/60 bg-stone-100 text-stone-700 dark:border-stone-400/40 dark:bg-stone-400/15 dark:text-stone-300'; + default: + return 'border-base-content/30 bg-transparent text-base-content/50'; + } +} + +function RankBadge({ tier }: { tier?: ApiTierInfo }) { + const tooltip = formatRankTooltip(tier); return ( -
- - {formatTierLabel(participant.tier)} + + + {formatRankBadge(tier)} - {participant.tier.leaguePoints > 0 && ( - - {participant.tier.leaguePoints}LP - - )} + + ); +} + +function QueueRankCell({ + label, + tier, +}: { + label: 'SOLO' | 'FLEX'; + tier?: ApiTierInfo; +}) { + return ( + + {label} + + + ); +} + +function TierCell({ participant }: { participant: ParticipantView }) { + const profileQuery = useUserHistoryProfile( + participant.userId, + DEFAULT_COMMUNITY_ID, + ); + const tiers = profileQuery.data?.tiers ?? []; + const soloTier = + tierByQueue(tiers, 'RANKED_SOLO_5x5') ?? + (participant.tier?.queueType === 'RANKED_SOLO_5x5' + ? participant.tier + : undefined); + const flexTier = tierByQueue(tiers, 'RANKED_FLEX_SR'); + + return ( +
+ +
); } @@ -841,10 +951,11 @@ export default function MatchDetailPage() { const canUseMemberActions = Boolean(currentUser || authUserId); const auctionQuery = useAuction(id, DEFAULT_COMMUNITY_ID); const [captainSelections, setCaptainSelections] = useState< - Record + Record >({}); const [topTierThreshold, setTopTierThreshold] = useState('NONE'); + const [manualTopTierUserIds, setManualTopTierUserIds] = useState([]); const pollTournamentResultMutation = usePollTournamentResult( DEFAULT_COMMUNITY_ID, ); @@ -882,11 +993,15 @@ export default function MatchDetailPage() { teamIndex: slot.teamIndex, userId: captainSelections[captainSlotKey(slot)]?.userId, initialPoints: - captainSelections[captainSlotKey(slot)]?.initialPoints ?? 1000, + parseInitialPointsInput( + captainSelections[captainSlotKey(slot)]?.initialPoints ?? '', + ) ?? 1000, }), ), initialPoints: 1000, topTierThreshold, + manualTopTierUserIds: + topTierThreshold === 'MANUAL' ? selectedManualTopTierUserIds : [], maxTimerSeconds: 30, }), }), @@ -925,7 +1040,7 @@ export default function MatchDetailPage() { } setCaptainSelections((current) => { - const next: Record = {}; + const next: Record = {}; const usedUserIds = new Set(); for (const slot of slots) { @@ -940,7 +1055,7 @@ export default function MatchDetailPage() { if (currentIsValid) { next[key] = { userId: currentUserId, - initialPoints: currentSelection?.initialPoints ?? 1000, + initialPoints: currentSelection?.initialPoints ?? '1000', }; usedUserIds.add(currentUserId); continue; @@ -951,7 +1066,7 @@ export default function MatchDetailPage() { ); next[key] = { userId: fallback?.userId ?? '', - initialPoints: currentSelection?.initialPoints ?? 1000, + initialPoints: currentSelection?.initialPoints ?? '1000', }; if (fallback) usedUserIds.add(fallback.userId); } @@ -1008,6 +1123,22 @@ export default function MatchDetailPage() { const hasUniqueCaptainSelections = selectedCaptainIds.length === captainSlots.length && new Set(selectedCaptainIds).size === selectedCaptainIds.length; + const hasValidCaptainInitialPoints = captainSlots.every((slot) => + Boolean( + parseInitialPointsInput( + captainSelections[captainSlotKey(slot)]?.initialPoints ?? '', + ), + ), + ); + const manualPriorityCandidates = auctionParticipantPool.filter( + (participant) => !selectedCaptainIds.includes(participant.userId), + ); + const manualPriorityCandidateIds = new Set( + manualPriorityCandidates.map((participant) => participant.userId), + ); + const selectedManualTopTierUserIds = manualTopTierUserIds.filter((userId) => + manualPriorityCandidateIds.has(userId), + ); const waitingParticipantCount = matchQuery.data.participants.length - auctionParticipantPool.length; const canStartAuction = @@ -1015,7 +1146,8 @@ export default function MatchDetailPage() { match.status === 'recruiting' && auctionParticipantPool.length >= 10 && auctionNotStarted && - hasUniqueCaptainSelections; + hasUniqueCaptainSelections && + hasValidCaptainInitialPoints; return (
@@ -1151,7 +1283,7 @@ export default function MatchDetailPage() { [key]: { userId: event.target.value, initialPoints: - current[key]?.initialPoints ?? 1000, + current[key]?.initialPoints ?? '1000', }, })) } @@ -1180,22 +1312,31 @@ export default function MatchDetailPage() { max={100000} step={50} className="w-full border border-base-content/10 bg-transparent px-2 py-2 text-sm tabular-nums" - value={currentSelection?.initialPoints ?? 1000} + value={currentSelection?.initialPoints ?? '1000'} onChange={(event) => setCaptainSelections((current) => ({ ...current, [key]: { userId: current[key]?.userId ?? '', - initialPoints: Math.min( - 100000, - Math.max( - 100, - Number(event.target.value) || 100, - ), - ), + initialPoints: event.target.value, }, })) } + onBlur={() => + setCaptainSelections((current) => { + const points = parseInitialPointsInput( + current[key]?.initialPoints ?? '', + ); + if (points !== null) return current; + return { + ...current, + [key]: { + userId: current[key]?.userId ?? '', + initialPoints: '1000', + }, + }; + }) + } />
@@ -1222,8 +1363,56 @@ export default function MatchDetailPage() { + + {topTierThreshold === 'MANUAL' && ( +
+
+ 우선 등장 선수 +
+
+ {manualPriorityCandidates.map((participant) => { + const checked = selectedManualTopTierUserIds.includes( + participant.userId, + ); + return ( + + ); + })} + {manualPriorityCandidates.length === 0 && ( +
+ 팀장을 제외한 우선 등장 후보가 없습니다. +
+ )} +
+
+ )}
Lv.{profile.summonerLevel} - {primaryTier ? ( - - {formatTierLabel(primaryTier)} {primaryTier.leaguePoints}LP - - ) : ( - 랭크 정보 없음 - )} + 시즌: {profile.season.label} 최근 저장: {formatLastFetched(profile.lastFetchedAt)}