fix: calculate user score only for their current coalition

Author: FreekBes

src/routes/charts.ts

@@ -259,7 +259,7 @@ export const setupChartRoutes = function(app: Express, prisma: PrismaClient): vo
 			}
 			dates.push(now); // always add the current score
 
-			// Get all scores for this user for the given timespan
+			// Get all scores for this user for the given timespan, and in the coalition they are currently in
 			const scoreSumsPerDate: { [key: number]: number } = {};
 			for (const date of dates) {
 				const scores = await prisma.codamCoalitionScore.groupBy({
@@ -269,6 +269,7 @@ export const setupChartRoutes = function(app: Express, prisma: PrismaClient): vo
 					},
 					where: {
 						user_id: user.id,
+						coalition_id: user.coalition_users[0].coalition.id,
 						created_at: {
 							gte: blocStart,
 							lte: date,
@@ -390,7 +391,7 @@ export const setupChartRoutes = function(app: Express, prisma: PrismaClient): vo
 			// @ts-ignore
 			fixedPointTypes.push({ type: null }); // replacement for null
 
-			// Get all scores for this user for the given timespan
+			// Get all scores for this user for the given timespan and coalition, split by fixed point type
 			const scoreSumsPerTypePerDate: { [key: string]: { [key: number]: number } } = {};
 			for (const fixedPointType of fixedPointTypes) {
 				scoreSumsPerTypePerDate[fixedPointType.type || 'null'] = {};
@@ -403,6 +404,7 @@ export const setupChartRoutes = function(app: Express, prisma: PrismaClient): vo
 					},
 					where: {
 						user_id: user.id,
+						coalition_id: user.coalition_users[0].coalition.id,
 						created_at: {
 							gte: blocStart,
 							lte: date,

src/routes/profile.ts

@@ -30,7 +30,8 @@ export const setupProfileRoutes = function(app: Express, prisma: PrismaClient):
 		}
 
 		const now = new Date();
-		const { userScores, totalScore } = await getUserScores(prisma, profileUser.id, now);
+		const userCoalitionId = profileUser.coalition_users.length > 0 ? profileUser.coalition_users[0].coalition_id : undefined;
+		const { userScores, totalScore } = await getUserScores(prisma, profileUser.id, userCoalitionId, now);
 		const ranking = await getUserSeasonRanking(prisma, profileUser.id);
 
 		const latestScores = await prisma.codamCoalitionScore.findMany({

src/utils.ts

@@ -427,7 +427,7 @@ export const getUsersScores = async function(prisma: PrismaClient, coalitionId:
 	return usersScores;
 };
 
-export const getUserScores = async function(prisma: PrismaClient, userId: number, untilDate: Date = new Date()): Promise<{ userScores: { fixed_type_id: string | null, _sum: { amount: number | null } }[], totalScore: number }> {
+export const getUserScores = async function(prisma: PrismaClient, userId: number, coalitionId: number | undefined = undefined, untilDate: Date = new Date()): Promise<{ userScores: { fixed_type_id: string | null, _sum: { amount: number | null } }[], totalScore: number }> {
 	const bloc = await getBlocAtDate(prisma, untilDate);
 	const userScores = (bloc ? (await prisma.codamCoalitionScore.groupBy({
 		by: ['fixed_type_id'],
@@ -436,6 +436,7 @@ export const getUserScores = async function(prisma: PrismaClient, userId: number
 		},
 		where: {
 			user_id: userId,
+			coalition_id: coalitionId, // if set to undefined, get user's scores across multiple coalitions (can happen if user switched coalitions mid-season)
 			created_at: {
 				gte: bloc.begin_at,
 				lte: untilDate,