fix buchholu caluclation

Author: Peu77

api/src/event/event.service.ts

@@ -17,6 +17,7 @@ import {
   IsNull,
   LessThanOrEqual,
   Repository,
+  type FindOptionsRelations,
   UpdateResult,
 } from "typeorm";
 import {
@@ -26,7 +27,6 @@ import {
 import * as CryptoJS from "crypto-js";
 import { ConfigService } from "@nestjs/config";
 import { TeamService } from "../team/team.service";
-import { FindOptionsRelations } from "typeorm/find-options/FindOptionsRelations";
 import { Cron, CronExpression } from "@nestjs/schedule";
 import { EventVersionDto } from "./dtos/eventVersionDto";
 import { LockKeys } from "../constants";

api/src/match/match.service.ts

@@ -4,7 +4,14 @@ import { InjectRepository } from "@nestjs/typeorm";
 import { MatchEntity, MatchPhase, MatchState } from "./entites/match.entity";
 import { MatchStatsEntity } from "./entites/matchStats.entity";
 import { getCreditWagerRefund } from "./match-credit-wager";
-import { DataSource, In, Not, Repository } from "typeorm";
+import {
+  DataSource,
+  In,
+  Not,
+  Repository,
+  type FindOptionsRelations,
+  type FindOptionsSelect,
+} from "typeorm";
 import { Swiss } from "tournament-pairings";
 import { EventService } from "../event/event.service";
 import type { Player } from "tournament-pairings/interfaces";
@@ -14,8 +21,6 @@ import { getRabbitmqConfig } from "../main";
 import { ConfigService } from "@nestjs/config";
 import { TeamEntity } from "../team/entities/team.entity";
 import { GithubApiService } from "../github-api/github-api.service";
-import { FindOptionsRelations } from "typeorm/find-options/FindOptionsRelations";
-import { FindOptionsSelect } from "typeorm/find-options/FindOptionsSelect";
 import { MatchTeamResultEntity } from "./entites/match.team.result.entity";
 import { GamblingService } from "../gambling/gambling.service";
 import { canViewTeamMatchReplay } from "./team-match-visibility";

api/src/team/team-search.spec.ts

@@ -0,0 +1,80 @@
+jest.mock("./entities/team.entity", () => ({
+  TeamEntity: class TeamEntity {},
+}));
+jest.mock("../event/entities/event.entity", () => ({
+  EventEntity: class EventEntity {},
+}));
+jest.mock("../event/event.service", () => ({
+  EventService: class EventService {},
+}));
+jest.mock("../github-api/github-api.service", () => ({
+  GithubApiService: class GithubApiService {},
+}));
+jest.mock("../match/match.service", () => ({
+  MatchService: class MatchService {},
+}));
+jest.mock("../user/user.service", () => ({
+  UserService: class UserService {},
+}));
+
+import type { TeamEntity } from "./entities/team.entity";
+import { TeamService } from "./team.service";
+
+describe("TeamService.getSearchedTeamsForEvent", () => {
+  it("returns the persisted Buchholz score for the admin reveal view", async () => {
+    const team = {
+      id: "team-1",
+      name: "Team One",
+      locked: false,
+      score: 4,
+      buchholzPoints: 12,
+      hadBye: false,
+      credits: 0,
+      createdAt: new Date("2026-01-01T00:00:00.000Z"),
+      updatedAt: new Date("2026-01-01T00:00:00.000Z"),
+    } as TeamEntity;
+
+    const queryBuilder = {
+      innerJoin: jest.fn().mockReturnThis(),
+      leftJoin: jest.fn().mockReturnThis(),
+      where: jest.fn().mockReturnThis(),
+      andWhere: jest.fn().mockReturnThis(),
+      select: jest.fn().mockReturnThis(),
+      addSelect: jest.fn().mockReturnThis(),
+      groupBy: jest.fn().mockReturnThis(),
+      getRawAndEntities: jest.fn().mockResolvedValue({
+        entities: [team],
+        raw: [{ user_count: "2" }],
+      }),
+    };
+    const calculateBuchholzPointsForTeams = jest
+      .fn()
+      .mockResolvedValue(new Map([["team-1", 8]]));
+    const service = Object.create(TeamService.prototype) as TeamService;
+
+    Reflect.set(service, "teamRepository", {
+      createQueryBuilder: jest.fn().mockReturnValue(queryBuilder),
+    });
+    Reflect.set(service, "eventService", {
+      isEventAdmin: jest.fn().mockResolvedValue(true),
+    });
+    Reflect.set(service, "matchService", {
+      calculateBuchholzPointsForTeams,
+    });
+    jest
+      .spyOn(service, "getLocationTagsForTeams")
+      .mockResolvedValue(new Map([["team-1", []]]));
+
+    const result = await service.getSearchedTeamsForEvent(
+      "event-1",
+      undefined,
+      undefined,
+      undefined,
+      "admin-1",
+      true,
+    );
+
+    expect(result[0].buchholzPoints).toBe(12);
+    expect(calculateBuchholzPointsForTeams).not.toHaveBeenCalled();
+  });
+});

api/src/team/team.service.ts

@@ -16,11 +16,11 @@ import {
   LessThanOrEqual,
   Not,
   Repository,
+  type FindOptionsRelations,
 } from "typeorm";
 import { GithubApiService } from "../github-api/github-api.service";
 import { EventService } from "../event/event.service";
 import { UserService } from "../user/user.service";
-import { FindOptionsRelations } from "typeorm/find-options/FindOptionsRelations";
 import { MatchService } from "../match/match.service";
 import { Cron, CronExpression } from "@nestjs/schedule";
 import { LockKeys } from "../constants";
@@ -57,7 +57,11 @@ export class TeamService {
     private readonly matchService: MatchService,
     @InjectDataSource()
     private readonly dataSource: DataSource,
-  ) {}
+  ) {
+    this.getSortedTeamsForTournament("2c10eecb-ab9b-48e4-a840-d54febb25854").then(results => {
+      console.log(results)
+    })
+  }
 
   logger = new Logger("TeamService");
 
@@ -617,13 +621,17 @@ export class TeamService {
 
     const result = await query.getRawAndEntities();
 
-    // Batch calculate Buchholz points for all teams in the result
     const teamIds = result.entities.map((t) => t.id);
-    const buchholzMap = await this.matchService.calculateBuchholzPointsForTeams(
-      teamIds,
-      eventId,
-      !revealAll,
-    );
+    // Public standings are calculated from revealed matches. The admin view must
+    // keep the persisted value selected above instead of overwriting it with a
+    // different on-the-fly calculation.
+    const revealedBuchholzMap = revealAll
+      ? undefined
+      : await this.matchService.calculateBuchholzPointsForTeams(
+          teamIds,
+          eventId,
+          true,
+        );
     const tagsByTeam = await this.getLocationTagsForTeams(teamIds);
 
     // Map properties from raw if entity is missing them due to partial select
@@ -655,8 +663,9 @@ export class TeamService {
             (team.hadBye ? 1 : 0);
         }
 
-        // Use the batch-calculated Buchholz points
-        mappedTeam.buchholzPoints = buchholzMap.get(team.id) || 0;
+        mappedTeam.buchholzPoints = revealAll
+          ? (team.buchholzPoints ?? 0)
+          : (revealedBuchholzMap?.get(team.id) ?? 0);
 
         return mappedTeam;
       }),

frontend/src/components/tournament/admin-bracket-stepper.tsx

@@ -167,7 +167,7 @@ export function AdminBracketStepper({
 
       <div className="h-1 overflow-hidden rounded-full bg-muted">
         <motion.div
-          className="h-full rounded-full bg-gradient-to-r from-primary/70 via-primary to-emerald-500"
+          className="h-full rounded-full bg-linear-to-r from-primary/70 via-primary to-emerald-500"
           initial={false}
           animate={{
             width: `${((safeIndex + 1) / orderedMatches.length) * 100}%`,

frontend/src/components/tournament/group-phase-graph-view.tsx

@@ -103,7 +103,7 @@ export function GroupPhaseGraphView({
 
   if (matches.length === 0) {
     return (
-      <div className="flex min-h-[360px] items-center justify-center rounded-xl border bg-card/50 px-6 text-center text-sm text-muted-foreground">
+      <div className="flex min-h-90 items-center justify-center rounded-xl border bg-card/50 px-6 text-center text-sm text-muted-foreground">
         Matches will appear here once the group phase starts.
       </div>
     )