refactor(lib): update rating utilities to use new player field names
This commit is contained in:
+26
-21
@@ -187,10 +187,10 @@ export async function recalculateAllOpenSkill(prisma: PrismaClient) {
|
||||
const matches = await prisma.match.findMany({
|
||||
orderBy: { playedAt: 'asc' },
|
||||
include: {
|
||||
team1P1: true,
|
||||
team1P2: true,
|
||||
team2P1: true,
|
||||
team2P2: true,
|
||||
player1P1: true,
|
||||
player1P2: true,
|
||||
player2P1: true,
|
||||
player2P2: true,
|
||||
},
|
||||
});
|
||||
|
||||
@@ -210,13 +210,18 @@ export async function recalculateAllOpenSkill(prisma: PrismaClient) {
|
||||
|
||||
// Process each match
|
||||
for (const match of matches) {
|
||||
const { team1P1, team1P2, team2P1, team2P2, team1Score, team2Score } = match;
|
||||
const { player1P1, player1P2, player2P1, player2P2, team1Score, team2Score } = match;
|
||||
|
||||
// Skip matches with missing players
|
||||
if (!player1P1 || !player1P2 || !player2P1 || !player2P2) {
|
||||
continue;
|
||||
}
|
||||
|
||||
// Get current ratings
|
||||
const p1Rating = playerRatings.get(team1P1.id) ?? { mu: 25.0, sigma: 8.33 };
|
||||
const p2Rating = playerRatings.get(team1P2.id) ?? { mu: 25.0, sigma: 8.33 };
|
||||
const p3Rating = playerRatings.get(team2P1.id) ?? { mu: 25.0, sigma: 8.33 };
|
||||
const p4Rating = playerRatings.get(team2P2.id) ?? { mu: 25.0, sigma: 8.33 };
|
||||
const p1Rating = playerRatings.get(player1P1.id) ?? { mu: 25.0, sigma: 8.33 };
|
||||
const p2Rating = playerRatings.get(player1P2.id) ?? { mu: 25.0, sigma: 8.33 };
|
||||
const p3Rating = playerRatings.get(player2P1.id) ?? { mu: 25.0, sigma: 8.33 };
|
||||
const p4Rating = playerRatings.get(player2P2.id) ?? { mu: 25.0, sigma: 8.33 };
|
||||
|
||||
const team1Won = team1Score > team2Score;
|
||||
const team2Won = team2Score > team1Score;
|
||||
@@ -228,14 +233,14 @@ export async function recalculateAllOpenSkill(prisma: PrismaClient) {
|
||||
const newRatings = calculateOpenSkillRatings(teams, rankings);
|
||||
|
||||
// Update in-memory ratings
|
||||
playerRatings.set(team1P1.id, newRatings[0][0]);
|
||||
playerRatings.set(team1P2.id, newRatings[0][1]);
|
||||
playerRatings.set(team2P1.id, newRatings[1][0]);
|
||||
playerRatings.set(team2P2.id, newRatings[1][1]);
|
||||
playerRatings.set(player1P1.id, newRatings[0][0]);
|
||||
playerRatings.set(player1P2.id, newRatings[0][1]);
|
||||
playerRatings.set(player2P1.id, newRatings[1][0]);
|
||||
playerRatings.set(player2P2.id, newRatings[1][1]);
|
||||
|
||||
// Update database records
|
||||
await (prisma as any).openSkillRating.upsert({
|
||||
where: { playerId: team1P1.id },
|
||||
where: { playerId: player1P1.id },
|
||||
update: {
|
||||
rating: fromOpenSkillRating(newRatings[0][0]),
|
||||
gamesPlayed: { increment: 1 },
|
||||
@@ -244,7 +249,7 @@ export async function recalculateAllOpenSkill(prisma: PrismaClient) {
|
||||
draws: isTie ? { increment: 1 } : undefined,
|
||||
},
|
||||
create: {
|
||||
playerId: team1P1.id,
|
||||
playerId: player1P1.id,
|
||||
rating: fromOpenSkillRating(newRatings[0][0]),
|
||||
gamesPlayed: 1,
|
||||
wins: team1Won ? 1 : 0,
|
||||
@@ -254,7 +259,7 @@ export async function recalculateAllOpenSkill(prisma: PrismaClient) {
|
||||
});
|
||||
|
||||
await (prisma as any).openSkillRating.upsert({
|
||||
where: { playerId: team1P2.id },
|
||||
where: { playerId: player1P2.id },
|
||||
update: {
|
||||
rating: fromOpenSkillRating(newRatings[0][1]),
|
||||
gamesPlayed: { increment: 1 },
|
||||
@@ -263,7 +268,7 @@ export async function recalculateAllOpenSkill(prisma: PrismaClient) {
|
||||
draws: isTie ? { increment: 1 } : undefined,
|
||||
},
|
||||
create: {
|
||||
playerId: team1P2.id,
|
||||
playerId: player1P2.id,
|
||||
rating: fromOpenSkillRating(newRatings[0][1]),
|
||||
gamesPlayed: 1,
|
||||
wins: team1Won ? 1 : 0,
|
||||
@@ -273,7 +278,7 @@ export async function recalculateAllOpenSkill(prisma: PrismaClient) {
|
||||
});
|
||||
|
||||
await (prisma as any).openSkillRating.upsert({
|
||||
where: { playerId: team2P1.id },
|
||||
where: { playerId: player2P1.id },
|
||||
update: {
|
||||
rating: fromOpenSkillRating(newRatings[1][0]),
|
||||
gamesPlayed: { increment: 1 },
|
||||
@@ -282,7 +287,7 @@ export async function recalculateAllOpenSkill(prisma: PrismaClient) {
|
||||
draws: isTie ? { increment: 1 } : undefined,
|
||||
},
|
||||
create: {
|
||||
playerId: team2P1.id,
|
||||
playerId: player2P1.id,
|
||||
rating: fromOpenSkillRating(newRatings[1][0]),
|
||||
gamesPlayed: 1,
|
||||
wins: team2Won ? 1 : 0,
|
||||
@@ -292,7 +297,7 @@ export async function recalculateAllOpenSkill(prisma: PrismaClient) {
|
||||
});
|
||||
|
||||
await (prisma as any).openSkillRating.upsert({
|
||||
where: { playerId: team2P2.id },
|
||||
where: { playerId: player2P2.id },
|
||||
update: {
|
||||
rating: fromOpenSkillRating(newRatings[1][1]),
|
||||
gamesPlayed: { increment: 1 },
|
||||
@@ -301,7 +306,7 @@ export async function recalculateAllOpenSkill(prisma: PrismaClient) {
|
||||
draws: isTie ? { increment: 1 } : undefined,
|
||||
},
|
||||
create: {
|
||||
playerId: team2P2.id,
|
||||
playerId: player2P2.id,
|
||||
rating: fromOpenSkillRating(newRatings[1][1]),
|
||||
gamesPlayed: 1,
|
||||
wins: team2Won ? 1 : 0,
|
||||
|
||||
Reference in New Issue
Block a user