Release 77 #1

Merged
dahyeon merged 57 commits from release/77 into main 2026-06-09 13:36:48 +00:00
2 changed files with 67 additions and 90 deletions
Showing only changes of commit b711c63dcd - Show all commits

No files matched your search

@@ -348,7 +348,7 @@ describe('AuctionService', () => {
expect(auction.save).not.toHaveBeenCalled();
});
it('marks a zero-bid player as passed and queues them for round two', async () => {
it('marks a zero-bid player as passed and queues them for another round', async () => {
const matchId = new mongoose.Types.ObjectId();
const playerId = new mongoose.Types.ObjectId();
const auction = {
@@ -383,25 +383,63 @@ describe('AuctionService', () => {
expect(auction.save).toHaveBeenCalledTimes(1);
});
it('force-assigns second-pass players to the open team with most points', async () => {
it('queues zero-bid passes after the first auction round', async () => {
const matchId = new mongoose.Types.ObjectId();
const playerId = new mongoose.Types.ObjectId();
const auction = {
_id: new mongoose.Types.ObjectId(),
matchId,
phase: 'bidding',
currentBid: 0,
currentIndex: 0,
auctionRound: 2,
order: [
{
userId: playerId,
preferredPositions: [{ position: 'MID', priority: 1 }],
passCount: 1,
},
],
passedQueue: [],
save: jest.fn().mockResolvedValue(undefined),
toObject: jest.fn().mockReturnValue({ _id: 'auction', matchId }),
};
const { service } = createService({
auction: {
findOne: jest.fn().mockResolvedValue(auction),
},
});
await service.markPassed(matchId);
expect(auction.phase).toBe('passed');
expect(auction.order[0].passCount).toBe(2);
expect(auction.passedQueue).toHaveLength(1);
expect(auction.passedQueue[0]).toMatchObject({
userId: playerId.toString(),
preferredPositions: [{ position: 'MID', priority: 1 }],
passCount: 2,
});
});
it('requeues second-pass players instead of force-assigning them', async () => {
const matchId = new mongoose.Types.ObjectId();
const captainOneId = new mongoose.Types.ObjectId();
const captainTwoId = new mongoose.Types.ObjectId();
const passedPlayerId = new mongoose.Types.ObjectId();
const passedPlayer = {
userId: passedPlayerId,
preferredPositions: [{ position: 'SUP', priority: 1 }],
passCount: 2,
};
const auction = {
_id: new mongoose.Types.ObjectId(),
matchId,
phase: 'passed',
currentIndex: 0,
auctionRound: 2,
order: [
{
userId: passedPlayerId,
preferredPositions: [{ position: 'SUP', priority: 1 }],
passCount: 2,
},
],
passedQueue: [],
order: [passedPlayer],
passedQueue: [passedPlayer],
teams: [
{
teamIndex: 1,
@@ -419,46 +457,28 @@ describe('AuctionService', () => {
save: jest.fn().mockResolvedValue(undefined),
toObject: jest.fn().mockReturnValue({ _id: 'auction', matchId }),
};
const match = {
participants: [
{
userId: captainOneId,
preferredPositions: [{ position: 'TOP', priority: 1 }],
},
{
userId: captainTwoId,
preferredPositions: [{ position: 'JGL', priority: 1 }],
},
{
userId: passedPlayerId,
preferredPositions: [{ position: 'SUP', priority: 1 }],
},
],
status: 'team-built',
teams: [],
teamBuiltAt: undefined,
save: jest.fn().mockResolvedValue(undefined),
};
const { service } = createService({
auction: {
findOne: jest.fn().mockResolvedValue(auction),
},
match: {
findById: jest.fn().mockResolvedValue(match),
},
});
await service.next(matchId);
expect(auction.phase).toBe('complete');
expect(auction.teams[1].members).toEqual([
{
userId: passedPlayerId,
assignedPosition: 'SUP',
cost: 1,
},
]);
expect(auction.teams[1].points).toBe(49);
expect(auction.phase).toBe('presenting');
expect(auction.auctionRound).toBe(3);
expect(auction.currentIndex).toBe(1);
expect(auction.order).toHaveLength(2);
expect(auction.order[1]).toMatchObject({
userId: passedPlayerId.toString(),
preferredPositions: [{ position: 'SUP', priority: 1 }],
passCount: 2,
});
expect(auction.passedQueue).toEqual([]);
expect(auction.teams[0].members).toEqual([]);
expect(auction.teams[1].members).toEqual([]);
expect(auction.teams[0].points).toBe(10);
expect(auction.teams[1].points).toBe(50);
});
it('syncs completed auction teams into the match document', async () => {
@@ -345,9 +345,8 @@ export class AuctionService {
await this.recordSnapshot(auction, 'passed');
current.passCount = (current.passCount ?? 0) + 1;
if ((auction.auctionRound ?? 1) === 1) {
auction.passedQueue.push(this.cloneAuctionPlayerSnapshot(current));
}
auction.passedQueue ??= [];
auction.passedQueue.push(this.cloneAuctionPlayerSnapshot(current));
auction.phase = 'passed';
auction.currentDeadline = undefined;
await auction.save();
@@ -368,29 +367,22 @@ export class AuctionService {
const nextIndex = auction.currentIndex + 1;
const completesAuction =
nextIndex >= auction.order.length &&
!(
(auction.auctionRound ?? 1) === 1 &&
(auction.passedQueue?.length ?? 0) > 0
);
(auction.passedQueue?.length ?? 0) === 0;
await this.recordSnapshot(auction, completesAuction ? 'complete' : 'next');
if (nextIndex >= auction.order.length) {
if (
(auction.auctionRound ?? 1) === 1 &&
(auction.passedQueue?.length ?? 0) > 0
) {
if ((auction.passedQueue?.length ?? 0) > 0) {
auction.order.push(
...auction.passedQueue.map((player) =>
this.cloneAuctionPlayerSnapshot(player),
),
);
auction.passedQueue = [];
auction.auctionRound = 2;
auction.auctionRound = (auction.auctionRound ?? 1) + 1;
auction.currentIndex = nextIndex;
auction.phase = 'presenting';
auction.currentBid = 0;
auction.currentBidderTeamIndex = undefined;
} else {
this.forceAssignRemainingPasses(auction);
auction.phase = 'complete';
auction.completedAt = new Date();
}
@@ -603,41 +595,6 @@ export class AuctionService {
return shuffled;
}
private forceAssignRemainingPasses(auction: AuctionDocument): void {
const forcedPlayers = auction.order.filter(
(player) =>
(player.passCount ?? 0) >= 2 &&
!this.isAuctionPlayerAssigned(auction, player.userId),
);
for (const player of forcedPlayers) {
const targetTeam = [...auction.teams]
.filter(
(team) => this.countTeamMembersIncludingCaptain(team) < AUCTION_MAX_TEAM_SIZE,
)
.sort((left, right) => right.points - left.points)[0];
if (!targetTeam) return;
const preferredPrimary = player.preferredPositions[0]?.position;
targetTeam.members.push({
userId: player.userId,
assignedPosition: preferredPrimary ?? 'MID',
cost: 1,
});
targetTeam.points = Math.max(0, targetTeam.points - 1);
}
}
private isAuctionPlayerAssigned(
auction: AuctionDocument,
userId: mongoose.Types.ObjectId,
): boolean {
const userIdText = userId.toString();
return auction.teams.some((team) =>
team.members.some((member) => member.userId.toString() === userIdText),
);
}
private cloneAuctionPlayerSnapshot(
player: AuctionPlayerSnapshot,
): AuctionPlayerSnapshot {